Skip to content

Commit e47cd8c

Browse files
eduolivareseduolivares
committed
[BGP] Remove NNCP for master nodes
In BGP DTs, NNCP only makes sense for OCP workers because no RHOSO service is deployed on OCP masters. Depends-On: openstack-k8s-operators/ci-framework#3337
1 parent 56e3c9c commit e47cd8c

File tree

18 files changed

+524
-2151
lines changed

18 files changed

+524
-2151
lines changed

‎automation/mocks/bgp-l3-xl.yaml‎

Lines changed: 99 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -566,9 +566,9 @@ cifmw_networking_env_definition:
566566
prefix_length_v4: 24
567567
skip_nm: false
568568
vlan_id: 22
569-
ocp_worker-0:
569+
ocp-worker-0:
570570
hostname: worker-0
571-
name: ocp_worker-0
571+
name: ocp-worker-0
572572
networks:
573573
ctlplane:
574574
interface_name: enp8s0
@@ -623,9 +623,9 @@ cifmw_networking_env_definition:
623623
prefix_length_v4: 24
624624
skip_nm: false
625625
vlan_id: 22
626-
ocp_worker-1:
626+
ocp-worker-1:
627627
hostname: worker-1
628-
name: ocp_worker-1
628+
name: ocp-worker-1
629629
networks:
630630
ctlplane:
631631
interface_name: enp8s0
@@ -680,9 +680,9 @@ cifmw_networking_env_definition:
680680
prefix_length_v4: 24
681681
skip_nm: false
682682
vlan_id: 22
683-
ocp_worker-2:
683+
ocp-worker-2:
684684
hostname: worker-2
685-
name: ocp_worker-2
685+
name: ocp-worker-2
686686
networks:
687687
ctlplane:
688688
interface_name: enp8s0
@@ -737,9 +737,9 @@ cifmw_networking_env_definition:
737737
prefix_length_v4: 24
738738
skip_nm: false
739739
vlan_id: 22
740-
ocp_worker-3:
740+
ocp-worker-3:
741741
hostname: worker-3
742-
name: ocp_worker-3
742+
name: ocp-worker-3
743743
networks:
744744
ctlplane:
745745
interface_name: enp7s0
@@ -794,9 +794,9 @@ cifmw_networking_env_definition:
794794
prefix_length_v4: 24
795795
skip_nm: false
796796
vlan_id: 22
797-
ocp_worker-4:
797+
ocp-worker-4:
798798
hostname: worker-4
799-
name: ocp_worker-4
799+
name: ocp-worker-4
800800
networks:
801801
ctlplane:
802802
interface_name: enp7s0
@@ -851,9 +851,9 @@ cifmw_networking_env_definition:
851851
prefix_length_v4: 24
852852
skip_nm: false
853853
vlan_id: 22
854-
ocp_worker-5:
854+
ocp-worker-5:
855855
hostname: worker-5
856-
name: ocp_worker-5
856+
name: ocp-worker-5
857857
networks:
858858
ctlplane:
859859
interface_name: enp7s0
@@ -908,9 +908,9 @@ cifmw_networking_env_definition:
908908
prefix_length_v4: 24
909909
skip_nm: false
910910
vlan_id: 22
911-
ocp_worker-6:
911+
ocp-worker-6:
912912
hostname: worker-6
913-
name: ocp_worker-6
913+
name: ocp-worker-6
914914
networks:
915915
ctlplane:
916916
interface_name: enp7s0
@@ -965,9 +965,9 @@ cifmw_networking_env_definition:
965965
prefix_length_v4: 24
966966
skip_nm: false
967967
vlan_id: 22
968-
ocp_worker-7:
968+
ocp-worker-7:
969969
hostname: worker-7
970-
name: ocp_worker-7
970+
name: ocp-worker-7
971971
networks:
972972
ctlplane:
973973
interface_name: enp7s0
@@ -1022,9 +1022,9 @@ cifmw_networking_env_definition:
10221022
prefix_length_v4: 24
10231023
skip_nm: false
10241024
vlan_id: 22
1025-
ocp_worker-8:
1025+
ocp-worker-8:
10261026
hostname: worker-8
1027-
name: ocp_worker-8
1027+
name: ocp-worker-8
10281028
networks:
10291029
ctlplane:
10301030
interface_name: enp7s0
@@ -1079,9 +1079,9 @@ cifmw_networking_env_definition:
10791079
prefix_length_v4: 24
10801080
skip_nm: false
10811081
vlan_id: 22
1082-
ocp_worker-9:
1082+
ocp-worker-9:
10831083
hostname: worker-9
1084-
name: ocp_worker-9
1084+
name: ocp-worker-9
10851085
networks:
10861086
ctlplane:
10871087
interface_name: enp7s0
@@ -1438,3 +1438,82 @@ cifmw_networking_env_definition:
14381438
ipv6_ranges: []
14391439
vlan_id: 22
14401440
routers: {}
1441+
1442+
test_groups:
1443+
all:
1444+
- controller-0
1445+
- r0-compute-0
1446+
- r1-compute-0
1447+
- r2-compute-0
1448+
- r0-networker-0
1449+
- r1-networker-0
1450+
- r2-networker-0
1451+
- ocp-master-0
1452+
- ocp-master-1
1453+
- ocp-master-2
1454+
- ocp-worker-0
1455+
- ocp-worker-1
1456+
- ocp-worker-2
1457+
- ocp-worker-3
1458+
- ocp-worker-4
1459+
- ocp-worker-5
1460+
- ocp-worker-6
1461+
- ocp-worker-7
1462+
- ocp-worker-8
1463+
- ocp-worker-9
1464+
- router-0
1465+
- spine-0
1466+
- spine-1
1467+
- leaf-0
1468+
- leaf-1
1469+
- leaf-2
1470+
- leaf-3
1471+
- leaf-4
1472+
- leaf-5
1473+
- hypervisor
1474+
- localhost
1475+
controllers:
1476+
- controller-0
1477+
hypervisors:
1478+
- hypervisor
1479+
leafs:
1480+
- leaf-0
1481+
- leaf-1
1482+
- leaf-2
1483+
- leaf-3
1484+
- leaf-4
1485+
- leaf-5
1486+
localhosts:
1487+
- localhost
1488+
ocp_workers:
1489+
- ocp-worker-0
1490+
- ocp-worker-1
1491+
- ocp-worker-2
1492+
- ocp-worker-3
1493+
- ocp-worker-4
1494+
- ocp-worker-5
1495+
- ocp-worker-6
1496+
- ocp-worker-7
1497+
- ocp-worker-8
1498+
- ocp-worker-9
1499+
ocps:
1500+
- ocp-master-0
1501+
- ocp-master-1
1502+
- ocp-master-2
1503+
r0-computes:
1504+
- r0-compute-0
1505+
r0-networkers:
1506+
- r0-networker-0
1507+
r1-computes:
1508+
- r1-compute-0
1509+
r1-networkers:
1510+
- r1-networker-0
1511+
r2-computes:
1512+
- r2-compute-0
1513+
r2-networkers:
1514+
- r2-networker-0
1515+
routers:
1516+
- router-0
1517+
spines:
1518+
- spine-0
1519+
- spine-1

‎automation/mocks/bgp_dt01.yaml‎

Lines changed: 75 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -428,9 +428,9 @@ cifmw_networking_env_definition:
428428
prefix_length_v4: 24
429429
skip_nm: false
430430
vlan_id: 22
431-
ocp_worker-0:
431+
ocp-worker-0:
432432
hostname: worker-0
433-
name: ocp_worker-0
433+
name: ocp-worker-0
434434
networks:
435435
ctlplane:
436436
interface_name: enp8s0
@@ -485,9 +485,9 @@ cifmw_networking_env_definition:
485485
prefix_length_v4: 24
486486
skip_nm: false
487487
vlan_id: 22
488-
ocp_worker-1:
488+
ocp-worker-1:
489489
hostname: worker-1
490-
name: ocp_worker-1
490+
name: ocp-worker-1
491491
networks:
492492
ctlplane:
493493
interface_name: enp8s0
@@ -542,9 +542,9 @@ cifmw_networking_env_definition:
542542
prefix_length_v4: 24
543543
skip_nm: false
544544
vlan_id: 22
545-
ocp_worker-2:
545+
ocp-worker-2:
546546
hostname: worker-2
547-
name: ocp_worker-2
547+
name: ocp-worker-2
548548
networks:
549549
ctlplane:
550550
interface_name: enp8s0
@@ -599,9 +599,9 @@ cifmw_networking_env_definition:
599599
prefix_length_v4: 24
600600
skip_nm: false
601601
vlan_id: 22
602-
ocp_worker-3:
602+
ocp-worker-3:
603603
hostname: worker-3
604-
name: ocp_worker-3
604+
name: ocp-worker-3
605605
networks:
606606
ctlplane:
607607
interface_name: enp7s0
@@ -958,3 +958,70 @@ cifmw_networking_env_definition:
958958
ipv6_ranges: []
959959
vlan_id: 22
960960
routers: {}
961+
962+
test_groups:
963+
all:
964+
- controller-0
965+
- r0-compute-0
966+
- r1-compute-0
967+
- r2-compute-0
968+
- r0-networker-0
969+
- r1-networker-0
970+
- r2-networker-0
971+
- ocp-master-0
972+
- ocp-master-1
973+
- ocp-master-2
974+
- ocp-worker-0
975+
- ocp-worker-1
976+
- ocp-worker-2
977+
- ocp-worker-3
978+
- router-0
979+
- spine-0
980+
- spine-1
981+
- leaf-0
982+
- leaf-1
983+
- leaf-2
984+
- leaf-3
985+
- leaf-4
986+
- leaf-5
987+
- hypervisor
988+
- localhost
989+
controllers:
990+
- controller-0
991+
hypervisors:
992+
- hypervisor
993+
leafs:
994+
- leaf-0
995+
- leaf-1
996+
- leaf-2
997+
- leaf-3
998+
- leaf-4
999+
- leaf-5
1000+
localhosts:
1001+
- localhost
1002+
ocp_workers:
1003+
- ocp-worker-0
1004+
- ocp-worker-1
1005+
- ocp-worker-2
1006+
- ocp-worker-3
1007+
ocps:
1008+
- ocp-master-0
1009+
- ocp-master-1
1010+
- ocp-master-2
1011+
r0-computes:
1012+
- r0-compute-0
1013+
r0-networkers:
1014+
- r0-networker-0
1015+
r1-computes:
1016+
- r1-compute-0
1017+
r1-networkers:
1018+
- r1-networker-0
1019+
r2-computes:
1020+
- r2-compute-0
1021+
r2-networkers:
1022+
- r2-networker-0
1023+
routers:
1024+
- router-0
1025+
spines:
1026+
- spine-0
1027+
- spine-1

0 commit comments

Comments
 (0)