From cb1580250b0950c68164b1cd5b3ed9f8163f9089 Mon Sep 17 00:00:00 2001 From: gcalvino Date: Fri, 24 Nov 2017 14:04:53 +0100 Subject: [PATCH] NS and VNF descriptors updated to R. THREE Change-Id: I979386493ea242ec7ab691dd658c8507af43f46c Signed-off-by: gcalvino --- .../nsd/VyOS_ns/src/VyOS_nsd.yaml | 8 +- .../cirros_2vnf_ns/src/cirros_2vnf_nsd.yaml | 3 +- .../src/cirros_noportsecurity_2vnf_nsd.yaml | 15 ++-- .../nsd/cirros_ns/src/cirros_nsd.yaml | 3 +- .../src/cirros_set_vim_network_nsd.yaml | 9 +-- .../nsd/dns_aws_ns/src/dns_aws_nsd.yaml | 35 ++++----- .../ims_allin1_corpa/src/IMS-corpA__nsd.yaml | 7 +- .../nsd/ping_pong_ns/src/ping_pong_nsd.yaml | 2 +- .../nsd/ref1_ns/src/ref1_nsd.yaml | 2 +- .../nsd/ref2_ns/src/ref2_nsd.yaml | 2 +- .../src/ubuntu_cirros_multidisk_nsd.yaml | 2 +- .../src/ubuntu_cloudinit_nsd.yaml | 36 ++++----- .../src/ubuntu_epa_virtio_nsd.yaml | 2 +- .../vnfd/VyOS_vnf/src/VyOS__vnfd.yaml | 4 +- .../src/cirros_noportsecurity_vnfd.yaml | 4 +- .../vnfd/cirros_vnf/src/cirros_vnfd.yaml | 4 +- .../vnfd/dns_aws_vnfd/src/dns_aws_vnfd.yaml | 77 +++++++++---------- .../src/IMS-ALLIN1__vnfd.yaml | 6 +- .../vnfd/ping_vnf/src/ping_vnfd.yaml | 2 +- .../vnfd/pong_vnf/src/pong_vnfd.yaml | 2 +- .../vnfd/ref11_vnf/src/ref11_vnfd.yaml | 3 +- .../vnfd/ref12_vnf/src/ref12_vnfd.yaml | 3 +- .../vnfd/ref21_vnf/src/ref21_vnfd.yaml | 2 +- .../vnfd/ref22_vnf/src/ref22_vnfd.yaml | 2 +- .../ubuntu_1iface_cloudinit_newfile_vnfd.yaml | 2 +- .../src/ubuntu_cirros_multidisk_vnfd.yaml | 2 +- .../src/ubuntu_epa_virtio_vnfd.yaml | 2 +- .../src/ubuntu_xenial_vnfd.yaml | 2 +- 28 files changed, 114 insertions(+), 129 deletions(-) diff --git a/descriptor-packages/nsd/VyOS_ns/src/VyOS_nsd.yaml b/descriptor-packages/nsd/VyOS_ns/src/VyOS_nsd.yaml index f263e40a..b3f46110 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 @@ nsd:nsd-catalog: 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 @@ nsd:nsd-catalog: 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 @@ nsd:nsd-catalog: 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 298b8344..c573ab17 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 @@ nsd:nsd-catalog: mgmt-network: 'true' # vim-network-name: # provider-network: - # overlay-type: VLAN # segmentation_id: 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 57ec12b2..9e5a23ae 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 @@ nsd:nsd-catalog: mgmt-network: 'true' # vim-network-name: # provider-network: - # overlay-type: VLAN # segmentation_id: 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 d9d7476c..5c4e2149 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 @@ nsd:nsd-catalog: mgmt-network: 'true' # vim-network-name: # provider-network: - # overlay-type: VLAN # segmentation_id: 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 e3468308..2fabb3bf 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 @@ nsd:nsd-catalog: mgmt-network: 'true' # vim-network-name: # provider-network: - # overlay-type: VLAN # segmentation_id: vim-network-name: mgmt vnfd-connection-point-ref: @@ -45,7 +44,7 @@ nsd:nsd-catalog: # 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 d42568ce..a6b4a0d5 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 01103f43..3124886f 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 @@ nsd:nsd-catalog: 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 @@ nsd:nsd-catalog: 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 @@ nsd:nsd-catalog: 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 ec13b26a..bec59974 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 161fc581..d8c3813f 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 974e2af5..6f67ed24 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 5f1a8d5c..51cc963f 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 e768c778..fa9a5679 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 82e55b94..31378ef3 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 b115d91e..1d7689b4 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 @@ vnfd:vnfd-catalog: 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 ab353ff1..ed8900b8 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 @@ vnfd:vnfd-catalog: 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 436bf3f3..94fa5f1f 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 @@ vnfd:vnfd-catalog: 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 8a5f40fb..25b7e839 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 2b859ae6..fb903fcd 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 @@ vnfd:vnfd-catalog: mgmt-interface: cp: eth1 vnf-configuration: - service-primitive: + config-primitive: - name: config parameter: - name: home_domain @@ -16,7 +16,7 @@ vnfd:vnfd-catalog: 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 37b38440..0639419e 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 e69bdb10..4dfbab05 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 3d8f7ce2..d1b78400 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 @@ vnfd:vnfd-catalog: 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 bdb23869..ae534a8b 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 @@ vnfd:vnfd-catalog: 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 9284b8ee..58cd499f 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 5a1a46d8..02987b16 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 3e6bcdd3..53df870d 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 3cd208c9..9d56adbb 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 11f31223..9935f76f 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 f9170540..5d0eed02 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 -- 2.25.1