diff --git a/tools/azure-sdk-tools/devtools_testutils/mgmt_testcase.py b/tools/azure-sdk-tools/devtools_testutils/mgmt_testcase.py index 26d2f84cf884..ee89daf4d383 100644 --- a/tools/azure-sdk-tools/devtools_testutils/mgmt_testcase.py +++ b/tools/azure-sdk-tools/devtools_testutils/mgmt_testcase.py @@ -158,7 +158,15 @@ def moniker(self): self.resource_moniker = self.random_name return self.resource_moniker - def create_mgmt_client(self, client_class): - return self.test_class_instance.create_mgmt_client( - client_class + def create_mgmt_client(self, client_class, **kwargs): + subscription_id = None + if self.is_live: + subscription_id = os.environ.get("AZURE_SUBSCRIPTION_ID", None) + if not subscription_id: + subscription_id = self.test_class_instance.settings.SUBSCRIPTION_ID + + return self.test_class_instance.create_basic_client( + client_class, + subscription_id=subscription_id, + **kwargs )