Fix Vpc Network

tools/cloud-build/daily-tests/builds/h4d-vm.yaml

@@ -67,6 +67,7 @@ steps:
     REGION="$${ZONE%-*}"
     BUILD_ID_SHORT=$${BUILD_ID:0:6}
     BLUEPRINT="/workspace/examples/h4d-vm.yaml"
+    python3 tools/modify_vpc.py "$${BLUEPRINT}"
     sed -i -e '/deletion_protection:/{n;s/enabled: true/enabled: false/}' $${BLUEPRINT}
     sed -i -e '/reason:/d' $${BLUEPRINT}
     sed -i '/  - id: h4d-vms/,/  - id: wait-for-vms/ { /    settings:/a \

tools/cloud-build/daily-tests/tests/h4d-vm.yml

@@ -31,6 +31,7 @@ custom_vars:
     h4d_onspot: true
   enable_spot: true
 cli_deployment_vars:
+  test_name: '{{ test_name }}'
   base_network_name: '{{ test_name }}'
   region: "{{ region }}"
   zone: "{{ zone }}"

tools/modify_vpc.py

@@ -0,0 +1,29 @@
+import yaml
+import sys
+
+def modify_vpcs(blueprint_path):
+    with open(blueprint_path, 'r') as f:
+        data = yaml.safe_load(f)
+
+    vpc_count = 0
+    # Iterate through all deployment groups and modules
+    if 'deployment_groups' in data:
+        for group in data['deployment_groups']:
+            for module in group.get('modules', []):
+                # Identify VPC modules by their source path
+                if 'modules/network/vpc' in module.get('source', ''):
+                    if 'settings' not in module:
+                        module['settings'] = {}
+                    # Set the consecutive name using the $(vars.test_name) variable
+                    module['settings']['network_name'] = f"$(vars.test_name)-{vpc_count}"
+                    print(f"Updated module '{module.get('id')}' to: $(vars.test_name)-{vpc_count}")
+                    vpc_count += 1
+
+    with open(blueprint_path, 'w') as f:
+        yaml.dump(data, f, sort_keys=False)
+
+if __name__ == "__main__":
+    if len(sys.argv) < 2:
+        sys.exit(1)
+    modify_vpcs(sys.argv[1])
+