api_endpoint modifications

Author: priyansh-sumo

EventHubs/tests/test_eventhub_metrics.py

@@ -9,10 +9,10 @@
 class TestEventHubMetrics(BaseEventHubTest):
 
     def setUp(self):
-        super(TestEventHubMetrics, self).setUp()
         datetime_value = datetime.now().strftime("%d-%m-%y-%H-%M-%S")
         self.collector_name = "azure_metric_unittest-%s" % (datetime_value)
         self.source_name = "metric_data-%s" % (datetime_value)
+        super(TestEventHubMetrics, self).setUp()
         self.RESOURCE_GROUP_NAME = "EventHubMetrics-%s" % (datetime_value)
         self.template_name = "azuredeploy_metrics.json"
         self.event_hub_namespace_prefix = "SMNamespace"

test_utils/basetest.py

@@ -80,13 +80,13 @@ def get_git_info(self):
 
         return repo_name, branch_name
 
-    def api_endpoint(self):
-        if self.sumo_deployment == "us1":
+    def api_endpoint(self, sumo_deployment):
+        if sumo_deployment == "us1":
             return "https://api.sumologic.com/api"
-        elif self.sumo_deployment in ["ca", "au", "de", "eu", "jp", "us2", "fed", "in"]:
-            return "https://api.%s.sumologic.com/api" % self.sumo_deployment
+        elif sumo_deployment in ["ca", "au", "de", "eu", "jp", "us2", "fed", "in"]:
+            return "https://api.%s.sumologic.com/api" % sumo_deployment
         else:
-            return 'https://%s-api.sumologic.net/api' % self.sumo_deployment
+            return 'https://%s-api.sumologic.net/api' % sumo_deployment
 
     def create_collector(self, collector_name):
         print("create_collector start")