update nested_node_nics to force 10.0.0.0 for nic0 on each vm

Author: mcgov

lisa/sut_orchestrator/azure/arm_template.bicep

@@ -269,11 +269,11 @@ resource virtual_network_name_resource 'Microsoft.Network/virtualNetworks@2024-0
       )
     }
     subnets: [for j in range(0, subnet_count): {
-      name: '10.${resource_group_index}.${j}.0/24'
+      name: j == 0 ? '10.0.0.0' : '10.${resource_group_index}.${j}.0'
       properties: {
         addressPrefixes: concat(
-          ['10.${resource_group_index}.${j}.0/24'],
-          use_ipv6 ? ['2001:db8:${resource_group_index}:${j}::/64'] : []
+          ['10.${j ==0 ? '0' : resource_group_index}.${j}.0/24'],
+          use_ipv6 ? ['2001:db8:${j == 0 ? j : resource_group_index}:${j}::/64'] : []
         )
         defaultOutboundAccess: enable_vm_nat
         networkSecurityGroup: {

lisa/sut_orchestrator/azure/autogen_arm_template.json

@@ -6,7 +6,7 @@
     "_generator": {
       "name": "bicep",
       "version": "0.40.2.10011",
-      "templateHash": "16491672364169834990"
+      "templateHash": "6973919806372738793"
     }
   },
   "functions": [
@@ -596,9 +596,9 @@
             "name": "subnets",
             "count": "[length(range(0, parameters('subnet_count')))]",
             "input": {
-              "name": "[format('10.{0}.{1}.0/24', parameters('resource_group_index'), range(0, parameters('subnet_count'))[copyIndex('subnets')])]",
+              "name": "[if(equals(range(0, parameters('subnet_count'))[copyIndex('subnets')], 0), '10.0.0.0', format('10.{0}.{1}.0', parameters('resource_group_index'), range(0, parameters('subnet_count'))[copyIndex('subnets')]))]",
               "properties": {
-                "addressPrefixes": "[concat(createArray(format('10.{0}.{1}.0/24', parameters('resource_group_index'), range(0, parameters('subnet_count'))[copyIndex('subnets')])), if(parameters('use_ipv6'), createArray(format('2001:db8:{0}:{1}::/64', parameters('resource_group_index'), range(0, parameters('subnet_count'))[copyIndex('subnets')])), createArray()))]",
+                "addressPrefixes": "[concat(createArray(format('10.{0}.{1}.0/24', if(equals(range(0, parameters('subnet_count'))[copyIndex('subnets')], 0), '0', parameters('resource_group_index')), range(0, parameters('subnet_count'))[copyIndex('subnets')])), if(parameters('use_ipv6'), createArray(format('2001:db8:{0}:{1}::/64', if(equals(range(0, parameters('subnet_count'))[copyIndex('subnets')], 0), range(0, parameters('subnet_count'))[copyIndex('subnets')], parameters('resource_group_index')), range(0, parameters('subnet_count'))[copyIndex('subnets')])), createArray()))]",
                 "defaultOutboundAccess": "[parameters('enable_vm_nat')]",
                 "networkSecurityGroup": {
                   "id": "[resourceId('Microsoft.Network/networkSecurityGroups', format('{0}-nsg', toLower(parameters('virtual_network_name'))))]"
@@ -933,7 +933,7 @@
             "_generator": {
               "name": "bicep",
               "version": "0.40.2.10011",
-              "templateHash": "1909517540330820286"
+              "templateHash": "18100026266609217689"
             }
           },
           "functions": [
@@ -971,7 +971,7 @@
                   ],
                   "output": {
                     "type": "string",
-                    "value": "[format('10.{0}.{1}.0', parameters('resource_group_index'), parameters('nic_index'))]"
+                    "value": "[if(equals(parameters('nic_index'), 0), '10.0.0.0', format('10.{0}.{1}.0', parameters('resource_group_index'), parameters('nic_index')))]"
                   }
                 }
               }

lisa/sut_orchestrator/azure/common.py

@@ -1262,6 +1262,7 @@ class AzureArmParameter:
     enable_vm_nat: bool = False
     create_public_address: bool = True
     source_address_prefixes: List[str] = field(default_factory=list)
+    resource_group_index: int = 0
 
     def __post_init__(self, *args: Any, **kwargs: Any) -> None:
         add_secret(self.admin_username, PATTERN_HEADTAIL)

lisa/sut_orchestrator/azure/nested_nodes_nics.bicep

@@ -15,7 +15,7 @@ func getPublicIpAddress(vmName string, publicIpName string) object => {
 var publicIpAddress = getPublicIpAddress(vmName, '${vmName}-public-ip')
 var publicIpAddressV6 = getPublicIpAddress(vmName, '${vmName}-public-ipv6')
 
-func getSubnetName(resource_group_index int, nic_index int) string => '10.${resource_group_index}.${nic_index}.0'
+func getSubnetName(resource_group_index int, nic_index int) string => nic_index == 0 ? '10.0.0.0' : '10.${resource_group_index}.${nic_index}.0'
 
 resource vm_nics 'Microsoft.Network/networkInterfaces@2023-06-01' = [for i in range(0, nic_count): {
   name: '${vmName}-nic-${i}'

lisa/sut_orchestrator/azure/platform_.py

@@ -605,6 +605,7 @@ def _deploy_environment(self, environment: Environment, log: Logger) -> None:
         assert self._azure_runbook
 
         environment_context = get_environment_context(environment=environment)
+
         if self._azure_runbook.resource_group_name:
             resource_group_name = self._azure_runbook.resource_group_name
         else:
@@ -1217,6 +1218,7 @@ def _create_deployment_parameters(
             self._azure_runbook.virtual_network_name or AZURE_VIRTUAL_NETWORK_NAME
         )
         arm_parameters.use_ipv6 = self._azure_runbook.use_ipv6
+        arm_parameters.resource_group_index = int(environment.id)
 
         is_windows: bool = False
         arm_parameters.admin_username = self.runbook.admin_username