From c34852a15ef4835a51fa819d9fb6fb37289951c2 Mon Sep 17 00:00:00 2001 From: limon Date: Fri, 11 Jun 2021 09:41:50 +0200 Subject: [PATCH 1/3] Add alternative images to slice_basic_vnf --- slice_basic_vnf/slice_basic_vnfd.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/slice_basic_vnf/slice_basic_vnfd.yaml b/slice_basic_vnf/slice_basic_vnfd.yaml index ab17e0d9..528b5937 100644 --- a/slice_basic_vnf/slice_basic_vnfd.yaml +++ b/slice_basic_vnf/slice_basic_vnfd.yaml @@ -27,6 +27,14 @@ vnfd: - id: ubuntu18.04 image: ubuntu18.04 name: ubuntu18.04 + - id: ubuntu18.04-aws + name: ubuntu18.04-aws + image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509 + vim-type: aws + - id: ubuntu18.04-azure + name: ubuntu18.04-azure + image: Canonical:UbuntuServer:18.04-LTS:latest + vim-type: azure vdu: - cloud-init-file: cloud-config.txt description: ubuntu_slice-VM @@ -48,6 +56,9 @@ vnfd: vpci: 0000:00:0a.0 name: ubuntu_slice-VM sw-image-desc: ubuntu18.04 + alternative-sw-image-desc: + - ubuntu18.04-aws + - ubuntu18.04-azure virtual-compute-desc: ubuntu_slice-VM-compute virtual-storage-desc: - ubuntu_slice-VM-storage -- GitLab From 900637788aaa0818c483387b8e0e594c1177792e Mon Sep 17 00:00:00 2001 From: limon Date: Fri, 11 Jun 2021 09:42:52 +0200 Subject: [PATCH 2/3] Add alternative images to slice_basic_middle_vnf --- slice_basic_middle_vnf/slice_basic_middle_vnfd.yaml | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/slice_basic_middle_vnf/slice_basic_middle_vnfd.yaml b/slice_basic_middle_vnf/slice_basic_middle_vnfd.yaml index a3ba8c83..a688d5a0 100644 --- a/slice_basic_middle_vnf/slice_basic_middle_vnfd.yaml +++ b/slice_basic_middle_vnf/slice_basic_middle_vnfd.yaml @@ -31,6 +31,14 @@ vnfd: - id: ubuntu18.04 image: ubuntu18.04 name: ubuntu18.04 + - id: ubuntu18.04-aws + name: ubuntu18.04-aws + image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509 + vim-type: aws + - id: ubuntu18.04-azure + name: ubuntu18.04-azure + image: Canonical:UbuntuServer:18.04-LTS:latest + vim-type: azure vdu: - cloud-init-file: cloud-config.txt description: ubuntu_slice-VM @@ -59,6 +67,9 @@ vnfd: vpci: 0000:00:0a.0 name: ubuntu_slice-VM sw-image-desc: ubuntu18.04 + alternative-sw-image-desc: + - ubuntu18.04-aws + - ubuntu18.04-azure virtual-compute-desc: ubuntu_slice-VM-compute virtual-storage-desc: - ubuntu_slice-VM-storage -- GitLab From f2d2cc9ee7342025473b518a3d11a000a952f3fc Mon Sep 17 00:00:00 2001 From: limon Date: Fri, 18 Jun 2021 09:14:37 +0000 Subject: [PATCH 3/3] Add alternative images for Azure and AWS Signed-off-by: limon --- cirros_alarm_vnf/cirros_alarm_vnfd.yaml | 11 +++++++++++ epa_1vm_passthrough_vnf/epa_1vm_passthrough_vnfd.yaml | 11 +++++++++++ epa_1vm_sriov_vnf/epa_1vm_sriov_vnfd.yaml | 11 +++++++++++ 3 files changed, 33 insertions(+) diff --git a/cirros_alarm_vnf/cirros_alarm_vnfd.yaml b/cirros_alarm_vnf/cirros_alarm_vnfd.yaml index 8a301b5b..41190230 100644 --- a/cirros_alarm_vnf/cirros_alarm_vnfd.yaml +++ b/cirros_alarm_vnf/cirros_alarm_vnfd.yaml @@ -23,6 +23,14 @@ vnfd: - id: cirros-0.3.5-x86_64-disk.img image: cirros-0.3.5-x86_64-disk.img name: cirros-0.3.5-x86_64-disk.img + - 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 vdu: - alarm: - actions: @@ -55,6 +63,9 @@ vnfd: performance-metric: average_memory_utilization name: cirros_vnfd-VM sw-image-desc: cirros-0.3.5-x86_64-disk.img + alternative-sw-image-desc: + - ubuntu20.04-aws + - ubuntu20.04-azure virtual-compute-desc: cirros_vnfd-VM-compute virtual-storage-desc: - cirros_vnfd-VM-storage diff --git a/epa_1vm_passthrough_vnf/epa_1vm_passthrough_vnfd.yaml b/epa_1vm_passthrough_vnf/epa_1vm_passthrough_vnfd.yaml index d7512e3d..8a2843e3 100755 --- a/epa_1vm_passthrough_vnf/epa_1vm_passthrough_vnfd.yaml +++ b/epa_1vm_passthrough_vnf/epa_1vm_passthrough_vnfd.yaml @@ -26,6 +26,14 @@ vnfd: - 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 vdu: - cloud-init-file: cloud-config.txt id: dataVM @@ -44,6 +52,9 @@ vnfd: type: PCI-PASSTHROUGH name: dataVM sw-image-desc: ubuntu20.04 + alternative-sw-image-desc: + - ubuntu20.04-aws + - ubuntu20.04-azure virtual-compute-desc: dataVM-compute virtual-storage-desc: - dataVM-storage diff --git a/epa_1vm_sriov_vnf/epa_1vm_sriov_vnfd.yaml b/epa_1vm_sriov_vnf/epa_1vm_sriov_vnfd.yaml index f374fae1..78b59432 100644 --- a/epa_1vm_sriov_vnf/epa_1vm_sriov_vnfd.yaml +++ b/epa_1vm_sriov_vnf/epa_1vm_sriov_vnfd.yaml @@ -26,6 +26,14 @@ vnfd: - 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 vdu: - cloud-init-file: cloud-config.txt id: dataVM @@ -44,6 +52,9 @@ vnfd: type: SR-IOV name: dataVM sw-image-desc: ubuntu20.04 + alternative-sw-image-desc: + - ubuntu20.04-aws + - ubuntu20.04-azure virtual-compute-desc: dataVM-compute virtual-storage-desc: - dataVM-storage -- GitLab