Skip to content

[AKS] az aks enable-addons: Add support for default workspace creation in Bleu and Delos clouds #32753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
yanzhudd merged 2 commits into from
Feb 13, 2026
Merged

[AKS] az aks enable-addons: Add support for default workspace creation in Bleu and Delos clouds #32753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
25ff1a3
add bleu and delos default workspace region support
rashmichandrashekar Feb 6, 2026
2afcade
adding unit tests
rashmichandrashekar Feb 6, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
37 changes: 36 additions & 1 deletion src/azure-cli/azure/cli/command_modules/acs/addonconfiguration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,6 +185,28 @@
"ussecwest": "ussecwest",
}

# mapping for azure bleu cloud
AzureBleuLocationToOmsRegionCodeMap = {
"bleufrancecentral": "BLEUC",
"bleufrancesouth": "BLEUS",
}

AzureBleuRegionToOmsRegionMap = {
"bleufrancecentral": "bleufrancecentral",
"bleufrancesouth": "bleufrancesouth",
}

# mapping for azure delos cloud
AzureDelosLocationToOmsRegionCodeMap = {
"deloscloudgermanycentral": "DELOSC",
"deloscloudgermanynorth": "DELOSN",
}

AzureDelosRegionToOmsRegionMap = {
"deloscloudgermanycentral": "deloscloudgermanycentral",
"deloscloudgermanynorth": "deloscloudgermanynorth",
}

ContainerInsightsStreams = [
"Microsoft-ContainerLog",
"Microsoft-ContainerLogV2-HighScale",
Expand Down Expand Up @@ -245,7 +267,20 @@ def ensure_default_log_analytics_workspace_for_monitoring(
workspace_region_code = AzureUSSecLocationToOmsRegionCodeMap.get(
workspace_region, "USSW"
)

elif cloud_name.lower() == "azurebleucloud":
workspace_region = AzureBleuRegionToOmsRegionMap.get(
rg_location, "bleufrancecentral"
)
workspace_region_code = AzureBleuLocationToOmsRegionCodeMap.get(
workspace_region, "BLEUC"
)
elif cloud_name.lower() == "azuredeloscloud":
workspace_region = AzureDelosRegionToOmsRegionMap.get(
rg_location, "deloscloudgermanycentral"
)
workspace_region_code = AzureDelosLocationToOmsRegionCodeMap.get(
workspace_region, "DELOSC"
)
else:
logger.error(
"AKS Monitoring addon not supported in cloud : %s", cloud_name
Expand Down
293 changes: 293 additions & 0 deletions src/azure-cli/azure/cli/command_modules/acs/tests/latest/test_custom.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@
CONST_KUBE_DASHBOARD_ADDON_NAME,
CONST_MONITORING_ADDON_NAME,
)
from azure.cli.command_modules.acs.addonconfiguration import (
ensure_default_log_analytics_workspace_for_monitoring,
)
from azure.cli.command_modules.acs.custom import (
_get_command_context,
_update_addons,
Expand Down Expand Up @@ -879,5 +882,295 @@ def test_get_command_context_valid(self):
self.assertNotEqual(context, '')


class TestAddonConfigurationAzureBleuCloud(unittest.TestCase):
"""Test cases for AzureBleu Cloud region mapping in addon configuration."""

def setUp(self):
self.cli = MockCLI()
self.cmd = MockCmd(self.cli)
# Set cloud name to AzureBleuCloud
self.cmd.cli_ctx.cloud.name = 'AzureBleuCloud'

@mock.patch('azure.cli.command_modules.acs.addonconfiguration.get_resources_client')
@mock.patch('azure.cli.command_modules.acs.addonconfiguration.get_resource_groups_client')
@mock.patch('azure.cli.command_modules.acs.addonconfiguration.get_rg_location')
def test_bleufrancecentral_region_mapping(self, mock_get_rg_location, mock_get_rg_client, mock_get_resources_client):
"""Test that bleufrancecentral region maps correctly."""
# Arrange
mock_get_rg_location.return_value = 'bleufrancecentral'
subscription_id = '00000000-0000-0000-0000-000000000000'
resource_group_name = 'test-rg'

# Mock resource group client
mock_rg_client = mock.Mock()
mock_rg_client.check_existence.return_value = False
mock_rg_client.create_or_update = mock.Mock()
mock_get_rg_client.return_value = mock_rg_client

# Mock resources client
mock_resources_client = mock.Mock()
mock_poller = mock.Mock()
mock_result = mock.Mock()
mock_result.id = f'/subscriptions/{subscription_id}/resourceGroups/DefaultResourceGroup-BLEUC/providers/Microsoft.OperationalInsights/workspaces/DefaultWorkspace-{subscription_id}-BLEUC'
mock_poller.result.return_value = mock_result
mock_poller.done.return_value = True
mock_resources_client.begin_create_or_update_by_id.return_value = mock_poller
mock_get_resources_client.return_value = mock_resources_client

# Mock get_models for GenericResource
self.cmd.get_models = mock.Mock(return_value=mock.Mock)

# Act
result = ensure_default_log_analytics_workspace_for_monitoring(
self.cmd, subscription_id, resource_group_name
)

# Assert
# Verify the resource group was created with correct region
mock_rg_client.create_or_update.assert_called_once_with(
'DefaultResourceGroup-BLEUC',
{'location': 'bleufrancecentral'}
)

# Verify the workspace resource ID contains the correct region code
self.assertIn('DefaultResourceGroup-BLEUC', result)
self.assertIn(f'DefaultWorkspace-{subscription_id}-BLEUC', result)

@mock.patch('azure.cli.command_modules.acs.addonconfiguration.get_resources_client')
@mock.patch('azure.cli.command_modules.acs.addonconfiguration.get_resource_groups_client')
@mock.patch('azure.cli.command_modules.acs.addonconfiguration.get_rg_location')
def test_bleufrancesouth_region_mapping(self, mock_get_rg_location, mock_get_rg_client, mock_get_resources_client):
"""Test that bleufrancesouth region maps correctly."""
# Arrange
mock_get_rg_location.return_value = 'bleufrancesouth'
subscription_id = '00000000-0000-0000-0000-000000000000'
resource_group_name = 'test-rg'

# Mock resource group client
mock_rg_client = mock.Mock()
mock_rg_client.check_existence.return_value = False
mock_rg_client.create_or_update = mock.Mock()
mock_get_rg_client.return_value = mock_rg_client

# Mock resources client
mock_resources_client = mock.Mock()
mock_poller = mock.Mock()
mock_result = mock.Mock()
mock_result.id = f'/subscriptions/{subscription_id}/resourceGroups/DefaultResourceGroup-BLEUS/providers/Microsoft.OperationalInsights/workspaces/DefaultWorkspace-{subscription_id}-BLEUS'
mock_poller.result.return_value = mock_result
mock_poller.done.return_value = True
mock_resources_client.begin_create_or_update_by_id.return_value = mock_poller
mock_get_resources_client.return_value = mock_resources_client

# Mock get_models for GenericResource
self.cmd.get_models = mock.Mock(return_value=mock.Mock)

# Act
result = ensure_default_log_analytics_workspace_for_monitoring(
self.cmd, subscription_id, resource_group_name
)

# Assert
# Verify the resource group was created with correct region
mock_rg_client.create_or_update.assert_called_once_with(
'DefaultResourceGroup-BLEUS',
{'location': 'bleufrancesouth'}
)

# Verify the workspace resource ID contains the correct region code
self.assertIn('DefaultResourceGroup-BLEUS', result)
self.assertIn(f'DefaultWorkspace-{subscription_id}-BLEUS', result)

@mock.patch('azure.cli.command_modules.acs.addonconfiguration.get_resources_client')
@mock.patch('azure.cli.command_modules.acs.addonconfiguration.get_resource_groups_client')
@mock.patch('azure.cli.command_modules.acs.addonconfiguration.get_rg_location')
def test_unknown_bleu_region_defaults_to_bleufrancecentral(self, mock_get_rg_location, mock_get_rg_client, mock_get_resources_client):
"""Test that unknown regions in AzureBleu cloud default to bleufrancecentral."""
# Arrange
mock_get_rg_location.return_value = 'unknownregion'
subscription_id = '00000000-0000-0000-0000-000000000000'
resource_group_name = 'test-rg'

# Mock resource group client
mock_rg_client = mock.Mock()
mock_rg_client.check_existence.return_value = False
mock_rg_client.create_or_update = mock.Mock()
mock_get_rg_client.return_value = mock_rg_client

# Mock resources client
mock_resources_client = mock.Mock()
mock_poller = mock.Mock()
mock_result = mock.Mock()
mock_result.id = f'/subscriptions/{subscription_id}/resourceGroups/DefaultResourceGroup-BLEUC/providers/Microsoft.OperationalInsights/workspaces/DefaultWorkspace-{subscription_id}-BLEUC'
mock_poller.result.return_value = mock_result
mock_poller.done.return_value = True
mock_resources_client.begin_create_or_update_by_id.return_value = mock_poller
mock_get_resources_client.return_value = mock_resources_client

# Mock get_models for GenericResource
self.cmd.get_models = mock.Mock(return_value=mock.Mock)

# Act
result = ensure_default_log_analytics_workspace_for_monitoring(
self.cmd, subscription_id, resource_group_name
)

# Assert
# Verify the resource group was created with default region
mock_rg_client.create_or_update.assert_called_once_with(
'DefaultResourceGroup-BLEUC',
{'location': 'bleufrancecentral'}
)

# Verify the workspace resource ID contains the default region code
self.assertIn('DefaultResourceGroup-BLEUC', result)
self.assertIn(f'DefaultWorkspace-{subscription_id}-BLEUC', result)


class TestAddonConfigurationAzureDelosCloud(unittest.TestCase):
"""Test cases for AzureDelos Cloud region mapping in addon configuration."""

def setUp(self):
self.cli = MockCLI()
self.cmd = MockCmd(self.cli)
# Set cloud name to AzureDelosCloud
self.cmd.cli_ctx.cloud.name = 'AzureDelosCloud'

@mock.patch('azure.cli.command_modules.acs.addonconfiguration.get_resources_client')
@mock.patch('azure.cli.command_modules.acs.addonconfiguration.get_resource_groups_client')
@mock.patch('azure.cli.command_modules.acs.addonconfiguration.get_rg_location')
def test_deloscloudgermanycentral_region_mapping(self, mock_get_rg_location, mock_get_rg_client, mock_get_resources_client):
"""Test that deloscloudgermanycentral region maps correctly."""
# Arrange
mock_get_rg_location.return_value = 'deloscloudgermanycentral'
subscription_id = '00000000-0000-0000-0000-000000000000'
resource_group_name = 'test-rg'

# Mock resource group client
mock_rg_client = mock.Mock()
mock_rg_client.check_existence.return_value = False
mock_rg_client.create_or_update = mock.Mock()
mock_get_rg_client.return_value = mock_rg_client

# Mock resources client
mock_resources_client = mock.Mock()
mock_poller = mock.Mock()
mock_result = mock.Mock()
mock_result.id = f'/subscriptions/{subscription_id}/resourceGroups/DefaultResourceGroup-DELOSC/providers/Microsoft.OperationalInsights/workspaces/DefaultWorkspace-{subscription_id}-DELOSC'
mock_poller.result.return_value = mock_result
mock_poller.done.return_value = True
mock_resources_client.begin_create_or_update_by_id.return_value = mock_poller
mock_get_resources_client.return_value = mock_resources_client

# Mock get_models for GenericResource
self.cmd.get_models = mock.Mock(return_value=mock.Mock)

# Act
result = ensure_default_log_analytics_workspace_for_monitoring(
self.cmd, subscription_id, resource_group_name
)

# Assert
# Verify the resource group was created with correct region
mock_rg_client.create_or_update.assert_called_once_with(
'DefaultResourceGroup-DELOSC',
{'location': 'deloscloudgermanycentral'}
)

# Verify the workspace resource ID contains the correct region code
self.assertIn('DefaultResourceGroup-DELOSC', result)
self.assertIn(f'DefaultWorkspace-{subscription_id}-DELOSC', result)

@mock.patch('azure.cli.command_modules.acs.addonconfiguration.get_resources_client')
@mock.patch('azure.cli.command_modules.acs.addonconfiguration.get_resource_groups_client')
@mock.patch('azure.cli.command_modules.acs.addonconfiguration.get_rg_location')
def test_deloscloudgermanynorth_region_mapping(self, mock_get_rg_location, mock_get_rg_client, mock_get_resources_client):
"""Test that deloscloudgermanynorth region maps correctly."""
# Arrange
mock_get_rg_location.return_value = 'deloscloudgermanynorth'
subscription_id = '00000000-0000-0000-0000-000000000000'
resource_group_name = 'test-rg'

# Mock resource group client
mock_rg_client = mock.Mock()
mock_rg_client.check_existence.return_value = False
mock_rg_client.create_or_update = mock.Mock()
mock_get_rg_client.return_value = mock_rg_client

# Mock resources client
mock_resources_client = mock.Mock()
mock_poller = mock.Mock()
mock_result = mock.Mock()
mock_result.id = f'/subscriptions/{subscription_id}/resourceGroups/DefaultResourceGroup-DELOSN/providers/Microsoft.OperationalInsights/workspaces/DefaultWorkspace-{subscription_id}-DELOSN'
mock_poller.result.return_value = mock_result
mock_poller.done.return_value = True
mock_resources_client.begin_create_or_update_by_id.return_value = mock_poller
mock_get_resources_client.return_value = mock_resources_client

# Mock get_models for GenericResource
self.cmd.get_models = mock.Mock(return_value=mock.Mock)

# Act
result = ensure_default_log_analytics_workspace_for_monitoring(
self.cmd, subscription_id, resource_group_name
)

# Assert
# Verify the resource group was created with correct region
mock_rg_client.create_or_update.assert_called_once_with(
'DefaultResourceGroup-DELOSN',
{'location': 'deloscloudgermanynorth'}
)

# Verify the workspace resource ID contains the correct region code
self.assertIn('DefaultResourceGroup-DELOSN', result)
self.assertIn(f'DefaultWorkspace-{subscription_id}-DELOSN', result)

@mock.patch('azure.cli.command_modules.acs.addonconfiguration.get_resources_client')
@mock.patch('azure.cli.command_modules.acs.addonconfiguration.get_resource_groups_client')
@mock.patch('azure.cli.command_modules.acs.addonconfiguration.get_rg_location')
def test_unknown_delos_region_defaults_to_deloscloudgermanycentral(self, mock_get_rg_location, mock_get_rg_client, mock_get_resources_client):
"""Test that unknown regions in AzureDelos cloud default to deloscloudgermanycentral."""
# Arrange
mock_get_rg_location.return_value = 'unknownregion'
subscription_id = '00000000-0000-0000-0000-000000000000'
resource_group_name = 'test-rg'

# Mock resource group client
mock_rg_client = mock.Mock()
mock_rg_client.check_existence.return_value = False
mock_rg_client.create_or_update = mock.Mock()
mock_get_rg_client.return_value = mock_rg_client

# Mock resources client
mock_resources_client = mock.Mock()
mock_poller = mock.Mock()
mock_result = mock.Mock()
mock_result.id = f'/subscriptions/{subscription_id}/resourceGroups/DefaultResourceGroup-DELOSC/providers/Microsoft.OperationalInsights/workspaces/DefaultWorkspace-{subscription_id}-DELOSC'
mock_poller.result.return_value = mock_result
mock_poller.done.return_value = True
mock_resources_client.begin_create_or_update_by_id.return_value = mock_poller
mock_get_resources_client.return_value = mock_resources_client

# Mock get_models for GenericResource
self.cmd.get_models = mock.Mock(return_value=mock.Mock)

# Act
result = ensure_default_log_analytics_workspace_for_monitoring(
self.cmd, subscription_id, resource_group_name
)

# Assert
# Verify the resource group was created with default region
mock_rg_client.create_or_update.assert_called_once_with(
'DefaultResourceGroup-DELOSC',
{'location': 'deloscloudgermanycentral'}
)

# Verify the workspace resource ID contains the default region code
self.assertIn('DefaultResourceGroup-DELOSC', result)
self.assertIn(f'DefaultWorkspace-{subscription_id}-DELOSC', result)


if __name__ == "__main__":
unittest.main()
Loading