PMM. Fix auth tests, remove all PSMDB services before adding PSMDB with new auth method

Author: sandraromanchenko

pmm_psmdb_diffauth_setup/test/test.py

@@ -14,9 +14,21 @@
 
 def run_test(add_db_command):
     try:
-        docker_pmm_client.check_output('pmm-admin remove mongodb psmdb-server', timeout=30)
-    except AssertionError:
-        pass
+        output = docker_pmm_client.check_output('pmm-admin list --json', timeout=30)
+        services_info = json.loads(output)
+    except (AssertionError, json.JSONDecodeError):
+        pytest.fail("Failed to get or parse service list from pmm-admin")
+    services_to_remove = []
+    for service in services_info.get("service", []):
+        service_type = service.get("service_type")
+        service_name = service.get("service_name", "")
+        if service_type == "SERVICE_TYPE_MONGODB_SERVICE" and service_name.startswith("psmdb-server"):
+            services_to_remove.append(service_name)
+    for service_name in services_to_remove:
+        try:
+            docker_pmm_client.check_output(f'pmm-admin remove mongodb {service_name}', timeout=30)
+        except AssertionError:
+            pass
     try:
         docker_pmm_client.check_output(add_db_command, timeout=30)
     except AssertionError:
@@ -26,7 +38,7 @@ def run_test(add_db_command):
     pmm_admin_list = json.loads(docker_pmm_client.check_output('pmm-admin list --json', timeout=30))
     for agent in pmm_admin_list['agent']:
         if agent['agent_type'] == 'AGENT_TYPE_MONGODB_EXPORTER':
-            agent_id = "mypass"
+            agent_id = "mypass" if "GSSAPI" not in add_db_command else agent['agent_id']
             agent_port = agent['port']
             break
     try: