From 4012836a8aa83e017dd7c52cd977b7dd49758115 Mon Sep 17 00:00:00 2001 From: Alexis Romero Date: Tue, 15 Mar 2022 16:38:52 +0100 Subject: [PATCH 1/6] Feature 10906: Packages for testing affinity groups Signed-off-by: Alexis Romero --- affinity_basic_ns/affinity_basic_nsd.yaml | 25 +++++++ affinity_basic_vnf/affinity_basic_vnfd.yaml | 75 +++++++++++++++++++++ 2 files changed, 100 insertions(+) create mode 100644 affinity_basic_ns/affinity_basic_nsd.yaml create mode 100644 affinity_basic_vnf/affinity_basic_vnfd.yaml diff --git a/affinity_basic_ns/affinity_basic_nsd.yaml b/affinity_basic_ns/affinity_basic_nsd.yaml new file mode 100644 index 00000000..ad7ee609 --- /dev/null +++ b/affinity_basic_ns/affinity_basic_nsd.yaml @@ -0,0 +1,25 @@ +nsd: + nsd: + - description: Simple NS with a single VNF and a single VL + df: + - id: default-df + vnf-profile: + - id: 'affinity-basic-1' + virtual-link-connectivity: + - constituent-cpd-id: + - constituent-base-element-id: 'affinity-basic-1' + constituent-cpd-id: vnf-cp0-ext-1 + virtual-link-profile-id: mgmtnet + - constituent-cpd-id: + - constituent-base-element-id: 'affinity-basic-1' + constituent-cpd-id: vnf-cp0-ext-2 + virtual-link-profile-id: mgmtnet + vnfd-id: affinity_basic-vnf + id: affinity_basic-ns + name: affinity_basic-ns + version: '1.0' + virtual-link-desc: + - id: mgmtnet + mgmt-network: true + vnfd-id: + - affinity_basic-vnf diff --git a/affinity_basic_vnf/affinity_basic_vnfd.yaml b/affinity_basic_vnf/affinity_basic_vnfd.yaml new file mode 100644 index 00000000..feef6918 --- /dev/null +++ b/affinity_basic_vnf/affinity_basic_vnfd.yaml @@ -0,0 +1,75 @@ +vnfd: + description: A basic VNF descriptor w/ two VDUs and a affinity group + df: + - id: default-df + instantiation-level: + - id: default-instantiation-level + vdu-level: + - number-of-instances: 1 + vdu-id: affinity_basic-VM-1 + - number-of-instances: 1 + vdu-id: affinity_basic-VM-2 + vdu-profile: + - id: affinity_basic-VM-1 + min-number-of-instances: 1 + affinity-or-anti-affinity-group: + - id: affinity-group-1 + - id: affinity_basic-VM-2 + min-number-of-instances: 1 + affinity-or-anti-affinity-group: + - id: affinity-group-1 + affinity-or-anti-affinity-group: + - id: affinity-group-1 + type: affinity + scope: nfvi-node + ext-cpd: + - id: vnf-cp0-ext-1 + int-cpd: + cpd: vdu-eth0-int + vdu-id: affinity_basic-VM-1 + - id: vnf-cp0-ext-2 + int-cpd: + cpd: vdu-eth0-int + vdu-id: affinity_basic-VM-2 + id: affinity_basic-vnf + mgmt-cp: vnf-cp0-ext-1 + product-name: affinity_basic-vnf + sw-image-desc: + - id: ubuntu18.04 + name: ubuntu18.04 + image: ubuntu18.04 + vdu: + - id: affinity_basic-VM-1 + name: affinity_basic-VM-1 + sw-image-desc: ubuntu18.04 + virtual-compute-desc: affinity_basic-VM-compute + virtual-storage-desc: + - affinity_basic-VM-storage + int-cpd: + - id: vdu-eth0-int + virtual-network-interface-requirement: + - name: vdu-eth0 + virtual-interface: + type: PARAVIRT + - id: affinity_basic-VM-2 + name: affinity_basic-VM-2 + sw-image-desc: ubuntu18.04 + virtual-compute-desc: affinity_basic-VM-compute + virtual-storage-desc: + - affinity_basic-VM-storage + int-cpd: + - id: vdu-eth0-int + virtual-network-interface-requirement: + - name: vdu-eth0 + virtual-interface: + type: PARAVIRT + version: '1.0' + virtual-compute-desc: + - id: affinity_basic-VM-compute + virtual-cpu: + num-virtual-cpu: "1" + virtual-memory: + size: "1.0" + virtual-storage-desc: + - id: affinity_basic-VM-storage + size-of-storage: "10" -- GitLab From 092bfabfdb3d27fe1c690d3e50229f3e7fbb00e4 Mon Sep 17 00:00:00 2001 From: romeromonser Date: Wed, 16 Mar 2022 05:42:06 +0000 Subject: [PATCH 2/6] Fixed typo in description for affinity_basic_vnfd.yaml --- affinity_basic_vnf/affinity_basic_vnfd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/affinity_basic_vnf/affinity_basic_vnfd.yaml b/affinity_basic_vnf/affinity_basic_vnfd.yaml index feef6918..f5461059 100644 --- a/affinity_basic_vnf/affinity_basic_vnfd.yaml +++ b/affinity_basic_vnf/affinity_basic_vnfd.yaml @@ -1,5 +1,5 @@ vnfd: - description: A basic VNF descriptor w/ two VDUs and a affinity group + description: A basic VNF descriptor w/ two VDUs and an affinity group df: - id: default-df instantiation-level: -- GitLab From 10f55cbe0755d7d67ddcba7e1e205d9368d1d797 Mon Sep 17 00:00:00 2001 From: Alexis Romero Date: Tue, 5 Apr 2022 12:51:57 +0200 Subject: [PATCH 3/6] Updated images to ubuntu20.04 and added alternative images for AWS, GCP and Azure Signed-off-by: Alexis Romero --- affinity_basic_vnf/affinity_basic_vnfd.yaml | 36 ++++++++++++--------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/affinity_basic_vnf/affinity_basic_vnfd.yaml b/affinity_basic_vnf/affinity_basic_vnfd.yaml index f5461059..c2d70d05 100644 --- a/affinity_basic_vnf/affinity_basic_vnfd.yaml +++ b/affinity_basic_vnf/affinity_basic_vnfd.yaml @@ -35,25 +35,29 @@ vnfd: mgmt-cp: vnf-cp0-ext-1 product-name: affinity_basic-vnf sw-image-desc: - - id: ubuntu18.04 - name: ubuntu18.04 - image: ubuntu18.04 + - id: ubuntu20.04 + image: ubuntu20.04 + name: ubuntu20.04 + - id: ubuntu20.04-aws + name: ubuntu20.04-aws + image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509 + vim-type: aws + - id: ubuntu20.04-azure + name: ubuntu20.04-azure + image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest + vim-type: azure + - id: ubuntu20.04-gcp + name: ubuntu20.04-gcp + image: ubuntu-os-cloud:image-family:ubuntu-2004-lts + vim-type: gcp vdu: - id: affinity_basic-VM-1 name: affinity_basic-VM-1 - sw-image-desc: ubuntu18.04 - virtual-compute-desc: affinity_basic-VM-compute - virtual-storage-desc: - - affinity_basic-VM-storage - int-cpd: - - id: vdu-eth0-int - virtual-network-interface-requirement: - - name: vdu-eth0 - virtual-interface: - type: PARAVIRT - - id: affinity_basic-VM-2 - name: affinity_basic-VM-2 - sw-image-desc: ubuntu18.04 + sw-image-desc: ubuntu20.04 + alternative-sw-image-desc: + - ubuntu20.04-aws + - ubuntu20.04-azure + - ubuntu20.04-gcp virtual-compute-desc: affinity_basic-VM-compute virtual-storage-desc: - affinity_basic-VM-storage -- GitLab From 3580333d45f7d08e8c250adaa39df93bd78f03e1 Mon Sep 17 00:00:00 2001 From: Alexis Romero Date: Tue, 5 Apr 2022 14:01:34 +0200 Subject: [PATCH 4/6] Restored deleted vdu in affinity descriptor Signed-off-by: Alexis Romero --- affinity_basic_vnf/affinity_basic_vnfd.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/affinity_basic_vnf/affinity_basic_vnfd.yaml b/affinity_basic_vnf/affinity_basic_vnfd.yaml index c2d70d05..985163bb 100644 --- a/affinity_basic_vnf/affinity_basic_vnfd.yaml +++ b/affinity_basic_vnf/affinity_basic_vnfd.yaml @@ -67,6 +67,22 @@ vnfd: - name: vdu-eth0 virtual-interface: type: PARAVIRT + - id: affinity_basic-VM-2 + name: affinity_basic-VM-2 + sw-image-desc: ubuntu20.04 + alternative-sw-image-desc: + - ubuntu20.04-aws + - ubuntu20.04-azure + - ubuntu20.04-gcp + virtual-compute-desc: affinity_basic-VM-compute + virtual-storage-desc: + - affinity_basic-VM-storage + int-cpd: + - id: vdu-eth0-int + virtual-network-interface-requirement: + - name: vdu-eth0 + virtual-interface: + type: PARAVIRT version: '1.0' virtual-compute-desc: - id: affinity_basic-VM-compute -- GitLab From 5065a684efa8477b312694e66dd5a8308fe45066 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Wed, 6 Apr 2022 09:41:09 +0000 Subject: [PATCH 5/6] Update affinity_basic_nsd.yaml --- affinity_basic_ns/affinity_basic_nsd.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/affinity_basic_ns/affinity_basic_nsd.yaml b/affinity_basic_ns/affinity_basic_nsd.yaml index ad7ee609..19cf5b7f 100644 --- a/affinity_basic_ns/affinity_basic_nsd.yaml +++ b/affinity_basic_ns/affinity_basic_nsd.yaml @@ -4,20 +4,20 @@ nsd: df: - id: default-df vnf-profile: - - id: 'affinity-basic-1' + - id: affinity-basic-1 virtual-link-connectivity: - constituent-cpd-id: - - constituent-base-element-id: 'affinity-basic-1' + - constituent-base-element-id: affinity-basic-1 constituent-cpd-id: vnf-cp0-ext-1 virtual-link-profile-id: mgmtnet - constituent-cpd-id: - - constituent-base-element-id: 'affinity-basic-1' + - constituent-base-element-id: affinity-basic-1 constituent-cpd-id: vnf-cp0-ext-2 virtual-link-profile-id: mgmtnet vnfd-id: affinity_basic-vnf id: affinity_basic-ns name: affinity_basic-ns - version: '1.0' + version: 1.0 virtual-link-desc: - id: mgmtnet mgmt-network: true -- GitLab From 79d1aa04c030b0d07608056f18abd160fde86d28 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Wed, 6 Apr 2022 09:42:04 +0000 Subject: [PATCH 6/6] Update affinity_basic_vnfd.yaml --- affinity_basic_vnf/affinity_basic_vnfd.yaml | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/affinity_basic_vnf/affinity_basic_vnfd.yaml b/affinity_basic_vnf/affinity_basic_vnfd.yaml index 985163bb..92eb1b7e 100644 --- a/affinity_basic_vnf/affinity_basic_vnfd.yaml +++ b/affinity_basic_vnf/affinity_basic_vnfd.yaml @@ -83,13 +83,13 @@ vnfd: - name: vdu-eth0 virtual-interface: type: PARAVIRT - version: '1.0' + version: 1.0 virtual-compute-desc: - id: affinity_basic-VM-compute virtual-cpu: - num-virtual-cpu: "1" + num-virtual-cpu: 1 virtual-memory: - size: "1.0" + size: 1.0 virtual-storage-desc: - id: affinity_basic-VM-storage - size-of-storage: "10" + size-of-storage: 10 -- GitLab