Skip to content

GitLab

Commit 993c6dcd authored by garciadeblas's avatar garciadeblas
Browse files

Merge branch 'azure-alternative-images' into 'master' 

Azure alternative images

See merge request !153
parents 2d41926d 198c37b7
Pipeline #826 failed with stage
in 2 minutes and 4 seconds
Hide whitespace changes
Inline Side-by-side
Showing with 358 additions and 207 deletions
charm-packages/ha_proxy_charm_vnf/ha_proxy_charm_vnfd.yaml
View file @ 993c6dcd
...@@ -65,6 +65,14 @@ vnfd: ...@@ -65,6 +65,14 @@ vnfd:
- id: ubuntu18.04 - id: ubuntu18.04
image: ubuntu18.04 image: ubuntu18.04
name: 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: vdu:
- cloud-init-file: cloud-config.txt - cloud-init-file: cloud-config.txt
id: mgmtVM id: mgmtVM
...@@ -83,6 +91,9 @@ vnfd: ...@@ -83,6 +91,9 @@ vnfd:
type: PARAVIRT type: PARAVIRT
name: mgmtVM name: mgmtVM
sw-image-desc: ubuntu18.04 sw-image-desc: ubuntu18.04
alternative-sw-image-desc:
- ubuntu18.04-aws
- ubuntu18.04-azure
virtual-compute-desc: mgmtVM-compute virtual-compute-desc: mgmtVM-compute
virtual-storage-desc: virtual-storage-desc:
- mgmtVM-storage - mgmtVM-storage
......
charm-packages/k8s_proxy_charm_vnf/k8s_proxy_charm_vnfd.yaml
View file @ 993c6dcd
...@@ -65,6 +65,10 @@ vnfd: ...@@ -65,6 +65,10 @@ vnfd:
- id: ubuntu18.04 - id: ubuntu18.04
image: ubuntu18.04 image: ubuntu18.04
name: ubuntu18.04 name: ubuntu18.04
- id: ubuntu18.04-azure
name: ubuntu18.04-azure
image: Canonical:UbuntuServer:18.04-LTS:latest
vim-type: azure
vdu: vdu:
- cloud-init-file: cloud-config.txt - cloud-init-file: cloud-config.txt
id: mgmtVM id: mgmtVM
...@@ -83,6 +87,8 @@ vnfd: ...@@ -83,6 +87,8 @@ vnfd:
type: PARAVIRT type: PARAVIRT
name: mgmtVM name: mgmtVM
sw-image-desc: ubuntu18.04 sw-image-desc: ubuntu18.04
alternative-sw-image-desc:
- ubuntu18.04-azure
virtual-compute-desc: mgmtVM-compute virtual-compute-desc: mgmtVM-compute
virtual-storage-desc: virtual-storage-desc:
- mgmtVM-storage - mgmtVM-storage
......
charm-packages/native_charm_vnf/native_charm_vnfd.yaml
View file @ 993c6dcd
...@@ -55,6 +55,10 @@ vnfd: ...@@ -55,6 +55,10 @@ vnfd:
- id: ubuntu18.04 - id: ubuntu18.04
image: ubuntu18.04 image: ubuntu18.04
name: ubuntu18.04 name: ubuntu18.04
- id: ubuntu18.04-azure
name: ubuntu18.04-azure
image: Canonical:UbuntuServer:18.04-LTS:latest
vim-type: azure
vdu: vdu:
- cloud-init-file: cloud-config.txt - cloud-init-file: cloud-config.txt
id: mgmtVM id: mgmtVM
...@@ -73,6 +77,8 @@ vnfd: ...@@ -73,6 +77,8 @@ vnfd:
type: PARAVIRT type: PARAVIRT
name: mgmtVM name: mgmtVM
sw-image-desc: ubuntu18.04 sw-image-desc: ubuntu18.04
alternative-sw-image-desc:
- ubuntu18.04-azure
virtual-compute-desc: mgmtVM-compute virtual-compute-desc: mgmtVM-compute
virtual-storage-desc: virtual-storage-desc:
- mgmtVM-storage - mgmtVM-storage
......
charm-packages/nopasswd_k8s_proxy_charm_vnf/nopasswd_k8s_proxy_charm_vnfd.yaml
View file @ 993c6dcd
...@@ -63,6 +63,10 @@ vnfd: ...@@ -63,6 +63,10 @@ vnfd:
- id: ubuntu18.04 - id: ubuntu18.04
image: ubuntu18.04 image: ubuntu18.04
name: ubuntu18.04 name: ubuntu18.04
- id: ubuntu18.04-azure
name: ubuntu18.04-azure
image: Canonical:UbuntuServer:18.04-LTS:latest
vim-type: azure
vdu: vdu:
- cloud-init-file: cloud-config.txt - cloud-init-file: cloud-config.txt
id: mgmtVM id: mgmtVM
...@@ -81,6 +85,8 @@ vnfd: ...@@ -81,6 +85,8 @@ vnfd:
type: PARAVIRT type: PARAVIRT
name: mgmtVM name: mgmtVM
sw-image-desc: ubuntu18.04 sw-image-desc: ubuntu18.04
alternative-sw-image-desc:
- ubuntu18.04-azure
virtual-compute-desc: mgmtVM-compute virtual-compute-desc: mgmtVM-compute
virtual-storage-desc: virtual-storage-desc:
- mgmtVM-storage - mgmtVM-storage
......
charm-packages/nopasswd_proxy_charm_vnf/nopasswd_proxy_charm_vnfd.yaml
View file @ 993c6dcd
...@@ -62,6 +62,14 @@ vnfd: ...@@ -62,6 +62,14 @@ vnfd:
- id: ubuntu18.04 - id: ubuntu18.04
image: ubuntu18.04 image: ubuntu18.04
name: 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: vdu:
- cloud-init-file: cloud-config.txt - cloud-init-file: cloud-config.txt
id: mgmtVM id: mgmtVM
...@@ -80,6 +88,9 @@ vnfd: ...@@ -80,6 +88,9 @@ vnfd:
type: PARAVIRT type: PARAVIRT
name: mgmtVM name: mgmtVM
sw-image-desc: ubuntu18.04 sw-image-desc: ubuntu18.04
alternative-sw-image-desc:
- ubuntu18.04-aws
- ubuntu18.04-azure
virtual-compute-desc: mgmtVM-compute virtual-compute-desc: mgmtVM-compute
virtual-storage-desc: virtual-storage-desc:
- mgmtVM-storage - mgmtVM-storage
......
charm-packages/ns_relations_provides_vnf/ns_relations_provides_vnfd.yaml
View file @ 993c6dcd
...@@ -51,6 +51,10 @@ vnfd: ...@@ -51,6 +51,10 @@ vnfd:
- id: ubuntu18.04 - id: ubuntu18.04
image: ubuntu18.04 image: ubuntu18.04
name: ubuntu18.04 name: ubuntu18.04
- id: ubuntu18.04-azure
name: ubuntu18.04-azure
image: Canonical:UbuntuServer:18.04-LTS:latest
vim-type: azure
vdu: vdu:
- cloud-init-file: cloud-config.txt - cloud-init-file: cloud-config.txt
id: simple_provides id: simple_provides
...@@ -63,6 +67,8 @@ vnfd: ...@@ -63,6 +67,8 @@ vnfd:
type: PARAVIRT type: PARAVIRT
name: simple_provides name: simple_provides
sw-image-desc: ubuntu18.04 sw-image-desc: ubuntu18.04
alternative-sw-image-desc:
- ubuntu18.04-azure
virtual-compute-desc: simple_provides-compute virtual-compute-desc: simple_provides-compute
virtual-storage-desc: virtual-storage-desc:
- simple_provides-storage - simple_provides-storage
......
charm-packages/ns_relations_requires_vnf/ns_relations_requires_vnfd.yaml
View file @ 993c6dcd
...@@ -51,6 +51,10 @@ vnfd: ...@@ -51,6 +51,10 @@ vnfd:
- id: ubuntu18.04 - id: ubuntu18.04
image: ubuntu18.04 image: ubuntu18.04
name: ubuntu18.04 name: ubuntu18.04
- id: ubuntu18.04-azure
name: ubuntu18.04-azure
image: Canonical:UbuntuServer:18.04-LTS:latest
vim-type: azure
vdu: vdu:
- cloud-init-file: cloud-config.txt - cloud-init-file: cloud-config.txt
id: simple_requires id: simple_requires
...@@ -63,6 +67,8 @@ vnfd: ...@@ -63,6 +67,8 @@ vnfd:
type: PARAVIRT type: PARAVIRT
name: simple_requires name: simple_requires
sw-image-desc: ubuntu18.04 sw-image-desc: ubuntu18.04
alternative-sw-image-desc:
- ubuntu18.04-azure
virtual-compute-desc: simple_requires-compute virtual-compute-desc: simple_requires-compute
virtual-storage-desc: virtual-storage-desc:
- simple_requires-storage - simple_requires-storage
......
charm-packages/vnf_relations_vnf/vnf_relations_vnfd.yaml
View file @ 993c6dcd
...@@ -94,6 +94,10 @@ vnfd: ...@@ -94,6 +94,10 @@ vnfd:
- id: ubuntu18.04 - id: ubuntu18.04
image: ubuntu18.04 image: ubuntu18.04
name: ubuntu18.04 name: ubuntu18.04
- id: ubuntu18.04-azure
name: ubuntu18.04-azure
image: Canonical:UbuntuServer:18.04-LTS:latest
vim-type: azure
vdu: vdu:
- cloud-init-file: cloud-config.txt - cloud-init-file: cloud-config.txt
id: simple_requires id: simple_requires
...@@ -106,6 +110,8 @@ vnfd: ...@@ -106,6 +110,8 @@ vnfd:
type: PARAVIRT type: PARAVIRT
name: simple_requires name: simple_requires
sw-image-desc: ubuntu18.04 sw-image-desc: ubuntu18.04
alternative-sw-image-desc:
- ubuntu18.04-azure
virtual-compute-desc: simple_requires-compute virtual-compute-desc: simple_requires-compute
virtual-storage-desc: virtual-storage-desc:
- simple_requires-storage - simple_requires-storage
...@@ -120,6 +126,8 @@ vnfd: ...@@ -120,6 +126,8 @@ vnfd:
type: PARAVIRT type: PARAVIRT
name: simple_provides name: simple_provides
sw-image-desc: ubuntu18.04 sw-image-desc: ubuntu18.04
alternative-sw-image-desc:
- ubuntu18.04-azure
virtual-compute-desc: simple_provides-compute virtual-compute-desc: simple_provides-compute
virtual-storage-desc: virtual-storage-desc:
- simple_provides-storage - simple_provides-storage
......
epa_quota_vnf/epa_quota_vnfd.yaml
View file @ 993c6dcd
...@@ -19,9 +19,17 @@ vnfd: ...@@ -19,9 +19,17 @@ vnfd:
mgmt-cp: vnf-cp0-ext mgmt-cp: vnf-cp0-ext
product-name: epa_quota-vnf product-name: epa_quota-vnf
sw-image-desc: sw-image-desc:
- id: US1604 - id: ubuntu18.04
image: US1604 image: ubuntu18.04
name: US1604 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: vdu:
- id: epa_quota-VM - id: epa_quota-VM
int-cpd: int-cpd:
...@@ -31,7 +39,10 @@ vnfd: ...@@ -31,7 +39,10 @@ vnfd:
virtual-interface: virtual-interface:
type: PARAVIRT type: PARAVIRT
name: epa_quota-VM 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-compute-desc: epa_quota-VM-compute
virtual-storage-desc: virtual-storage-desc:
- epa_quota-VM-storage - epa_quota-VM-storage
......
hackfest_basic_metrics_vnf/hackfest_basic_metrics_vnfd.yaml
View file @ 993c6dcd
...@@ -42,9 +42,17 @@ vnfd: ...@@ -42,9 +42,17 @@ vnfd:
mgmt-cp: vnf-cp0-ext mgmt-cp: vnf-cp0-ext
product-name: hackfest_basic_metrics-vnf product-name: hackfest_basic_metrics-vnf
sw-image-desc: sw-image-desc:
- id: ubuntu16.04 - id: ubuntu18.04
image: ubuntu16.04 image: ubuntu18.04
name: ubuntu16.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: vdu:
- cloud-init-file: cloud-config - cloud-init-file: cloud-config
id: hackfest_basic_metrics-VM id: hackfest_basic_metrics-VM
...@@ -68,7 +76,10 @@ vnfd: ...@@ -68,7 +76,10 @@ vnfd:
name: vnf_packets_received name: vnf_packets_received
performance-metric: packets_received performance-metric: packets_received
name: hackfest_basic_metrics-VM 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-compute-desc: hackfest_basic_metrics-VM-compute
virtual-storage-desc: virtual-storage-desc:
- hackfest_basic_metrics-VM-storage - hackfest_basic_metrics-VM-storage
......
hackfest_basic_sriov_vnf/hackfest_basic_sriov_vnfd.yaml
View file @ 993c6dcd
...@@ -26,6 +26,10 @@ vnfd: ...@@ -26,6 +26,10 @@ vnfd:
- id: ubuntu18.04 - id: ubuntu18.04
image: ubuntu18.04 image: ubuntu18.04
name: ubuntu18.04 name: ubuntu18.04
- id: ubuntu18.04-azure
name: ubuntu18.04-azure
image: Canonical:UbuntuServer:18.04-LTS:latest
vim-type: azure
vdu: vdu:
- cloud-init-file: cloud.config - cloud-init-file: cloud.config
id: hackfest_basic-VM id: hackfest_basic-VM
...@@ -42,6 +46,8 @@ vnfd: ...@@ -42,6 +46,8 @@ vnfd:
type: SR-IOV type: SR-IOV
name: hackfest_basic-VM name: hackfest_basic-VM
sw-image-desc: ubuntu18.04 sw-image-desc: ubuntu18.04
alternative-sw-image-desc:
- ubuntu18.04-azure
virtual-compute-desc: hackfest_basic-VM-compute virtual-compute-desc: hackfest_basic-VM-compute
virtual-storage-desc: virtual-storage-desc:
- hackfest_basic-VM-storage - hackfest_basic-VM-storage
......
hackfest_basic_vnf/hackfest_basic_vnfd.yaml
View file @ 993c6dcd
...@@ -19,19 +19,24 @@ vnfd: ...@@ -19,19 +19,24 @@ vnfd:
mgmt-cp: vnf-cp0-ext mgmt-cp: vnf-cp0-ext
product-name: hackfest_basic-vnf product-name: hackfest_basic-vnf
sw-image-desc: sw-image-desc:
- id: ubuntu16.04 - id: ubuntu18.04
name: ubuntu16.04 name: ubuntu18.04
image: ubuntu16.04 image: ubuntu18.04
- id: ubuntu16.04-aws - id: ubuntu18.04-aws
name: ubuntu16.04-aws name: ubuntu18.04-aws
image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509 image: ubuntu/images/hvm-ssd/ubuntu-artful-17.10-amd64-server-20180509
vim-type: aws vim-type: aws
- id: ubuntu18.04-azure
name: ubuntu18.04-azure
image: Canonical:UbuntuServer:18.04-LTS:latest
vim-type: azure
vdu: vdu:
- id: hackfest_basic-VM - id: hackfest_basic-VM
name: hackfest_basic-VM name: hackfest_basic-VM
sw-image-desc: ubuntu16.04 sw-image-desc: ubuntu18.04
alternative-sw-image-desc: alternative-sw-image-desc:
- ubuntu16.04-aws - ubuntu18.04-aws
- ubuntu18.04-azure
virtual-compute-desc: hackfest_basic-VM-compute virtual-compute-desc: hackfest_basic-VM-compute
virtual-storage-desc: virtual-storage-desc:
- hackfest_basic-VM-storage - hackfest_basic-VM-storage
......
hackfest_cloudinit_vnf/hackfest_cloudinit_vnfd.yaml
View file @ 993c6dcd
...@@ -30,9 +30,17 @@ vnfd: ...@@ -30,9 +30,17 @@ vnfd:
mgmt-cp: vnf-mgmt-ext mgmt-cp: vnf-mgmt-ext
product-name: hackfest_cloudinit-vnf product-name: hackfest_cloudinit-vnf
sw-image-desc: sw-image-desc:
- id: ubuntu16.04 - id: ubuntu18.04
image: ubuntu16.04 image: ubuntu18.04
name: ubuntu16.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: vdu:
- cloud-init-file: cloud-config.txt - cloud-init-file: cloud-config.txt
id: mgmtVM id: mgmtVM
...@@ -51,7 +59,10 @@ vnfd: ...@@ -51,7 +59,10 @@ vnfd:
virtual-interface: virtual-interface:
type: PARAVIRT type: PARAVIRT
name: mgmtVM 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-compute-desc: mgmtVM-compute
virtual-storage-desc: virtual-storage-desc:
- mgmtVM-storage - mgmtVM-storage
...@@ -71,7 +82,10 @@ vnfd: ...@@ -71,7 +82,10 @@ vnfd:
virtual-interface: virtual-interface:
type: PARAVIRT type: PARAVIRT
name: dataVM 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-compute-desc: dataVM-compute
virtual-storage-desc: virtual-storage-desc:
- dataVM-storage - dataVM-storage
......
hackfest_multivdu_vnf/hackfest_multivdu_vnfd.yaml
View file @ 993c6dcd
...@@ -32,6 +32,14 @@ vnfd: ...@@ -32,6 +32,14 @@ vnfd:
- id: ubuntu20.04 - id: ubuntu20.04
image: ubuntu20.04 image: ubuntu20.04
name: 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: vdu:
- id: mgmtVM - id: mgmtVM
int-cpd: int-cpd:
...@@ -50,6 +58,9 @@ vnfd: ...@@ -50,6 +58,9 @@ vnfd:
type: PARAVIRT type: PARAVIRT
name: mgmtVM name: mgmtVM
sw-image-desc: ubuntu20.04 sw-image-desc: ubuntu20.04
alternative-sw-image-desc:
- ubuntu20.04-aws
- ubuntu20.04-azure
virtual-compute-desc: mgmtVM-compute virtual-compute-desc: mgmtVM-compute
virtual-storage-desc: virtual-storage-desc:
- mgmtVM-storage - mgmtVM-storage
...@@ -70,6 +81,9 @@ vnfd: ...@@ -70,6 +81,9 @@ vnfd:
type: PARAVIRT type: PARAVIRT
name: dataVM name: dataVM
sw-image-desc: ubuntu20.04 sw-image-desc: ubuntu20.04
alternative-sw-image-desc:
- ubuntu20.04-aws
- ubuntu20.04-azure
virtual-compute-desc: dataVM-compute virtual-compute-desc: dataVM-compute
virtual-storage-desc: virtual-storage-desc:
- dataVM-storage - dataVM-storage
......
hackfest_proxycharm_vnf/hackfest_proxycharm_vnfd.yaml
View file @ 993c6dcd
...@@ -61,9 +61,9 @@ vnfd: ...@@ -61,9 +61,9 @@ vnfd:
mgmt-cp: vnf-mgmt-ext mgmt-cp: vnf-mgmt-ext
product-name: hackfest_proxycharm-vnf product-name: hackfest_proxycharm-vnf
sw-image-desc: sw-image-desc:
- id: ubuntu16.04 - id: ubuntu18.04
image: ubuntu16.04 image: ubuntu18.04
name: ubuntu16.04 name: ubuntu18.04
vdu: vdu:
- cloud-init-file: cloud-config.txt - cloud-init-file: cloud-config.txt
id: mgmtVM id: mgmtVM
...@@ -81,7 +81,7 @@ vnfd: ...@@ -81,7 +81,7 @@ vnfd:
virtual-interface: virtual-interface:
type: PARAVIRT type: PARAVIRT
name: mgmtVM name: mgmtVM
sw-image-desc: ubuntu16.04 sw-image-desc: ubuntu18.04
virtual-compute-desc: mgmtVM-compute virtual-compute-desc: mgmtVM-compute
virtual-storage-desc: virtual-storage-desc:
- mgmtVM-storage - mgmtVM-storage
......
ipprofile_2vm_ns/ipprofile_2vm_nsd.yaml
View file @ 993c6dcd
nsd: nsd:
nsd: nsd:
- description: NS with 1 VNFs connected by mgmtnet VL - description: NS with 1 VNFs connected by mgmtnet VL
df: df:
- id: default-df - id: default-df
vnf-profile: vnf-profile:
- id: '1' - id: '1'
virtual-link-connectivity: virtual-link-connectivity:
- constituent-cpd-id: - constituent-cpd-id:
- constituent-base-element-id: '1' - constituent-base-element-id: '1'
constituent-cpd-id: vnf-mgmt-ext constituent-cpd-id: vnf-mgmt-ext
virtual-link-profile-id: mgmtnet virtual-link-profile-id: mgmtnet
vnfd-id: ipprofile_2vm-vnf vnfd-id: ipprofile_2vm-vnf
id: ipprofile_2vm-ns id: ipprofile_2vm-ns
name: ipprofile_2vm-ns name: ipprofile_2vm-ns
version: '1.0' version: '1.0'
virtual-link-desc: virtual-link-desc:
- id: mgmtnet - id: mgmtnet
mgmt-network: true mgmt-network: true
vnfd-id: vnfd-id:
- ipprofile_2vm-vnf - ipprofile_2vm-vnf
ipprofile_2vm_vnf/ipprofile_2vm_vnfd.yaml
View file @ 993c6dcd
vnfd: vnfd:
description: A VNF consisting of 2 VDUs connected to an internal VL description: A VNF consisting of 2 VDUs connected to an internal VL
df: df:
- id: default-df - id: default-df
instantiation-level: instantiation-level:
- id: default-instantiation-level - id: default-instantiation-level
vdu-level: vdu-level:
- number-of-instances: 1 - number-of-instances: 1
vdu-id: mgmtVM vdu-id: mgmtVM
- number-of-instances: 1 - number-of-instances: 1
vdu-id: dataVM vdu-id: dataVM
vdu-profile: vdu-profile:
- id: mgmtVM - id: mgmtVM
min-number-of-instances: 1 min-number-of-instances: 1
- id: dataVM - id: dataVM
min-number-of-instances: 1 min-number-of-instances: 1
virtual-link-profile: virtual-link-profile:
- id: internal - id: internal
flavour: '' flavour: ''
virtual-link-protocol-data: virtual-link-protocol-data:
l3-protocol-data: l3-protocol-data:
cidr: 192.168.200.0/24 cidr: 192.168.200.0/24
ip-version: ipv4 ip-version: ipv4
ext-cpd: ext-cpd:
- id: vnf-mgmt-ext - id: vnf-mgmt-ext
int-cpd: int-cpd:
cpd: mgmtVM-eth0-int cpd: mgmtVM-eth0-int
vdu-id: mgmtVM vdu-id: mgmtVM
id: ipprofile_2vm-vnf id: ipprofile_2vm-vnf
int-virtual-link-desc: int-virtual-link-desc:
- id: internal - id: internal
mgmt-cp: vnf-mgmt-ext mgmt-cp: vnf-mgmt-ext
product-name: ipprofile_2vm-vnf product-name: ipprofile_2vm-vnf
sw-image-desc: sw-image-desc:
- id: ubuntu20.04 - id: ubuntu20.04
image: ubuntu20.04 image: ubuntu20.04
name: ubuntu20.04 name: ubuntu20.04
vdu: - id: ubuntu20.04-azure
- id: mgmtVM name: ubuntu20.04-azure
int-cpd: image: Canonical:0001-com-ubuntu-server-focal:20_04-lts:latest
- id: mgmtVM-eth0-int vim-type: azure
virtual-network-interface-requirement: vdu:
- name: mgmtVM-eth0 - id: mgmtVM
position: 1 int-cpd:
virtual-interface: - id: mgmtVM-eth0-int
type: PARAVIRT virtual-network-interface-requirement:
- id: mgmtVM-eth1-int - name: mgmtVM-eth0
int-virtual-link-desc: internal position: 1
virtual-network-interface-requirement: virtual-interface:
- name: mgmtVM-eth1 type: PARAVIRT
position: 2 - id: mgmtVM-eth1-int
virtual-interface: int-virtual-link-desc: internal
type: PARAVIRT virtual-network-interface-requirement:
name: mgmtVM - name: mgmtVM-eth1
sw-image-desc: ubuntu20.04 position: 2
virtual-compute-desc: mgmtVM-compute virtual-interface:
virtual-storage-desc: type: PARAVIRT
- mgmtVM-storage name: mgmtVM
- id: dataVM sw-image-desc: ubuntu20.04
int-cpd: alternative-sw-image-desc:
- id: dataVM-eth0-int - ubuntu20.04-azure
int-virtual-link-desc: internal virtual-compute-desc: mgmtVM-compute
virtual-network-interface-requirement: virtual-storage-desc:
- name: dataVM-eth0 - mgmtVM-storage
position: 1 - id: dataVM
virtual-interface: int-cpd:
type: PARAVIRT - id: dataVM-eth0-int
name: dataVM int-virtual-link-desc: internal
sw-image-desc: ubuntu20.04 virtual-network-interface-requirement:
virtual-compute-desc: dataVM-compute - name: dataVM-eth0
virtual-storage-desc: position: 1
- dataVM-storage virtual-interface:
version: '1.0' type: PARAVIRT
virtual-compute-desc: name: dataVM
- id: mgmtVM-compute sw-image-desc: ubuntu20.04
virtual-memory: alternative-sw-image-desc:
size: 1.0 - ubuntu20.04-azure
virtual-cpu: virtual-compute-desc: dataVM-compute
num-virtual-cpu: 1 virtual-storage-desc:
- id: dataVM-compute - dataVM-storage
virtual-memory: version: '1.0'
size: 1.0 virtual-compute-desc:
virtual-cpu: - id: mgmtVM-compute
num-virtual-cpu: 1 virtual-memory:
virtual-storage-desc: size: 1.0
- id: mgmtVM-storage virtual-cpu:
size-of-storage: 10 num-virtual-cpu: 1
- id: dataVM-storage - id: dataVM-compute
size-of-storage: 10 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
magma/hackfest_magma-agw-enb_vnfd/helm-charts/eechart/templates/statefulset.yaml
View file @ 993c6dcd
apiVersion: apps/v1 apiVersion: apps/v1
kind: StatefulSet kind: StatefulSet
metadata: metadata:
name: {{ include "eechart.fullname" . }} name: {{ include "eechart.fullname" . }}
labels: labels:
{{ include "eechart.labels" . | indent 4 }} {{ include "eechart.labels" . | indent 4 }}
spec: spec:
serviceName: {{ include "eechart.fullname" . }} serviceName: {{ include "eechart.fullname" . }}
replicas: {{ .Values.replicaCount }} replicas: {{ .Values.replicaCount }}
selector: selector:
matchLabels: matchLabels:
app.kubernetes.io/name: {{ include "eechart.name" . }} app.kubernetes.io/name: {{ include "eechart.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
template: template:
metadata: metadata:
labels: labels:
app.kubernetes.io/name: {{ include "eechart.name" . }} app.kubernetes.io/name: {{ include "eechart.name" . }}
app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/instance: {{ .Release.Name }}
spec: spec:
imagePullSecrets: imagePullSecrets:
- name: regcred - name: regcred
serviceAccountName: {{ template "eechart.serviceAccountName" . }} serviceAccountName: {{ template "eechart.serviceAccountName" . }}
securityContext: securityContext:
runAsUser: 0 runAsUser: 0
containers: containers:
- name: {{ .Chart.Name }} - name: {{ .Chart.Name }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}" image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
imagePullPolicy: {{ .Values.image.pullPolicy }} imagePullPolicy: {{ .Values.image.pullPolicy }}
ports: ports:
- name: grpc - name: grpc
containerPort: 50051 containerPort: 50051
protocol: TCP protocol: TCP
resources: resources:
{{- toYaml .Values.resources | nindent 12 }} {{- toYaml .Values.resources | nindent 12 }}
volumeMounts: volumeMounts:
- name: osm-ee - name: osm-ee
mountPath: /app/storage mountPath: /app/storage
- name: osm-ee-source - name: osm-ee-source
mountPath: /app/EE/osm_ee/vnf mountPath: /app/EE/osm_ee/vnf
{{- if .Values.snmpexporter.enabled }} {{- if .Values.snmpexporter.enabled }}
- name: snmp-config-volume - name: snmp-config-volume
mountPath: /etc/snmp_exporter mountPath: /etc/snmp_exporter
- name: vnf-mibs - name: vnf-mibs
mountPath: /root/.snmp/mibs mountPath: /root/.snmp/mibs
- name: vnf-generator - name: vnf-generator
mountPath: /app/vnf/generator mountPath: /app/vnf/generator
{{- end }} {{- end }}
volumes: volumes:
- name: osm-ee-source - name: osm-ee-source
configMap: configMap:
name: {{ include "eechart.fullname" . }} name: {{ include "eechart.fullname" . }}
- name: osm-ee - name: osm-ee
hostPath: hostPath:
path: /var/lib/osm/osm/osm_osm_packages/_data path: /var/lib/osm/osm/osm_osm_packages/_data
{{- if .Values.snmpexporter.enabled }} {{- if .Values.snmpexporter.enabled }}
- name: snmp-config-volume - name: snmp-config-volume
hostPath: hostPath:
path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/" path: "/var/lib/osm/snmp_exporter/{{ .Values.global.osm.vnf_id | lower }}/"
- name: vnf-mibs - name: vnf-mibs
configMap: configMap:
name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}" name: "vnf-snmp-mibs-{{ .Values.global.osm.vnf_id | lower}}"
- name: vnf-generator - name: vnf-generator
configMap: configMap:
name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}" name: "vnf-snmp-generator-{{ .Values.global.osm.vnf_id | lower}}"
{{- end }} {{- end }}
nscharm_policy_vnf/nscharm_policy_vnfd.yaml
View file @ 993c6dcd
...@@ -41,9 +41,17 @@ vnfd: ...@@ -41,9 +41,17 @@ vnfd:
mgmt-cp: vnf-mgmt-ext mgmt-cp: vnf-mgmt-ext
product-name: nscharm-policy-vnf product-name: nscharm-policy-vnf
sw-image-desc: sw-image-desc:
- id: ubuntu1604 - id: ubuntu1804
image: ubuntu16.04 image: ubuntu18.04
name: ubuntu16.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: vdu:
- cloud-init-file: cloud-config.txt - cloud-init-file: cloud-config.txt
id: policyVM id: policyVM
...@@ -62,7 +70,10 @@ vnfd: ...@@ -62,7 +70,10 @@ vnfd:
virtual-interface: virtual-interface:
type: VIRTIO type: VIRTIO
name: policyVM 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-compute-desc: policyVM-compute
virtual-storage-desc: virtual-storage-desc:
- policyVM-storage - policyVM-storage
......
nscharm_user_vnf/nscharm_user_vnfd.yaml
View file @ 993c6dcd
...@@ -41,9 +41,17 @@ vnfd: ...@@ -41,9 +41,17 @@ vnfd:
mgmt-cp: vnf-mgmt-ext mgmt-cp: vnf-mgmt-ext
product-name: nscharm-user-vnf product-name: nscharm-user-vnf
sw-image-desc: sw-image-desc:
- id: ubuntu1604 - id: ubuntu1804
image: ubuntu16.04 image: ubuntu18.04
name: ubuntu16.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: vdu:
- cloud-init-file: cloud-config.txt - cloud-init-file: cloud-config.txt
id: userVM id: userVM
...@@ -62,7 +70,10 @@ vnfd: ...@@ -62,7 +70,10 @@ vnfd:
virtual-interface: virtual-interface:
type: VIRTIO type: VIRTIO
name: userVM 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-compute-desc: userVM-compute
virtual-storage-desc: virtual-storage-desc:
- userVM-storage - userVM-storage
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment