From 16fcab561ebdb307eb5ccfc958e17a3d63610aa7 Mon Sep 17 00:00:00 2001 From: aguilard Date: Fri, 21 Jan 2022 15:15:51 +0000 Subject: [PATCH 1/2] Added GCP alternative images in two descriptors --- .../cmr_relation_vnf/cmr_relation_vnfd.yaml | 17 +++++++++++++++++ simple_2vm_vnf/simple_2vm_vnfd.yaml | 5 +++++ 2 files changed, 22 insertions(+) diff --git a/charm-packages/cmr_relation_vnf/cmr_relation_vnfd.yaml b/charm-packages/cmr_relation_vnf/cmr_relation_vnfd.yaml index 8e9764ff..4c2c8f37 100644 --- a/charm-packages/cmr_relation_vnf/cmr_relation_vnfd.yaml +++ b/charm-packages/cmr_relation_vnf/cmr_relation_vnfd.yaml @@ -150,6 +150,14 @@ vnfd: - id: ubuntu18.04 image: ubuntu18.04 name: ubuntu18.04 + - id: ubuntu18.04-azure + name: ubuntu18.04-azure + image: Canonical:UbuntuServer:18.04-LTS:latest + vim-type: azure + - id: ubuntu18.04-gcp + name: ubuntu18.04-gcp + image: ubuntu-os-cloud:image-family:ubuntu-1804-lts + vim-type: gcp kdu: - name: native-kdu juju-bundle: bundle.yaml @@ -165,6 +173,9 @@ vnfd: type: PARAVIRT name: simple_requires sw-image-desc: ubuntu18.04 + alternative-sw-image-desc: + - ubuntu18.04-azure + - ubuntu18.04-gcp virtual-compute-desc: simple_requires-compute virtual-storage-desc: - simple_requires-storage @@ -179,6 +190,9 @@ vnfd: type: PARAVIRT name: simple_requires_kdu sw-image-desc: ubuntu18.04 + alternative-sw-image-desc: + - ubuntu18.04-azure + - ubuntu18.04-gcp virtual-compute-desc: simple_requires_kdu-compute virtual-storage-desc: - simple_requires_kdu-storage @@ -193,6 +207,9 @@ vnfd: type: PARAVIRT name: simple_provides sw-image-desc: ubuntu18.04 + alternative-sw-image-desc: + - ubuntu18.04-azure + - ubuntu18.04-gcp virtual-compute-desc: simple_provides-compute virtual-storage-desc: - simple_provides-storage diff --git a/simple_2vm_vnf/simple_2vm_vnfd.yaml b/simple_2vm_vnf/simple_2vm_vnfd.yaml index ba1eab22..d6d15781 100755 --- a/simple_2vm_vnf/simple_2vm_vnfd.yaml +++ b/simple_2vm_vnf/simple_2vm_vnfd.yaml @@ -32,6 +32,10 @@ vnfd: 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: mgmtVM int-cpd: @@ -52,6 +56,7 @@ vnfd: sw-image-desc: ubuntu20.04 alternative-sw-image-desc: - ubuntu20.04-azure + - ubuntu20.04-gcp virtual-compute-desc: mgmtVM-compute virtual-storage-desc: - mgmtVM-storage -- GitLab From 7409c5253cf41ceb53b46668e7f821f349dfb865 Mon Sep 17 00:00:00 2001 From: aguilard Date: Mon, 24 Jan 2022 19:11:21 +0000 Subject: [PATCH 2/2] Update simple_2vm_vnf/simple_2vm_vnfd.yaml --- simple_2vm_vnf/simple_2vm_vnfd.yaml | 1 + 1 file changed, 1 insertion(+) diff --git a/simple_2vm_vnf/simple_2vm_vnfd.yaml b/simple_2vm_vnf/simple_2vm_vnfd.yaml index d6d15781..562af4d2 100755 --- a/simple_2vm_vnf/simple_2vm_vnfd.yaml +++ b/simple_2vm_vnf/simple_2vm_vnfd.yaml @@ -73,6 +73,7 @@ vnfd: sw-image-desc: ubuntu20.04 alternative-sw-image-desc: - ubuntu20.04-azure + - ubuntu20.04-gcp virtual-compute-desc: dataVM-compute virtual-storage-desc: - dataVM-storage -- GitLab