Fix VLAN placement

The VLAN key needs to be nested under the subnet
dictionary. Otherwise they will fail the schema validation
during network deployment.

This changes moves them in all examples to the subnet
dictionaries in each file.

Closes-Bug: #1930316
Change-Id: I0a73443630faf25de870a7878a9568ac8319aee9

network-data-samples/default-network-isolation-ipv6.yaml

@@ -1,7 +1,6 @@
 - name: Storage
   name_lower: storage
   vip: true
-  vlan: 30
   mtu: 1500
   subnets:
     storage_subnet:
@@ -9,10 +8,10 @@
       ipv6_allocation_pools:
         - start: fd00:fd00:fd00:3000::10
           end: fd00:fd00:fd00:3000:ffff:ffff:ffff:fffe
+      vlan: 30
 - name: StorageMgmt
   name_lower: storage_mgmt
   vip: true
-  vlan: 40
   mtu: 1500
   subnets:
     storage_mgmt_subnet:
@@ -20,10 +19,10 @@
       ipv6_allocation_pools:
         - start: fd00:fd00:fd00:4000::10
           end: fd00:fd00:fd00:4000:ffff:ffff:ffff:fffe
+      vlan: 40
 - name: InternalApi
   name_lower: internal_api
   vip: true
-  vlan: 20
   mtu: 1500
   subnets:
     internal_api_subnet:
@@ -31,10 +30,10 @@
       ipv6_allocation_pools:
         - start: fd00:fd00:fd00:2000::10
           end: fd00:fd00:fd00:2000:ffff:ffff:ffff:fffe
+      vlan: 20
 - name: Tenant
-  vip: false  # Tenant network does not use VIPs
   name_lower: tenant
-  vlan: 50
+  vip: false # Tenant networks do not use VIPs
   mtu: 1500
   subnets:
     tenant_subnet:
@@ -42,10 +41,10 @@
       ipv6_allocation_pools:
         - start: fd00:fd00:fd00:5000::10
           end: fd00:fd00:fd00:5000:ffff:ffff:ffff:fffe
+      vlan: 50
 - name: External
   name_lower: external
   vip: true
-  vlan: 10
   mtu: 1500
   subnets:
     external_subnet:
@@ -53,4 +52,5 @@
       ipv6_allocation_pools:
         - start: 2001:db8:fd00:1000::10
           end: 2001:db8:fd00:1000:ffff:ffff:ffff:fffe
-      gateway_ipv6: 2001:db8:fd00:1000::1
+      gateway_ipv6: 2001:db8:fd00:1000::1
+      vlan: 10

network-data-samples/default-network-isolation.yaml

@@ -1,7 +1,6 @@
 - name: Storage
   name_lower: storage
   vip: true
-  vlan: 30
   mtu: 1500
   subnets:
     storage_subnet:
@@ -9,10 +8,10 @@
       allocation_pools:
         - start: 172.16.1.4
           end: 172.16.1.250
+      vlan: 30
 - name: StorageMgmt
   name_lower: storage_mgmt
   vip: true
-  vlan: 40
   mtu: 1500
   subnets:
     storage_mgmt_subnet:
@@ -20,10 +19,10 @@
       allocation_pools:
         - start: 172.16.3.4
           end: 172.16.3.250
+      vlan: 40
 - name: InternalApi
   name_lower: internal_api
   vip: true
-  vlan: 20
   mtu: 1500
   subnets:
     internal_api_subnet:
@@ -31,26 +30,27 @@
       allocation_pools:
         - start: 172.16.2.4
           end: 172.16.2.250
+      vlan: 20
 - name: Tenant
   vip: false  # Tenant network does not use VIPs
-  name_lower: tenant
-  vlan: 50
   mtu: 1500
+  name_lower: tenant
   subnets:
     tenant_subnet:
       ip_subnet: 172.16.0.0/24
       allocation_pools:
         - start: 172.16.0.4
           end: 172.16.0.250
+      vlan: 50
 - name: External
   name_lower: external
   vip: true
-  vlan: 10
   mtu: 1500
   subnets:
     external_subnet:
       ip_subnet: 10.0.0.0/24
       allocation_pools:
         - start: 10.0.0.4
-          end': 10.0.0.250
+          end: 10.0.0.250
       gateway_ip: 10.0.0.1
+      vlan: 10

network-data-samples/ganesha-ipv6.yaml

@@ -1,7 +1,6 @@
 - name: StorageNFS
   name_lower: storage_nfs
   vip: true
-  vlan: 70
   mtu: 1500
   subnets:
     storage_nfs_subnet:
@@ -20,3 +19,4 @@
       ipv6_allocation_pools:
         - start: fd00:fd00:fd00:7000::4
           end: fd00:fd00:fd00:7000::fffe
+      vlan: 70

network-data-samples/ganesha.yaml

@@ -1,7 +1,6 @@
 - name: StorageNFS
   name_lower: storage_nfs
   vip: true
-  vlan: 70
   mtu: 1500
   subnets:
     storage_nfs_subnet:
@@ -21,4 +20,4 @@
       allocation_pools:
         - start: 172.17.0.4
           end: 172.17.0.250
-
+      vlan: 70

network-data-samples/legacy-routed-networks-ipv6.yaml

@@ -1,90 +1,90 @@
 - name: Storage
   name_lower: storage
   vip: true
-  vlan: 30
   mtu: 1500
   subnets:
     storage_subnet:
       ipv6_subnet: fd00:fd00:fd00:3000::/64
       ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:3000::10', 'end': 'fd00:fd00:fd00:3000:ffff:ffff:ffff:fffe'}]
       routes_ipv6: [{'destination':'fd00:fd00:fd00:3004::/64', 'nexthop':'fd00:fd00:fd00:3000::1'}]
+      vlan: 30
 - name: StorageLeaf2
   name_lower: storage2
   vip: false
-  vlan: 31
   mtu: 1500
   subnets:
     storage2_subnet:
       ipv6_subnet: fd00:fd00:fd00:3004::/64
       ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:3004::10', 'end': 'fd00:fd00:fd00:3004:ffff:ffff:ffff:fffe'}]
       routes_ipv6: [{'destination':'fd00:fd00:fd00:3000::/64', 'nexthop':'fd00:fd00:fd00:3004::1'}]
+      vlan: 31
 - name: StorageMgmt
   name_lower: storage_mgmt
   vip: true
-  vlan: 40
   mtu: 1500
   subnets:
     storage_mgmt_subnet:
       ipv6_subnet: fd00:fd00:fd00:4000::/64
       ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:4000::10', 'end': 'fd00:fd00:fd00:4000:ffff:ffff:ffff:fffe'}]
       routes_ipv6: [{'destination':'fd00:fd00:fd00:4004::/64', 'nexthop':'fd00:fd00:fd00:4000::1'}]
+      vlan: 40
 - name: StorageMgmtLeaf2
   name_lower: storage_mgmt2
   vip: false
-  vlan: 41
   mtu: 1500
   subnets:
     storage_mgmt2_subnet:
       ipv6_subnet: 'fd00:fd00:fd00:4004::/64'
       ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:4004::10', 'end': 'fd00:fd00:fd00:4004:ffff:ffff:ffff:fffe'}]
       routes_ipv6: [{'destination':'fd00:fd00:fd00:4000::/64', 'nexthop':'fd00:fd00:fd00:4004::1'}]
+      vlan: 41
 - name: InternalApi
   name_lower: internal_api
   vip: true
-  vlan: 20
   mtu: 1500
   subnets:
     internal_api_subnet:
       ipv6_subnet: 'fd00:fd00:fd00:2000::/64'
       ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:2000::10', 'end': 'fd00:fd00:fd00:2000:ffff:ffff:ffff:fffe'}]
       routes_ipv6: [{'destination':'fd00:fd00:fd00:2004::/64', 'nexthop':'fd00:fd00:fd00:2000::1'}]
+      vlan: 20
 - name: InternalApiLeaf2
   name_lower: internal_api2
   vip: false
-  vlan: 21
   mtu: 1500
   subnets:
     internal_api2_subnet:
       ipv6_subnet: 'fd00:fd00:fd00:2004::/64'
       ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:2004::10', 'end': 'fd00:fd00:fd00:2004:ffff:ffff:ffff:fffe'}]
       routes_ipv6: [{'destination':'fd00:fd00:fd00:2000::/64', 'nexthop':'fd00:fd00:fd00:2004::1'}]
+      vlan: 21
 - name: Tenant
   name_lower: tenant
   vip: false  # Tenant networks do not use VIPs
-  vlan: 50
   mtu: 1500
   subnets:
     tenant_subnet:
       ipv6_subnet: 'fd00:fd00:fd00:5000::/64'
       ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:5000::10', 'end': 'fd00:fd00:fd00:5000:ffff:ffff:ffff:fffe'}]
       routes_ipv6: [{'destination':'fd00:fd00:fd00:5004::/64', 'nexthop':'fd00:fd00:fd00:5000::1'}]
+      vlan: 50
 - name: TenantLeaf2
   name_lower: tenant2
   vip: false  # Tenant networks do not use VIPs
-  vlan: 51
   mtu: 1500
   subnets:
     tenant2_subnet:
       ipv6_subnet: 'fd00:fd00:fd00:5004::/64'
       ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:5004::10', 'end': 'fd00:fd00:fd00:5004:ffff:ffff:ffff:fffe'}]
       routes_ipv6: [{'destination':'fd00:fd00:fd00:5000::/64', 'nexthop':'fd00:fd00:fd00:5004::1'}]
+      vlan: 51
 - name: External
   name_lower: external
   vip: true
-  vlan: 10
   mtu: 1500
   subnets:
     external_subnet:
       ipv6_subnet: '2001:db8:fd00:1000::/64'
       ipv6_allocation_pools: [{'start': '2001:db8:fd00:1000::10', 'end': '2001:db8:fd00:1000:ffff:ffff:ffff:fffe'}]
-      gateway_ipv6: '2001:db8:fd00:1000::1'
+      gateway_ipv6: '2001:db8:fd00:1000::1'
+      vlan: 10

network-data-samples/legacy-routed-networks.yaml

@@ -1,7 +1,6 @@
 - name: Storage
   name_lower: storage
   vip: true
-  vlan: 30
   mtu: 1500
   subnets:
     storage_subnet:
@@ -9,10 +8,10 @@
       gateway_ip: 172.16.16.1
       routes: [{'destination':'172.16.16.0/20', 'nexthop':'172.16.16.1'}]
       allocation_pools: [{'start': '172.16.16.4', 'end': '172.16.16.250'}]
+      vlan: 30
 - name: StorageLeaf2
   name_lower: storage2
   vip: false
-  vlan: 31
   mtu: 1500
   subnets:
     storage2_subnet:
@@ -20,10 +19,10 @@
       gateway_ip: 172.16.17.1
       routes: [{'destination':'172.16.16.0/20', 'nexthop':'172.16.17.1'}]
       allocation_pools: [{'start': '172.16.17.4', 'end': '172.16.17.250'}]
+      vlan: 31
 - name: StorageMgmt
   name_lower: storage_mgmt
   vip: true
-  vlan: 40
   mtu: 1500
   subnets:
     storage_mgmt_subnet:
@@ -31,10 +30,10 @@
       gateway_ip: 172.16.48.1
       routes: [{'destination':'172.16.48.0/20', 'nexthop':'172.16.48.1'}]
       allocation_pools: [{'start': '172.16.48.4', 'end': '172.16.48.250'}]
+      vlan: 40
 - name: StorageMgmtLeaf2
   name_lower: storage_mgmt2
   vip: false
-  vlan: 41
   mtu: 1500
   subnets:
     storage_mgmt2_subnet:
@@ -42,10 +41,10 @@
       gateway_ip: 172.16.49.1
       routes: [{'destination':'172.16.48.0/20', 'nexthop':'172.16.49.1'}]
       allocation_pools: [{'start': '172.16.49.4', 'end': '172.16.49.250'}]
+      vlan: 41
 - name: InternalApi
   name_lower: internal_api
   vip: true
-  vlan: 20
   mtu: 1500
   subnets:
     internal_api_subnet:
@@ -53,10 +52,10 @@
       gateway_ip: 172.16.32.1
       routes: [{'destination':'172.16.32.0/20', 'nexthop':'172.16.32.1'}]
       allocation_pools: [{'start': '172.16.32.4', 'end': '172.16.32.250'}]
+      vlan: 20
 - name: InternalApiLeaf2
   name_lower: internal_api2
   vip: false
-  vlan: 21
   mtu: 1500
   subnets:
     internal_api2_subnet:
@@ -64,10 +63,10 @@
       gateway_ip: 172.16.33.1
       routes: [{'destination':'172.16.32.0/20', 'nexthop':'172.16.33.1'}]
       allocation_pools: [{'start': '172.16.33.4', 'end': '172.16.33.250'}]
+      vlan: 21
 - name: Tenant
   name_lower: tenant
   vip: false  # Tenant networks do not use VIPs
-  vlan: 50
   mtu: 1500
   subnets:
     tenant_subnet:
@@ -75,10 +74,10 @@
       gateway_ip: 172.16.0.1
       routes: [{'destination':'172.16.0.0/20', 'nexthop':'172.16.0.1'}]
       allocation_pools: [{'start': '172.16.0.4', 'end': '172.16.0.250'}]
+      vlan: 50
 - name: TenantLeaf2
   name_lower: tenant2
   vip: false  # Tenant networks do not use VIPs
-  vlan: 51
   mtu: 1500
   subnets:
     tenant2_subnet:
@@ -86,13 +85,14 @@
       gateway_ip: 172.16.1.1
       routes: [{'destination':'172.16.0.0/20', 'nexthop':'172.16.1.1'}]
       allocation_pools: [{'start': '172.16.1.4', 'end': '172.16.1.250'}]
+      vlan: 51
 - name: External
   name_lower: external
   vip: true
-  vlan: 10
   mtu: 1500
   subnets:
     external_subnet:
       ip_subnet: 10.0.0.0/24
       allocation_pools: [{'start': '10.0.0.4', 'end': '10.0.0.250'}]
-      gateway_ip: 10.0.0.1
+      gateway_ip: 10.0.0.1
+      vlan: 10

network-data-samples/management-ipv6.yaml

@@ -1,7 +1,6 @@
 - name: Management
   name_lower: management
   vip: false  # Management network does not use VIPs
-  vlan: 60
   mtu: 1500
   subnets:
     management_subnet:
@@ -9,4 +8,5 @@
       ipv6_allocation_pools:
         - start: fd00:fd00:fd00:6000::10
           end: fd00:fd00:fd00:6000:ffff:ffff:ffff:fffe
-      gateway_ipv6: fd00:fd00:fd00:6000::1
+      gateway_ipv6: fd00:fd00:fd00:6000::1
+      vlan: 60

network-data-samples/management.yaml

@@ -1,7 +1,6 @@
 - name: Management
   name_lower: management
   vip: false  # Management network does not use VIPs
-  vlan: 60
   mtu: 1500
   subnets:
     management_subnet:
@@ -10,3 +9,4 @@
         - start: 10.0.1.4
           end: 10.0.1.250
       gateway_ip: 10.0.1.1
+      vlan: 60

network-data-samples/routed-networks-ipv6.yaml

@@ -1,7 +1,6 @@
 - name: Storage
   name_lower: storage
   vip: true
-  vlan: 30
   mtu: 1500
   subnets:
     storage_subnet:
@@ -10,16 +9,17 @@
         - start: fd00:fd00:fd00:3000::10
           end: fd00:fd00:fd00:3000:ffff:ffff:ffff:fffe
       gateway_ipv6: fd00:fd00:fd00:3000::1
+      vlan: 30
     storage2_subnet:
       ipv6_subnet: fd00:fd00:fd00:3004::/64
       ipv6_allocation_pools:
         - start: fd00:fd00:fd00:3004::10
           end: fd00:fd00:fd00:3004:ffff:ffff:ffff:fffe
-    gateway_ipv6: fd00:fd00:fd00:3004::1
+      gateway_ipv6: fd00:fd00:fd00:3004::1
+      vlan: 30
 - name: StorageMgmt
   name_lower: storage_mgmt
   vip: true
-  vlan: 40
   mtu: 1500
   subnets:
     storage_mgmt_subnet:
@@ -28,16 +28,17 @@
         - start: fd00:fd00:fd00:4000::10
           end: fd00:fd00:fd00:4000:ffff:ffff:ffff:fffe
       gateway_ipv6: fd00:fd00:fd00:4000::1
+      vlan: 40
     storage_mgmt2_subnet:
       ipv6_subnet: fd00:fd00:fd00:4004::/64
       ipv6_allocation_pools:
         - start: fd00:fd00:fd00:4004::1
           end: fd00:fd00:fd00:4004:ffff:ffff:ffff:fffe
       gateway_ipv6: fd00:fd00:fd00:4004::1
+      vlan: 40
 - name: InternalApi
   name_lower: internal_api
   vip: true
-  vlan: 20
   mtu: 1500
   subnets:
     internal_api_subnet:
@@ -46,16 +47,17 @@
         - start: fd00:fd00:fd00:2000::10
           end: fd00:fd00:fd00:2000:ffff:ffff:ffff:fffe
       gateway_ipv6: fd00:fd00:fd00:2000::1
+      vlan: 20
     internal_api2_subnet:
       ipv6_subnet: fd00:fd00:fd00:2004::/64
       ipv6_allocation_pools:
         - start: fd00:fd00:fd00:2004::10
           end: fd00:fd00:fd00:2004:ffff:ffff:ffff:fffe
       gateway_ipv6: fd00:fd00:fd00:2004::1
+      vlan: 20
 - name: Tenant
   name_lower: tenant
   vip: false  # Tenant networks do not use VIPs
-  vlan: 50
   mtu: 1500
   subnets:
     tenant_subnet:
@@ -64,16 +66,17 @@
         - start: fd00:fd00:fd00:5000::10
           end: fd00:fd00:fd00:5000:ffff:ffff:ffff:fffe
       gateway_ipv6: fd00:fd00:fd00:5000::1
+      vlan: 50
     tenant2_subnet:
       ipv6_subnet: fd00:fd00:fd00:5004::/64
       ipv6_allocation_pools:
         - start: fd00:fd00:fd00:5004::10
           end: fd00:fd00:fd00:5004:ffff:ffff:ffff:fffe
       gateway_ipv6: fd00:fd00:fd00:5004::1
+      vlan: 50
 - name: External
   name_lower: external
   vip: true
-  vlan: 10
   mtu: 1500
   subnets:
     external_subnet:
@@ -81,4 +84,5 @@
       ipv6_allocation_pools:
         - start: 2001:db8:fd00:1000::10
           end: 2001:db8:fd00:1000:ffff:ffff:ffff:fffe
-      gateway_ipv6: 2001:db8:fd00:1000::1
+      gateway_ipv6: 2001:db8:fd00:1000::1
+      vlan: 10

network-data-samples/routed-networks.yaml

@@ -1,7 +1,6 @@
 - name: Storage
   name_lower: storage
   vip: true
-  vlan: 30
   mtu: 1500
   subnets:
     storage_subnet:
@@ -10,16 +9,17 @@
       allocation_pools:
         - start: 172.16.16.4
           end: 172.16.16.250
+      vlan: 30
     storage2_subnet:
       ip_subnet: 172.16.17.0/24
       gateway_ip: 172.16.17.1
       allocation_pools:
         - start: 172.16.17.4
           end: 172.16.17.250
+      vlan: 30
 - name: StorageMgmt
   name_lower: storage_mgmt
   vip: true
-  vlan: 40
   mtu: 1500
   subnets:
     storage_mgmt_subnet:
@@ -28,16 +28,17 @@
       allocation_pools:
         - start: 172.16.48.4
           end: 172.16.48.250
+      vlan: 40
     storage_mgmt2_subnet:
       ip_subnet: 172.16.49.0/24
       gateway_ip: 172.16.49.1
       allocation_pools:
         - start: 172.16.49.4
           end': 172.16.49.250
+      vlan: 40
 - name: InternalApi
   name_lower: internal_api
   vip: true
-  vlan: 20
   mtu: 1500
   subnets:
     internal_api_subnet:
@@ -46,16 +47,17 @@
       allocation_pools:
         - start: 172.16.32.4
           end: 172.16.32.250
+      vlan: 20
     internal_api2_subnet:
       ip_subnet: 172.16.33.0/24
       gateway_ip: 172.16.33.1
       allocation_pools:
         - start: 172.16.33.4
           end: 172.16.33.250
+      vlan: 20
 - name: Tenant
   name_lower: tenant
   vip: false  # Tenant networks do not use VIPs
-  vlan: 50
   mtu: 1500
   subnets:
     tenant_subnet:
@@ -64,16 +66,17 @@
       allocation_pools:
         - start: 172.16.0.4
           end: 172.16.0.250
+      vlan: 50
     tenant2_subnet:
       ip_subnet: 172.16.1.0/24
       gateway_ip: 172.16.1.1
       allocation_pools:
         - start: 172.16.1.4
           end: 172.16.1.250
+      vlan: 50
 - name: External
   name_lower: external
   vip: true
-  vlan: 10
   mtu: 1500
   subnets:
     external_subnet:
@@ -82,3 +85,4 @@
         - start: 10.0.0.4
           end: 10.0.0.250
       gateway_ip: 10.0.0.1
+      vlan: 10