NS and VNF descriptors updated to R. THREE
Change-Id: I979386493ea242ec7ab691dd658c8507af43f46c
Signed-off-by: gcalvino <guillermo.calvinosanchez@altran.com>
diff --git a/descriptor-packages/nsd/VyOS_ns/src/VyOS_nsd.yaml b/descriptor-packages/nsd/VyOS_ns/src/VyOS_nsd.yaml
index f263e40..b3f4611 100644
--- a/descriptor-packages/nsd/VyOS_ns/src/VyOS_nsd.yaml
+++ b/descriptor-packages/nsd/VyOS_ns/src/VyOS_nsd.yaml
@@ -1,4 +1,4 @@
-nsd:nsd-catalog:
+nsd-catalog:
nsd:
- id: VyOS
name: VyOS
@@ -14,8 +14,6 @@
short-name: data
type: ELAN
vim-network-name: net-corp
- provider-network:
- overlay-type: VLAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: eth1
@@ -26,8 +24,6 @@
mgmt-network: 'true'
type: ELAN
vim-network-name: net-mgmtOS
- provider-network:
- overlay-type: VLAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: eth0
@@ -48,4 +44,4 @@
vnfd-name: VyOS
primitive:
- index: '1'
- name: ping
+ name: ping
\ No newline at end of file
diff --git a/descriptor-packages/nsd/cirros_2vnf_ns/src/cirros_2vnf_nsd.yaml b/descriptor-packages/nsd/cirros_2vnf_ns/src/cirros_2vnf_nsd.yaml
index 298b834..c573ab1 100644
--- a/descriptor-packages/nsd/cirros_2vnf_ns/src/cirros_2vnf_nsd.yaml
+++ b/descriptor-packages/nsd/cirros_2vnf_ns/src/cirros_2vnf_nsd.yaml
@@ -1,4 +1,4 @@
-nsd:nsd-catalog:
+nsd-catalog:
nsd:
- id: cirros_2vnf_nsd
name: cirros_2vnf_ns
@@ -30,7 +30,6 @@
mgmt-network: 'true'
# vim-network-name: <update>
# provider-network:
- # overlay-type: VLAN
# segmentation_id: <update>
vnfd-connection-point-ref:
# Specify the constituent VNFs
diff --git a/descriptor-packages/nsd/cirros_noportsecurity_2vnf_ns/src/cirros_noportsecurity_2vnf_nsd.yaml b/descriptor-packages/nsd/cirros_noportsecurity_2vnf_ns/src/cirros_noportsecurity_2vnf_nsd.yaml
index 57ec12b..9e5a23a 100644
--- a/descriptor-packages/nsd/cirros_noportsecurity_2vnf_ns/src/cirros_noportsecurity_2vnf_nsd.yaml
+++ b/descriptor-packages/nsd/cirros_noportsecurity_2vnf_ns/src/cirros_noportsecurity_2vnf_nsd.yaml
@@ -1,4 +1,4 @@
-nsd:nsd-catalog:
+nsd-catalog:
nsd:
- id: cirros_noportsecurity_2vnf_nsd
name: cirros_noportsecurity_2vnf_ns
@@ -30,16 +30,15 @@
mgmt-network: 'true'
# vim-network-name: <update>
# provider-network:
- # overlay-type: VLAN
# segmentation_id: <update>
vnfd-connection-point-ref:
# Specify the constituent VNFs
# member-vnf-index-ref - entry from constituent vnf
# vnfd-id-ref - VNFD id
# vnfd-connection-point-ref - connection point name in the VNFD
- - nsd:member-vnf-index-ref: 1
- nsd:vnfd-id-ref: cirros_noportsecurity_vnfd
- nsd:vnfd-connection-point-ref: eth0
- - nsd:member-vnf-index-ref: 2
- nsd:vnfd-id-ref: cirros_noportsecurity_vnfd
- nsd:vnfd-connection-point-ref: eth0
+ - member-vnf-index-ref: 1
+ vnfd-id-ref: cirros_noportsecurity_vnfd
+ vnfd-connection-point-ref: eth0
+ - member-vnf-index-ref: 2
+ vnfd-id-ref: cirros_noportsecurity_vnfd
+ vnfd-connection-point-ref: eth0
diff --git a/descriptor-packages/nsd/cirros_ns/src/cirros_nsd.yaml b/descriptor-packages/nsd/cirros_ns/src/cirros_nsd.yaml
index d9d7476..5c4e214 100644
--- a/descriptor-packages/nsd/cirros_ns/src/cirros_nsd.yaml
+++ b/descriptor-packages/nsd/cirros_ns/src/cirros_nsd.yaml
@@ -1,4 +1,4 @@
-nsd:nsd-catalog:
+nsd-catalog:
nsd:
- id: cirros_nsd
name: cirros_ns
@@ -37,7 +37,6 @@
mgmt-network: 'true'
# vim-network-name: <update>
# provider-network:
- # overlay-type: VLAN
# segmentation_id: <update>
vnfd-connection-point-ref:
# Specify the constituent VNFs
diff --git a/descriptor-packages/nsd/cirros_set_vim_network_ns/src/cirros_set_vim_network_nsd.yaml b/descriptor-packages/nsd/cirros_set_vim_network_ns/src/cirros_set_vim_network_nsd.yaml
index e346830..2fabb3b 100755
--- a/descriptor-packages/nsd/cirros_set_vim_network_ns/src/cirros_set_vim_network_nsd.yaml
+++ b/descriptor-packages/nsd/cirros_set_vim_network_ns/src/cirros_set_vim_network_nsd.yaml
@@ -1,4 +1,4 @@
-nsd:nsd-catalog:
+nsd-catalog:
nsd:
- id: cirros_set_vim_network_ns
name: cirros_set_vim_network_ns
@@ -37,7 +37,6 @@
mgmt-network: 'true'
# vim-network-name: <update>
# provider-network:
- # overlay-type: VLAN
# segmentation_id: <update>
vim-network-name: mgmt
vnfd-connection-point-ref:
@@ -45,7 +44,7 @@
# member-vnf-index-ref - entry from constituent vnf
# vnfd-id-ref - VNFD id
# vnfd-connection-point-ref - connection point name in the VNFD
- - nsd:member-vnf-index-ref: 1
- nsd:vnfd-id-ref: cirros_vnfd
+ - member-vnf-index-ref: 1
+ vnfd-id-ref: cirros_vnfd
# NOTE: Validate the entry below
- nsd:vnfd-connection-point-ref: eth0
+ vnfd-connection-point-ref: eth0
diff --git a/descriptor-packages/nsd/dns_aws_ns/src/dns_aws_nsd.yaml b/descriptor-packages/nsd/dns_aws_ns/src/dns_aws_nsd.yaml
index d42568c..a6b4a0d 100755
--- a/descriptor-packages/nsd/dns_aws_ns/src/dns_aws_nsd.yaml
+++ b/descriptor-packages/nsd/dns_aws_ns/src/dns_aws_nsd.yaml
@@ -1,19 +1,18 @@
nsd:nsd-catalog:
- nsd:nsd:
- - nsd:constituent-vnfd:
- - nsd:member-vnf-index: '1'
- nsd:start-by-default: 'true'
- nsd:vnfd-id-ref: dns_forwarder
- nsd:id: dns_forwarder_ns
- nsd:logo: dns.jpg
- nsd:name: dns_forwarder_ns
- nsd:vld:
- - nsd:id: management
- nsd:mgmt-network: 'true'
- nsd:name: management
- nsd:vim-network-name: subnet-8a91b2c0
- nsd:vnfd-connection-point-ref:
- - nsd:member-vnf-index-ref: '1'
- nsd:vnfd-connection-point-ref: eth0
- nsd:vnfd-id-ref: dns_forwarder
- rw-nsd:meta: '{"containerPositionMap":{"1":{"top":210.5,"left":248,"right":498,"bottom":265.5,"width":250,"height":55},"ada27681-7f3e-4768-8be8-41973f849066":{"top":30,"left":135,"right":385,"bottom":85,"width":250,"height":55},"vld-1":{"top":60,"left":495,"right":745,"bottom":98,"width":250,"height":38},"management":{"top":90,"left":480,"right":730,"bottom":128,"width":250,"height":38}}}'
+ nsd:
+ - constituent-vnfd:
+ - member-vnf-index: '1'
+ start-by-default: 'true'
+ vnfd-id-ref: dns_forwarder
+ id: dns_forwarder_ns
+ logo: dns.jpg
+ name: dns_forwarder_ns
+ vld:
+ - id: management
+ mgmt-network: 'true'
+ name: management
+ vim-network-name: subnet-8a91b2c0
+ vnfd-connection-point-ref:
+ - member-vnf-index-ref: '1'
+ vnfd-connection-point-ref: eth0
+ vnfd-id-ref: dns_forwarder
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 01103f4..3124886 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
@@ -1,4 +1,4 @@
-nsd:nsd-catalog:
+nsd-catalog:
nsd:
- id: IMS-corpA
name: IMS-corpA
@@ -15,7 +15,6 @@
type: ELAN
vim-network-name: net-corp:108
provider-network:
- overlay-type: VLAN
physical-network: net-corp
segmentation_id: '108'
vnfd-connection-point-ref:
@@ -28,8 +27,6 @@
short-name: management
type: ELAN
vim-network-name: net-mgmtOS
- provider-network:
- overlay-type: VLAN
vnfd-connection-point-ref:
- member-vnf-index-ref: '1'
vnfd-connection-point-ref: eth1
@@ -58,4 +55,4 @@
vnfd-name: cwims_vnfd
primitive:
- index: '1'
- name: delete-user
+ name: delete-user
\ No newline at end of file
diff --git a/descriptor-packages/nsd/ping_pong_ns/src/ping_pong_nsd.yaml b/descriptor-packages/nsd/ping_pong_ns/src/ping_pong_nsd.yaml
index ec13b26..bec5997 100644
--- a/descriptor-packages/nsd/ping_pong_ns/src/ping_pong_nsd.yaml
+++ b/descriptor-packages/nsd/ping_pong_ns/src/ping_pong_nsd.yaml
@@ -15,7 +15,7 @@
#
#
-nsd:nsd-catalog:
+nsd-catalog:
nsd:
- id: rift_ping_pong_ns
logo: rift_logo.png
diff --git a/descriptor-packages/nsd/ref1_ns/src/ref1_nsd.yaml b/descriptor-packages/nsd/ref1_ns/src/ref1_nsd.yaml
index 161fc58..d8c3813 100644
--- a/descriptor-packages/nsd/ref1_ns/src/ref1_nsd.yaml
+++ b/descriptor-packages/nsd/ref1_ns/src/ref1_nsd.yaml
@@ -1,4 +1,4 @@
-nsd:nsd-catalog:
+nsd-catalog:
nsd:
- constituent-vnfd:
- member-vnf-index: '1'
diff --git a/descriptor-packages/nsd/ref2_ns/src/ref2_nsd.yaml b/descriptor-packages/nsd/ref2_ns/src/ref2_nsd.yaml
index 974e2af..6f67ed2 100644
--- a/descriptor-packages/nsd/ref2_ns/src/ref2_nsd.yaml
+++ b/descriptor-packages/nsd/ref2_ns/src/ref2_nsd.yaml
@@ -1,4 +1,4 @@
-nsd:nsd-catalog:
+nsd-catalog:
nsd:
- constituent-vnfd:
- member-vnf-index: '1'
diff --git a/descriptor-packages/nsd/ubuntu_cirros_multidisk_ns/src/ubuntu_cirros_multidisk_nsd.yaml b/descriptor-packages/nsd/ubuntu_cirros_multidisk_ns/src/ubuntu_cirros_multidisk_nsd.yaml
index 5f1a8d5..51cc963 100644
--- a/descriptor-packages/nsd/ubuntu_cirros_multidisk_ns/src/ubuntu_cirros_multidisk_nsd.yaml
+++ b/descriptor-packages/nsd/ubuntu_cirros_multidisk_ns/src/ubuntu_cirros_multidisk_nsd.yaml
@@ -1,4 +1,4 @@
-nsd:nsd-catalog:
+nsd-catalog:
nsd:
- id: ubuntu_cirros_multidisk_nsd
name: ubuntu_cirros_multidisk_nsd
diff --git a/descriptor-packages/nsd/ubuntu_cloudinit_ns/src/ubuntu_cloudinit_nsd.yaml b/descriptor-packages/nsd/ubuntu_cloudinit_ns/src/ubuntu_cloudinit_nsd.yaml
index e768c77..fa9a567 100755
--- a/descriptor-packages/nsd/ubuntu_cloudinit_ns/src/ubuntu_cloudinit_nsd.yaml
+++ b/descriptor-packages/nsd/ubuntu_cloudinit_ns/src/ubuntu_cloudinit_nsd.yaml
@@ -1,19 +1,19 @@
-nsd:nsd-catalog:
- nsd:nsd:
- - nsd:constituent-vnfd:
- - nsd:member-vnf-index: '1'
- nsd:start-by-default: 'true'
- nsd:vnfd-id-ref: ubuntu_1iface_cloudinit_newfile_vnfd
- nsd:id: ubuntu_cloudinit
- nsd:name: ubuntu_cloudinit
- nsd:short-name: ubuntu_cloudinit
- nsd:vld:
- - nsd:id: mgmt
- nsd:mgmt-network: 'false'
- nsd:name: mgmt
- nsd:short-name: mgmt
+nsd-catalog:
+ nsd:
+ - constituent-vnfd:
+ - member-vnf-index: '1'
+ start-by-default: 'true'
+ vnfd-id-ref: ubuntu_1iface_cloudinit_newfile_vnfd
+ id: ubuntu_cloudinit
+ name: ubuntu_cloudinit
+ short-name: ubuntu_cloudinit
+ vld:
+ - id: mgmt
+ mgmt-network: 'false'
+ name: mgmt
+ short-name: mgmt
mgmt-network: 'true'
- nsd:vnfd-connection-point-ref:
- - nsd:member-vnf-index-ref: '1'
- nsd:vnfd-connection-point-ref: eth0
- nsd:vnfd-id-ref: ubuntu_1iface_cloudinit_newfile_vnfd
+ vnfd-connection-point-ref:
+ - member-vnf-index-ref: '1'
+ vnfd-connection-point-ref: eth0
+ vnfd-id-ref: ubuntu_1iface_cloudinit_newfile_vnfd
diff --git a/descriptor-packages/nsd/ubuntu_epa_virtio_ns/src/ubuntu_epa_virtio_nsd.yaml b/descriptor-packages/nsd/ubuntu_epa_virtio_ns/src/ubuntu_epa_virtio_nsd.yaml
index 82e55b9..31378ef 100755
--- a/descriptor-packages/nsd/ubuntu_epa_virtio_ns/src/ubuntu_epa_virtio_nsd.yaml
+++ b/descriptor-packages/nsd/ubuntu_epa_virtio_ns/src/ubuntu_epa_virtio_nsd.yaml
@@ -1,4 +1,4 @@
-nsd:nsd-catalog:
+nsd-catalog:
nsd:
- id: ubuntu_epa_virtio_ns
name: ubuntu_epa_virtio_ns
diff --git a/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml b/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml
index b115d91..1d7689b 100644
--- a/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml
+++ b/descriptor-packages/vnfd/VyOS_vnf/src/VyOS__vnfd.yaml
@@ -1,4 +1,4 @@
-vnfd:vnfd-catalog:
+vnfd-catalog:
vnfd:
- id: VyOS
name: VyOS
@@ -8,7 +8,7 @@
mgmt-interface:
cp: eth0
vnf-configuration:
- service-primitive:
+ config-primitive:
- name: config
parameter:
- name: user
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 ab353ff..ed8900b 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
@@ -1,4 +1,4 @@
-vnfd:vnfd-catalog:
+vnfd-catalog:
vnfd:
- id: cirros_noportsecurity_vnfd
name: cirros_noportsecurity_vnf
@@ -29,7 +29,7 @@
storage-gb: 2
# Image/checksum or image including the full path
- image: cirros034
+ image: 'cirros034'
#checksum:
interface:
diff --git a/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml b/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml
index 436bf3f..94fa5f1 100644
--- a/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml
+++ b/descriptor-packages/vnfd/cirros_vnf/src/cirros_vnfd.yaml
@@ -1,4 +1,4 @@
-vnfd:vnfd-catalog:
+vnfd-catalog:
vnfd:
- id: cirros_vnfd
name: cirros_vnf
@@ -29,7 +29,7 @@
storage-gb: 2
# Image/checksum or image including the full path
- image: cirros034
+ image: 'cirros034'
#checksum:
interface:
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 8a5f40f..25b7e83 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
@@ -1,39 +1,38 @@
-vnfd:vnfd-catalog:
- vnfd:vnfd:
- - rw-vnfd:meta: '{"containerPositionMap":{"dns_forwarder":{"top":30,"left":260,"right":510,"bottom":85,"width":250,"height":55},"dns_forwarder/dns_forwarder-VM":{"top":130,"left":260,"right":510,"bottom":185,"width":250,"height":55}}}'
- vnfd:connection-point:
- - vnfd:name: eth0
- vnfd:type: VPORT
- vnfd:description: Simple VNF example with a DNS forwarder
- vnfd:id: dns_forwarder
- vnfd:logo: dns.jpg
- vnfd:mgmt-interface:
- vnfd:cp: eth0
- vnfd:name: dns_forwarder
- vnfd:service-function-chain: UNAWARE
- vnfd:short-name: dns_forwarder
- vnfd:vdu:
- - vnfd:count: '1'
- vnfd:description: dns_forwarder-VM
- vnfd:interface:
- - vnfd:name: eth0
- vnfd:type: EXTERNAL
- vnfd:virtual-interface:
- vnfd:bandwidth: '0'
- vnfd:type: VIRTIO
- vnfd:vpci: 0000:00:0a.0
- vnfd:external-connection-point-ref: eth0
- vnfd:guest-epa:
- vnfd:cpu-pinning-policy: ANY
- vnfd:id: dns_forwarder-VM
- vnfd:image: ubuntu/images/hvm-ssd/ubuntu-zesty-17.04-amd64-server-20170619.1
- vnfd:cloud-init-file: cloud_init.cfg
- vnfd:name: dns_forwarder-VM
- vnfd:supplemental-boot-data:
- vnfd:boot-data-drive: 'false'
- vnfd:vm-flavor:
- vnfd:memory-mb: '1024'
- vnfd:storage-gb: '1'
- vnfd:vcpu-count: '1'
- vnfd:vendor: OSM
- vnfd:version: '1.0'
+vnfd-catalog:
+ vnfd:
+ - connection-point:
+ - name: eth0
+ type: VPORT
+ description: Simple VNF example with a DNS forwarder
+ id: dns_forwarder
+ logo: dns.jpg
+ mgmt-interface:
+ cp: eth0
+ name: dns_forwarder
+ service-function-chain: UNAWARE
+ short-name: dns_forwarder
+ vdu:
+ - count: '1'
+ description: dns_forwarder-VM
+ interface:
+ - name: eth0
+ type: EXTERNAL
+ virtual-interface:
+ bandwidth: '0'
+ type: VIRTIO
+ vpci: 0000:00:0a.0
+ external-connection-point-ref: eth0
+ guest-epa:
+ cpu-pinning-policy: ANY
+ id: dns_forwarder-VM
+ image: ubuntu/images/hvm-ssd/ubuntu-zesty-17.04-amd64-server-20170619.1
+ cloud-init-file: cloud_init.cfg
+ name: dns_forwarder-VM
+ supplemental-boot-data:
+ boot-data-drive: 'false'
+ vm-flavor:
+ memory-mb: '1024'
+ storage-gb: '1'
+ vcpu-count: '1'
+ vendor: OSM
+ version: '1.0'
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 2b859ae..fb903fc 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
@@ -1,4 +1,4 @@
-vnfd:vnfd-catalog:
+vnfd-catalog:
vnfd:
- id: IMS-ALLIN1_2p
name: IMS-ALLIN1_2p
@@ -8,7 +8,7 @@
mgmt-interface:
cp: eth1
vnf-configuration:
- service-primitive:
+ config-primitive:
- name: config
parameter:
- name: home_domain
@@ -16,7 +16,7 @@
mandatory: 'true'
default-value: ims.com
- name: password
- data-type: string
+ data-type: STRING
mandatory: 'true'
default-value: cw-aio
- name: create-update-user
diff --git a/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml b/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
index 37b3844..0639419 100644
--- a/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
+++ b/descriptor-packages/vnfd/ping_vnf/src/ping_vnfd.yaml
@@ -15,7 +15,7 @@
#
#
-vnfd:vnfd-catalog:
+vnfd-catalog:
vnfd:
- id: rift_ping_vnf
name: ping_vnf
diff --git a/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml b/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
index e69bdb1..4dfbab0 100644
--- a/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
+++ b/descriptor-packages/vnfd/pong_vnf/src/pong_vnfd.yaml
@@ -15,7 +15,7 @@
#
#
-vnfd:vnfd-catalog:
+vnfd-catalog:
vnfd:
- id: rift_pong_vnf
name: pong_vnf
diff --git a/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml b/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml
index 3d8f7ce..d1b7840 100644
--- a/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml
+++ b/descriptor-packages/vnfd/ref11_vnf/src/ref11_vnfd.yaml
@@ -1,4 +1,4 @@
-vnfd:vnfd-catalog:
+vnfd-catalog:
vnfd:
- connection-point:
- name: mgmt0
@@ -17,7 +17,6 @@
name: VL12
short-name: VL12
type: ELAN
- vendor: ETSI
internal-connection-point:
- id-ref: 'iface11'
- id-ref: 'iface21'
diff --git a/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml b/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml
index bdb2386..ae534a8 100644
--- a/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml
+++ b/descriptor-packages/vnfd/ref12_vnf/src/ref12_vnfd.yaml
@@ -1,4 +1,4 @@
-vnfd:vnfd-catalog:
+vnfd-catalog:
vnfd:
- connection-point:
- name: mgmt0
@@ -19,7 +19,6 @@
name: VL34
short-name: VL34
type: ELAN
- vendor: ETSI
internal-connection-point:
- id-ref: 'iface31'
- id-ref: 'iface41'
diff --git a/descriptor-packages/vnfd/ref21_vnf/src/ref21_vnfd.yaml b/descriptor-packages/vnfd/ref21_vnf/src/ref21_vnfd.yaml
index 9284b8e..58cd499 100644
--- a/descriptor-packages/vnfd/ref21_vnf/src/ref21_vnfd.yaml
+++ b/descriptor-packages/vnfd/ref21_vnf/src/ref21_vnfd.yaml
@@ -1,4 +1,4 @@
-vnfd:vnfd-catalog:
+vnfd-catalog:
vnfd:
- connection-point:
- name: mgmt
diff --git a/descriptor-packages/vnfd/ref22_vnf/src/ref22_vnfd.yaml b/descriptor-packages/vnfd/ref22_vnf/src/ref22_vnfd.yaml
index 5a1a46d..02987b1 100644
--- a/descriptor-packages/vnfd/ref22_vnf/src/ref22_vnfd.yaml
+++ b/descriptor-packages/vnfd/ref22_vnf/src/ref22_vnfd.yaml
@@ -1,4 +1,4 @@
-vnfd:vnfd-catalog:
+vnfd-catalog:
vnfd:
- connection-point:
- name: mgmt
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 3e6bcdd..53df870 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
@@ -1,4 +1,4 @@
-vnfd:vnfd-catalog:
+vnfd-catalog:
vnfd:
- id: ubuntu_1iface_cloudinit_newfile_vnfd
name: ubuntu_1iface_cloudinit_newfile_vnf
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 3cd208c..9d56adb 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
@@ -1,4 +1,4 @@
-vnfd:vnfd-catalog:
+vnfd-catalog:
vnfd:
- id: ubuntu_cirros_multidisk_vnfd
name: ubuntu_cirros_multidisk_vnfd
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 11f3122..9935f76 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
@@ -1,4 +1,4 @@
-vnfd:vnfd-catalog:
+vnfd-catalog:
vnfd:
- id: ubuntu_epa_virtio_vnf
name: ubuntu_epa_virtio_vnf
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 f917054..5d0eed0 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
@@ -1,4 +1,4 @@
-vnfd:vnfd-catalog:
+vnfd-catalog:
vnfd:
- id: ubuntu_xenial_vnfd
name: ubuntu_xenial_vnf