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 2b6ebd280767b74ac002568c9314005da9c13493..11f4b31b1a461919e1a96801e2b31e87d9c66277 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: ubuntu18.04-aws
+ name: ubuntu18.04-aws
+ image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
+ vim-type: aws
+ - id: ubuntu18.04-azure
+ name: ubuntu18.04-azure
+ image: Canonical:UbuntuServer:18.04-LTS:latest
+ vim-type: azure
vdu:
- cloud-init-file: cloud-config.txt
id: mgmtVM
@@ -83,6 +91,9 @@ vnfd:
type: PARAVIRT
name: mgmtVM
sw-image-desc: ubuntu18.04
+ alternative-sw-image-desc:
+ - 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 30f617e8ade1d467db87a2120bd15f31c259cf30..6a7744ddc87788894233cc773498150d6bc2cd93 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 e037d32a5c2f53f533917b2b8352c5b6a200e6a7..a4ab31243beb167d14e027aa4e9780c33e4a401e 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 bf32376cd9ac6f66e1fbf1887757a0cd1295400a..60d15147c1b73f22d7a8890f31f5c0fee5ed3983 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 0777117a3badad9fed67ad3ba15fcb0a4d8db28e..b582d68406716eb57c42ff036d88b15fe772d4e8 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: ubuntu18.04-aws
+ name: ubuntu18.04-aws
+ image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
+ vim-type: aws
+ - id: ubuntu18.04-azure
+ name: ubuntu18.04-azure
+ image: Canonical:UbuntuServer:18.04-LTS:latest
+ vim-type: azure
vdu:
- cloud-init-file: cloud-config.txt
id: mgmtVM
@@ -80,6 +88,9 @@ vnfd:
type: PARAVIRT
name: mgmtVM
sw-image-desc: ubuntu18.04
+ alternative-sw-image-desc:
+ - 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 ceb8d2953d130cd2bcface10873b9566779f508c..8d672d1cd7785257a74addf2b287b195d677f715 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 b4c45c0411925f63587156717ce13170700953f1..7be7a88f2ff9d2a2bec3f4e89f6b27ffa0a39976 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 f0a5b25e7dbd9bb31717f476256097be05d53b96..94febcd4ee51adf98e09535cfe3a0bf57a205e15 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
@@ -106,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
@@ -120,6 +126,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 1b1bfb5306eec8926ea48576b8942ebf148e66a9..809d2ad923c418cd4398ae2c3ddbd38907d220c3 100644
--- a/epa_quota_vnf/epa_quota_vnfd.yaml
+++ b/epa_quota_vnf/epa_quota_vnfd.yaml
@@ -19,9 +19,17 @@ vnfd:
mgmt-cp: vnf-cp0-ext
product-name: epa_quota-vnf
sw-image-desc:
- - id: US1604
- image: US1604
- name: US1604
+ - id: ubuntu18.04
+ image: ubuntu18.04
+ name: ubuntu18.04
+ - id: ubuntu18.04-aws
+ name: ubuntu18.04-aws
+ image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
+ vim-type: aws
+ - id: ubuntu18.04-azure
+ name: ubuntu18.04-azure
+ image: Canonical:UbuntuServer:18.04-LTS:latest
+ vim-type: azure
vdu:
- id: epa_quota-VM
int-cpd:
@@ -31,7 +39,10 @@ vnfd:
virtual-interface:
type: PARAVIRT
name: epa_quota-VM
- sw-image-desc: US1604
+ sw-image-desc: ubuntu18.04
+ alternative-sw-image-desc:
+ - 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 0da9e96134fcee393aad34cd32882b701d745141..5ed09ad4a020c7d15ba136d29ddfc9036d09e683 100644
--- a/hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml
+++ b/hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml
@@ -42,9 +42,17 @@ 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: ubuntu18.04
+ image: ubuntu18.04
+ name: ubuntu18.04
+ - id: ubuntu18.04-aws
+ name: ubuntu18.04-aws
+ image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
+ vim-type: aws
+ - id: ubuntu18.04-azure
+ name: ubuntu18.04-azure
+ image: Canonical:UbuntuServer:18.04-LTS:latest
+ vim-type: azure
vdu:
- cloud-init-file: cloud-config
id: hackfest_basic_metrics-VM
@@ -68,7 +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:
+ - 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 a6631397394010c0cd9031958d0ec4b21ddad188..d8874bf5143470c36dc342b30798fc00c34a54b1 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 04832554aed141fbfb9898758218612c0bf84ed4..f58a3e7dfda45186bb0fdcafb2852da379a2e746 100644
--- a/hackfest_basic_vnf/hackfest_basic_vnfd.yaml
+++ b/hackfest_basic_vnf/hackfest_basic_vnfd.yaml
@@ -19,19 +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: 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
+ - 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 cfa7d77631096fbd10fb238b3f45eb9c0be2bfea..168fad70743329c0e903382a4c06618d8cc65dc6 100644
--- a/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml
+++ b/hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml
@@ -30,9 +30,17 @@ vnfd:
mgmt-cp: vnf-mgmt-ext
product-name: hackfest_cloudinit-vnf
sw-image-desc:
- - id: ubuntu16.04
- image: ubuntu16.04
- name: ubuntu16.04
+ - id: ubuntu18.04
+ image: ubuntu18.04
+ name: ubuntu18.04
+ - id: ubuntu18.04-aws
+ name: ubuntu18.04-aws
+ image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
+ vim-type: aws
+ - id: ubuntu18.04-azure
+ name: ubuntu18.04-azure
+ image: Canonical:UbuntuServer:18.04-LTS:latest
+ vim-type: azure
vdu:
- cloud-init-file: cloud-config.txt
id: mgmtVM
@@ -51,7 +59,10 @@ vnfd:
virtual-interface:
type: PARAVIRT
name: mgmtVM
- sw-image-desc: ubuntu16.04
+ sw-image-desc: ubuntu18.04
+ alternative-sw-image-desc:
+ - ubuntu18.04-aws
+ - ubuntu18.04-azure
virtual-compute-desc: mgmtVM-compute
virtual-storage-desc:
- mgmtVM-storage
@@ -71,7 +82,10 @@ vnfd:
virtual-interface:
type: PARAVIRT
name: dataVM
- sw-image-desc: ubuntu16.04
+ sw-image-desc: ubuntu18.04
+ alternative-sw-image-desc:
+ - 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 24e02a5a2f29b2f18872916786faf1000bee12dc..699734b2a717c8d77cc5ecc1b14e74f594205ffd 100644
--- a/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml
+++ b/hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml
@@ -32,6 +32,14 @@ vnfd:
- id: ubuntu20.04
image: ubuntu20.04
name: ubuntu20.04
+ - id: ubuntu20.04-aws
+ name: ubuntu20.04-aws
+ image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
+ vim-type: aws
+ - id: ubuntu20.04-azure
+ name: ubuntu20.04-azure
+ image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest
+ vim-type: azure
vdu:
- id: mgmtVM
int-cpd:
@@ -50,6 +58,9 @@ vnfd:
type: PARAVIRT
name: mgmtVM
sw-image-desc: ubuntu20.04
+ alternative-sw-image-desc:
+ - ubuntu20.04-aws
+ - ubuntu20.04-azure
virtual-compute-desc: mgmtVM-compute
virtual-storage-desc:
- mgmtVM-storage
@@ -70,6 +81,9 @@ vnfd:
type: PARAVIRT
name: dataVM
sw-image-desc: ubuntu20.04
+ alternative-sw-image-desc:
+ - ubuntu20.04-aws
+ - ubuntu20.04-azure
virtual-compute-desc: dataVM-compute
virtual-storage-desc:
- dataVM-storage
diff --git a/hackfest_proxycharm_vnf/hackfest_proxycharm_vnfd.yaml b/hackfest_proxycharm_vnf/hackfest_proxycharm_vnfd.yaml
index e058bfee7876caf5a23a37693b05f93dbdc30d0e..ae421383b23ad15e2e8a84ec022f8ddd8ad01f2c 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/ipprofile_2vm_ns/ipprofile_2vm_nsd.yaml b/ipprofile_2vm_ns/ipprofile_2vm_nsd.yaml
index 72e7c3ff343ebf04befc5d45eccdf7f65f898384..2195f42d77ace235dcdc92b22d8a0e357a83448e 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 f40976af2bb35a9cbab6ebed2e687560c25ecf73..af1c41209c1ca845fd9c9c0e2964829094b92b4f 100644
--- a/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml
+++ b/ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml
@@ -1,89 +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
- 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
- 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
- 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:0001-com-ubuntu-server-focal: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 9af244dea0fec0be8c13ef81a72a832160986ff3..5557b9cb76cdbe31cd97db423af2d4173ba22b0b 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/nscharm_policy_vnf/nscharm_policy_vnfd.yaml b/nscharm_policy_vnf/nscharm_policy_vnfd.yaml
index ca1030e094f7f6d49cd7183e5acff52065c1f9cd..06b7083eabd9e8f22b6e5b61c14894d27521f970 100644
--- a/nscharm_policy_vnf/nscharm_policy_vnfd.yaml
+++ b/nscharm_policy_vnf/nscharm_policy_vnfd.yaml
@@ -41,9 +41,17 @@ vnfd:
mgmt-cp: vnf-mgmt-ext
product-name: nscharm-policy-vnf
sw-image-desc:
- - id: ubuntu1604
- image: ubuntu16.04
- name: ubuntu16.04
+ - 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: 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: policyVM
@@ -62,7 +70,10 @@ vnfd:
virtual-interface:
type: VIRTIO
name: policyVM
- sw-image-desc: ubuntu1604
+ sw-image-desc: ubuntu1804
+ alternative-sw-image-desc:
+ - 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 7859261fc12c920132301b8ec61fefc37b0fb52d..fe3524a5085d809b0754ec245f029c0dfd8d318e 100644
--- a/nscharm_user_vnf/nscharm_user_vnfd.yaml
+++ b/nscharm_user_vnf/nscharm_user_vnfd.yaml
@@ -41,9 +41,17 @@ vnfd:
mgmt-cp: vnf-mgmt-ext
product-name: nscharm-user-vnf
sw-image-desc:
- - id: ubuntu1604
- image: ubuntu16.04
- name: ubuntu16.04
+ - 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: 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: userVM
@@ -62,7 +70,10 @@ vnfd:
virtual-interface:
type: VIRTIO
name: userVM
- sw-image-desc: ubuntu1604
+ sw-image-desc: ubuntu1804
+ alternative-sw-image-desc:
+ - ubuntu18.04-aws
+ - ubuntu18.04-azure
virtual-compute-desc: userVM-compute
virtual-storage-desc:
- userVM-storage
diff --git a/several_volumes_ns/several_volumes_nsd.yaml b/several_volumes_ns/several_volumes_nsd.yaml
index 45f82de6c30cc01c11e0502cc106743467193455..30726a294ca15d88e125a5045d7a54da7492c296 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/several_volumes_vnf/several_volumes_vnfd.yaml b/several_volumes_vnf/several_volumes_vnfd.yaml
index 4128cc2513891be4e332c8c4a56cf744c259cb1b..f4305ec475ace6d7ca3f1b81b80a9382fc47188e 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_ns/simple_2vm_nsd.yaml b/simple_2vm_ns/simple_2vm_nsd.yaml
index a3de4758d0c1a513fbad7f3a9f7a0cdc61c6d319..27194655c0f53296024b8bbc4db0711448b2b7b5 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 3e9c0291814cb3d281b873a006fe0b1eb7d3b593..ba1eab224959679143bb895a564085462a251970 100755
--- a/simple_2vm_vnf/simple_2vm_vnfd.yaml
+++ b/simple_2vm_vnf/simple_2vm_vnfd.yaml
@@ -1,82 +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
- 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
- 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
- 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:0001-com-ubuntu-server-focal: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 3d721fe2d53ef73ba7b00af3d9567542c3799028..e31e589aa763b48e75ef8b29c1669ab0a3724e36 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/simple_ee_vnf/simple_ee_vnfd.yaml b/simple_ee_vnf/simple_ee_vnfd.yaml
index c6ea1482aba70e05df14cc888b5fe0b6c5475e6d..eb478520e8267e36f65bad69584e8562806b5f6c 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 d94d716ef499157f6c0aa71c950351d0d50962de..a87c2c19b514e18341b7300921d8c1a82ea2829a 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/slice_basic_nst/slice_basic_2nd_nst.yaml b/slice_basic_nst/slice_basic_2nd_nst.yaml
index 02c0dc2bda44157810d87c00f6c0c6a24ed4d4c9..c89492a9f4611ba251248834165f7fc47fb79bec 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 eb2982ed01971da741fd9e748a292c5ea5bda60e..b4f7a4354d59e04d3589226119b10ae46c19f3c8 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 c188ad1d98bb93247c8fa0ee9132d9494f43e8ff..24cc1db2c63aa89d09b0607478dde1efdfaee4b4 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 7a2f84637e8959be185ec6ef3519727ded51bd8e..8b124995057b996bbf43b867ffb908da1c254f31 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
diff --git a/ubuntu_4ifaces_vnf/ubuntu_4ifaces_vnfd.yaml b/ubuntu_4ifaces_vnf/ubuntu_4ifaces_vnfd.yaml
index 8ae9fb0c822db558c3f1653d0a4714fb1d5784a4..28d767aeb2d26f8f042808dbd42185eddc8e168f 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:0001-com-ubuntu-server-focal: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
diff --git a/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml b/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml
index 5159b5a900b23a809e03786d4b2d60808d9b9ef2..316cf06fa13496b75634a0fb0d0781d8fb3c434c 100644
--- a/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml
+++ b/ubuntu_cloudinit_vnf/ubuntu_cloudinit_vnfd.yaml
@@ -20,9 +20,17 @@ vnfd:
product-name: ubuntu_cloudinit-vnf
provider: OSM
sw-image-desc:
- - id: ubuntu16.04
- image: ubuntu16.04
- name: ubuntu16.04
+ - id: ubuntu18.04
+ image: ubuntu18.04
+ name: ubuntu18.04
+ - id: ubuntu18.04-aws
+ name: ubuntu18.04-aws
+ image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
+ vim-type: aws
+ - id: ubuntu18.04-azure
+ name: ubuntu18.04-azure
+ image: Canonical:UbuntuServer:18.04-LTS:latest
+ vim-type: azure
vdu:
- cloud-init-file: cloud-init.cfg
description: ubuntu_cloudinit-vnf-VM
@@ -34,7 +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:
+ - ubuntu18.04-aws
+ - ubuntu18.04-azure
virtual-compute-desc: ubuntu_cloudinit-vnf-VM-compute
virtual-storage-desc:
- ubuntu_cloudinit-vnf-VM-storage