Multiple nodesets for ovs-dpdk-sriov scenario

Created a new dt based on ovs-dpdk-sriov va

automation/vars/default.yaml

@@ -221,6 +221,65 @@ vas:
             src_file: values.yaml
         build_output: deployment.yaml
 
+  ovs-dpdk-sriov-2nodesets:
+    stages:
+      - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/nncp
+        wait_conditions:
+          - >-
+            oc -n openstack wait nncp
+            -l osp/nncm-config-type=standard
+            --for jsonpath='{.status.conditions[0].reason}'=SuccessfullyConfigured
+            --timeout=60s
+        values:
+          - name: network-values
+            src_file: ../../../../va/nfv/ovs-dpdk-sriov/nncp/values.yaml
+        build_output: nncp.yaml
+
+      - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets
+        wait_conditions:
+          - >-
+            oc -n openstack wait osctlplane controlplane --for condition=Ready
+            --timeout=1200s
+        values:
+          - name: network-values
+            src_file: ../../../va/nfv/ovs-dpdk-sriov/nncp/values.yaml
+          - name: service-values
+            src_file: ../../../va/nfv/ovs-dpdk-sriov/service-values.yaml
+        build_output: control-plane.yaml
+
+      - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset
+        wait_conditions:
+          - >-
+            oc -n openstack wait
+            osdpns openstack-edpm --for condition=SetupReady
+            --timeout=60m
+        values:
+          - name: edpm-nodeset-values
+            src_file: ../../../../../va/nfv/ovs-dpdk-sriov/edpm/nodeset/values.yaml
+        build_output: nodeset.yaml
+
+      - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset2
+        wait_conditions:
+          - >-
+            oc -n openstack wait
+            osdpns openstack-edpm-2 --for condition=SetupReady
+            --timeout=60m
+        values:
+          - name: edpm-nodeset2-values
+            src_file: ../../../../../va/nfv/ovs-dpdk-sriov/edpm/nodeset/values.yaml
+        build_output: nodeset2.yaml
+
+      - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/deployment
+        wait_conditions:
+          - >-
+            oc -n openstack wait
+            osdpns openstack-edpm --for condition=Ready
+            --timeout=60m
+        values:
+          - name: edpm-deployment-values
+            src_file: ../../../../../va/nfv/ovs-dpdk-sriov/edpm/deployment/values.yaml
+        build_output: deployment.yaml
+
   nfv-ovs-dpdk-sriov-hci:
     stages:
       - path: examples/dt/nfv/nfv-ovs-dpdk-sriov-hci/control-plane/nncp

examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/deployment/.gitignore

@@ -0,0 +1 @@
+dataplane-deployment.yaml

examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/deployment/kustomization.yaml

@@ -0,0 +1,15 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../../../../va/nfv/ovs-dpdk-sriov/edpm/deployment
+
+patches:
+  - target:
+      kind: OpenStackDataPlaneDeployment
+      name: edpm-deployment
+    patch: |
+      - op: add
+        path: /spec/nodeSets/-
+        value: openstack-edpm-2

examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset/kustomization.yaml

@@ -0,0 +1,6 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../../../../va/nfv/ovs-dpdk-sriov/edpm/nodeset

examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset2/.gitignore

@@ -0,0 +1 @@
+dataplane-nodeset-2.yaml

examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset2/kustomization.yaml

@@ -0,0 +1,53 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../../../../va/nfv/ovs-dpdk-sriov/edpm/nodeset
+
+patches:
+  - target:
+      kind: ConfigMap
+      name: sriov-nova
+    patch: |-
+      - op: replace
+        path: /metadata/name
+        value: sriov-nova-2
+  - target:
+      kind: ConfigMap
+      name: ovs-dpdk-sriov-cpu-pinning-nova
+    patch: |-
+      - op: replace
+        path: /metadata/name
+        value: ovs-dpdk-sriov-cpu-pinning-nova-2
+  - target:
+      kind: OpenStackDataPlaneService
+      name: nova-custom-ovsdpdksriov
+    patch: |-
+      - op: replace
+        path: /metadata/name
+        value: nova-custom-ovsdpdksriov-2
+      - op: replace
+        path: /spec/label
+        value: nova-custom-ovsdpdksriov-2
+      - op: replace
+        path: /spec/dataSources/0/configMapRef/name
+        value: ovs-dpdk-sriov-cpu-pinning-nova-2
+      - op: replace
+        path: /spec/dataSources/1/configMapRef/name
+        value: sriov-nova-2
+  - target:
+      kind: OpenStackDataPlaneNodeSet
+      name: openstack-edpm
+    patch: |-
+      - op: replace
+        path: /metadata/name
+        value: openstack-edpm-2
+      - op: replace
+        path: /spec/baremetalSetTemplate/bmhLabelSelector/app
+        value: openstack-2
+      - op: replace
+        path: /spec/services/16
+        value: nova-custom-ovsdpdksriov-2
+      - op: remove
+        path: /spec/services/8

examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/kustomization.yaml

@@ -0,0 +1,6 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../../va/nfv/ovs-dpdk-sriov

examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/nncp/kustomization.yaml

@@ -0,0 +1,6 @@
+---
+apiVersion: kustomize.config.k8s.io/v1beta1
+kind: Kustomization
+
+resources:
+  - ../../../../va/nfv/ovs-dpdk-sriov/nncp

zuul.d/projects.yaml

@@ -9,6 +9,7 @@
       - rhoso-architecture-validate-osasinfra
       - rhoso-architecture-validate-ovs-dpdk
       - rhoso-architecture-validate-ovs-dpdk-sriov
+      - rhoso-architecture-validate-ovs-dpdk-sriov-2nodesets
       - rhoso-architecture-validate-pidone
       - rhoso-architecture-validate-sriov
       - rhoso-architecture-validate-uni01alpha

zuul.d/validations.yaml

@@ -90,6 +90,18 @@
     parent: rhoso-architecture-base-job
     vars:
       cifmw_architecture_scenario: ovs-dpdk-sriov
+- job:
+    files:
+    - examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets
+    - examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/deployment
+    - examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset
+    - examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/edpm/nodeset2
+    - examples/dt/nfv/nfv-ovs-dpdk-sriov-2nodesets/nncp
+    - lib
+    name: rhoso-architecture-validate-ovs-dpdk-sriov-2nodesets
+    parent: rhoso-architecture-base-job
+    vars:
+      cifmw_architecture_scenario: ovs-dpdk-sriov-2nodesets
 - job:
     files:
     - automation/net-env/pidone.yaml