From 1cde0ebbb44dcbd9f7b9357d60fa3a2ef6f71841 Mon Sep 17 00:00:00 2001 From: montesmoreno Date: Thu, 2 Nov 2017 09:32:01 +0000 Subject: [PATCH] Added management network flag to NS descriptors that did not include it. Moved vnf descriptor located in nsd directory Signed-off-by: montesmoreno --- .../nsd/cirros_2vnf_ns/src/cirros_2vnf_nsd.yaml | 1 + .../src/cirros_noportsecurity_2vnf_nsd.yaml | 1 + .../src/cirros_set_vim_network_nsd.yaml | 1 + .../src/ubuntu_cirros_multidisk_nsd.yaml | 1 + .../src/ubuntu_cloudinit_nsd.yaml | 1 + .../src/ubuntu_epa_virtio_nsd.yaml | 1 + .../{nsd => vnfd}/dns_aws_vnfd/Makefile | 0 .../dns_aws_vnfd/src/cloud_init/cloud_init.cfg | 0 .../dns_aws_vnfd/src/dns_aws_vnfd.yaml | 0 .../{nsd => vnfd}/dns_aws_vnfd/src/icons/dns.jpg | Bin 10 files changed, 6 insertions(+) rename descriptor-packages/{nsd => vnfd}/dns_aws_vnfd/Makefile (100%) rename descriptor-packages/{nsd => vnfd}/dns_aws_vnfd/src/cloud_init/cloud_init.cfg (100%) rename descriptor-packages/{nsd => vnfd}/dns_aws_vnfd/src/dns_aws_vnfd.yaml (100%) rename descriptor-packages/{nsd => vnfd}/dns_aws_vnfd/src/icons/dns.jpg (100%) 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 200f1538..298b8344 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 @@ -27,6 +27,7 @@ nsd:nsd-catalog: name: cirros_2vnf_nsd_vld1 short-name: cirros_2vnf_nsd_vld1 type: ELAN + mgmt-network: 'true' # vim-network-name: # provider-network: # overlay-type: VLAN 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 5f048abd..57ec12b2 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 @@ -27,6 +27,7 @@ nsd:nsd-catalog: name: cirros_2vnf_nsd_vld1 short-name: cirros_2vnf_nsd_vld1 type: ELAN + mgmt-network: 'true' # vim-network-name: # provider-network: # overlay-type: VLAN 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 e87d4f2f..e3468308 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 @@ -34,6 +34,7 @@ nsd:nsd-catalog: - id: cirros_nsd_vld1 name: cirros_nsd_vld1 type: ELAN + mgmt-network: 'true' # vim-network-name: # provider-network: # overlay-type: VLAN 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 cbbe6a20..5f1a8d5c 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 @@ -24,6 +24,7 @@ nsd:nsd-catalog: name: management short-name: management type: ELAN + mgmt-network: 'true' vnfd-connection-point-ref: # Specify the constituent VNFs - member-vnf-index-ref: 1 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 9b442824..e768c778 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 @@ -12,6 +12,7 @@ nsd:nsd-catalog: nsd:mgmt-network: 'false' nsd:name: mgmt nsd:short-name: mgmt + mgmt-network: 'true' nsd:vnfd-connection-point-ref: - nsd:member-vnf-index-ref: '1' nsd:vnfd-connection-point-ref: eth0 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 b8ae75b0..82e55b94 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 @@ -17,6 +17,7 @@ nsd:nsd-catalog: name: mgmt short-name: mgmt type: ELAN + mgmt-network: 'true' vnfd-connection-point-ref: - member-vnf-index-ref: 1 vnfd-id-ref: ubuntu_epa_virtio_vnf diff --git a/descriptor-packages/nsd/dns_aws_vnfd/Makefile b/descriptor-packages/vnfd/dns_aws_vnfd/Makefile similarity index 100% rename from descriptor-packages/nsd/dns_aws_vnfd/Makefile rename to descriptor-packages/vnfd/dns_aws_vnfd/Makefile diff --git a/descriptor-packages/nsd/dns_aws_vnfd/src/cloud_init/cloud_init.cfg b/descriptor-packages/vnfd/dns_aws_vnfd/src/cloud_init/cloud_init.cfg similarity index 100% rename from descriptor-packages/nsd/dns_aws_vnfd/src/cloud_init/cloud_init.cfg rename to descriptor-packages/vnfd/dns_aws_vnfd/src/cloud_init/cloud_init.cfg diff --git a/descriptor-packages/nsd/dns_aws_vnfd/src/dns_aws_vnfd.yaml b/descriptor-packages/vnfd/dns_aws_vnfd/src/dns_aws_vnfd.yaml similarity index 100% rename from descriptor-packages/nsd/dns_aws_vnfd/src/dns_aws_vnfd.yaml rename to descriptor-packages/vnfd/dns_aws_vnfd/src/dns_aws_vnfd.yaml diff --git a/descriptor-packages/nsd/dns_aws_vnfd/src/icons/dns.jpg b/descriptor-packages/vnfd/dns_aws_vnfd/src/icons/dns.jpg similarity index 100% rename from descriptor-packages/nsd/dns_aws_vnfd/src/icons/dns.jpg rename to descriptor-packages/vnfd/dns_aws_vnfd/src/icons/dns.jpg -- 2.25.1