Merge "Replace ALL "tag" parameter with "vlan_start""

system_test/tests_templates/devops_configs/centos_master.yaml

@@ -68,23 +68,24 @@ address_pools:
   fuelweb_admin-pool01:
     net: *pool_default
     params:
-      tag: 0
+      vlan_start: 0
   public-pool01:
     net: *pool_default
     params:
-      tag: 0
+      vlan_start: 0
   storage-pool01:
     net: *pool_default
     params:
-      tag: 101
+      vlan_start: 101
   management-pool01:
     net: *pool_default
     params:
-      tag: 102
+      vlan_start: 102
   private-pool01:
     net: *pool_default
     params:
-      tag: 103
+      vlan_start: 103
+      vlan_end: 120
 
 groups:
  - name: default

system_test/tests_templates/devops_configs/default.yaml

@@ -68,23 +68,24 @@ address_pools:
   fuelweb_admin-pool01:
     net: *pool_default
     params:
-      tag: 0
+      vlan_start: 0
   public-pool01:
     net: *pool_default
     params:
-      tag: 0
+      vlan_start: 0
   storage-pool01:
     net: *pool_default
     params:
-      tag: 101
+      vlan_start: 101
   management-pool01:
     net: *pool_default
     params:
-      tag: 102
+      vlan_start: 102
   private-pool01:
     net: *pool_default
     params:
-      tag: 103
+      vlan_start: 103
+      vlan_end: 120
 
 groups:
  - name: default

system_test/tests_templates/devops_configs/default30-2groups.yaml

@@ -15,7 +15,7 @@ address_pools:
   fuelweb_admin-pool01:
     net: *pool_default
     params:
-      tag: 0
+      vlan_start: 0
       ip_reserved:
         gateway: +1
         l2_network_device: +1  # l2_network_device will get this IP address
@@ -25,7 +25,7 @@ address_pools:
   public-pool01:
     net: *pool_default
     params:
-      tag: 100
+      vlan_start: 100
       ip_reserved:
         gateway: +1
         l2_network_device: +1  # l2_network_device will get this IP address
@@ -36,7 +36,7 @@ address_pools:
   storage-pool01:
     net: *pool_default
     params:
-      tag: 101
+      vlan_start: 101
       ip_reserved:
         gateway: +1
         l2_network_device: +1  # l2_network_device will get this IP address
@@ -46,7 +46,7 @@ address_pools:
   management-pool01:
     net: *pool_default
     params:
-      tag: 102
+      vlan_start: 102
       ip_reserved:
         gateway: +1
         l2_network_device: +1  # l2_network_device will get this IP address
@@ -56,7 +56,8 @@ address_pools:
   private-pool01:
     net: *pool_default
     params:
-      tag: 960
+      vlan_start: 960
+      vlan_end: 990
       ip_reserved:
         gateway: +1
         l2_network_device: +1  # l2_network_device will get this IP address
@@ -66,7 +67,7 @@ address_pools:
   public-pool02:
     net: *pool_default
     params:
-      tag: 100
+      vlan_start: 100
       ip_reserved:
         gateway: +1
         l2_network_device: +1  # l2_network_device will get this IP address
@@ -77,7 +78,7 @@ address_pools:
   storage-pool02:
     net: *pool_default
     params:
-      tag: 101
+      vlan_start: 101
       ip_reserved:
         gateway: +1
         l2_network_device: +1  # l2_network_device will get this IP address
@@ -87,7 +88,7 @@ address_pools:
   management-pool02:
     net: *pool_default
     params:
-      tag: 102
+      vlan_start: 102
       ip_reserved:
         gateway: +1
         l2_network_device: +1  # l2_network_device will get this IP address
@@ -97,7 +98,8 @@ address_pools:
   private-pool02:
     net: *pool_default
     params:
-      tag: 960
+      vlan_start: 960
+      vlan_end: 990
       ip_reserved:
         gateway: +1
         l2_network_device: +1  # l2_network_device will get this IP address

system_test/tests_templates/devops_configs/default30-2groups_.yaml

@@ -14,7 +14,7 @@ address_pools:
   fuelweb_admin-pool01:
     net: *pool_default
     params:
-      tag: 0
+      vlan_start: 0
       ip_reserved:
         gateway: +1
         l2_network_device: +1  # l2_network_device will get this IP address
@@ -24,7 +24,7 @@ address_pools:
   public-pool01:
     net: *pool_default
     params:
-      tag: 100
+      vlan_start: 100
       ip_reserved:
         gateway: +1
         l2_network_device: +1  # l2_network_device will get this IP address
@@ -35,15 +35,16 @@ address_pools:
   storage-pool01:
     net: *pool_default
     params:
-      tag: 101
+      vlan_start: 101
   management-pool01:
     net: *pool_default
     params:
-      tag: 102
+      vlan_start: 102
   private-pool01:
     net: *pool_default
     params:
-      tag: 960
+      vlan_start: 960
+      vlan_start: 990
 
 groups:
 

system_test/tests_templates/devops_configs/default30-bond.yaml

@@ -15,7 +15,7 @@ address_pools:
   fuelweb_admin-pool01:
     net: *pool_default
     params:
-      tag: 0
+      vlan_start: 0
       ip_reserved:
         gateway: +1
         l2_network_device: +1  # l2_network_device will get this IP address
@@ -25,7 +25,7 @@ address_pools:
   public-pool01:
     net: *pool_default
     params:
-      tag: 100
+      vlan_start: 100
       ip_reserved:
         gateway: +1
         l2_network_device: +1  # l2_network_device will get this IP address
@@ -36,15 +36,16 @@ address_pools:
   storage-pool01:
     net: *pool_default
     params:
-      tag: 101
+      vlan_start: 101
   management-pool01:
     net: *pool_default
     params:
-      tag: 102
+      vlan_start: 102
   private-pool01:
     net: *pool_default
     params:
-      tag: 103
+      vlan_start: 103
+      vlan_end: 120
 
 groups:
  - name: default

system_test/tests_templates/devops_configs/default30.yaml

@@ -15,7 +15,7 @@ address_pools:
   fuelweb_admin-pool01:
     net: *pool_default
     params:
-      tag: 0
+      vlan_start: 0
       ip_reserved:
         gateway: +1
         l2_network_device: +1  # l2_network_device will get this IP address
@@ -25,7 +25,7 @@ address_pools:
   public-pool01:
     net: *pool_default
     params:
-      tag: 100
+      vlan_start: 100
       ip_reserved:
         gateway: +1
         l2_network_device: +1  # l2_network_device will get this IP address
@@ -36,15 +36,16 @@ address_pools:
   storage-pool01:
     net: *pool_default
     params:
-      tag: 101
+      vlan_start: 101
   management-pool01:
     net: *pool_default
     params:
-      tag: 102
+      vlan_start: 102
   private-pool01:
     net: *pool_default
     params:
-      tag: 103
+      vlan_start: 103
+      vlan_end: 120
 
 groups:
  - name: default

system_test/tests_templates/devops_configs/external_haproxy.yaml

@@ -197,57 +197,60 @@ address_pools:
   fuelweb_admin-pool01:
     net: *pool_default
     params:
-      tag: 0
+      vlan_start: 0
   public-pool01:
     net: *pool_default
     params:
-      tag: 0
+      vlan_start: 0
   storage-pool01:
     net: *pool_default
     params:
-      tag: 101
+      vlan_start: 101
   management-pool01:
     net: *pool_default
     params:
-      tag: 102
+      vlan_start: 102
   private-pool01:
     net: *pool_default
     params:
-      tag: 103
+      vlan_start: 103
+      vlan_end: 120
 
   fuelweb_admin-pool02:
     net: *pool_default
     params:
-      tag: 0
+      vlan_start: 0
   public-pool02:
     net: *pool_default
     params:
-      tag: 0
+      vlan_start: 0
   management-pool02:
     net: *pool_default
     params:
-      tag: 102
+      vlan_start: 102
   private-pool02:
     net: *pool_default
     params:
-      tag: 103
+      vlan_start: 103
+      vlan_end: 120
 
   fuelweb_admin-pool03:
     net: *pool_default
     params:
-      tag: 0
+      vlan_start: 0
   public-pool03:
     net: *pool_default
     params:
-      tag: 0
+      vlan_start: 0
   management-pool03:
     net: *pool_default
     params:
-      tag: 102
+      vlan_start: 102
   private-pool03:
     net: *pool_default
     params:
-      tag: 103
+      vlan_start: 103
+      vlan_end: 120
 
 groups:
  - name: default

system_test/tests_templates/devops_configs/public_api.yaml

@@ -74,27 +74,28 @@ address_pools:
   fuelweb_admin-pool01:
     net: *pool_default
     params:
-      tag: 0
+      vlan_start: 0
   public-pool01:
     net: *pool_default
     params:
-      tag: 0
+      vlan_start: 0
   os-api-pool01:
     net: *pool_default
     params:
-      tag: 0
+      vlan_start: 0
   storage-pool01:
     net: *pool_default
     params:
-      tag: 101
+      vlan_start: 101
   management-pool01:
     net: *pool_default
     params:
-      tag: 102
+      vlan_start: 102
   private-pool01:
     net: *pool_default
     params:
-      tag: 103
+      vlan_start: 103
+      vlan_end: 120
 
 groups:
  - name: default

system_test/tests_templates/devops_configs/security_scan.yaml

@@ -68,23 +68,24 @@ template:
       fuelweb_admin-pool01:
         net: *pool_default
         params:
-          tag: 0
+          vlan_start: 0
       public-pool01:
         net: *pool_default
         params:
-          tag: 0
+          vlan_start: 0
       storage-pool01:
         net: *pool_default
         params:
-          tag: 101
+          vlan_start: 101
       management-pool01:
         net: *pool_default
         params:
-          tag: 102
+          vlan_start: 102
       private-pool01:
         net: *pool_default
         params:
-          tag: 103
+          vlan_start: 103
+          vlan_end: 120
 
     groups:
      - name: default

system_test/tests_templates/devops_configs/vcenter_ha_default.yaml

@@ -87,23 +87,24 @@ address_pools:
   fuelweb_admin-pool01:
     net: *pool_default
     params:
-      tag: 0
+      vlan_start: 0
   public-pool01:
     net: *pool_default
     params:
-      tag: 0
+      vlan_start: 0
   storage-pool01:
     net: *pool_default
     params:
-      tag: 101
+      vlan_start: 101
   management-pool01:
     net: *pool_default
     params:
-      tag: 102
+      vlan_start: 102
   private-pool01:
     net: *pool_default
     params:
-      tag: 103
+      vlan_start: 103
+      vlan_end: 120
 
 groups:
  - name: cat