diff --git a/src/azure-cli-core/azure/cli/core/cloud.py b/src/azure-cli-core/azure/cli/core/cloud.py index f8f90009835..4cb39a544bf 100644 --- a/src/azure-cli-core/azure/cli/core/cloud.py +++ b/src/azure-cli-core/azure/cli/core/cloud.py @@ -358,6 +358,7 @@ class CloudNameEnum: # pylint: disable=too-few-public-methods AzureChinaCloud = 'AzureChinaCloud' AzureUSGovernment = 'AzureUSGovernment' AzureGermanCloud = 'AzureGermanCloud' + AzureBleuCloud = 'AzureBleuCloud' AZURE_PUBLIC_CLOUD = Cloud( @@ -492,7 +493,36 @@ class CloudNameEnum: # pylint: disable=too-few-public-methods postgresql_server_endpoint='.postgres.database.cloudapi.de', mariadb_server_endpoint='.mariadb.database.cloudapi.de')) -HARD_CODED_CLOUD_LIST = [AZURE_PUBLIC_CLOUD, AZURE_CHINA_CLOUD, AZURE_US_GOV_CLOUD, AZURE_GERMAN_CLOUD] +AZURE_BLEU_CLOUD = Cloud( + CloudNameEnum.AzureBleuCloud, + endpoints=CloudEndpoints( + management='https://management.sovcloud-api.fr/', + resource_manager='https://management.sovcloud-api.fr', + sql_management='https://management.database.sovcloud-api.fr:8443/', + batch_resource_id='https://batch.sovcloud-api.fr/', + gallery='https://gallery.sovcloud-api.fr/', + active_directory='https://login.sovcloud-api.fr', + active_directory_resource_id='https://management.sovcloud-api.fr/', + active_directory_graph_resource_id='https://graph.svc.sovcloud.fr/', + microsoft_graph_resource_id='https://graph.svc.sovcloud.fr', + vm_image_alias_doc='https://raw.githubusercontent.com/Azure/azure-rest-api-specs/master/arm-compute/quickstart-templates/aliases.json', + media_resource_id='https://rest.media.sovcloud-api.fr', + ossrdbms_resource_id='https://ossrdbms-aad.database.sovcloud-api.fr', + portal='https://portal.sovcloud-azure.fr'), + suffixes=CloudSuffixes( + acr_login_server_endpoint='.azurecr.sovcloud-azure.fr', + attestation_endpoint='attest.sovcloud-api.fr', + storage_endpoint='core.sovcloud-api.fr', + storage_sync_endpoint='afs.sovcloud-api.fr', + keyvault_dns='.vault.sovcloud-api.fr', + mhsm_dns='.managedhsm.sovcloud-api.fr', + sql_server_hostname='.database.sovcloud-api.fr', + mysql_server_endpoint='.mysql.database.sovcloud-api.fr', + postgresql_server_endpoint='.postgres.database.sovcloud-api.fr', + mariadb_server_endpoint='.mariadb.database.sovcloud-api.fr', + synapse_analytics_endpoint='.dev.azuresynapse.sovcloud-api.fr')) + +HARD_CODED_CLOUD_LIST = [AZURE_PUBLIC_CLOUD, AZURE_CHINA_CLOUD, AZURE_US_GOV_CLOUD, AZURE_GERMAN_CLOUD, AZURE_BLEU_CLOUD] def retrieve_arm_cloud_metadata(): diff --git a/src/azure-cli/azure/cli/command_modules/cloud/tests/latest/test_cloud.py b/src/azure-cli/azure/cli/command_modules/cloud/tests/latest/test_cloud.py index e49921a1832..9cb1aa326be 100644 --- a/src/azure-cli/azure/cli/command_modules/cloud/tests/latest/test_cloud.py +++ b/src/azure-cli/azure/cli/command_modules/cloud/tests/latest/test_cloud.py @@ -42,6 +42,11 @@ def test_cloud_set_AzureGermanCloud(self): self.cmd('az cloud set -n AzureGermanCloud') self.cmd('az cloud show -n AzureGermanCloud', checks=[self.check('isActive', True)]) + @serial_test() + def test_cloud_set_AzureBleuCloud(self): + self.cmd('az cloud set -n AzureBleuCloud') + self.cmd('az cloud show -n AzureBleuCloud', checks=[self.check('isActive', True)]) + @serial_test() def test_cloud_set_azurecloud(self): self.cmd('az cloud set -n azurecloud') @@ -62,6 +67,11 @@ def test_cloud_set_azuregermancloud(self): self.cmd('az cloud set -n azuregermancloud') self.cmd('az cloud show -n AzureGermanCloud', checks=[self.check('isActive', True)]) + @serial_test() + def test_cloud_set_azurebleucloud(self): + self.cmd('az cloud set -n azurebleucloud') + self.cmd('az cloud show -n AzureBleuCloud', checks=[self.check('isActive', True)]) + @serial_test() def test_cloud_set_unregistered_cloud_name(self): self.cmd('az cloud set -n azCloud', expect_failure=True)