PR comment Modifications

Author: priyansh-sumo

EventHubs/tests/baseeventhubtest.py

@@ -20,10 +20,14 @@ def setUp(self):
         self.resource_client = ResourceManagementClient(self.azure_credential, 
                                                         self.subscription_id)
         self.repo_name, self.branch_name = self.get_git_info()
-
+        self.collector_id = self.create_collector(self.collector_name)
+        self.sumo_source_id, self.sumo_endpoint_url = self.create_source(self.collector_id, self.source_name)
+        
     def tearDown(self):
         if self.resource_group_exists(self.RESOURCE_GROUP_NAME):
             self.delete_resource_group()
+        self.delete_source(self.collector_id, self.sumo_source_id)
+        self.delete_collector(self.collector_id)
 
     def get_resource_name(self, resprefix, restype):
         for item in self.resource_client.resources.list_by_resource_group(self.RESOURCE_GROUP_NAME):

EventHubs/tests/test_eventhub_metrics.py

@@ -22,8 +22,6 @@ def setUp(self):
         self.expected_resource_count = 7
 
     def test_pipeline(self):
-        collector_id = self.create_collector(self.collector_name)
-        self.sumo_source_id, self.sumo_endpoint_url = self.create_source(collector_id, self.source_name)
         self.create_resource_group()
         self.deploy_template()
         self.assertTrue(self.resource_group_exists(self.RESOURCE_GROUP_NAME)) 
@@ -35,8 +33,6 @@ def test_pipeline(self):
         self.check_success_log(captured_output)
         self.check_error_log(captured_output)
         self.check_warning_log(captured_output)
-        self.delete_source(collector_id,self.sumo_source_id)
-        self.delete_collector(collector_id)
 
     def insert_mock_metrics_in_EventHub(self, filename):
         print("Inserting fake metrics in EventHub")

test_utils/basetest.py

@@ -5,17 +5,15 @@
 import subprocess
 from sumologic import SumoLogic
 from azure.identity import DefaultAzureCredential
-from azure.mgmt.resource.resources.models import Deployment,DeploymentMode
+from azure.mgmt.resource.resources.models import Deployment, DeploymentMode
+
 
 class BaseTest(unittest.TestCase):
 
     def create_credentials(self):
         self.azure_credential = DefaultAzureCredential()
         self.subscription_id = os.environ["AZURE_SUBSCRIPTION_ID"]
         self.resourcegroup_location = os.environ["AZURE_DEFAULT_REGION"]
-        self.sumo_access_id = os.environ["SUMO_ACCESS_ID"]
-        self.sumo_access_key = os.environ["SUMO_ACCESS_KEY"]
-        self.sumo_deployment = os.environ["SUMO_DEPLOYMENT"]
 
     def resource_group_exists(self, group_name):
         # grp: name,id,properties
@@ -93,8 +91,7 @@ def api_endpoint(self):
     def create_collector(self, collector_name):
         print("create_collector start")
         collector_id = None
-        self.sumologic_cli = SumoLogic(self.sumo_access_id, self.sumo_access_key, self.api_endpoint())
-        
+        self.sumologic_cli = SumoLogic(os.environ["SUMO_ACCESS_ID"], os.environ["SUMO_ACCESS_KEY"], self.api_endpoint(os.environ["SUMO_DEPLOYMENT"]))
         collector = {
                     'collector': {
                         'collectorType': 'Hosted',
@@ -115,7 +112,7 @@ def create_collector(self, collector_name):
     def delete_collector(self, collector_id):
         sources = self.sumologic_cli.sources(collector_id, limit=10)
         if len(sources) == 0:
-            response = self.sumologic_cli.delete_collector({"collector": {"id": collector_id}})
+            self.sumologic_cli.delete_collector({"collector": {"id": collector_id}})
             print(f"deleted collector {collector_id}")
 
     def create_source(self, collector_id, source_name):
@@ -140,5 +137,5 @@ def create_source(self, collector_id, source_name):
         return source_id, endpoint
 
     def delete_source(self, collector_id, source_id):
-        response = self.sumologic_cli.delete_source(collector_id, {"source": {"id": source_id}})
+        self.sumologic_cli.delete_source(collector_id, {"source": {"id": source_id}})
         print(f"deleted source {source_id}")