From 2d478a90fa71a39d5e12ca4a0faedca65be27bb7 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 23 Mar 2021 01:14:02 +0100 Subject: [PATCH 1/9] Updated descriptors with alternative images for Azure and AWS Signed-off-by: garciadeblas --- .../ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml | 11 +++++++++++ .../k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml | 6 ++++++ .../native_charm_vnf/native_charm_vnfd.yaml | 6 ++++++ .../nopasswd_k8s_proxy_charm_vnfd.yaml | 6 ++++++ .../nopasswd_proxy_charm_vnfd.yaml | 11 +++++++++++ .../ns_relations_provides_vnfd.yaml | 6 ++++++ .../ns_relations_requires_vnfd.yaml | 6 ++++++ .../vnf_relations_vnf/vnf_relations_vnfd.yaml | 6 ++++++ epa_quota_vnf/epa_quota_vnfd.yaml | 11 +++++++++++ .../hackfest_basic_metrics_vnfd.yaml | 11 +++++++++++ .../hackfest_basic_sriov_vnfd.yaml | 6 ++++++ hackfest_basic_vnf/hackfest_basic_vnfd.yaml | 5 +++++ .../hackfest_cloudinit_vnfd.yaml | 14 ++++++++++++++ hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml | 14 ++++++++++++++ nscharm_policy_vnf/nscharm_policy_vnfd.yaml | 11 +++++++++++ nscharm_user_vnf/nscharm_user_vnfd.yaml | 11 +++++++++++ ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml | 11 +++++++++++ 17 files changed, 152 insertions(+) diff --git a/charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml b/charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml index 2b6ebd28..a4842b3f 100644 --- a/charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml +++ b/charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml @@ -65,6 +65,14 @@ vnfd: - id: ubuntu18.04 image: ubuntu18.04 name: ubuntu18.04 + - id: ubuntu16.04-aws + name: ubuntu16.04-aws + image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509 + vim-type: aws + - id: ubuntu16.04-azure + name: ubuntu16.04-azure + image: Canonical:UbuntuServer:16.04-LTS:latest + vim-type: azure vdu: - cloud-init-file: cloud-config.txt id: mgmtVM @@ -83,6 +91,9 @@ vnfd: type: PARAVIRT name: mgmtVM sw-image-desc: ubuntu18.04 + alternative-sw-image-desc: + - ubuntu16.04-aws + - ubuntu16.04-azure virtual-compute-desc: mgmtVM-compute virtual-storage-desc: - mgmtVM-storage diff --git a/charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml b/charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml index 30f617e8..6a7744dd 100644 --- a/charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml +++ b/charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml @@ -65,6 +65,10 @@ 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 vdu: - cloud-init-file: cloud-config.txt id: mgmtVM @@ -83,6 +87,8 @@ vnfd: type: PARAVIRT name: mgmtVM sw-image-desc: ubuntu18.04 + alternative-sw-image-desc: + - ubuntu18.04-azure virtual-compute-desc: mgmtVM-compute virtual-storage-desc: - mgmtVM-storage diff --git a/charm-packages/native_charm_vnf/native_charm_vnfd.yaml b/charm-packages/native_charm_vnf/native_charm_vnfd.yaml index e037d32a..a4ab3124 100644 --- a/charm-packages/native_charm_vnf/native_charm_vnfd.yaml +++ b/charm-packages/native_charm_vnf/native_charm_vnfd.yaml @@ -55,6 +55,10 @@ 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 vdu: - cloud-init-file: cloud-config.txt id: mgmtVM @@ -73,6 +77,8 @@ vnfd: type: PARAVIRT name: mgmtVM sw-image-desc: ubuntu18.04 + alternative-sw-image-desc: + - ubuntu18.04-azure virtual-compute-desc: mgmtVM-compute virtual-storage-desc: - mgmtVM-storage diff --git a/charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml b/charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml index bf32376c..60d15147 100644 --- a/charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml +++ b/charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml @@ -63,6 +63,10 @@ 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 vdu: - cloud-init-file: cloud-config.txt id: mgmtVM @@ -81,6 +85,8 @@ vnfd: type: PARAVIRT name: mgmtVM sw-image-desc: ubuntu18.04 + alternative-sw-image-desc: + - ubuntu18.04-azure virtual-compute-desc: mgmtVM-compute virtual-storage-desc: - mgmtVM-storage diff --git a/charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml b/charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml index 0777117a..2308d5d1 100644 --- a/charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml +++ b/charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml @@ -62,6 +62,14 @@ vnfd: - id: ubuntu18.04 image: ubuntu18.04 name: ubuntu18.04 + - id: ubuntu16.04-aws + name: ubuntu16.04-aws + image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509 + vim-type: aws + - id: ubuntu16.04-azure + name: ubuntu16.04-azure + image: Canonical:UbuntuServer:16.04-LTS:latest + vim-type: azure vdu: - cloud-init-file: cloud-config.txt id: mgmtVM @@ -80,6 +88,9 @@ vnfd: type: PARAVIRT name: mgmtVM sw-image-desc: ubuntu18.04 + alternative-sw-image-desc: + - ubuntu16.04-aws + - ubuntu16.04-azure virtual-compute-desc: mgmtVM-compute virtual-storage-desc: - mgmtVM-storage diff --git a/charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml b/charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml index ceb8d295..8d672d1c 100644 --- a/charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml +++ b/charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml @@ -51,6 +51,10 @@ 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 vdu: - cloud-init-file: cloud-config.txt id: simple_provides @@ -63,6 +67,8 @@ vnfd: type: PARAVIRT name: simple_provides sw-image-desc: ubuntu18.04 + alternative-sw-image-desc: + - ubuntu18.04-azure virtual-compute-desc: simple_provides-compute virtual-storage-desc: - simple_provides-storage diff --git a/charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml b/charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml index b4c45c04..7be7a88f 100644 --- a/charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml +++ b/charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml @@ -51,6 +51,10 @@ 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 vdu: - cloud-init-file: cloud-config.txt id: simple_requires @@ -63,6 +67,8 @@ vnfd: type: PARAVIRT name: simple_requires sw-image-desc: ubuntu18.04 + alternative-sw-image-desc: + - ubuntu18.04-azure virtual-compute-desc: simple_requires-compute virtual-storage-desc: - simple_requires-storage diff --git a/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml b/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml index f0a5b25e..572c8c91 100644 --- a/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml +++ b/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml @@ -94,6 +94,10 @@ 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 vdu: - cloud-init-file: cloud-config.txt id: simple_requires @@ -120,6 +124,8 @@ vnfd: type: PARAVIRT name: simple_provides sw-image-desc: ubuntu18.04 + alternative-sw-image-desc: + - ubuntu18.04-azure virtual-compute-desc: simple_provides-compute virtual-storage-desc: - simple_provides-storage diff --git a/epa_quota_vnf/epa_quota_vnfd.yaml b/epa_quota_vnf/epa_quota_vnfd.yaml index 1b1bfb53..6f241478 100644 --- a/epa_quota_vnf/epa_quota_vnfd.yaml +++ b/epa_quota_vnf/epa_quota_vnfd.yaml @@ -22,6 +22,14 @@ vnfd: - id: US1604 image: US1604 name: US1604 + - id: ubuntu16.04-aws + name: ubuntu16.04-aws + image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509 + vim-type: aws + - id: ubuntu16.04-azure + name: ubuntu16.04-azure + image: Canonical:UbuntuServer:16.04-LTS:latest + vim-type: azure vdu: - id: epa_quota-VM int-cpd: @@ -32,6 +40,9 @@ vnfd: type: PARAVIRT name: epa_quota-VM sw-image-desc: US1604 + alternative-sw-image-desc: + - ubuntu16.04-aws + - ubuntu16.04-azure virtual-compute-desc: epa_quota-VM-compute virtual-storage-desc: - epa_quota-VM-storage diff --git a/hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml b/hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml index 0da9e961..4ca223e4 100644 --- a/hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml +++ b/hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml @@ -45,6 +45,14 @@ vnfd: - id: ubuntu16.04 image: ubuntu16.04 name: ubuntu16.04 + - id: ubuntu16.04-aws + name: ubuntu16.04-aws + image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509 + vim-type: aws + - id: ubuntu16.04-azure + name: ubuntu16.04-azure + image: Canonical:UbuntuServer:16.04-LTS:latest + vim-type: azure vdu: - cloud-init-file: cloud-config id: hackfest_basic_metrics-VM @@ -69,6 +77,9 @@ vnfd: performance-metric: packets_received name: hackfest_basic_metrics-VM sw-image-desc: ubuntu16.04 + alternative-sw-image-desc: + - ubuntu16.04-aws + - ubuntu16.04-azure virtual-compute-desc: hackfest_basic_metrics-VM-compute virtual-storage-desc: - hackfest_basic_metrics-VM-storage diff --git a/hackfest_basic_sriov_vnf/hackfest_basic_sriov_vnfd.yaml b/hackfest_basic_sriov_vnf/hackfest_basic_sriov_vnfd.yaml index a6631397..d8874bf5 100644 --- a/hackfest_basic_sriov_vnf/hackfest_basic_sriov_vnfd.yaml +++ b/hackfest_basic_sriov_vnf/hackfest_basic_sriov_vnfd.yaml @@ -26,6 +26,10 @@ 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 vdu: - cloud-init-file: cloud.config id: hackfest_basic-VM @@ -42,6 +46,8 @@ vnfd: type: SR-IOV name: hackfest_basic-VM sw-image-desc: ubuntu18.04 + alternative-sw-image-desc: + - ubuntu18.04-azure virtual-compute-desc: hackfest_basic-VM-compute virtual-storage-desc: - hackfest_basic-VM-storage diff --git a/hackfest_basic_vnf/hackfest_basic_vnfd.yaml b/hackfest_basic_vnf/hackfest_basic_vnfd.yaml index 04832554..0b5df361 100644 --- a/hackfest_basic_vnf/hackfest_basic_vnfd.yaml +++ b/hackfest_basic_vnf/hackfest_basic_vnfd.yaml @@ -26,12 +26,17 @@ vnfd: name: ubuntu16.04-aws image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509 vim-type: aws + - id: ubuntu16.04-azure + name: ubuntu16.04-azure + image: Canonical:UbuntuServer:16.04-LTS:latest + vim-type: azure vdu: - id: hackfest_basic-VM name: hackfest_basic-VM sw-image-desc: ubuntu16.04 alternative-sw-image-desc: - ubuntu16.04-aws + - ubuntu16.04-azure virtual-compute-desc: hackfest_basic-VM-compute virtual-storage-desc: - hackfest_basic-VM-storage diff --git a/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml b/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml index cfa7d776..3b787e20 100644 --- a/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml +++ b/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml @@ -33,6 +33,14 @@ vnfd: - id: ubuntu16.04 image: ubuntu16.04 name: ubuntu16.04 + - id: ubuntu16.04-aws + name: ubuntu16.04-aws + image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509 + vim-type: aws + - id: ubuntu16.04-azure + name: ubuntu16.04-azure + image: Canonical:UbuntuServer:16.04-LTS:latest + vim-type: azure vdu: - cloud-init-file: cloud-config.txt id: mgmtVM @@ -52,6 +60,9 @@ vnfd: type: PARAVIRT name: mgmtVM sw-image-desc: ubuntu16.04 + alternative-sw-image-desc: + - ubuntu16.04-aws + - ubuntu16.04-azure virtual-compute-desc: mgmtVM-compute virtual-storage-desc: - mgmtVM-storage @@ -72,6 +83,9 @@ vnfd: type: PARAVIRT name: dataVM sw-image-desc: ubuntu16.04 + alternative-sw-image-desc: + - ubuntu16.04-aws + - ubuntu16.04-azure virtual-compute-desc: dataVM-compute virtual-storage-desc: - dataVM-storage diff --git a/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml b/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml index 1ec95702..b09cf187 100644 --- a/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml +++ b/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml @@ -32,6 +32,14 @@ vnfd: - id: US1604 image: US1604 name: US1604 + - id: ubuntu16.04-aws + name: ubuntu16.04-aws + image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509 + vim-type: aws + - id: ubuntu16.04-azure + name: ubuntu16.04-azure + image: Canonical:UbuntuServer:16.04-LTS:latest + vim-type: azure vdu: - id: mgmtVM int-cpd: @@ -50,6 +58,9 @@ vnfd: type: PARAVIRT name: mgmtVM sw-image-desc: US1604 + alternative-sw-image-desc: + - ubuntu16.04-aws + - ubuntu16.04-azure virtual-compute-desc: mgmtVM-compute virtual-storage-desc: - mgmtVM-storage @@ -70,6 +81,9 @@ vnfd: type: PARAVIRT name: dataVM sw-image-desc: US1604 + alternative-sw-image-desc: + - ubuntu16.04-aws + - ubuntu16.04-azure virtual-compute-desc: dataVM-compute virtual-storage-desc: - dataVM-storage diff --git a/nscharm_policy_vnf/nscharm_policy_vnfd.yaml b/nscharm_policy_vnf/nscharm_policy_vnfd.yaml index ca1030e0..a1619861 100644 --- a/nscharm_policy_vnf/nscharm_policy_vnfd.yaml +++ b/nscharm_policy_vnf/nscharm_policy_vnfd.yaml @@ -44,6 +44,14 @@ vnfd: - id: ubuntu1604 image: ubuntu16.04 name: ubuntu16.04 + - id: ubuntu16.04-aws + name: ubuntu16.04-aws + image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509 + vim-type: aws + - id: ubuntu16.04-azure + name: ubuntu16.04-azure + image: Canonical:UbuntuServer:16.04-LTS:latest + vim-type: azure vdu: - cloud-init-file: cloud-config.txt id: policyVM @@ -63,6 +71,9 @@ vnfd: type: VIRTIO name: policyVM sw-image-desc: ubuntu1604 + alternative-sw-image-desc: + - ubuntu16.04-aws + - ubuntu16.04-azure virtual-compute-desc: policyVM-compute virtual-storage-desc: - policyVM-storage diff --git a/nscharm_user_vnf/nscharm_user_vnfd.yaml b/nscharm_user_vnf/nscharm_user_vnfd.yaml index 7859261f..f8cdccce 100644 --- a/nscharm_user_vnf/nscharm_user_vnfd.yaml +++ b/nscharm_user_vnf/nscharm_user_vnfd.yaml @@ -44,6 +44,14 @@ vnfd: - id: ubuntu1604 image: ubuntu16.04 name: ubuntu16.04 + - id: ubuntu16.04-aws + name: ubuntu16.04-aws + image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509 + vim-type: aws + - id: ubuntu16.04-azure + name: ubuntu16.04-azure + image: Canonical:UbuntuServer:16.04-LTS:latest + vim-type: azure vdu: - cloud-init-file: cloud-config.txt id: userVM @@ -63,6 +71,9 @@ vnfd: type: VIRTIO name: userVM sw-image-desc: ubuntu1604 + alternative-sw-image-desc: + - ubuntu16.04-aws + - ubuntu16.04-azure virtual-compute-desc: userVM-compute virtual-storage-desc: - userVM-storage diff --git a/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml b/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml index 5159b5a9..9b291ff0 100644 --- a/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml +++ b/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml @@ -23,6 +23,14 @@ vnfd: - id: ubuntu16.04 image: ubuntu16.04 name: ubuntu16.04 + - id: ubuntu16.04-aws + name: ubuntu16.04-aws + image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509 + vim-type: aws + - id: ubuntu16.04-azure + name: ubuntu16.04-azure + image: Canonical:UbuntuServer:16.04-LTS:latest + vim-type: azure vdu: - cloud-init-file: cloud-init.cfg description: ubuntu_cloudinit-vnf-VM @@ -35,6 +43,9 @@ vnfd: type: PARAVIRT name: ubuntu_cloudinit-vnf-VM sw-image-desc: ubuntu16.04 + alternative-sw-image-desc: + - ubuntu16.04-aws + - ubuntu16.04-azure virtual-compute-desc: ubuntu_cloudinit-vnf-VM-compute virtual-storage-desc: - ubuntu_cloudinit-vnf-VM-storage -- GitLab From 6dbefccd8f3502ac6348330382fa9e4c9b7bf93e Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 23 Mar 2021 12:53:31 +0100 Subject: [PATCH 2/9] Update VNFD with more specific ubuntu server images as alternative images for Azure Signed-off-by: garciadeblas --- charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml | 2 +- charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml | 2 +- charm-packages/native_charm_vnf/native_charm_vnfd.yaml | 2 +- .../nopasswd_k8s_proxy_charm_vnfd.yaml | 2 +- .../nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml | 2 +- .../ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml | 2 +- .../ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml | 2 +- charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml | 2 +- epa_quota_vnf/epa_quota_vnfd.yaml | 2 +- hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml | 2 +- hackfest_basic_sriov_vnf/hackfest_basic_sriov_vnfd.yaml | 2 +- hackfest_basic_vnf/hackfest_basic_vnfd.yaml | 2 +- hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml | 2 +- hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml | 2 +- nscharm_policy_vnf/nscharm_policy_vnfd.yaml | 2 +- nscharm_user_vnf/nscharm_user_vnfd.yaml | 2 +- ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml | 2 +- 17 files changed, 17 insertions(+), 17 deletions(-) diff --git a/charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml b/charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml index a4842b3f..8a85ba10 100644 --- a/charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml +++ b/charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml @@ -71,7 +71,7 @@ vnfd: vim-type: aws - id: ubuntu16.04-azure name: ubuntu16.04-azure - image: Canonical:UbuntuServer:16.04-LTS:latest + image: Canonical:UbuntuServer:16.04-LTS:16.04.202103160 vim-type: azure vdu: - cloud-init-file: cloud-config.txt diff --git a/charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml b/charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml index 6a7744dd..9fcbf6d6 100644 --- a/charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml +++ b/charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml @@ -67,7 +67,7 @@ vnfd: name: ubuntu18.04 - id: ubuntu18.04-azure name: ubuntu18.04-azure - image: Canonical:UbuntuServer:18.04-LTS:latest + image: Canonical:UbuntuServer:18.04-LTS:18.04.202103151 vim-type: azure vdu: - cloud-init-file: cloud-config.txt diff --git a/charm-packages/native_charm_vnf/native_charm_vnfd.yaml b/charm-packages/native_charm_vnf/native_charm_vnfd.yaml index a4ab3124..8c958e8c 100644 --- a/charm-packages/native_charm_vnf/native_charm_vnfd.yaml +++ b/charm-packages/native_charm_vnf/native_charm_vnfd.yaml @@ -57,7 +57,7 @@ vnfd: name: ubuntu18.04 - id: ubuntu18.04-azure name: ubuntu18.04-azure - image: Canonical:UbuntuServer:18.04-LTS:latest + image: Canonical:UbuntuServer:18.04-LTS:18.04.202103151 vim-type: azure vdu: - cloud-init-file: cloud-config.txt diff --git a/charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml b/charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml index 60d15147..128bbbfc 100644 --- a/charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml +++ b/charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml @@ -65,7 +65,7 @@ vnfd: name: ubuntu18.04 - id: ubuntu18.04-azure name: ubuntu18.04-azure - image: Canonical:UbuntuServer:18.04-LTS:latest + image: Canonical:UbuntuServer:18.04-LTS:18.04.202103151 vim-type: azure vdu: - cloud-init-file: cloud-config.txt diff --git a/charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml b/charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml index 2308d5d1..131d1af4 100644 --- a/charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml +++ b/charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml @@ -68,7 +68,7 @@ vnfd: vim-type: aws - id: ubuntu16.04-azure name: ubuntu16.04-azure - image: Canonical:UbuntuServer:16.04-LTS:latest + image: Canonical:UbuntuServer:16.04-LTS:16.04.202103160 vim-type: azure vdu: - cloud-init-file: cloud-config.txt diff --git a/charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml b/charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml index 8d672d1c..2bcc3f68 100644 --- a/charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml +++ b/charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml @@ -53,7 +53,7 @@ vnfd: name: ubuntu18.04 - id: ubuntu18.04-azure name: ubuntu18.04-azure - image: Canonical:UbuntuServer:18.04-LTS:latest + image: Canonical:UbuntuServer:18.04-LTS:18.04.202103151 vim-type: azure vdu: - cloud-init-file: cloud-config.txt diff --git a/charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml b/charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml index 7be7a88f..8f19f300 100644 --- a/charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml +++ b/charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml @@ -53,7 +53,7 @@ vnfd: name: ubuntu18.04 - id: ubuntu18.04-azure name: ubuntu18.04-azure - image: Canonical:UbuntuServer:18.04-LTS:latest + image: Canonical:UbuntuServer:18.04-LTS:18.04.202103151 vim-type: azure vdu: - cloud-init-file: cloud-config.txt diff --git a/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml b/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml index 572c8c91..be361ef0 100644 --- a/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml +++ b/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml @@ -96,7 +96,7 @@ vnfd: name: ubuntu18.04 - id: ubuntu18.04-azure name: ubuntu18.04-azure - image: Canonical:UbuntuServer:18.04-LTS:latest + image: Canonical:UbuntuServer:18.04-LTS:18.04.202103151 vim-type: azure vdu: - cloud-init-file: cloud-config.txt diff --git a/epa_quota_vnf/epa_quota_vnfd.yaml b/epa_quota_vnf/epa_quota_vnfd.yaml index 6f241478..34ce5161 100644 --- a/epa_quota_vnf/epa_quota_vnfd.yaml +++ b/epa_quota_vnf/epa_quota_vnfd.yaml @@ -28,7 +28,7 @@ vnfd: vim-type: aws - id: ubuntu16.04-azure name: ubuntu16.04-azure - image: Canonical:UbuntuServer:16.04-LTS:latest + image: Canonical:UbuntuServer:16.04-LTS:16.04.202103160 vim-type: azure vdu: - id: epa_quota-VM diff --git a/hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml b/hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml index 4ca223e4..11ba1891 100644 --- a/hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml +++ b/hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml @@ -51,7 +51,7 @@ vnfd: vim-type: aws - id: ubuntu16.04-azure name: ubuntu16.04-azure - image: Canonical:UbuntuServer:16.04-LTS:latest + image: Canonical:UbuntuServer:16.04-LTS:16.04.202103160 vim-type: azure vdu: - cloud-init-file: cloud-config diff --git a/hackfest_basic_sriov_vnf/hackfest_basic_sriov_vnfd.yaml b/hackfest_basic_sriov_vnf/hackfest_basic_sriov_vnfd.yaml index d8874bf5..6d953e03 100644 --- a/hackfest_basic_sriov_vnf/hackfest_basic_sriov_vnfd.yaml +++ b/hackfest_basic_sriov_vnf/hackfest_basic_sriov_vnfd.yaml @@ -28,7 +28,7 @@ vnfd: name: ubuntu18.04 - id: ubuntu18.04-azure name: ubuntu18.04-azure - image: Canonical:UbuntuServer:18.04-LTS:latest + image: Canonical:UbuntuServer:18.04-LTS:18.04.202103151 vim-type: azure vdu: - cloud-init-file: cloud.config diff --git a/hackfest_basic_vnf/hackfest_basic_vnfd.yaml b/hackfest_basic_vnf/hackfest_basic_vnfd.yaml index 0b5df361..6ae2805c 100644 --- a/hackfest_basic_vnf/hackfest_basic_vnfd.yaml +++ b/hackfest_basic_vnf/hackfest_basic_vnfd.yaml @@ -28,7 +28,7 @@ vnfd: vim-type: aws - id: ubuntu16.04-azure name: ubuntu16.04-azure - image: Canonical:UbuntuServer:16.04-LTS:latest + image: Canonical:UbuntuServer:16.04-LTS:16.04.202103160 vim-type: azure vdu: - id: hackfest_basic-VM diff --git a/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml b/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml index 3b787e20..3d757c7e 100644 --- a/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml +++ b/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml @@ -39,7 +39,7 @@ vnfd: vim-type: aws - id: ubuntu16.04-azure name: ubuntu16.04-azure - image: Canonical:UbuntuServer:16.04-LTS:latest + image: Canonical:UbuntuServer:16.04-LTS:16.04.202103160 vim-type: azure vdu: - cloud-init-file: cloud-config.txt diff --git a/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml b/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml index b09cf187..fd762284 100644 --- a/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml +++ b/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml @@ -38,7 +38,7 @@ vnfd: vim-type: aws - id: ubuntu16.04-azure name: ubuntu16.04-azure - image: Canonical:UbuntuServer:16.04-LTS:latest + image: Canonical:UbuntuServer:16.04-LTS:16.04.202103160 vim-type: azure vdu: - id: mgmtVM diff --git a/nscharm_policy_vnf/nscharm_policy_vnfd.yaml b/nscharm_policy_vnf/nscharm_policy_vnfd.yaml index a1619861..4249f193 100644 --- a/nscharm_policy_vnf/nscharm_policy_vnfd.yaml +++ b/nscharm_policy_vnf/nscharm_policy_vnfd.yaml @@ -50,7 +50,7 @@ vnfd: vim-type: aws - id: ubuntu16.04-azure name: ubuntu16.04-azure - image: Canonical:UbuntuServer:16.04-LTS:latest + image: Canonical:UbuntuServer:16.04-LTS:16.04.202103160 vim-type: azure vdu: - cloud-init-file: cloud-config.txt diff --git a/nscharm_user_vnf/nscharm_user_vnfd.yaml b/nscharm_user_vnf/nscharm_user_vnfd.yaml index f8cdccce..c1d1bf3f 100644 --- a/nscharm_user_vnf/nscharm_user_vnfd.yaml +++ b/nscharm_user_vnf/nscharm_user_vnfd.yaml @@ -50,7 +50,7 @@ vnfd: vim-type: aws - id: ubuntu16.04-azure name: ubuntu16.04-azure - image: Canonical:UbuntuServer:16.04-LTS:latest + image: Canonical:UbuntuServer:16.04-LTS:16.04.202103160 vim-type: azure vdu: - cloud-init-file: cloud-config.txt diff --git a/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml b/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml index 9b291ff0..abc05f9a 100644 --- a/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml +++ b/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml @@ -29,7 +29,7 @@ vnfd: vim-type: aws - id: ubuntu16.04-azure name: ubuntu16.04-azure - image: Canonical:UbuntuServer:16.04-LTS:latest + image: Canonical:UbuntuServer:16.04-LTS:16.04.202103160 vim-type: azure vdu: - cloud-init-file: cloud-init.cfg -- GitLab From 430a4bf7f1c0496123dc1a14eac2e61ca401c368 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 23 Mar 2021 13:16:53 +0100 Subject: [PATCH 3/9] Updated images in hackfest_multivdu and epa_quota from US1604 to ubuntu16.04 Signed-off-by: garciadeblas --- epa_quota_vnf/epa_quota_vnfd.yaml | 8 ++++---- hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml | 10 +++++----- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/epa_quota_vnf/epa_quota_vnfd.yaml b/epa_quota_vnf/epa_quota_vnfd.yaml index 34ce5161..6253e932 100644 --- a/epa_quota_vnf/epa_quota_vnfd.yaml +++ b/epa_quota_vnf/epa_quota_vnfd.yaml @@ -19,9 +19,9 @@ vnfd: mgmt-cp: vnf-cp0-ext product-name: epa_quota-vnf sw-image-desc: - - id: US1604 - image: US1604 - name: US1604 + - id: ubuntu16.04 + image: ubuntu16.04 + name: ubuntu16.04 - id: ubuntu16.04-aws name: ubuntu16.04-aws image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509 @@ -39,7 +39,7 @@ vnfd: virtual-interface: type: PARAVIRT name: epa_quota-VM - sw-image-desc: US1604 + sw-image-desc: ubuntu16.04 alternative-sw-image-desc: - ubuntu16.04-aws - ubuntu16.04-azure diff --git a/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml b/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml index fd762284..1c0c9ffd 100644 --- a/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml +++ b/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml @@ -29,9 +29,9 @@ vnfd: mgmt-cp: vnf-mgmt-ext product-name: hackfest_multivdu-vnf sw-image-desc: - - id: US1604 - image: US1604 - name: US1604 + - id: ubuntu16.04 + image: ubuntu16.04 + name: ubuntu16.04 - id: ubuntu16.04-aws name: ubuntu16.04-aws image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509 @@ -57,7 +57,7 @@ vnfd: virtual-interface: type: PARAVIRT name: mgmtVM - sw-image-desc: US1604 + sw-image-desc: ubuntu16.04 alternative-sw-image-desc: - ubuntu16.04-aws - ubuntu16.04-azure @@ -80,7 +80,7 @@ vnfd: virtual-interface: type: PARAVIRT name: dataVM - sw-image-desc: US1604 + sw-image-desc: ubuntu16.04 alternative-sw-image-desc: - ubuntu16.04-aws - ubuntu16.04-azure -- GitLab From 262964db6d01fe2e758a7443dc4114243f5592f9 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Tue, 30 Mar 2021 10:12:17 +0200 Subject: [PATCH 4/9] vnf_relations VNF: missing alternative-sw-image-desc in one VDU Signed-off-by: garciadeblas --- charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml b/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml index be361ef0..22ceb2c9 100644 --- a/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml +++ b/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml @@ -110,6 +110,8 @@ vnfd: type: PARAVIRT name: simple_requires sw-image-desc: ubuntu18.04 + alternative-sw-image-desc: + - ubuntu18.04-azure virtual-compute-desc: simple_requires-compute virtual-storage-desc: - simple_requires-storage -- GitLab From d3aeeab5178487a90c53a3756b8ac96e2535fdb3 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Fri, 16 Apr 2021 00:54:56 +0200 Subject: [PATCH 5/9] Replace ubuntu16 images by ubuntu18 Signed-off-by: garciadeblas --- .../ha_proxy_charm_vnfd.yaml | 14 +++++----- .../k8s_proxy_charm_vnfd.yaml | 2 +- .../native_charm_vnf/native_charm_vnfd.yaml | 2 +- .../nopasswd_k8s_proxy_charm_vnfd.yaml | 2 +- .../nopasswd_proxy_charm_vnfd.yaml | 14 +++++----- .../ns_relations_provides_vnfd.yaml | 2 +- .../ns_relations_requires_vnfd.yaml | 2 +- .../vnf_relations_vnf/vnf_relations_vnfd.yaml | 2 +- epa_quota_vnf/epa_quota_vnfd.yaml | 22 +++++++-------- .../hackfest_basic_metrics_vnfd.yaml | 22 +++++++-------- .../hackfest_basic_sriov_vnfd.yaml | 2 +- hackfest_basic_vnf/hackfest_basic_vnfd.yaml | 22 +++++++-------- .../hackfest_cloudinit_vnfd.yaml | 28 +++++++++---------- .../hackfest_multivdu_vnfd.yaml | 28 +++++++++---------- .../hackfest_proxycharm_vnfd.yaml | 8 +++--- nscharm_policy_vnf/nscharm_policy_vnfd.yaml | 22 +++++++-------- nscharm_user_vnf/nscharm_user_vnfd.yaml | 22 +++++++-------- simple_ee_vnf/simple_ee_vnfd.yaml | 8 +++--- simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml | 10 +++---- .../ubuntu_cloudinit_vnfd.yaml | 22 +++++++-------- 20 files changed, 128 insertions(+), 128 deletions(-) diff --git a/charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml b/charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml index 8a85ba10..11f4b31b 100644 --- a/charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml +++ b/charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml @@ -65,13 +65,13 @@ vnfd: - id: ubuntu18.04 image: ubuntu18.04 name: ubuntu18.04 - - id: ubuntu16.04-aws - name: ubuntu16.04-aws + - id: ubuntu18.04-aws + name: ubuntu18.04-aws image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509 vim-type: aws - - id: ubuntu16.04-azure - name: ubuntu16.04-azure - image: Canonical:UbuntuServer:16.04-LTS:16.04.202103160 + - 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 @@ -92,8 +92,8 @@ vnfd: name: mgmtVM sw-image-desc: ubuntu18.04 alternative-sw-image-desc: - - ubuntu16.04-aws - - ubuntu16.04-azure + - ubuntu18.04-aws + - ubuntu18.04-azure virtual-compute-desc: mgmtVM-compute virtual-storage-desc: - mgmtVM-storage diff --git a/charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml b/charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml index 9fcbf6d6..6a7744dd 100644 --- a/charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml +++ b/charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml @@ -67,7 +67,7 @@ vnfd: name: ubuntu18.04 - id: ubuntu18.04-azure name: ubuntu18.04-azure - image: Canonical:UbuntuServer:18.04-LTS:18.04.202103151 + image: Canonical:UbuntuServer:18.04-LTS:latest vim-type: azure vdu: - cloud-init-file: cloud-config.txt diff --git a/charm-packages/native_charm_vnf/native_charm_vnfd.yaml b/charm-packages/native_charm_vnf/native_charm_vnfd.yaml index 8c958e8c..a4ab3124 100644 --- a/charm-packages/native_charm_vnf/native_charm_vnfd.yaml +++ b/charm-packages/native_charm_vnf/native_charm_vnfd.yaml @@ -57,7 +57,7 @@ vnfd: name: ubuntu18.04 - id: ubuntu18.04-azure name: ubuntu18.04-azure - image: Canonical:UbuntuServer:18.04-LTS:18.04.202103151 + image: Canonical:UbuntuServer:18.04-LTS:latest vim-type: azure vdu: - cloud-init-file: cloud-config.txt diff --git a/charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml b/charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml index 128bbbfc..60d15147 100644 --- a/charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml +++ b/charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml @@ -65,7 +65,7 @@ vnfd: name: ubuntu18.04 - id: ubuntu18.04-azure name: ubuntu18.04-azure - image: Canonical:UbuntuServer:18.04-LTS:18.04.202103151 + image: Canonical:UbuntuServer:18.04-LTS:latest vim-type: azure vdu: - cloud-init-file: cloud-config.txt diff --git a/charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml b/charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml index 131d1af4..b582d684 100644 --- a/charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml +++ b/charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml @@ -62,13 +62,13 @@ vnfd: - id: ubuntu18.04 image: ubuntu18.04 name: ubuntu18.04 - - id: ubuntu16.04-aws - name: ubuntu16.04-aws + - id: ubuntu18.04-aws + name: ubuntu18.04-aws image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509 vim-type: aws - - id: ubuntu16.04-azure - name: ubuntu16.04-azure - image: Canonical:UbuntuServer:16.04-LTS:16.04.202103160 + - 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 @@ -89,8 +89,8 @@ vnfd: name: mgmtVM sw-image-desc: ubuntu18.04 alternative-sw-image-desc: - - ubuntu16.04-aws - - ubuntu16.04-azure + - ubuntu18.04-aws + - ubuntu18.04-azure virtual-compute-desc: mgmtVM-compute virtual-storage-desc: - mgmtVM-storage diff --git a/charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml b/charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml index 2bcc3f68..8d672d1c 100644 --- a/charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml +++ b/charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml @@ -53,7 +53,7 @@ vnfd: name: ubuntu18.04 - id: ubuntu18.04-azure name: ubuntu18.04-azure - image: Canonical:UbuntuServer:18.04-LTS:18.04.202103151 + image: Canonical:UbuntuServer:18.04-LTS:latest vim-type: azure vdu: - cloud-init-file: cloud-config.txt diff --git a/charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml b/charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml index 8f19f300..7be7a88f 100644 --- a/charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml +++ b/charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml @@ -53,7 +53,7 @@ vnfd: name: ubuntu18.04 - id: ubuntu18.04-azure name: ubuntu18.04-azure - image: Canonical:UbuntuServer:18.04-LTS:18.04.202103151 + image: Canonical:UbuntuServer:18.04-LTS:latest vim-type: azure vdu: - cloud-init-file: cloud-config.txt diff --git a/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml b/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml index 22ceb2c9..94febcd4 100644 --- a/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml +++ b/charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml @@ -96,7 +96,7 @@ vnfd: name: ubuntu18.04 - id: ubuntu18.04-azure name: ubuntu18.04-azure - image: Canonical:UbuntuServer:18.04-LTS:18.04.202103151 + image: Canonical:UbuntuServer:18.04-LTS:latest vim-type: azure vdu: - cloud-init-file: cloud-config.txt diff --git a/epa_quota_vnf/epa_quota_vnfd.yaml b/epa_quota_vnf/epa_quota_vnfd.yaml index 6253e932..809d2ad9 100644 --- a/epa_quota_vnf/epa_quota_vnfd.yaml +++ b/epa_quota_vnf/epa_quota_vnfd.yaml @@ -19,16 +19,16 @@ vnfd: mgmt-cp: vnf-cp0-ext product-name: epa_quota-vnf sw-image-desc: - - id: ubuntu16.04 - image: ubuntu16.04 - name: ubuntu16.04 - - id: ubuntu16.04-aws - name: ubuntu16.04-aws + - 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: ubuntu16.04-azure - name: ubuntu16.04-azure - image: Canonical:UbuntuServer:16.04-LTS:16.04.202103160 + - id: ubuntu18.04-azure + name: ubuntu18.04-azure + image: Canonical:UbuntuServer:18.04-LTS:latest vim-type: azure vdu: - id: epa_quota-VM @@ -39,10 +39,10 @@ vnfd: virtual-interface: type: PARAVIRT name: epa_quota-VM - sw-image-desc: ubuntu16.04 + sw-image-desc: ubuntu18.04 alternative-sw-image-desc: - - ubuntu16.04-aws - - ubuntu16.04-azure + - ubuntu18.04-aws + - ubuntu18.04-azure virtual-compute-desc: epa_quota-VM-compute virtual-storage-desc: - epa_quota-VM-storage diff --git a/hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml b/hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml index 11ba1891..5ed09ad4 100644 --- a/hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml +++ b/hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml @@ -42,16 +42,16 @@ vnfd: mgmt-cp: vnf-cp0-ext product-name: hackfest_basic_metrics-vnf sw-image-desc: - - id: ubuntu16.04 - image: ubuntu16.04 - name: ubuntu16.04 - - id: ubuntu16.04-aws - name: ubuntu16.04-aws + - 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: ubuntu16.04-azure - name: ubuntu16.04-azure - image: Canonical:UbuntuServer:16.04-LTS:16.04.202103160 + - id: ubuntu18.04-azure + name: ubuntu18.04-azure + image: Canonical:UbuntuServer:18.04-LTS:latest vim-type: azure vdu: - cloud-init-file: cloud-config @@ -76,10 +76,10 @@ vnfd: name: vnf_packets_received performance-metric: packets_received name: hackfest_basic_metrics-VM - sw-image-desc: ubuntu16.04 + sw-image-desc: ubuntu18.04 alternative-sw-image-desc: - - ubuntu16.04-aws - - ubuntu16.04-azure + - ubuntu18.04-aws + - ubuntu18.04-azure virtual-compute-desc: hackfest_basic_metrics-VM-compute virtual-storage-desc: - hackfest_basic_metrics-VM-storage diff --git a/hackfest_basic_sriov_vnf/hackfest_basic_sriov_vnfd.yaml b/hackfest_basic_sriov_vnf/hackfest_basic_sriov_vnfd.yaml index 6d953e03..d8874bf5 100644 --- a/hackfest_basic_sriov_vnf/hackfest_basic_sriov_vnfd.yaml +++ b/hackfest_basic_sriov_vnf/hackfest_basic_sriov_vnfd.yaml @@ -28,7 +28,7 @@ vnfd: name: ubuntu18.04 - id: ubuntu18.04-azure name: ubuntu18.04-azure - image: Canonical:UbuntuServer:18.04-LTS:18.04.202103151 + image: Canonical:UbuntuServer:18.04-LTS:latest vim-type: azure vdu: - cloud-init-file: cloud.config diff --git a/hackfest_basic_vnf/hackfest_basic_vnfd.yaml b/hackfest_basic_vnf/hackfest_basic_vnfd.yaml index 6ae2805c..f58a3e7d 100644 --- a/hackfest_basic_vnf/hackfest_basic_vnfd.yaml +++ b/hackfest_basic_vnf/hackfest_basic_vnfd.yaml @@ -19,24 +19,24 @@ vnfd: mgmt-cp: vnf-cp0-ext product-name: hackfest_basic-vnf sw-image-desc: - - id: ubuntu16.04 - name: ubuntu16.04 - image: ubuntu16.04 - - id: ubuntu16.04-aws - name: ubuntu16.04-aws + - id: ubuntu18.04 + name: ubuntu18.04 + image: 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: ubuntu16.04-azure - name: ubuntu16.04-azure - image: Canonical:UbuntuServer:16.04-LTS:16.04.202103160 + - id: ubuntu18.04-azure + name: ubuntu18.04-azure + image: Canonical:UbuntuServer:18.04-LTS:latest vim-type: azure vdu: - id: hackfest_basic-VM name: hackfest_basic-VM - sw-image-desc: ubuntu16.04 + sw-image-desc: ubuntu18.04 alternative-sw-image-desc: - - ubuntu16.04-aws - - ubuntu16.04-azure + - ubuntu18.04-aws + - ubuntu18.04-azure virtual-compute-desc: hackfest_basic-VM-compute virtual-storage-desc: - hackfest_basic-VM-storage diff --git a/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml b/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml index 3d757c7e..168fad70 100644 --- a/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml +++ b/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml @@ -30,16 +30,16 @@ vnfd: mgmt-cp: vnf-mgmt-ext product-name: hackfest_cloudinit-vnf sw-image-desc: - - id: ubuntu16.04 - image: ubuntu16.04 - name: ubuntu16.04 - - id: ubuntu16.04-aws - name: ubuntu16.04-aws + - 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: ubuntu16.04-azure - name: ubuntu16.04-azure - image: Canonical:UbuntuServer:16.04-LTS:16.04.202103160 + - 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 @@ -59,10 +59,10 @@ vnfd: virtual-interface: type: PARAVIRT name: mgmtVM - sw-image-desc: ubuntu16.04 + sw-image-desc: ubuntu18.04 alternative-sw-image-desc: - - ubuntu16.04-aws - - ubuntu16.04-azure + - ubuntu18.04-aws + - ubuntu18.04-azure virtual-compute-desc: mgmtVM-compute virtual-storage-desc: - mgmtVM-storage @@ -82,10 +82,10 @@ vnfd: virtual-interface: type: PARAVIRT name: dataVM - sw-image-desc: ubuntu16.04 + sw-image-desc: ubuntu18.04 alternative-sw-image-desc: - - ubuntu16.04-aws - - ubuntu16.04-azure + - ubuntu18.04-aws + - ubuntu18.04-azure virtual-compute-desc: dataVM-compute virtual-storage-desc: - dataVM-storage diff --git a/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml b/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml index 1c0c9ffd..b8a7083e 100644 --- a/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml +++ b/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml @@ -29,16 +29,16 @@ vnfd: mgmt-cp: vnf-mgmt-ext product-name: hackfest_multivdu-vnf sw-image-desc: - - id: ubuntu16.04 - image: ubuntu16.04 - name: ubuntu16.04 - - id: ubuntu16.04-aws - name: ubuntu16.04-aws + - 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: ubuntu16.04-azure - name: ubuntu16.04-azure - image: Canonical:UbuntuServer:16.04-LTS:16.04.202103160 + - id: ubuntu18.04-azure + name: ubuntu18.04-azure + image: Canonical:UbuntuServer:18.04-LTS:latest vim-type: azure vdu: - id: mgmtVM @@ -57,10 +57,10 @@ vnfd: virtual-interface: type: PARAVIRT name: mgmtVM - sw-image-desc: ubuntu16.04 + sw-image-desc: ubuntu18.04 alternative-sw-image-desc: - - ubuntu16.04-aws - - ubuntu16.04-azure + - ubuntu18.04-aws + - ubuntu18.04-azure virtual-compute-desc: mgmtVM-compute virtual-storage-desc: - mgmtVM-storage @@ -80,10 +80,10 @@ vnfd: virtual-interface: type: PARAVIRT name: dataVM - sw-image-desc: ubuntu16.04 + sw-image-desc: ubuntu18.04 alternative-sw-image-desc: - - ubuntu16.04-aws - - ubuntu16.04-azure + - ubuntu18.04-aws + - ubuntu18.04-azure virtual-compute-desc: dataVM-compute virtual-storage-desc: - dataVM-storage diff --git a/hackfest_proxycharm_vnf/hackfest_proxycharm_vnfd.yaml b/hackfest_proxycharm_vnf/hackfest_proxycharm_vnfd.yaml index e058bfee..ae421383 100644 --- a/hackfest_proxycharm_vnf/hackfest_proxycharm_vnfd.yaml +++ b/hackfest_proxycharm_vnf/hackfest_proxycharm_vnfd.yaml @@ -61,9 +61,9 @@ vnfd: mgmt-cp: vnf-mgmt-ext product-name: hackfest_proxycharm-vnf sw-image-desc: - - id: ubuntu16.04 - image: ubuntu16.04 - name: ubuntu16.04 + - id: ubuntu18.04 + image: ubuntu18.04 + name: ubuntu18.04 vdu: - cloud-init-file: cloud-config.txt id: mgmtVM @@ -81,7 +81,7 @@ vnfd: virtual-interface: type: PARAVIRT name: mgmtVM - sw-image-desc: ubuntu16.04 + sw-image-desc: ubuntu18.04 virtual-compute-desc: mgmtVM-compute virtual-storage-desc: - mgmtVM-storage diff --git a/nscharm_policy_vnf/nscharm_policy_vnfd.yaml b/nscharm_policy_vnf/nscharm_policy_vnfd.yaml index 4249f193..06b7083e 100644 --- a/nscharm_policy_vnf/nscharm_policy_vnfd.yaml +++ b/nscharm_policy_vnf/nscharm_policy_vnfd.yaml @@ -41,16 +41,16 @@ vnfd: mgmt-cp: vnf-mgmt-ext product-name: nscharm-policy-vnf sw-image-desc: - - id: ubuntu1604 - image: ubuntu16.04 - name: ubuntu16.04 - - id: ubuntu16.04-aws - name: ubuntu16.04-aws + - id: ubuntu1804 + 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: ubuntu16.04-azure - name: ubuntu16.04-azure - image: Canonical:UbuntuServer:16.04-LTS:16.04.202103160 + - 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 @@ -70,10 +70,10 @@ vnfd: virtual-interface: type: VIRTIO name: policyVM - sw-image-desc: ubuntu1604 + sw-image-desc: ubuntu1804 alternative-sw-image-desc: - - ubuntu16.04-aws - - ubuntu16.04-azure + - ubuntu18.04-aws + - ubuntu18.04-azure virtual-compute-desc: policyVM-compute virtual-storage-desc: - policyVM-storage diff --git a/nscharm_user_vnf/nscharm_user_vnfd.yaml b/nscharm_user_vnf/nscharm_user_vnfd.yaml index c1d1bf3f..fe3524a5 100644 --- a/nscharm_user_vnf/nscharm_user_vnfd.yaml +++ b/nscharm_user_vnf/nscharm_user_vnfd.yaml @@ -41,16 +41,16 @@ vnfd: mgmt-cp: vnf-mgmt-ext product-name: nscharm-user-vnf sw-image-desc: - - id: ubuntu1604 - image: ubuntu16.04 - name: ubuntu16.04 - - id: ubuntu16.04-aws - name: ubuntu16.04-aws + - id: ubuntu1804 + 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: ubuntu16.04-azure - name: ubuntu16.04-azure - image: Canonical:UbuntuServer:16.04-LTS:16.04.202103160 + - 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 @@ -70,10 +70,10 @@ vnfd: virtual-interface: type: VIRTIO name: userVM - sw-image-desc: ubuntu1604 + sw-image-desc: ubuntu1804 alternative-sw-image-desc: - - ubuntu16.04-aws - - ubuntu16.04-azure + - ubuntu18.04-aws + - ubuntu18.04-azure virtual-compute-desc: userVM-compute virtual-storage-desc: - userVM-storage diff --git a/simple_ee_vnf/simple_ee_vnfd.yaml b/simple_ee_vnf/simple_ee_vnfd.yaml index c6ea1482..eb478520 100644 --- a/simple_ee_vnf/simple_ee_vnfd.yaml +++ b/simple_ee_vnf/simple_ee_vnfd.yaml @@ -59,9 +59,9 @@ vnfd: mgmt-cp: vnf-mgmt-ext product-name: simple_ee-vnf sw-image-desc: - - id: ubuntu16.04 - image: ubuntu16.04 - name: ubuntu16.04 + - id: ubuntu18.04 + image: ubuntu18.04 + name: ubuntu18.04 vdu: - cloud-init-file: cloud-config.txt id: mgmtVM @@ -73,7 +73,7 @@ vnfd: virtual-interface: type: PARAVIRT name: mgmtVM - sw-image-desc: ubuntu16.04 + sw-image-desc: ubuntu18.04 virtual-compute-desc: mgmtVM-compute virtual-storage-desc: - mgmtVM-storage diff --git a/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml b/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml index d94d716e..a87c2c19 100644 --- a/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml +++ b/simple_nopasswd_vnf/simple_nopasswd_vnfd.yaml @@ -64,9 +64,9 @@ vnfd: mgmt-cp: vnf-mgmt-ext product-name: simple_nopasswd-vnf sw-image-desc: - - id: ubuntu16.04 - image: ubuntu16.04 - name: ubuntu16.04 + - id: ubuntu18.04 + image: ubuntu18.04 + name: ubuntu18.04 vdu: - cloud-init-file: cloud-config.txt id: mgmtVM @@ -85,7 +85,7 @@ vnfd: virtual-interface: type: PARAVIRT name: mgmtVM - sw-image-desc: ubuntu16.04 + sw-image-desc: ubuntu18.04 virtual-compute-desc: mgmtVM-compute virtual-storage-desc: - mgmtVM-storage @@ -105,7 +105,7 @@ vnfd: virtual-interface: type: PARAVIRT name: dataVM - sw-image-desc: ubuntu16.04 + sw-image-desc: ubuntu18.04 virtual-compute-desc: dataVM-compute virtual-storage-desc: - dataVM-storage diff --git a/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml b/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml index abc05f9a..316cf06f 100644 --- a/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml +++ b/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml @@ -20,16 +20,16 @@ vnfd: product-name: ubuntu_cloudinit-vnf provider: OSM sw-image-desc: - - id: ubuntu16.04 - image: ubuntu16.04 - name: ubuntu16.04 - - id: ubuntu16.04-aws - name: ubuntu16.04-aws + - 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: ubuntu16.04-azure - name: ubuntu16.04-azure - image: Canonical:UbuntuServer:16.04-LTS:16.04.202103160 + - id: ubuntu18.04-azure + name: ubuntu18.04-azure + image: Canonical:UbuntuServer:18.04-LTS:latest vim-type: azure vdu: - cloud-init-file: cloud-init.cfg @@ -42,10 +42,10 @@ vnfd: virtual-interface: type: PARAVIRT name: ubuntu_cloudinit-vnf-VM - sw-image-desc: ubuntu16.04 + sw-image-desc: ubuntu18.04 alternative-sw-image-desc: - - ubuntu16.04-aws - - ubuntu16.04-azure + - ubuntu18.04-aws + - ubuntu18.04-azure virtual-compute-desc: ubuntu_cloudinit-vnf-VM-compute virtual-storage-desc: - ubuntu_cloudinit-vnf-VM-storage -- GitLab From fc84077a601bc946df78dce3110f3edf84679708 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Mon, 24 May 2021 12:19:15 +0200 Subject: [PATCH 6/9] Update Ubuntu20 image for Azure using the right URN Signed-off-by: garciadeblas --- hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml b/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml index 32cdb003..699734b2 100644 --- a/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml +++ b/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml @@ -38,7 +38,7 @@ vnfd: vim-type: aws - id: ubuntu20.04-azure name: ubuntu20.04-azure - image: Canonical:UbuntuServer:20.04-LTS:latest + image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest vim-type: azure vdu: - id: mgmtVM -- GitLab From 1f31538fc81a5771b4fd66d8907742cf3880d143 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Mon, 24 May 2021 16:17:44 +0200 Subject: [PATCH 7/9] Add alternative images for Azure in new packages Signed-off-by: garciadeblas --- ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml | 8 ++++++++ simple_2vm_vnf/simple_2vm_vnfd.yaml | 8 ++++++++ ubuntu_4ifaces_vnf/ubuntu_4ifaces_vnfd.yaml | 6 ++++++ 3 files changed, 22 insertions(+) diff --git a/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml b/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml index f40976af..791bf9cd 100644 --- a/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml +++ b/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml @@ -35,6 +35,10 @@ vnfd: - id: ubuntu20.04 image: ubuntu20.04 name: ubuntu20.04 + - id: ubuntu20.04-azure + name: ubuntu20.04-azure + image: Canonical:UbuntuServer:20.04-LTS:latest + vim-type: azure vdu: - id: mgmtVM int-cpd: @@ -53,6 +57,8 @@ vnfd: type: PARAVIRT name: mgmtVM sw-image-desc: ubuntu20.04 + alternative-sw-image-desc: + - ubuntu20.04-azure virtual-compute-desc: mgmtVM-compute virtual-storage-desc: - mgmtVM-storage @@ -67,6 +73,8 @@ vnfd: type: PARAVIRT name: dataVM sw-image-desc: ubuntu20.04 + alternative-sw-image-desc: + - ubuntu20.04-azure virtual-compute-desc: dataVM-compute virtual-storage-desc: - dataVM-storage diff --git a/simple_2vm_vnf/simple_2vm_vnfd.yaml b/simple_2vm_vnf/simple_2vm_vnfd.yaml index 3e9c0291..be7c75b3 100755 --- a/simple_2vm_vnf/simple_2vm_vnfd.yaml +++ b/simple_2vm_vnf/simple_2vm_vnfd.yaml @@ -28,6 +28,10 @@ vnfd: - id: ubuntu20.04 image: ubuntu20.04 name: ubuntu20.04 + - id: ubuntu20.04-azure + name: ubuntu20.04-azure + image: Canonical:UbuntuServer:20.04-LTS:latest + vim-type: azure vdu: - id: mgmtVM int-cpd: @@ -46,6 +50,8 @@ vnfd: type: PARAVIRT name: mgmtVM sw-image-desc: ubuntu20.04 + alternative-sw-image-desc: + - ubuntu20.04-azure virtual-compute-desc: mgmtVM-compute virtual-storage-desc: - mgmtVM-storage @@ -60,6 +66,8 @@ vnfd: type: PARAVIRT name: dataVM sw-image-desc: ubuntu20.04 + alternative-sw-image-desc: + - ubuntu20.04-azure virtual-compute-desc: dataVM-compute virtual-storage-desc: - dataVM-storage diff --git a/ubuntu_4ifaces_vnf/ubuntu_4ifaces_vnfd.yaml b/ubuntu_4ifaces_vnf/ubuntu_4ifaces_vnfd.yaml index 8ae9fb0c..8124eb8a 100644 --- a/ubuntu_4ifaces_vnf/ubuntu_4ifaces_vnfd.yaml +++ b/ubuntu_4ifaces_vnf/ubuntu_4ifaces_vnfd.yaml @@ -34,6 +34,10 @@ vnfd: - id: ubuntu20.04 image: ubuntu20.04 name: ubuntu20.04 + - id: ubuntu20.04-azure + name: ubuntu20.04-azure + image: Canonical:UbuntuServer:20.04-LTS:latest + vim-type: azure vdu: - cloud-init-file: cloud-config.txt id: dataVM @@ -64,6 +68,8 @@ vnfd: type: PARAVIRT name: dataVM sw-image-desc: ubuntu20.04 + alternative-sw-image-desc: + - ubuntu20.04-azure virtual-compute-desc: dataVM-compute virtual-storage-desc: - dataVM-storage -- GitLab From 203e75e2e2fa3647108f68a272d78be98eb7e7a6 Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Mon, 24 May 2021 16:22:40 +0200 Subject: [PATCH 8/9] Remove CRLF line terminators Signed-off-by: garciadeblas --- ipprofile_2vm_ns/ipprofile_2vm_nsd.yaml | 42 ++-- ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml | 194 +++++++++--------- .../eechart/templates/statefulset.yaml | 130 ++++++------ several_volumes_ns/several_volumes_nsd.yaml | 42 ++-- simple_2vm_ns/simple_2vm_nsd.yaml | 42 ++-- simple_2vm_vnf/simple_2vm_vnfd.yaml | 180 ++++++++-------- .../eechart/templates/statefulset.yaml | 130 ++++++------ slice_basic_nst/slice_basic_2nd_nst.yaml | 102 ++++----- slice_basic_nst/slice_basic_nst.yaml | 130 ++++++------ .../eechart/templates/statefulset.yaml | 120 +++++------ .../eechart/templates/statefulset.yaml | 124 +++++------ 11 files changed, 618 insertions(+), 618 deletions(-) diff --git a/ipprofile_2vm_ns/ipprofile_2vm_nsd.yaml b/ipprofile_2vm_ns/ipprofile_2vm_nsd.yaml index 72e7c3ff..2195f42d 100644 --- a/ipprofile_2vm_ns/ipprofile_2vm_nsd.yaml +++ b/ipprofile_2vm_ns/ipprofile_2vm_nsd.yaml @@ -1,21 +1,21 @@ -nsd: - nsd: - - description: NS with 1 VNFs connected by mgmtnet VL - df: - - id: default-df - vnf-profile: - - id: '1' - virtual-link-connectivity: - - constituent-cpd-id: - - constituent-base-element-id: '1' - constituent-cpd-id: vnf-mgmt-ext - virtual-link-profile-id: mgmtnet - vnfd-id: ipprofile_2vm-vnf - id: ipprofile_2vm-ns - name: ipprofile_2vm-ns - version: '1.0' - virtual-link-desc: - - id: mgmtnet - mgmt-network: true - vnfd-id: - - ipprofile_2vm-vnf +nsd: + nsd: + - description: NS with 1 VNFs connected by mgmtnet VL + df: + - id: default-df + vnf-profile: + - id: '1' + virtual-link-connectivity: + - constituent-cpd-id: + - constituent-base-element-id: '1' + constituent-cpd-id: vnf-mgmt-ext + virtual-link-profile-id: mgmtnet + vnfd-id: ipprofile_2vm-vnf + id: ipprofile_2vm-ns + name: ipprofile_2vm-ns + version: '1.0' + virtual-link-desc: + - id: mgmtnet + mgmt-network: true + vnfd-id: + - ipprofile_2vm-vnf diff --git a/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml b/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml index 791bf9cd..b62b5277 100644 --- a/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml +++ b/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml @@ -1,97 +1,97 @@ -vnfd: - description: A VNF consisting of 2 VDUs connected to an internal VL - df: - - id: default-df - instantiation-level: - - id: default-instantiation-level - vdu-level: - - number-of-instances: 1 - vdu-id: mgmtVM - - number-of-instances: 1 - vdu-id: dataVM - vdu-profile: - - id: mgmtVM - min-number-of-instances: 1 - - id: dataVM - min-number-of-instances: 1 - virtual-link-profile: - - id: internal - flavour: '' - virtual-link-protocol-data: - l3-protocol-data: - cidr: 192.168.200.0/24 - ip-version: ipv4 - ext-cpd: - - id: vnf-mgmt-ext - int-cpd: - cpd: mgmtVM-eth0-int - vdu-id: mgmtVM - id: ipprofile_2vm-vnf - int-virtual-link-desc: - - id: internal - mgmt-cp: vnf-mgmt-ext - product-name: ipprofile_2vm-vnf - sw-image-desc: - - id: ubuntu20.04 - image: ubuntu20.04 - name: ubuntu20.04 - - id: ubuntu20.04-azure - name: ubuntu20.04-azure - image: Canonical:UbuntuServer:20.04-LTS:latest - vim-type: azure - vdu: - - id: mgmtVM - int-cpd: - - id: mgmtVM-eth0-int - virtual-network-interface-requirement: - - name: mgmtVM-eth0 - position: 1 - virtual-interface: - type: PARAVIRT - - id: mgmtVM-eth1-int - int-virtual-link-desc: internal - virtual-network-interface-requirement: - - name: mgmtVM-eth1 - position: 2 - virtual-interface: - type: PARAVIRT - name: mgmtVM - sw-image-desc: ubuntu20.04 - alternative-sw-image-desc: - - ubuntu20.04-azure - virtual-compute-desc: mgmtVM-compute - virtual-storage-desc: - - mgmtVM-storage - - id: dataVM - int-cpd: - - id: dataVM-eth0-int - int-virtual-link-desc: internal - virtual-network-interface-requirement: - - name: dataVM-eth0 - position: 1 - virtual-interface: - type: PARAVIRT - name: dataVM - sw-image-desc: ubuntu20.04 - alternative-sw-image-desc: - - ubuntu20.04-azure - virtual-compute-desc: dataVM-compute - virtual-storage-desc: - - dataVM-storage - version: '1.0' - virtual-compute-desc: - - id: mgmtVM-compute - virtual-memory: - size: 1.0 - virtual-cpu: - num-virtual-cpu: 1 - - id: dataVM-compute - virtual-memory: - size: 1.0 - virtual-cpu: - num-virtual-cpu: 1 - virtual-storage-desc: - - id: mgmtVM-storage - size-of-storage: 10 - - id: dataVM-storage - size-of-storage: 10 +vnfd: + description: A VNF consisting of 2 VDUs connected to an internal VL + df: + - id: default-df + instantiation-level: + - id: default-instantiation-level + vdu-level: + - number-of-instances: 1 + vdu-id: mgmtVM + - number-of-instances: 1 + vdu-id: dataVM + vdu-profile: + - id: mgmtVM + min-number-of-instances: 1 + - id: dataVM + min-number-of-instances: 1 + virtual-link-profile: + - id: internal + flavour: '' + virtual-link-protocol-data: + l3-protocol-data: + cidr: 192.168.200.0/24 + ip-version: ipv4 + ext-cpd: + - id: vnf-mgmt-ext + int-cpd: + cpd: mgmtVM-eth0-int + vdu-id: mgmtVM + id: ipprofile_2vm-vnf + int-virtual-link-desc: + - id: internal + mgmt-cp: vnf-mgmt-ext + product-name: ipprofile_2vm-vnf + sw-image-desc: + - id: ubuntu20.04 + image: ubuntu20.04 + name: ubuntu20.04 + - id: ubuntu20.04-azure + name: ubuntu20.04-azure + image: Canonical:UbuntuServer:20.04-LTS:latest + vim-type: azure + vdu: + - id: mgmtVM + int-cpd: + - id: mgmtVM-eth0-int + virtual-network-interface-requirement: + - name: mgmtVM-eth0 + position: 1 + virtual-interface: + type: PARAVIRT + - id: mgmtVM-eth1-int + int-virtual-link-desc: internal + virtual-network-interface-requirement: + - name: mgmtVM-eth1 + position: 2 + virtual-interface: + type: PARAVIRT + name: mgmtVM + sw-image-desc: ubuntu20.04 + alternative-sw-image-desc: + - ubuntu20.04-azure + virtual-compute-desc: mgmtVM-compute + virtual-storage-desc: + - mgmtVM-storage + - id: dataVM + int-cpd: + - id: dataVM-eth0-int + int-virtual-link-desc: internal + virtual-network-interface-requirement: + - name: dataVM-eth0 + position: 1 + virtual-interface: + type: PARAVIRT + name: dataVM + sw-image-desc: ubuntu20.04 + alternative-sw-image-desc: + - ubuntu20.04-azure + virtual-compute-desc: dataVM-compute + virtual-storage-desc: + - dataVM-storage + version: '1.0' + virtual-compute-desc: + - id: mgmtVM-compute + virtual-memory: + size: 1.0 + virtual-cpu: + num-virtual-cpu: 1 + - id: dataVM-compute + virtual-memory: + size: 1.0 + virtual-cpu: + num-virtual-cpu: 1 + virtual-storage-desc: + - id: mgmtVM-storage + size-of-storage: 10 + - id: dataVM-storage + size-of-storage: 10 diff --git a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/templates/statefulset.yaml b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/templates/statefulset.yaml index 9af244de..5557b9cb 100644 --- a/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/templates/statefulset.yaml +++ b/magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/templates/statefulset.yaml @@ -1,65 +1,65 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ include "eechart.fullname" . }} - labels: -{{ include "eechart.labels" . | indent 4 }} -spec: - serviceName: {{ include "eechart.fullname" . }} - replicas: {{ .Values.replicaCount }} - selector: - matchLabels: - app.kubernetes.io/name: {{ include "eechart.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - template: - metadata: - labels: - app.kubernetes.io/name: {{ include "eechart.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - spec: - imagePullSecrets: - - name: regcred - serviceAccountName: {{ template "eechart.serviceAccountName" . }} - securityContext: - runAsUser: 0 - containers: - - name: {{ .Chart.Name }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - name: grpc - containerPort: 50051 - protocol: TCP - resources: - {{- toYaml .Values.resources | nindent 12 }} - volumeMounts: - - name: osm-ee - mountPath: /app/storage - - name: osm-ee-source - mountPath: /app/EE/osm_ee/vnf -{{- if .Values.snmpexporter.enabled }} - - name: snmp-config-volume - mountPath: /etc/snmp_exporter - - name: vnf-mibs - mountPath: /root/.snmp/mibs - - name: vnf-generator - mountPath: /app/vnf/generator -{{- end }} - volumes: - - name: osm-ee-source - configMap: - name: {{ include "eechart.fullname" . }} - - name: osm-ee - hostPath: - path: /var/lib/osm/osm/osm_osm_packages/_data -{{- if .Values.snmpexporter.enabled }} - - name: snmp-config-volume - hostPath: - path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/" - - name: vnf-mibs - configMap: - name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}" - - name: vnf-generator - configMap: - name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}" -{{- end }} +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: {{ include "eechart.fullname" . }} + labels: +{{ include "eechart.labels" . | indent 4 }} +spec: + serviceName: {{ include "eechart.fullname" . }} + replicas: {{ .Values.replicaCount }} + selector: + matchLabels: + app.kubernetes.io/name: {{ include "eechart.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + template: + metadata: + labels: + app.kubernetes.io/name: {{ include "eechart.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + spec: + imagePullSecrets: + - name: regcred + serviceAccountName: {{ template "eechart.serviceAccountName" . }} + securityContext: + runAsUser: 0 + containers: + - name: {{ .Chart.Name }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: grpc + containerPort: 50051 + protocol: TCP + resources: + {{- toYaml .Values.resources | nindent 12 }} + volumeMounts: + - name: osm-ee + mountPath: /app/storage + - name: osm-ee-source + mountPath: /app/EE/osm_ee/vnf +{{- if .Values.snmpexporter.enabled }} + - name: snmp-config-volume + mountPath: /etc/snmp_exporter + - name: vnf-mibs + mountPath: /root/.snmp/mibs + - name: vnf-generator + mountPath: /app/vnf/generator +{{- end }} + volumes: + - name: osm-ee-source + configMap: + name: {{ include "eechart.fullname" . }} + - name: osm-ee + hostPath: + path: /var/lib/osm/osm/osm_osm_packages/_data +{{- if .Values.snmpexporter.enabled }} + - name: snmp-config-volume + hostPath: + path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/" + - name: vnf-mibs + configMap: + name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}" + - name: vnf-generator + configMap: + name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}" +{{- end }} diff --git a/several_volumes_ns/several_volumes_nsd.yaml b/several_volumes_ns/several_volumes_nsd.yaml index 45f82de6..30726a29 100755 --- a/several_volumes_ns/several_volumes_nsd.yaml +++ b/several_volumes_ns/several_volumes_nsd.yaml @@ -1,21 +1,21 @@ -nsd: - nsd: - - description: NS with 1 VNFs connected to mgmtnet VL - df: - - id: default-df - vnf-profile: - - id: vnf-several-volumes - virtual-link-connectivity: - - constituent-cpd-id: - - constituent-base-element-id: vnf-several-volumes - constituent-cpd-id: vnf-mgmt-ext - virtual-link-profile-id: mgmtnet - vnfd-id: several_volumes-vnf - id: several_volumes-ns - name: several_volumes-ns - version: '1.0' - virtual-link-desc: - - id: mgmtnet - mgmt-network: true - vnfd-id: - - several_volumes-vnf +nsd: + nsd: + - description: NS with 1 VNFs connected to mgmtnet VL + df: + - id: default-df + vnf-profile: + - id: vnf-several-volumes + virtual-link-connectivity: + - constituent-cpd-id: + - constituent-base-element-id: vnf-several-volumes + constituent-cpd-id: vnf-mgmt-ext + virtual-link-profile-id: mgmtnet + vnfd-id: several_volumes-vnf + id: several_volumes-ns + name: several_volumes-ns + version: '1.0' + virtual-link-desc: + - id: mgmtnet + mgmt-network: true + vnfd-id: + - several_volumes-vnf diff --git a/simple_2vm_ns/simple_2vm_nsd.yaml b/simple_2vm_ns/simple_2vm_nsd.yaml index a3de4758..27194655 100755 --- a/simple_2vm_ns/simple_2vm_nsd.yaml +++ b/simple_2vm_ns/simple_2vm_nsd.yaml @@ -1,21 +1,21 @@ -nsd: - nsd: - - description: NS with 1 VNFs connected by mgmtnet VL - df: - - id: default-df - vnf-profile: - - id: '1' - virtual-link-connectivity: - - constituent-cpd-id: - - constituent-base-element-id: '1' - constituent-cpd-id: vnf-mgmt-ext - virtual-link-profile-id: mgmtnet - vnfd-id: simple_2vm-vnf - id: simple_2vm-ns - name: simple_2vm-ns - version: '1.0' - virtual-link-desc: - - id: mgmtnet - mgmt-network: true - vnfd-id: - - simple_2vm-vnf +nsd: + nsd: + - description: NS with 1 VNFs connected by mgmtnet VL + df: + - id: default-df + vnf-profile: + - id: '1' + virtual-link-connectivity: + - constituent-cpd-id: + - constituent-base-element-id: '1' + constituent-cpd-id: vnf-mgmt-ext + virtual-link-profile-id: mgmtnet + vnfd-id: simple_2vm-vnf + id: simple_2vm-ns + name: simple_2vm-ns + version: '1.0' + virtual-link-desc: + - id: mgmtnet + mgmt-network: true + vnfd-id: + - simple_2vm-vnf diff --git a/simple_2vm_vnf/simple_2vm_vnfd.yaml b/simple_2vm_vnf/simple_2vm_vnfd.yaml index be7c75b3..39df1cbb 100755 --- a/simple_2vm_vnf/simple_2vm_vnfd.yaml +++ b/simple_2vm_vnf/simple_2vm_vnfd.yaml @@ -1,90 +1,90 @@ -vnfd: - description: A VNF consisting of 2 VDUs connected to an internal VL - df: - - id: default-df - instantiation-level: - - id: default-instantiation-level - vdu-level: - - number-of-instances: 1 - vdu-id: mgmtVM - - number-of-instances: 1 - vdu-id: dataVM - vdu-profile: - - id: mgmtVM - min-number-of-instances: 1 - - id: dataVM - min-number-of-instances: 1 - ext-cpd: - - id: vnf-mgmt-ext - int-cpd: - cpd: mgmtVM-eth0-int - vdu-id: mgmtVM - id: simple_2vm-vnf - int-virtual-link-desc: - - id: internal - mgmt-cp: vnf-mgmt-ext - product-name: simple_2vm-vnf - sw-image-desc: - - id: ubuntu20.04 - image: ubuntu20.04 - name: ubuntu20.04 - - id: ubuntu20.04-azure - name: ubuntu20.04-azure - image: Canonical:UbuntuServer:20.04-LTS:latest - vim-type: azure - vdu: - - id: mgmtVM - int-cpd: - - id: mgmtVM-eth0-int - virtual-network-interface-requirement: - - name: mgmtVM-eth0 - position: 1 - virtual-interface: - type: PARAVIRT - - id: mgmtVM-eth1-int - int-virtual-link-desc: internal - virtual-network-interface-requirement: - - name: mgmtVM-eth1 - position: 2 - virtual-interface: - type: PARAVIRT - name: mgmtVM - sw-image-desc: ubuntu20.04 - alternative-sw-image-desc: - - ubuntu20.04-azure - virtual-compute-desc: mgmtVM-compute - virtual-storage-desc: - - mgmtVM-storage - - id: dataVM - int-cpd: - - id: dataVM-eth0-int - int-virtual-link-desc: internal - virtual-network-interface-requirement: - - name: dataVM-eth0 - position: 1 - virtual-interface: - type: PARAVIRT - name: dataVM - sw-image-desc: ubuntu20.04 - alternative-sw-image-desc: - - ubuntu20.04-azure - virtual-compute-desc: dataVM-compute - virtual-storage-desc: - - dataVM-storage - version: '1.0' - virtual-compute-desc: - - id: mgmtVM-compute - virtual-memory: - size: 1.0 - virtual-cpu: - num-virtual-cpu: 1 - - id: dataVM-compute - virtual-memory: - size: 1.0 - virtual-cpu: - num-virtual-cpu: 1 - virtual-storage-desc: - - id: mgmtVM-storage - size-of-storage: 10 - - id: dataVM-storage - size-of-storage: 10 +vnfd: + description: A VNF consisting of 2 VDUs connected to an internal VL + df: + - id: default-df + instantiation-level: + - id: default-instantiation-level + vdu-level: + - number-of-instances: 1 + vdu-id: mgmtVM + - number-of-instances: 1 + vdu-id: dataVM + vdu-profile: + - id: mgmtVM + min-number-of-instances: 1 + - id: dataVM + min-number-of-instances: 1 + ext-cpd: + - id: vnf-mgmt-ext + int-cpd: + cpd: mgmtVM-eth0-int + vdu-id: mgmtVM + id: simple_2vm-vnf + int-virtual-link-desc: + - id: internal + mgmt-cp: vnf-mgmt-ext + product-name: simple_2vm-vnf + sw-image-desc: + - id: ubuntu20.04 + image: ubuntu20.04 + name: ubuntu20.04 + - id: ubuntu20.04-azure + name: ubuntu20.04-azure + image: Canonical:UbuntuServer:20.04-LTS:latest + vim-type: azure + vdu: + - id: mgmtVM + int-cpd: + - id: mgmtVM-eth0-int + virtual-network-interface-requirement: + - name: mgmtVM-eth0 + position: 1 + virtual-interface: + type: PARAVIRT + - id: mgmtVM-eth1-int + int-virtual-link-desc: internal + virtual-network-interface-requirement: + - name: mgmtVM-eth1 + position: 2 + virtual-interface: + type: PARAVIRT + name: mgmtVM + sw-image-desc: ubuntu20.04 + alternative-sw-image-desc: + - ubuntu20.04-azure + virtual-compute-desc: mgmtVM-compute + virtual-storage-desc: + - mgmtVM-storage + - id: dataVM + int-cpd: + - id: dataVM-eth0-int + int-virtual-link-desc: internal + virtual-network-interface-requirement: + - name: dataVM-eth0 + position: 1 + virtual-interface: + type: PARAVIRT + name: dataVM + sw-image-desc: ubuntu20.04 + alternative-sw-image-desc: + - ubuntu20.04-azure + virtual-compute-desc: dataVM-compute + virtual-storage-desc: + - dataVM-storage + version: '1.0' + virtual-compute-desc: + - id: mgmtVM-compute + virtual-memory: + size: 1.0 + virtual-cpu: + num-virtual-cpu: 1 + - id: dataVM-compute + virtual-memory: + size: 1.0 + virtual-cpu: + num-virtual-cpu: 1 + virtual-storage-desc: + - id: mgmtVM-storage + size-of-storage: 10 + - id: dataVM-storage + size-of-storage: 10 diff --git a/simple_ee_vnf/helm-charts/eechart/templates/statefulset.yaml b/simple_ee_vnf/helm-charts/eechart/templates/statefulset.yaml index 3d721fe2..e31e589a 100755 --- a/simple_ee_vnf/helm-charts/eechart/templates/statefulset.yaml +++ b/simple_ee_vnf/helm-charts/eechart/templates/statefulset.yaml @@ -1,65 +1,65 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ include "eechart.fullname" . }} - labels: -{{ include "eechart.labels" . | indent 4 }} -spec: - serviceName: {{ include "eechart.fullname" . }} - replicas: {{ .Values.replicaCount }} - selector: - matchLabels: - app.kubernetes.io/name: {{ include "eechart.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - template: - metadata: - labels: - app.kubernetes.io/name: {{ include "eechart.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - spec: - imagePullSecrets: - - name: regcred - serviceAccountName: {{ template "eechart.serviceAccountName" . }} - securityContext: - {{- toYaml .Values.podSecurityContext | nindent 8 }} - containers: - - name: {{ .Chart.Name }} - securityContext: - {{- toYaml .Values.securityContext | nindent 12 }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - name: grpc - containerPort: 50051 - protocol: TCP - resources: - {{- toYaml .Values.resources | nindent 12 }} - volumeMounts: - - name: osm-ee - mountPath: /app/storage - - name: osm-ee-source - mountPath: /app/EE/osm_ee/vnf - volumes: - - name: osm-ee-source - configMap: - name: {{ include "eechart.fullname" . }} - volumeClaimTemplates: - - metadata: - name: osm-ee - spec: - accessModes: [ "ReadWriteOnce" ] - resources: - requests: - storage: 1Gi - {{- with .Values.nodeSelector }} - nodeSelector: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.affinity }} - affinity: - {{- toYaml . | nindent 8 }} - {{- end }} - {{- with .Values.tolerations }} - tolerations: - {{- toYaml . | nindent 8 }} - {{- end }} +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: {{ include "eechart.fullname" . }} + labels: +{{ include "eechart.labels" . | indent 4 }} +spec: + serviceName: {{ include "eechart.fullname" . }} + replicas: {{ .Values.replicaCount }} + selector: + matchLabels: + app.kubernetes.io/name: {{ include "eechart.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + template: + metadata: + labels: + app.kubernetes.io/name: {{ include "eechart.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + spec: + imagePullSecrets: + - name: regcred + serviceAccountName: {{ template "eechart.serviceAccountName" . }} + securityContext: + {{- toYaml .Values.podSecurityContext | nindent 8 }} + containers: + - name: {{ .Chart.Name }} + securityContext: + {{- toYaml .Values.securityContext | nindent 12 }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: grpc + containerPort: 50051 + protocol: TCP + resources: + {{- toYaml .Values.resources | nindent 12 }} + volumeMounts: + - name: osm-ee + mountPath: /app/storage + - name: osm-ee-source + mountPath: /app/EE/osm_ee/vnf + volumes: + - name: osm-ee-source + configMap: + name: {{ include "eechart.fullname" . }} + volumeClaimTemplates: + - metadata: + name: osm-ee + spec: + accessModes: [ "ReadWriteOnce" ] + resources: + requests: + storage: 1Gi + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/slice_basic_nst/slice_basic_2nd_nst.yaml b/slice_basic_nst/slice_basic_2nd_nst.yaml index 02c0dc2b..c89492a9 100644 --- a/slice_basic_nst/slice_basic_2nd_nst.yaml +++ b/slice_basic_nst/slice_basic_2nd_nst.yaml @@ -1,51 +1,51 @@ -# Copyright [2018] [Felipe Vicens, Pol Alemany, Ricard Vilalta] -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#NST to test VLD connection between Network Services within the same VIM -nst: -- id: slice_basic_nst2 - name: slice_basic_nst2 - SNSSAI-identifier: - slice-service-type: eMBB - quality-of-service: - id: 1 - - netslice-subnet: - - id: slice_basic_nsd_2 - is-shared-nss: true - description: NetSlice Subnet (service) composed by 1 vnf with 3 cp - nsd-ref: slice_basic_middle_ns - - id: slice_basic_nsd_3 - is-shared-nss: false - description: NetSlice Subnet (service) composed by 1 vnf with 2 cp - nsd-ref: slice_basic_ns - - netslice-vld: - - id: slice_vld_mgmt - name: slice_vld_mgmt - type: ELAN - mgmt-network: true - nss-connection-point-ref: - - nss-ref: slice_basic_nsd_2 - nsd-connection-point-ref: nsd_cp_mgmt - - nss-ref: slice_basic_nsd_3 - nsd-connection-point-ref: nsd_cp_mgmt - - id: slice_vld_data2 - name: slice_vld_data2 - type: ELAN - nss-connection-point-ref: - - nss-ref: slice_basic_nsd_2 - nsd-connection-point-ref: nsd_cp_data2 - - nss-ref: slice_basic_nsd_3 - nsd-connection-point-ref: nsd_cp_data +# Copyright [2018] [Felipe Vicens, Pol Alemany, Ricard Vilalta] +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#NST to test VLD connection between Network Services within the same VIM +nst: +- id: slice_basic_nst2 + name: slice_basic_nst2 + SNSSAI-identifier: + slice-service-type: eMBB + quality-of-service: + id: 1 + + netslice-subnet: + - id: slice_basic_nsd_2 + is-shared-nss: true + description: NetSlice Subnet (service) composed by 1 vnf with 3 cp + nsd-ref: slice_basic_middle_ns + - id: slice_basic_nsd_3 + is-shared-nss: false + description: NetSlice Subnet (service) composed by 1 vnf with 2 cp + nsd-ref: slice_basic_ns + + netslice-vld: + - id: slice_vld_mgmt + name: slice_vld_mgmt + type: ELAN + mgmt-network: true + nss-connection-point-ref: + - nss-ref: slice_basic_nsd_2 + nsd-connection-point-ref: nsd_cp_mgmt + - nss-ref: slice_basic_nsd_3 + nsd-connection-point-ref: nsd_cp_mgmt + - id: slice_vld_data2 + name: slice_vld_data2 + type: ELAN + nss-connection-point-ref: + - nss-ref: slice_basic_nsd_2 + nsd-connection-point-ref: nsd_cp_data2 + - nss-ref: slice_basic_nsd_3 + nsd-connection-point-ref: nsd_cp_data diff --git a/slice_basic_nst/slice_basic_nst.yaml b/slice_basic_nst/slice_basic_nst.yaml index eb2982ed..b4f7a435 100644 --- a/slice_basic_nst/slice_basic_nst.yaml +++ b/slice_basic_nst/slice_basic_nst.yaml @@ -1,65 +1,65 @@ -# Copyright [2018] [Felipe Vicens, Pol Alemany, Ricard Vilalta] -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -#NST to test VLD connection between Network Services within the same VIM -nst: -- id: slice_basic_nst - name: slice_basic_nst - SNSSAI-identifier: - slice-service-type: eMBB - quality-of-service: - id: 1 - - netslice-subnet: - - id: slice_basic_nsd_1 - is-shared-nss: false - description: NetSlice Subnet (service) composed by 1 vnf with 2 cp - nsd-ref: slice_basic_ns - - id: slice_basic_nsd_2 - is-shared-nss: true - description: NetSlice Subnet (service) composed by 1 vnf with 3 cp - nsd-ref: slice_basic_middle_ns - - id: slice_basic_nsd_3 - is-shared-nss: false - description: NetSlice Subnet (service) composed by 1 vnf with 2 cp - nsd-ref: slice_basic_ns - - netslice-vld: - - id: slice_vld_mgmt - name: slice_vld_mgmt - type: ELAN - mgmt-network: true - nss-connection-point-ref: - - nss-ref: slice_basic_nsd_1 - nsd-connection-point-ref: nsd_cp_mgmt - - nss-ref: slice_basic_nsd_2 - nsd-connection-point-ref: nsd_cp_mgmt - - nss-ref: slice_basic_nsd_3 - nsd-connection-point-ref: nsd_cp_mgmt - - id: slice_vld_data1 - name: slice_vld_data1 - type: ELAN - nss-connection-point-ref: - - nss-ref: slice_basic_nsd_1 - nsd-connection-point-ref: nsd_cp_data - - nss-ref: slice_basic_nsd_2 - nsd-connection-point-ref: nsd_cp_data1 - - id: slice_vld_data2 - name: slice_vld_data2 - type: ELAN - nss-connection-point-ref: - - nss-ref: slice_basic_nsd_2 - nsd-connection-point-ref: nsd_cp_data2 - - nss-ref: slice_basic_nsd_3 - nsd-connection-point-ref: nsd_cp_data +# Copyright [2018] [Felipe Vicens, Pol Alemany, Ricard Vilalta] +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + +#NST to test VLD connection between Network Services within the same VIM +nst: +- id: slice_basic_nst + name: slice_basic_nst + SNSSAI-identifier: + slice-service-type: eMBB + quality-of-service: + id: 1 + + netslice-subnet: + - id: slice_basic_nsd_1 + is-shared-nss: false + description: NetSlice Subnet (service) composed by 1 vnf with 2 cp + nsd-ref: slice_basic_ns + - id: slice_basic_nsd_2 + is-shared-nss: true + description: NetSlice Subnet (service) composed by 1 vnf with 3 cp + nsd-ref: slice_basic_middle_ns + - id: slice_basic_nsd_3 + is-shared-nss: false + description: NetSlice Subnet (service) composed by 1 vnf with 2 cp + nsd-ref: slice_basic_ns + + netslice-vld: + - id: slice_vld_mgmt + name: slice_vld_mgmt + type: ELAN + mgmt-network: true + nss-connection-point-ref: + - nss-ref: slice_basic_nsd_1 + nsd-connection-point-ref: nsd_cp_mgmt + - nss-ref: slice_basic_nsd_2 + nsd-connection-point-ref: nsd_cp_mgmt + - nss-ref: slice_basic_nsd_3 + nsd-connection-point-ref: nsd_cp_mgmt + - id: slice_vld_data1 + name: slice_vld_data1 + type: ELAN + nss-connection-point-ref: + - nss-ref: slice_basic_nsd_1 + nsd-connection-point-ref: nsd_cp_data + - nss-ref: slice_basic_nsd_2 + nsd-connection-point-ref: nsd_cp_data1 + - id: slice_vld_data2 + name: slice_vld_data2 + type: ELAN + nss-connection-point-ref: + - nss-ref: slice_basic_nsd_2 + nsd-connection-point-ref: nsd_cp_data2 + - nss-ref: slice_basic_nsd_3 + nsd-connection-point-ref: nsd_cp_data diff --git a/snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml b/snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml index c188ad1d..24cc1db2 100755 --- a/snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml +++ b/snmp_ee_vnf/helm-charts/eechart/templates/statefulset.yaml @@ -1,60 +1,60 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ include "eechart.fullname" . }} -spec: - serviceName: {{ include "eechart.fullname" . }} - replicas: {{ .Values.replicaCount }} - selector: - matchLabels: - app.kubernetes.io/name: {{ include "eechart.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - template: - metadata: - labels: - app.kubernetes.io/name: {{ include "eechart.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - vnf: {{ .Values.global.osm.vnf_id | lower}} - spec: - imagePullSecrets: - - name: regcred - serviceAccountName: {{ template "eechart.serviceAccountName" . }} - securityContext: - runAsUser: 0 - containers: - - name: {{ .Chart.Name }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - name: grpc - containerPort: 50051 - protocol: TCP - resources: - {{- toYaml .Values.resources | nindent 12 }} - volumeMounts: - - name: osm-ee - mountPath: /app/storage - - name: osm-ee-source - mountPath: /app/EE/osm_ee/vnf - - name: snmp-config-volume - mountPath: /etc/snmp_exporter - - name: vnf-mibs - mountPath: /root/.snmp/mibs - - name: vnf-generator - mountPath: /app/vnf/generator - volumes: - - name: osm-ee-source - configMap: - name: {{ include "eechart.fullname" . }} - - name: snmp-config-volume - hostPath: - path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/" - - name: vnf-mibs - configMap: - name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}" - - name: vnf-generator - configMap: - name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}" - - name: osm-ee - hostPath: - path: /var/lib/osm/osm/osm_osm_packages/_data +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: {{ include "eechart.fullname" . }} +spec: + serviceName: {{ include "eechart.fullname" . }} + replicas: {{ .Values.replicaCount }} + selector: + matchLabels: + app.kubernetes.io/name: {{ include "eechart.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + template: + metadata: + labels: + app.kubernetes.io/name: {{ include "eechart.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + vnf: {{ .Values.global.osm.vnf_id | lower}} + spec: + imagePullSecrets: + - name: regcred + serviceAccountName: {{ template "eechart.serviceAccountName" . }} + securityContext: + runAsUser: 0 + containers: + - name: {{ .Chart.Name }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: grpc + containerPort: 50051 + protocol: TCP + resources: + {{- toYaml .Values.resources | nindent 12 }} + volumeMounts: + - name: osm-ee + mountPath: /app/storage + - name: osm-ee-source + mountPath: /app/EE/osm_ee/vnf + - name: snmp-config-volume + mountPath: /etc/snmp_exporter + - name: vnf-mibs + mountPath: /root/.snmp/mibs + - name: vnf-generator + mountPath: /app/vnf/generator + volumes: + - name: osm-ee-source + configMap: + name: {{ include "eechart.fullname" . }} + - name: snmp-config-volume + hostPath: + path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/" + - name: vnf-mibs + configMap: + name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}" + - name: vnf-generator + configMap: + name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}" + - name: osm-ee + hostPath: + path: /var/lib/osm/osm/osm_osm_packages/_data diff --git a/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/statefulset.yaml b/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/statefulset.yaml index 7a2f8463..8b124995 100755 --- a/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/statefulset.yaml +++ b/snmp_setcomm_ee_vnf/helm-charts/eechart/templates/statefulset.yaml @@ -1,62 +1,62 @@ -apiVersion: apps/v1 -kind: StatefulSet -metadata: - name: {{ include "eechart.fullname" . }} - labels: -{{ include "eechart.labels" . | indent 4 }} -spec: - serviceName: {{ include "eechart.fullname" . }} - replicas: {{ .Values.replicaCount }} - selector: - matchLabels: - app.kubernetes.io/name: {{ include "eechart.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - template: - metadata: - labels: - app.kubernetes.io/name: {{ include "eechart.name" . }} - app.kubernetes.io/instance: {{ .Release.Name }} - vnf: {{ .Values.global.osm.vnf_id | lower}} - spec: - imagePullSecrets: - - name: regcred - serviceAccountName: {{ template "eechart.serviceAccountName" . }} - securityContext: - runAsUser: 0 - containers: - - name: {{ .Chart.Name }} - image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" - imagePullPolicy: {{ .Values.image.pullPolicy }} - ports: - - name: grpc - containerPort: 50051 - protocol: TCP - resources: - {{- toYaml .Values.resources | nindent 12 }} - volumeMounts: - - name: osm-ee - mountPath: /app/storage - - name: osm-ee-source - mountPath: /app/EE/osm_ee/vnf - - name: snmp-config-volume - mountPath: /etc/snmp_exporter - - name: vnf-mibs - mountPath: /root/.snmp/mibs - - name: vnf-generator - mountPath: /app/vnf/generator - volumes: - - name: osm-ee-source - configMap: - name: {{ include "eechart.fullname" . }} - - name: snmp-config-volume - hostPath: - path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/" - - name: vnf-mibs - configMap: - name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}" - - name: vnf-generator - configMap: - name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}" - - name: osm-ee - hostPath: - path: /var/lib/osm/osm/osm_osm_packages/_data +apiVersion: apps/v1 +kind: StatefulSet +metadata: + name: {{ include "eechart.fullname" . }} + labels: +{{ include "eechart.labels" . | indent 4 }} +spec: + serviceName: {{ include "eechart.fullname" . }} + replicas: {{ .Values.replicaCount }} + selector: + matchLabels: + app.kubernetes.io/name: {{ include "eechart.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + template: + metadata: + labels: + app.kubernetes.io/name: {{ include "eechart.name" . }} + app.kubernetes.io/instance: {{ .Release.Name }} + vnf: {{ .Values.global.osm.vnf_id | lower}} + spec: + imagePullSecrets: + - name: regcred + serviceAccountName: {{ template "eechart.serviceAccountName" . }} + securityContext: + runAsUser: 0 + containers: + - name: {{ .Chart.Name }} + image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" + imagePullPolicy: {{ .Values.image.pullPolicy }} + ports: + - name: grpc + containerPort: 50051 + protocol: TCP + resources: + {{- toYaml .Values.resources | nindent 12 }} + volumeMounts: + - name: osm-ee + mountPath: /app/storage + - name: osm-ee-source + mountPath: /app/EE/osm_ee/vnf + - name: snmp-config-volume + mountPath: /etc/snmp_exporter + - name: vnf-mibs + mountPath: /root/.snmp/mibs + - name: vnf-generator + mountPath: /app/vnf/generator + volumes: + - name: osm-ee-source + configMap: + name: {{ include "eechart.fullname" . }} + - name: snmp-config-volume + hostPath: + path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/" + - name: vnf-mibs + configMap: + name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}" + - name: vnf-generator + configMap: + name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}" + - name: osm-ee + hostPath: + path: /var/lib/osm/osm/osm_osm_packages/_data -- GitLab From 198c37b7d6c507c65bf9fb150977704016e5a44c Mon Sep 17 00:00:00 2001 From: garciadeblas Date: Mon, 24 May 2021 16:44:01 +0200 Subject: [PATCH 9/9] Update Ubuntu20 Azure image for new packages using the right URN Signed-off-by: garciadeblas --- ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml | 2 +- several_volumes_vnf/several_volumes_vnfd.yaml | 2 +- simple_2vm_vnf/simple_2vm_vnfd.yaml | 2 +- ubuntu_4ifaces_vnf/ubuntu_4ifaces_vnfd.yaml | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml b/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml index b62b5277..af1c4120 100644 --- a/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml +++ b/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml @@ -37,7 +37,7 @@ vnfd: name: ubuntu20.04 - id: ubuntu20.04-azure name: ubuntu20.04-azure - image: Canonical:UbuntuServer:20.04-LTS:latest + image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest vim-type: azure vdu: - id: mgmtVM diff --git a/several_volumes_vnf/several_volumes_vnfd.yaml b/several_volumes_vnf/several_volumes_vnfd.yaml index 4128cc25..f4305ec4 100644 --- a/several_volumes_vnf/several_volumes_vnfd.yaml +++ b/several_volumes_vnf/several_volumes_vnfd.yaml @@ -28,7 +28,7 @@ vnfd: vim-type: aws - id: ubuntu20.04-azure name: ubuntu20.04-azure - image: Canonical:UbuntuServer:20.04-LTS:latest + image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest vim-type: azure vdu: - id: several_volumes-VM diff --git a/simple_2vm_vnf/simple_2vm_vnfd.yaml b/simple_2vm_vnf/simple_2vm_vnfd.yaml index 39df1cbb..ba1eab22 100755 --- a/simple_2vm_vnf/simple_2vm_vnfd.yaml +++ b/simple_2vm_vnf/simple_2vm_vnfd.yaml @@ -30,7 +30,7 @@ vnfd: name: ubuntu20.04 - id: ubuntu20.04-azure name: ubuntu20.04-azure - image: Canonical:UbuntuServer:20.04-LTS:latest + image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest vim-type: azure vdu: - id: mgmtVM diff --git a/ubuntu_4ifaces_vnf/ubuntu_4ifaces_vnfd.yaml b/ubuntu_4ifaces_vnf/ubuntu_4ifaces_vnfd.yaml index 8124eb8a..28d767ae 100644 --- a/ubuntu_4ifaces_vnf/ubuntu_4ifaces_vnfd.yaml +++ b/ubuntu_4ifaces_vnf/ubuntu_4ifaces_vnfd.yaml @@ -36,7 +36,7 @@ vnfd: name: ubuntu20.04 - id: ubuntu20.04-azure name: ubuntu20.04-azure - image: Canonical:UbuntuServer:20.04-LTS:latest + image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest vim-type: azure vdu: - cloud-init-file: cloud-config.txt -- GitLab