NSDs modified to set the management flag in management network. VNFDs modified to indicate the cp that will be used for management instead of using the interface type OM-MGMT
Signed-off-by: montesmoreno <pablo.montesmoreno@telefonica.com>
diff --git a/descriptor-packages/nsd/VyOS_ns/src/VyOS_nsd.yaml b/descriptor-packages/nsd/VyOS_ns/src/VyOS_nsd.yaml
index 4b833fe..f263e40 100644
--- a/descriptor-packages/nsd/VyOS_ns/src/VyOS_nsd.yaml
+++ b/descriptor-packages/nsd/VyOS_ns/src/VyOS_nsd.yaml
@@ -23,6 +23,7 @@
- id: management
name: management
short-name: management
+ mgmt-network: 'true'
type: ELAN
vim-network-name: net-mgmtOS
provider-network:
diff --git a/descriptor-packages/nsd/ims_allin1_corpa/src/IMS-corpA__nsd.yaml b/descriptor-packages/nsd/ims_allin1_corpa/src/IMS-corpA__nsd.yaml
index cc613b3..01103f4 100644
--- a/descriptor-packages/nsd/ims_allin1_corpa/src/IMS-corpA__nsd.yaml
+++ b/descriptor-packages/nsd/ims_allin1_corpa/src/IMS-corpA__nsd.yaml
@@ -23,6 +23,7 @@
vnfd-connection-point-ref: eth0
vnfd-id-ref: IMS-ALLIN1_2p
- id: management
+ mgmt-network: 'true'
name: management
short-name: management
type: ELAN
diff --git a/descriptor-packages/nsd/ref1_ns/src/ref1_nsd.yaml b/descriptor-packages/nsd/ref1_ns/src/ref1_nsd.yaml
index 465537c..161fc58 100644
--- a/descriptor-packages/nsd/ref1_ns/src/ref1_nsd.yaml
+++ b/descriptor-packages/nsd/ref1_ns/src/ref1_nsd.yaml
@@ -12,6 +12,7 @@
vendor: ETSI
vld:
- description: Mgmt VL
+ mgmt-network: 'true'
id: 54c04
name: VL1
short-name: VL1
diff --git a/descriptor-packages/nsd/ref2_ns/src/ref2_nsd.yaml b/descriptor-packages/nsd/ref2_ns/src/ref2_nsd.yaml
index 281fdee..974e2af 100644
--- a/descriptor-packages/nsd/ref2_ns/src/ref2_nsd.yaml
+++ b/descriptor-packages/nsd/ref2_ns/src/ref2_nsd.yaml
@@ -11,6 +11,7 @@
vendor: ETSI
vld:
- id: '97465'
+ mgmt-network: 'true'
name: VL1
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
diff --git a/descriptor-packages/nsd/ubuntu_xenial_ns/src/ubuntu_xenial_nsd.yaml b/descriptor-packages/nsd/ubuntu_xenial_ns/src/ubuntu_xenial_nsd.yaml
index 6a16267..6a46694 100644
--- a/descriptor-packages/nsd/ubuntu_xenial_ns/src/ubuntu_xenial_nsd.yaml
+++ b/descriptor-packages/nsd/ubuntu_xenial_ns/src/ubuntu_xenial_nsd.yaml
@@ -21,6 +21,7 @@
vld:
# Networks for the VNFs
- id: ubuntu_xenial_nsd_vld1
+ mgmt-network: 'true'
name: management
short-name: management
type: ELAN
diff --git a/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml b/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml
index 4398ff0..b115d91 100644
--- a/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml
+++ b/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml
@@ -6,7 +6,7 @@
description: VyOS Router
logo: osm_2x.png
mgmt-interface:
- vdu-id: VyOS-VM
+ cp: eth0
vnf-configuration:
service-primitive:
- name: config
@@ -64,7 +64,7 @@
type: EXTERNAL
virtual-interface:
bandwidth: '0'
- type: OM-MGMT
+ type: VIRTIO
vpci: 0000:00:0a.0
external-connection-point-ref: eth0
- name: eth1
diff --git a/descriptor-packages/vnfd/cirros_noportsecurity_vnf/src/cirros_noportsecurity_vnfd.yaml b/descriptor-packages/vnfd/cirros_noportsecurity_vnf/src/cirros_noportsecurity_vnfd.yaml
index 2d28a54..d34414e 100755
--- a/descriptor-packages/vnfd/cirros_noportsecurity_vnf/src/cirros_noportsecurity_vnfd.yaml
+++ b/descriptor-packages/vnfd/cirros_noportsecurity_vnf/src/cirros_noportsecurity_vnfd.yaml
@@ -12,7 +12,7 @@
# Management interface
mgmt-interface:
- vdu-id: cirros_vnfd-VM
+ cp: eth0
# Atleast one VDU need to be specified
vdu:
@@ -36,8 +36,9 @@
# Specify the external interfaces
# There can be multiple interfaces defined
- name: eth0
+ type: EXTERNAL
virtual-interface:
- type: OM-MGMT
+ type: VIRTIO
bandwidth: '0'
vpci: 0000:00:0a.0
external-connection-point-ref: eth0
diff --git a/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml b/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml
index 47f8d27..e868ae0 100644
--- a/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml
+++ b/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml
@@ -12,7 +12,7 @@
# Management interface
mgmt-interface:
- vdu-id: cirros_vnfd-VM
+ cp: eth0
# Atleast one VDU need to be specified
vdu:
@@ -38,7 +38,7 @@
- name: eth0
type: EXTERNAL
virtual-interface:
- type: OM-MGMT
+ type: VIRTIO
bandwidth: '0'
vpci: 0000:00:0a.0
external-connection-point-ref: eth0
diff --git a/descriptor-packages/vnfd/dns_aws_vnfd/src/dns_aws_vnfd.yaml b/descriptor-packages/vnfd/dns_aws_vnfd/src/dns_aws_vnfd.yaml
index d70d2b9..8a5f40f 100755
--- a/descriptor-packages/vnfd/dns_aws_vnfd/src/dns_aws_vnfd.yaml
+++ b/descriptor-packages/vnfd/dns_aws_vnfd/src/dns_aws_vnfd.yaml
@@ -8,7 +8,7 @@
vnfd:id: dns_forwarder
vnfd:logo: dns.jpg
vnfd:mgmt-interface:
- vnfd:vdu-id: dns_forwarder-VM
+ vnfd:cp: eth0
vnfd:name: dns_forwarder
vnfd:service-function-chain: UNAWARE
vnfd:short-name: dns_forwarder
@@ -17,9 +17,10 @@
vnfd:description: dns_forwarder-VM
vnfd:interface:
- vnfd:name: eth0
+ vnfd:type: EXTERNAL
vnfd:virtual-interface:
vnfd:bandwidth: '0'
- vnfd:type: OM-MGMT
+ vnfd:type: VIRTIO
vnfd:vpci: 0000:00:0a.0
vnfd:external-connection-point-ref: eth0
vnfd:guest-epa:
diff --git a/descriptor-packages/vnfd/ims_allin1_2p_vnf/src/IMS-ALLIN1__vnfd.yaml b/descriptor-packages/vnfd/ims_allin1_2p_vnf/src/IMS-ALLIN1__vnfd.yaml
index 9e0cd92..2b859ae 100644
--- a/descriptor-packages/vnfd/ims_allin1_2p_vnf/src/IMS-ALLIN1__vnfd.yaml
+++ b/descriptor-packages/vnfd/ims_allin1_2p_vnf/src/IMS-ALLIN1__vnfd.yaml
@@ -6,7 +6,7 @@
description: IMS-ALLIN1_2p
logo: metaswitch_2x.png
mgmt-interface:
- vdu-id: IMS-ALLIN1_2p-VM
+ cp: eth1
vnf-configuration:
service-primitive:
- name: config
@@ -67,7 +67,7 @@
type: EXTERNAL
virtual-interface:
bandwidth: '0'
- type: OM-MGMT
+ type: VIRTIO
vpci: 0000:00:0b.0
external-connection-point-ref: eth1
guest-epa:
diff --git a/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml b/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
index f51012d..bfea210 100644
--- a/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
+++ b/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
@@ -37,7 +37,7 @@
path: api/v1/ping/stats
port: '18888'
port: '18888'
- vdu-id: iovdu_0
+ cp: ping_vnfd/cp0
# placement-groups:
# - member-vdus:
# - member-vdu-ref: iovdu_0
diff --git a/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml b/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
index 4c49888..536198b 100644
--- a/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
+++ b/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
@@ -37,7 +37,7 @@
path: api/v1/pong/stats
port: '18889'
port: '18889'
- vdu-id: iovdu_0
+ cp: pong_vnfd/cp0
# placement-groups:
# - member-vdus:
# - member-vdu-ref: iovdu_0
diff --git a/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml b/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml
index dc207f9..3d8f7ce 100644
--- a/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml
+++ b/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml
@@ -9,6 +9,8 @@
id: Ref_Vnf_11
name: Ref_VNF_11
short-name: Ref_VNF_11
+ mgmt-interface:
+ cp: mgmt0
internal-vld:
- description: Internal VL
id: VL12
@@ -24,7 +26,7 @@
- name: iface10
type: EXTERNAL
virtual-interface:
- type: OM-MGMT
+ type: VIRTIO
external-connection-point-ref: mgmt0
- name: iface11
type: INTERNAL
diff --git a/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml b/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml
index 8602895..bdb2386 100644
--- a/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml
+++ b/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml
@@ -11,6 +11,8 @@
id: Ref_Vnf_12
name: Ref_Vnf_12
short-name: Ref_Vnf_12
+ mgmt-interface:
+ cp: mgmt0
internal-vld:
- description: Internal VL
id: VL34
@@ -27,7 +29,7 @@
- name: iface30
type: EXTERNAL
virtual-interface:
- type: OM-MGMT
+ type: VIRTIO
external-connection-point-ref: mgmt0
- name: iface31
type: INTERNAL
diff --git a/descriptor-packages/vnfd/ref21_vnf/src/ref21_vnfd.yaml b/descriptor-packages/vnfd/ref21_vnf/src/ref21_vnfd.yaml
index 3d25e94..9284b8e 100644
--- a/descriptor-packages/vnfd/ref21_vnf/src/ref21_vnfd.yaml
+++ b/descriptor-packages/vnfd/ref21_vnf/src/ref21_vnfd.yaml
@@ -9,12 +9,14 @@
id: Ref_Vnf_21
name: Ref_Vnf_21
short-name: Ref_Vnf_21
+ mgmt-interface:
+ cp: mgmt
vdu:
- interface:
- name: iface50
type: EXTERNAL
virtual-interface:
- type: OM-MGMT
+ type: VIRTIO
external-connection-point-ref: mgmt
- name: iface51
type: EXTERNAL
diff --git a/descriptor-packages/vnfd/ref22_vnf/src/ref22_vnfd.yaml b/descriptor-packages/vnfd/ref22_vnf/src/ref22_vnfd.yaml
index 2b1806d..5a1a46d 100644
--- a/descriptor-packages/vnfd/ref22_vnf/src/ref22_vnfd.yaml
+++ b/descriptor-packages/vnfd/ref22_vnf/src/ref22_vnfd.yaml
@@ -11,12 +11,14 @@
id: Ref_Vnf_22
name: Ref_VNF_22
short-name: Ref_VNF_22
+ mgmt-interface:
+ cp: mgmt
vdu:
- interface:
- name: iface60
type: EXTERNAL
virtual-interface:
- type: OM-MGMT
+ type: VIRTIO
external-connection-point-ref: mgmt
- name: iface61
type: EXTERNAL
diff --git a/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/ubuntu_1iface_cloudinit_newfile_vnfd.yaml b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/ubuntu_1iface_cloudinit_newfile_vnfd.yaml
index 26ed38b..3e6bcdd 100644
--- a/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/ubuntu_1iface_cloudinit_newfile_vnfd.yaml
+++ b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/ubuntu_1iface_cloudinit_newfile_vnfd.yaml
@@ -12,7 +12,7 @@
# Management interface
mgmt-interface:
- vdu-id: ubuntu_1iface_cloudinit_newfile_vnfd-VM
+ cp: eth0
# Atleast one VDU need to be specified
vdu:
@@ -37,8 +37,9 @@
# Specify the external interfaces
# There can be multiple interfaces defined
- name: eth0
+ type: EXTERNAL
virtual-interface:
- type: OM-MGMT
+ type: VIRTIO
bandwidth: '0'
vpci: 0000:00:0a.0
external-connection-point-ref: eth0
diff --git a/descriptor-packages/vnfd/ubuntu_cirros_multidisk_vnf/src/ubuntu_cirros_multidisk_vnfd.yaml b/descriptor-packages/vnfd/ubuntu_cirros_multidisk_vnf/src/ubuntu_cirros_multidisk_vnfd.yaml
index 12d56fd..3cd208c 100644
--- a/descriptor-packages/vnfd/ubuntu_cirros_multidisk_vnf/src/ubuntu_cirros_multidisk_vnfd.yaml
+++ b/descriptor-packages/vnfd/ubuntu_cirros_multidisk_vnf/src/ubuntu_cirros_multidisk_vnfd.yaml
@@ -9,7 +9,7 @@
# Management interface
mgmt-interface:
- vdu-id: ubuntu_cirros_multidisk_vnfd-VM
+ cp: eth0
# Atleast one VDU need to be specified
vdu:
@@ -33,7 +33,7 @@
- name: eth0
type: EXTERNAL
virtual-interface:
- type: OM-MGMT
+ type: VIRTIO
external-connection-point-ref: eth0
# Specify the volume
# There can be multiple interfaces defined
diff --git a/descriptor-packages/vnfd/ubuntu_epa_virtio_vnf/src/ubuntu_epa_virtio_vnfd.yaml b/descriptor-packages/vnfd/ubuntu_epa_virtio_vnf/src/ubuntu_epa_virtio_vnfd.yaml
index 7d57eb6..11f3122 100644
--- a/descriptor-packages/vnfd/ubuntu_epa_virtio_vnf/src/ubuntu_epa_virtio_vnfd.yaml
+++ b/descriptor-packages/vnfd/ubuntu_epa_virtio_vnf/src/ubuntu_epa_virtio_vnfd.yaml
@@ -12,7 +12,7 @@
# Management interface
mgmt-interface:
- vdu-id: ubuntu_epa_virtio_vnf-VM
+ cp: eth0
# Atleast one VDU need to be specified
vdu:
@@ -33,8 +33,9 @@
# Specify the external interfaces
# There can be multiple interfaces defined
- name: eth0
+ type: EXTERNAL
virtual-interface:
- type: OM-MGMT
+ type: VIRTIO
bandwidth: '0'
vpci: 0000:00:0a.0
external-connection-point-ref: eth0
diff --git a/descriptor-packages/vnfd/ubuntu_xenial_vnf/src/ubuntu_xenial_vnfd.yaml b/descriptor-packages/vnfd/ubuntu_xenial_vnf/src/ubuntu_xenial_vnfd.yaml
index 846ccc8..f917054 100644
--- a/descriptor-packages/vnfd/ubuntu_xenial_vnf/src/ubuntu_xenial_vnfd.yaml
+++ b/descriptor-packages/vnfd/ubuntu_xenial_vnf/src/ubuntu_xenial_vnfd.yaml
@@ -12,7 +12,7 @@
# Management interface
mgmt-interface:
- vdu-id: ubuntu_xenial_vnfd-VM
+ cp: eth0
# Atleast one VDU need to be specified
vdu:
@@ -39,7 +39,7 @@
- name: eth0
type: EXTERNAL
virtual-interface:
- type: OM-MGMT
+ type: VIRTIO
bandwidth: '0'
vpci: 0000:00:0a.0
external-connection-point-ref: eth0