Add HTTPS and AUTH support to ControllerTest

Author: lo-simon

nmostesting/ControllerTest.py

@@ -76,16 +76,21 @@ class ControllerTest(GenericTest):
     """
     Testing initial set up of new test suite for controller testing
     """
-    def __init__(self, apis, registries, node, dns_server, disable_auto=True, **kwargs):
+    def __init__(self, apis, registries, node, dns_server, auths, disable_auto=True, **kwargs):
         # Remove the spec_path as there are no corresponding GitHub repos for Controller Tests
         apis[CONTROLLER_TEST_API_KEY].pop("spec_path", None)
         if CONFIG.ENABLE_HTTPS:
             # Comms with Testing Facade are http only
-            apis[CONTROLLER_TEST_API_KEY]["base_url"] \
-                = apis[CONTROLLER_TEST_API_KEY]["base_url"].replace("https", "http")
-            apis[CONTROLLER_TEST_API_KEY]["url"] = apis[CONTROLLER_TEST_API_KEY]["url"].replace("https", "http")
-        GenericTest.__init__(self, apis, disable_auto=disable_auto)
+            if apis[CONTROLLER_TEST_API_KEY]["base_url"] is not None:
+                apis[CONTROLLER_TEST_API_KEY]["base_url"] \
+                    = apis[CONTROLLER_TEST_API_KEY]["base_url"].replace("https", "http")
+            if apis[CONTROLLER_TEST_API_KEY]["url"] is not None:
+                apis[CONTROLLER_TEST_API_KEY]["url"] \
+                    = apis[CONTROLLER_TEST_API_KEY]["url"].replace("https", "http")
+        GenericTest.__init__(self, apis, auths=auths, disable_auto=disable_auto)
         self.authorization = False
+        if CONFIG.ENABLE_AUTH:
+            self.authorization = True
         self.primary_registry = registries[1]
         self.node = node
         self.dns_server = dns_server