Merge pull request #625 from eduolivares/bgp-no-nncp-for-masters

[BGP] Remove NNCP for master nodes

Author: evallesp

automation/mocks/bgp-l3-xl.yaml

@@ -566,9 +566,9 @@ cifmw_networking_env_definition:
           prefix_length_v4: 24
           skip_nm: false
           vlan_id: 22
-    ocp_worker-0:
+    ocp-worker-0:
       hostname: worker-0
-      name: ocp_worker-0
+      name: ocp-worker-0
       networks:
         ctlplane:
           interface_name: enp8s0
@@ -623,9 +623,9 @@ cifmw_networking_env_definition:
           prefix_length_v4: 24
           skip_nm: false
           vlan_id: 22
-    ocp_worker-1:
+    ocp-worker-1:
       hostname: worker-1
-      name: ocp_worker-1
+      name: ocp-worker-1
       networks:
         ctlplane:
           interface_name: enp8s0
@@ -680,9 +680,9 @@ cifmw_networking_env_definition:
           prefix_length_v4: 24
           skip_nm: false
           vlan_id: 22
-    ocp_worker-2:
+    ocp-worker-2:
       hostname: worker-2
-      name: ocp_worker-2
+      name: ocp-worker-2
       networks:
         ctlplane:
           interface_name: enp8s0
@@ -737,9 +737,9 @@ cifmw_networking_env_definition:
           prefix_length_v4: 24
           skip_nm: false
           vlan_id: 22
-    ocp_worker-3:
+    ocp-worker-3:
       hostname: worker-3
-      name: ocp_worker-3
+      name: ocp-worker-3
       networks:
         ctlplane:
           interface_name: enp7s0
@@ -794,9 +794,9 @@ cifmw_networking_env_definition:
           prefix_length_v4: 24
           skip_nm: false
           vlan_id: 22
-    ocp_worker-4:
+    ocp-worker-4:
       hostname: worker-4
-      name: ocp_worker-4
+      name: ocp-worker-4
       networks:
         ctlplane:
           interface_name: enp7s0
@@ -851,9 +851,9 @@ cifmw_networking_env_definition:
           prefix_length_v4: 24
           skip_nm: false
           vlan_id: 22
-    ocp_worker-5:
+    ocp-worker-5:
       hostname: worker-5
-      name: ocp_worker-5
+      name: ocp-worker-5
       networks:
         ctlplane:
           interface_name: enp7s0
@@ -908,9 +908,9 @@ cifmw_networking_env_definition:
           prefix_length_v4: 24
           skip_nm: false
           vlan_id: 22
-    ocp_worker-6:
+    ocp-worker-6:
       hostname: worker-6
-      name: ocp_worker-6
+      name: ocp-worker-6
       networks:
         ctlplane:
           interface_name: enp7s0
@@ -965,9 +965,9 @@ cifmw_networking_env_definition:
           prefix_length_v4: 24
           skip_nm: false
           vlan_id: 22
-    ocp_worker-7:
+    ocp-worker-7:
       hostname: worker-7
-      name: ocp_worker-7
+      name: ocp-worker-7
       networks:
         ctlplane:
           interface_name: enp7s0
@@ -1022,9 +1022,9 @@ cifmw_networking_env_definition:
           prefix_length_v4: 24
           skip_nm: false
           vlan_id: 22
-    ocp_worker-8:
+    ocp-worker-8:
       hostname: worker-8
-      name: ocp_worker-8
+      name: ocp-worker-8
       networks:
         ctlplane:
           interface_name: enp7s0
@@ -1079,9 +1079,9 @@ cifmw_networking_env_definition:
           prefix_length_v4: 24
           skip_nm: false
           vlan_id: 22
-    ocp_worker-9:
+    ocp-worker-9:
       hostname: worker-9
-      name: ocp_worker-9
+      name: ocp-worker-9
       networks:
         ctlplane:
           interface_name: enp7s0
@@ -1438,3 +1438,82 @@ cifmw_networking_env_definition:
           ipv6_ranges: []
       vlan_id: 22
   routers: {}
+
+test_groups:
+  all:
+    - controller-0
+    - r0-compute-0
+    - r1-compute-0
+    - r2-compute-0
+    - r0-networker-0
+    - r1-networker-0
+    - r2-networker-0
+    - ocp-master-0
+    - ocp-master-1
+    - ocp-master-2
+    - ocp-worker-0
+    - ocp-worker-1
+    - ocp-worker-2
+    - ocp-worker-3
+    - ocp-worker-4
+    - ocp-worker-5
+    - ocp-worker-6
+    - ocp-worker-7
+    - ocp-worker-8
+    - ocp-worker-9
+    - router-0
+    - spine-0
+    - spine-1
+    - leaf-0
+    - leaf-1
+    - leaf-2
+    - leaf-3
+    - leaf-4
+    - leaf-5
+    - hypervisor
+    - localhost
+  controllers:
+    - controller-0
+  hypervisors:
+    - hypervisor
+  leafs:
+    - leaf-0
+    - leaf-1
+    - leaf-2
+    - leaf-3
+    - leaf-4
+    - leaf-5
+  localhosts:
+    - localhost
+  ocp_workers:
+    - ocp-worker-0
+    - ocp-worker-1
+    - ocp-worker-2
+    - ocp-worker-3
+    - ocp-worker-4
+    - ocp-worker-5
+    - ocp-worker-6
+    - ocp-worker-7
+    - ocp-worker-8
+    - ocp-worker-9
+  ocps:
+    - ocp-master-0
+    - ocp-master-1
+    - ocp-master-2
+  r0-computes:
+    - r0-compute-0
+  r0-networkers:
+    - r0-networker-0
+  r1-computes:
+    - r1-compute-0
+  r1-networkers:
+    - r1-networker-0
+  r2-computes:
+    - r2-compute-0
+  r2-networkers:
+    - r2-networker-0
+  routers:
+    - router-0
+  spines:
+    - spine-0
+    - spine-1

automation/mocks/bgp_dt01.yaml

@@ -428,9 +428,9 @@ cifmw_networking_env_definition:
           prefix_length_v4: 24
           skip_nm: false
           vlan_id: 22
-    ocp_worker-0:
+    ocp-worker-0:
       hostname: worker-0
-      name: ocp_worker-0
+      name: ocp-worker-0
       networks:
         ctlplane:
           interface_name: enp8s0
@@ -485,9 +485,9 @@ cifmw_networking_env_definition:
           prefix_length_v4: 24
           skip_nm: false
           vlan_id: 22
-    ocp_worker-1:
+    ocp-worker-1:
       hostname: worker-1
-      name: ocp_worker-1
+      name: ocp-worker-1
       networks:
         ctlplane:
           interface_name: enp8s0
@@ -542,9 +542,9 @@ cifmw_networking_env_definition:
           prefix_length_v4: 24
           skip_nm: false
           vlan_id: 22
-    ocp_worker-2:
+    ocp-worker-2:
       hostname: worker-2
-      name: ocp_worker-2
+      name: ocp-worker-2
       networks:
         ctlplane:
           interface_name: enp8s0
@@ -599,9 +599,9 @@ cifmw_networking_env_definition:
           prefix_length_v4: 24
           skip_nm: false
           vlan_id: 22
-    ocp_worker-3:
+    ocp-worker-3:
       hostname: worker-3
-      name: ocp_worker-3
+      name: ocp-worker-3
       networks:
         ctlplane:
           interface_name: enp7s0
@@ -958,3 +958,70 @@ cifmw_networking_env_definition:
           ipv6_ranges: []
       vlan_id: 22
   routers: {}
+
+test_groups:
+  all:
+    - controller-0
+    - r0-compute-0
+    - r1-compute-0
+    - r2-compute-0
+    - r0-networker-0
+    - r1-networker-0
+    - r2-networker-0
+    - ocp-master-0
+    - ocp-master-1
+    - ocp-master-2
+    - ocp-worker-0
+    - ocp-worker-1
+    - ocp-worker-2
+    - ocp-worker-3
+    - router-0
+    - spine-0
+    - spine-1
+    - leaf-0
+    - leaf-1
+    - leaf-2
+    - leaf-3
+    - leaf-4
+    - leaf-5
+    - hypervisor
+    - localhost
+  controllers:
+    - controller-0
+  hypervisors:
+    - hypervisor
+  leafs:
+    - leaf-0
+    - leaf-1
+    - leaf-2
+    - leaf-3
+    - leaf-4
+    - leaf-5
+  localhosts:
+    - localhost
+  ocp_workers:
+    - ocp-worker-0
+    - ocp-worker-1
+    - ocp-worker-2
+    - ocp-worker-3
+  ocps:
+    - ocp-master-0
+    - ocp-master-1
+    - ocp-master-2
+  r0-computes:
+    - r0-compute-0
+  r0-networkers:
+    - r0-networker-0
+  r1-computes:
+    - r1-compute-0
+  r1-networkers:
+    - r1-networker-0
+  r2-computes:
+    - r2-compute-0
+  r2-networkers:
+    - r2-networker-0
+  routers:
+    - router-0
+  spines:
+    - spine-0
+    - spine-1