From: montesmoreno Date: Thu, 2 Nov 2017 09:32:01 +0000 (+0000) Subject: Added management network flag to NS descriptors that did not include it. Moved vnf... X-Git-Tag: v3.0.0rc15~1 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=1cde0ebbb44dcbd9f7b9357d60fa3a2ef6f71841;p=osm%2Fdevops.git Added management network flag to NS descriptors that did not include it. Moved vnf descriptor located in nsd directory Signed-off-by: montesmoreno --- 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/dns_aws_vnfd/Makefile b/descriptor-packages/nsd/dns_aws_vnfd/Makefile deleted file mode 100644 index ad4b68cb..00000000 --- a/descriptor-packages/nsd/dns_aws_vnfd/Makefile +++ /dev/null @@ -1,19 +0,0 @@ -# -# Copyright 2017 Sandvine -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -DESCRIPTORS_TOPDIR ?= ../.. -include $(DESCRIPTORS_TOPDIR)/mk/pkg.mk - -all: $(BUILD_DIR)/$(PKG_NAME) diff --git a/descriptor-packages/nsd/dns_aws_vnfd/src/cloud_init/cloud_init.cfg b/descriptor-packages/nsd/dns_aws_vnfd/src/cloud_init/cloud_init.cfg deleted file mode 100644 index 00c41b73..00000000 --- a/descriptor-packages/nsd/dns_aws_vnfd/src/cloud_init/cloud_init.cfg +++ /dev/null @@ -1,23 +0,0 @@ -#cloud-config - -password: c0mpl3xp4ssw0rd -chpasswd: { expire: False } -ssh_pwauth: True - -write_files: -- content: | - # My new helloworld file - sudo apt update - sudo apt install dnsmasq -y - sudo bash -c 'cat << EOF > /etc/dnsmasq.conf - strict-order - interface=eth0 - no-dhcp-interface=eth0 - EOF' - owner: root:root - permissions: '0774' - path: /tmp/configure_dns - -runcmd: - - /tmp/configure_dns - diff --git a/descriptor-packages/nsd/dns_aws_vnfd/src/dns_aws_vnfd.yaml b/descriptor-packages/nsd/dns_aws_vnfd/src/dns_aws_vnfd.yaml deleted file mode 100755 index d70d2b96..00000000 --- a/descriptor-packages/nsd/dns_aws_vnfd/src/dns_aws_vnfd.yaml +++ /dev/null @@ -1,38 +0,0 @@ -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:vdu-id: dns_forwarder-VM - 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:virtual-interface: - vnfd:bandwidth: '0' - vnfd:type: OM-MGMT - 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' diff --git a/descriptor-packages/nsd/dns_aws_vnfd/src/icons/dns.jpg b/descriptor-packages/nsd/dns_aws_vnfd/src/icons/dns.jpg deleted file mode 100644 index 6cec5e1a..00000000 Binary files a/descriptor-packages/nsd/dns_aws_vnfd/src/icons/dns.jpg and /dev/null differ 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/vnfd/dns_aws_vnfd/Makefile b/descriptor-packages/vnfd/dns_aws_vnfd/Makefile new file mode 100644 index 00000000..ad4b68cb --- /dev/null +++ b/descriptor-packages/vnfd/dns_aws_vnfd/Makefile @@ -0,0 +1,19 @@ +# +# Copyright 2017 Sandvine +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +DESCRIPTORS_TOPDIR ?= ../.. +include $(DESCRIPTORS_TOPDIR)/mk/pkg.mk + +all: $(BUILD_DIR)/$(PKG_NAME) diff --git a/descriptor-packages/vnfd/dns_aws_vnfd/src/cloud_init/cloud_init.cfg b/descriptor-packages/vnfd/dns_aws_vnfd/src/cloud_init/cloud_init.cfg new file mode 100644 index 00000000..00c41b73 --- /dev/null +++ b/descriptor-packages/vnfd/dns_aws_vnfd/src/cloud_init/cloud_init.cfg @@ -0,0 +1,23 @@ +#cloud-config + +password: c0mpl3xp4ssw0rd +chpasswd: { expire: False } +ssh_pwauth: True + +write_files: +- content: | + # My new helloworld file + sudo apt update + sudo apt install dnsmasq -y + sudo bash -c 'cat << EOF > /etc/dnsmasq.conf + strict-order + interface=eth0 + no-dhcp-interface=eth0 + EOF' + owner: root:root + permissions: '0774' + path: /tmp/configure_dns + +runcmd: + - /tmp/configure_dns + 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 new file mode 100755 index 00000000..d70d2b96 --- /dev/null +++ b/descriptor-packages/vnfd/dns_aws_vnfd/src/dns_aws_vnfd.yaml @@ -0,0 +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:vdu-id: dns_forwarder-VM + 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:virtual-interface: + vnfd:bandwidth: '0' + vnfd:type: OM-MGMT + 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' diff --git a/descriptor-packages/vnfd/dns_aws_vnfd/src/icons/dns.jpg b/descriptor-packages/vnfd/dns_aws_vnfd/src/icons/dns.jpg new file mode 100644 index 00000000..6cec5e1a Binary files /dev/null and b/descriptor-packages/vnfd/dns_aws_vnfd/src/icons/dns.jpg differ