test_aks_create_default_service_without_skip_role_assignment

Azure · May 13, 2022 · 906634a · 906634a
1 parent 7e5bb4f
commit 906634a
Show file tree

Hide file tree

Showing 4 changed files with 835 additions and 356 deletions.
diff --git a/src/azure-cli/azure/cli/command_modules/acs/tests/hybrid_2020_09_01/test_aks_commands.py b/src/azure-cli/azure/cli/command_modules/acs/tests/hybrid_2020_09_01/test_aks_commands.py
@@ -25,8 +25,7 @@
 # is set with the environment varibale for sp_name. This method is compatible with
 # both cases.
 def _process_sp_name(sp_name):
-    from azure.cli.core.util import is_guid
-    return sp_name if is_guid(sp_name) else 'http://{}'.format(sp_name)
+    return sp_name
 
 
 class AzureKubernetesServiceScenarioTest(ScenarioTest):
@@ -493,7 +492,7 @@ def generate_user_assigned_identity_resource_id(self, resource_group):
             resource_group, identity_name)).get_output_in_json()
         return identity.get("id")
 
-    
+
         # reset the count so in replay mode the random names will start with 0
         self.test_resources_count = 0
         # kwargs for string formatting

diff --git a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/custom_preparers.py b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/custom_preparers.py
@@ -177,7 +177,7 @@ def create_resource(self, name, **kwargs):
                 pass
 
             if self.live_test or self.test_class_instance.in_recording:
-                sp_name = name
+                sp_name = self.result['appId']
                 sp_password = self.result.get("password") or GraphClientPasswordReplacer.PWD_REPLACEMENT
             else:
                 sp_name = MOCK_GUID

diff --git a/...tests/latest/recordings/test_aks_create_default_service_without_skip_role_assignment.yaml b/...tests/latest/recordings/test_aks_create_default_service_without_skip_role_assignment.yaml
diff --git a/src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py b/src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_aks_commands.py
@@ -31,8 +31,7 @@
 # is set with the environment varibale for sp_name. This method is compatible with
 # both cases.
 def _process_sp_name(sp_name):
-    from azure.cli.core.util import is_guid
-    return sp_name if is_guid(sp_name) else 'http://{}'.format(sp_name)
+    return sp_name
 
 
 class AzureKubernetesServiceScenarioTest(ScenarioTest):
@@ -820,7 +819,7 @@ def test_aks_create_and_update_with_managed_nat_gateway_outbound(self, resource_
 
         update_cmd = 'aks update --resource-group={resource_group} --name={name} ' \
                      '--nat-gateway-managed-outbound-ip-count=2 ' \
-                     '--nat-gateway-idle-timeout=30 ' 
+                     '--nat-gateway-idle-timeout=30 '
         self.cmd(update_cmd, checks=[
             self.check('provisioningState', 'Succeeded'),
             self.check('networkProfile.outboundType', 'managedNATGateway'),