diff --git a/descriptor-packages/nsd/VyOS_ns/src/VyOS_nsd.yaml b/descriptor-packages/nsd/VyOS_ns/src/VyOS_nsd.yaml
index 4b833fedcb03020c1f38c952e5d8bfe6b0bc4a63..f263e40a5f818c4c0ac63be53cad2ef8a9de6fcb 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 @@ nsd:nsd-catalog:
- 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 cc613b3d83395309cdfa108fe98f7306bddcf3a4..01103f4376aec9b3b82e9e5015273efe74e7228a 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 @@ nsd:nsd-catalog:
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 465537cae8d86441e43a2eec35ec471f3f0e5807..161fc581e74116f418ae976f2f7759ccd86c0d46 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 @@ nsd:nsd-catalog:
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 281fdee236ae470e0ee67a9e30cb575ab33bb45e..974e2af5f05190b0c8116e9a5333d3139c12bf3b 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 @@ nsd:nsd-catalog:
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 6a16267ad84f1ac54287e0c73e1c153707ca3657..6a466941307eac29858baf6d5c746e2da6831604 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 @@ nsd:nsd-catalog:
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 4398ff0f59f1e3b7f2b285e5570f79b95dd17e79..b115d91e53be4f6eb5d9fdb5c67f9b1fa0d9ca07 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 @@ vnfd:vnfd-catalog:
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 @@ vnfd:vnfd-catalog:
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 2d28a548766daa84999bc8a34c03edbb20c17803..d34414e37efd5982d0010adccccfabc619edb71d 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 @@ vnfd:vnfd-catalog:
# Management interface
mgmt-interface:
- vdu-id: cirros_vnfd-VM
+ cp: eth0
# Atleast one VDU need to be specified
vdu:
@@ -36,8 +36,9 @@ vnfd:vnfd-catalog:
# 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 47f8d276590660e96d93d80f04b9e82d800f9bed..e868ae0e7805a80a49a2057d35377994e9206c30 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 @@ vnfd:vnfd-catalog:
# Management interface
mgmt-interface:
- vdu-id: cirros_vnfd-VM
+ cp: eth0
# Atleast one VDU need to be specified
vdu:
@@ -38,7 +38,7 @@ vnfd:vnfd-catalog:
- 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 d70d2b967fa49e026c71bb3b57e8b6081cada8f4..8a5f40fbfff897209b65ebc79489e9915ee8ac80 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:vnfd-catalog:
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:vnfd-catalog:
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 9e0cd92c4a21ad3ca7e69c3a962e8d70f8d15064..2b859ae68ef96dd7363e1f6178261039fbb40f39 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 @@ vnfd:vnfd-catalog:
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 @@ vnfd:vnfd-catalog:
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 f51012d713dec9d2cac622eaf13c17bc44186828..bfea21061cd8cafd6a30355cb3500f81a5bfe105 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 @@ vnfd:vnfd-catalog:
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 4c498885564bfd27bf5a80f7d037d54e152aef6b..536198b767a81ae2caefc7c757cd77deb059a626 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 @@ vnfd:vnfd-catalog:
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 dc207f965a4994ecf70f12216598fe0eeb417aea..3d8f7ce2cd1707cde6af51cf752b463fb245fa1a 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 @@ vnfd:vnfd-catalog:
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 @@ vnfd:vnfd-catalog:
- 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 860289591868ebe3200c4277dc19f6624aa68cbf..bdb2386995575bcae952dfa10f4ccc50a6175eba 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 @@ vnfd:vnfd-catalog:
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 @@ vnfd:vnfd-catalog:
- 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 3d25e94c6fc6a0a6d9ac3339702834d9bd1ad997..9284b8ee385a92e5c02f42eeed0706c742c9fa05 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 @@ vnfd:vnfd-catalog:
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 2b1806d8fcfc20484ef8ece5b1fcfaf92f902590..5a1a46d8e710d672073d79993bea751fa11684bd 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 @@ vnfd:vnfd-catalog:
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 26ed38bfb3d57874d9629dd8aa3bd15cb6aa1a57..3e6bcdd3e4aba649197f3422a60daba1d9fb1fe7 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 @@ vnfd:vnfd-catalog:
# 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 @@ vnfd:vnfd-catalog:
# 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 12d56fd099ff6b70ac7dfecf1b7fbdebdae8bb21..3cd208c90c2ac0c839fef9a5cc2cb9353b19999d 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 @@ vnfd:vnfd-catalog:
# 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 @@ vnfd:vnfd-catalog:
- 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 7d57eb6344ae89b937df7bfef23fc507ac65e0cf..11f3122385503f91acb710deee4fa4908c46c02a 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 @@ vnfd:vnfd-catalog:
# 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 @@ vnfd:vnfd-catalog:
# 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 846ccc881d7689fe87cf00ec0599bdfb12b8cd8e..f917054032e71c76d800560660c14663822b1af3 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 @@ vnfd:vnfd-catalog:
# Management interface
mgmt-interface:
- vdu-id: ubuntu_xenial_vnfd-VM
+ cp: eth0
# Atleast one VDU need to be specified
vdu:
@@ -39,7 +39,7 @@ vnfd:vnfd-catalog:
- name: eth0
type: EXTERNAL
virtual-interface:
- type: OM-MGMT
+ type: VIRTIO
bandwidth: '0'
vpci: 0000:00:0a.0
external-connection-point-ref: eth0