applied black, autoflake, isort

black - for formatting
autoflake - to remove unused imports
isort - to sort the imports

added tox file to check at the gate

Signed-off-by: rakeshgm <[email protected]>

Author: rakeshgm

.gitignore

@@ -2,6 +2,7 @@
 *.idea/
 *.xml
 *.vscode
+*.tox
 
 # Byte-compiled
 __pycache__/

.isort.cfg

@@ -0,0 +1,7 @@
+[settings]
+multi_line_output = 3
+include_trailing_comma = True
+force_grid_wrap = 0
+use_parentheses = True
+ensure_newline_before_comments = True
+line_length = 88

calamari/api_test_cases/codify.py

@@ -1,19 +1,39 @@
-from utils.utils import get_calamari_config
-import argparse, os
-import libs.log as log
-import test_cli, test_config, test_crush_map, test_crush_rule, test_crush_rule_set, test_crush_type, test_event, \
-    test_log, test_info, test_mon, test_osd, test_osd_config, test_pool, test_salt_key, test_server, test_sync, \
-    test_user
-from shutil import copyfile
+import argparse
+import os
 import sys
 import time
+from shutil import copyfile
 
-if __name__ == '__main__':
+import libs.log as log
+import test_cli
+import test_config
+import test_crush_map
+import test_crush_rule
+import test_crush_rule_set
+import test_crush_type
+import test_event
+import test_info
+import test_log
+import test_mon
+import test_osd
+import test_osd_config
+import test_pool
+import test_salt_key
+import test_server
+import test_sync
+import test_user
+from utils.utils import get_calamari_config
+
+if __name__ == "__main__":
 
-    parser = argparse.ArgumentParser(description='Calamari API Automation')
+    parser = argparse.ArgumentParser(description="Calamari API Automation")
 
-    parser.add_argument('-c', dest="config", default='config.yaml',
-                        help='calamari config file: yaml file')
+    parser.add_argument(
+        "-c",
+        dest="config",
+        default="config.yaml",
+        help="calamari config file: yaml file",
+    )
 
     args = parser.parse_args()
 
@@ -50,25 +70,32 @@
 
     all_tests_exec = [test for test in tests]
 
-    log.info('-------------------- Summary -------------------------')
+    log.info("-------------------- Summary -------------------------")
 
-    log.info('--------- Passed ----------')
+    log.info("--------- Passed ----------")
 
-    passed = [log.info('\nTest id: %s\nAPI: %s\n---------' % (passed['id'], passed['name']))
-              for passed in all_tests_exec if passed['status']]
+    passed = [
+        log.info("\nTest id: %s\nAPI: %s\n---------" % (passed["id"], passed["name"]))
+        for passed in all_tests_exec
+        if passed["status"]
+    ]
 
-    log.info('--------- Failed ----------')
+    log.info("--------- Failed ----------")
 
-    failed = [log.info('\nTest id: %s\nAPI: %s\n---------' % (failed['id'], failed['name']))
-              for failed in all_tests_exec if not failed['status']]
+    failed = [
+        log.info("\nTest id: %s\nAPI: %s\n---------" % (failed["id"], failed["name"]))
+        for failed in all_tests_exec
+        if not failed["status"]
+    ]
 
-    log.info('--------------->Total Tests Passed: %s' % len(passed))
-    log.info('--------------->Total Tests Failed: %s' % len(failed))
+    log.info("--------------->Total Tests Passed: %s" % len(passed))
+    log.info("--------------->Total Tests Failed: %s" % len(failed))
 
-    print 'copying the log file to the log location defined'
+    print "copying the log file to the log location defined"
 
-    copyfile(log.LOG_NAME,
-             os.path.join(calamari_config['log_copy_location'], log.LOG_NAME))
+    copyfile(
+        log.LOG_NAME, os.path.join(calamari_config["log_copy_location"], log.LOG_NAME)
+    )
 
     if len(failed) > 0:
         sys.exit(1)

calamari/api_test_cases/dry.py

@@ -1,53 +1,50 @@
-import requests
 import json
 
-if __name__ == '__main__':
+import requests
+
+if __name__ == "__main__":
     client = requests.session()
 
-    ip = ""    # ip address
+    ip = ""  # ip address
     port = "8002"  # port number
     username = ""  # calamari login username
     password = ""  # calamari login password
 
-    base_url = 'https://%s:%s/api/v2/' % (ip, port)
+    base_url = "https://%s:%s/api/v2/" % (ip, port)
 
     # login
 
-    login_url = base_url + 'auth/login/'
-    login_data = {'username': username, 'password': password, 'next': '/'}
+    login_url = base_url + "auth/login/"
+    login_data = {"username": username, "password": password, "next": "/"}
     response = client.post(login_url, login_data, verify=False)
-    token = response.cookies['XSRF-TOKEN']
-    headers = {'X-XSRF-TOKEN': token}
+    token = response.cookies["XSRF-TOKEN"]
+    headers = {"X-XSRF-TOKEN": token}
 
     if response.status_code == 200:
         print "logged in"
 
     # get fsid
 
-    url = base_url + 'cluster'
+    url = base_url + "cluster"
     print url
     response = client.get(url, verify=False)
     response.raise_for_status()
-    fsid = json.loads(response.content)[0]['id']
+    fsid = json.loads(response.content)[0]["id"]
     print "got fsid"
 
     # cli url
 
     url = base_url + "cluster" + "/" + fsid + "/cli"
     print url
     data1 = {"command": ["ceph", "osd", "tree"]}
-    headers['Referer'] = url
+    headers["Referer"] = url
     response = client.post(url, data=data1, verify=False, headers=headers)
     response.raise_for_status()
     print response.content
 
     data2 = {"command": "ceph osd tree"}
-    headers['Referer'] = url
+    headers["Referer"] = url
     response = client.post(url, data=data2, verify=False, headers=headers)
     response.raise_for_status()
 
     print response.content
-
-
-
-

calamari/api_test_cases/generate_config.py

@@ -1,28 +1,38 @@
-import yaml
 import argparse
 
+import yaml
+
 """
 Example arguments :
 python generate_config.py -http https -ip 10.8.128.63 -port 8002 -u admin -p admin123 -log /tmp/logs
 """
 
-if __name__ == '__main__':
+if __name__ == "__main__":
 
-    parser = argparse.ArgumentParser(description='Calamari API Automation configuration')
+    parser = argparse.ArgumentParser(
+        description="Calamari API Automation configuration"
+    )
 
-    parser.add_argument('-http', dest="http", default="https",
-                        help='Input type of the protocol: http or https')
+    parser.add_argument(
+        "-http",
+        dest="http",
+        default="https",
+        help="Input type of the protocol: http or https",
+    )
 
-    parser.add_argument('-ip', dest='ip', help='Enter IP address')
+    parser.add_argument("-ip", dest="ip", help="Enter IP address")
 
-    parser.add_argument('-port', dest='port', help='Enter port number')
+    parser.add_argument("-port", dest="port", help="Enter port number")
 
-    parser.add_argument('-u',  dest='uname', help='Enter calamari username')
+    parser.add_argument("-u", dest="uname", help="Enter calamari username")
 
-    parser.add_argument('-p',  dest='pwd', default='8002', help='Enter calamari password')
+    parser.add_argument(
+        "-p", dest="pwd", default="8002", help="Enter calamari password"
+    )
 
-    parser.add_argument('-log', dest='log', default='/tmp/log',
-                        help='Enter log copy location')
+    parser.add_argument(
+        "-log", dest="log", default="/tmp/log", help="Enter log copy location"
+    )
 
     args = parser.parse_args()
 
@@ -33,10 +43,9 @@
             port=args.port,
             username=args.uname,
             password=args.pwd,
-            log_copy_location=args.log
+            log_copy_location=args.log,
         )
     )
 
-    with open('config.yaml', 'w') as outfile:
+    with open("config.yaml", "w") as outfile:
         outfile.write(yaml.dump(data, default_flow_style=False))
-

calamari/api_test_cases/http_ops.py

@@ -1,15 +1,21 @@
+import traceback
+
 import libs.log as log
 from libs.http_client import HTTPRequest
 from libs.request import APIRequest
-import traceback
 from utils.utils import check_request_id, clean_response
 
 
 class Initialize(object):
-
     def __init__(self, **config):
 
-        self.http_request = HTTPRequest(config['http'], config['ip'], config['port'], config['username'], config['password'])
+        self.http_request = HTTPRequest(
+            config["http"],
+            config["ip"],
+            config["port"],
+            config["username"],
+            config["password"],
+        )
 
         assert self.http_request.login(), "login failed"
 
@@ -28,46 +34,46 @@ def get(self, url):
             return cleaned_response
 
         except Exception:
-            log.error('\n%s' % traceback.format_exc())
+            log.error("\n%s" % traceback.format_exc())
             raise AssertionError
 
     def post(self, url, data, request_api=True):
 
         try:
 
-            log.info('data to post:\n%s' % data)
+            log.info("data to post:\n%s" % data)
 
             response = self.http_request.post(url, data)
 
             cleaned_response = clean_response(response)
 
             if request_api:
 
-                check_request_id(self.api_request, cleaned_response['request_id'])
+                check_request_id(self.api_request, cleaned_response["request_id"])
 
             return cleaned_response
 
         except Exception:
-            log.error('\n%s' % traceback.format_exc())
+            log.error("\n%s" % traceback.format_exc())
             raise AssertionError
 
     def patch(self, url, data, request_api=True):
 
         try:
 
-            log.info('data to patch\n %s' % data)
+            log.info("data to patch\n %s" % data)
 
             response = self.http_request.patch(url, data)
 
             cleaned_response = clean_response(response)
 
             if request_api:
-                check_request_id(self.api_request, cleaned_response['request_id'])
+                check_request_id(self.api_request, cleaned_response["request_id"])
 
             return cleaned_response
 
         except Exception:
-            log.error('\n%s' % traceback.format_exc())
+            log.error("\n%s" % traceback.format_exc())
             raise AssertionError
 
     def delete(self, url, request_api=True):
@@ -79,10 +85,10 @@ def delete(self, url, request_api=True):
             cleaned_response = clean_response(response)
 
             if request_api:
-                check_request_id(self.api_request, cleaned_response['request_id'])
+                check_request_id(self.api_request, cleaned_response["request_id"])
 
             return cleaned_response
 
         except Exception:
-            log.error('\n%s' % traceback.format_exc())
+            log.error("\n%s" % traceback.format_exc())
             raise AssertionError