From: montesmoreno Date: Tue, 24 Oct 2017 14:02:26 +0000 (+0200) Subject: Move descriptors that were in the incorrect folder X-Git-Tag: v3.0.0rc14~2 X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=refs%2Fchanges%2F22%2F5622%2F1;p=osm%2Fdevops.git Move descriptors that were in the incorrect folder Signed-off-by: montesmoreno --- diff --git a/descriptor-packages/nsd/dns_aws_ns/Makefile b/descriptor-packages/nsd/dns_aws_ns/Makefile new file mode 100644 index 00000000..c5f5f691 --- /dev/null +++ b/descriptor-packages/nsd/dns_aws_ns/Makefile @@ -0,0 +1,20 @@ +# +# 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_ns/src/dns_aws_nsd.yaml b/descriptor-packages/nsd/dns_aws_ns/src/dns_aws_nsd.yaml new file mode 100755 index 00000000..d42568ce --- /dev/null +++ b/descriptor-packages/nsd/dns_aws_ns/src/dns_aws_nsd.yaml @@ -0,0 +1,19 @@ +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}}}' diff --git a/descriptor-packages/nsd/dns_aws_ns/src/icons/dns.jpg b/descriptor-packages/nsd/dns_aws_ns/src/icons/dns.jpg new file mode 100644 index 00000000..6cec5e1a Binary files /dev/null and b/descriptor-packages/nsd/dns_aws_ns/src/icons/dns.jpg differ diff --git a/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/Makefile b/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/Makefile deleted file mode 100644 index ad4b68cb..00000000 --- a/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/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/ubuntu_1iface_cloudinit_new_vnf/src/cloud_init/cloud_init.cfg b/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/cloud_init/cloud_init.cfg deleted file mode 100644 index ddc6f933..00000000 --- a/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/cloud_init/cloud_init.cfg +++ /dev/null @@ -1,14 +0,0 @@ -#cloud-config - -# Add public key to the default user's authorized_keys file -ssh_authorized_keys: -- ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXYVPzII6lwC/hb1PHsgJcf11mYKI1pEeHzcjQ8X8P7YwOj2ihikhy6IRtm38HzP7udMWjQolPUbIzNBmldt8fy6EFkZEpf7R3QziDbqw3FH6wIbQnLpCZWa9OCGRyPyPdBY//K0Ya5b/IBfG4t+KoIVwkJuSG+oYRGhCYhnAwRZ/IUwxhtbNVsS26wN+jGsaUKIWCEBbS5ccFeb9k3eovIFkELNDJVWVJsh2tyGrUd+HQ1+xQGtBUcnipJV75lwL2Z2rprnMIIuVc+A1tTNWArHccLSyfxf2kANy5jGCkwNAH1ETp3r8A5BgoFYd7NSLxK3ob3XycXvYvt/XMrUDP test4 - -write_files: -- content: | - # My new helloworld file - - owner: root:root - permissions: '0644' - path: /root/helloworld.txt - diff --git a/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/icons/ubuntu-logo14.png b/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/icons/ubuntu-logo14.png deleted file mode 100644 index e9667839..00000000 Binary files a/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/icons/ubuntu-logo14.png and /dev/null differ diff --git a/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pem b/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pem deleted file mode 100644 index e31971f8..00000000 --- a/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pem +++ /dev/null @@ -1,27 +0,0 @@ ------BEGIN RSA PRIVATE KEY----- -MIIEpAIBAAKCAQEA12FT8yCOpcAv4W9Tx7ICXH9dZmCiNaRHh83I0PF/D+2MDo9o -oYpIcuiEbZt/B8z+7nTFo0KJT1GyMzQZpXbfH8uhBZGRKX+0d0M4g26sNxR+sCG0 -Jy6QmVmvTghkcj8j3QWP/ytGGuW/yAXxuLfiqCFcJCbkhvqGERoQmIZwMEWfyFMM -YbWzVbEtusDfoxrGlCiFghAW0uXHBXm/ZN3qLyBZBCzQyVVlSbIdrchq1Hfh0Nfs -UBrQVHJ4qSVe+ZcC9mdq6a5zCCLlXPgNbUzVgKx3HC0sn8X9pADcuYxgpMDQB9RE -6d6/AOQYKBWHezUi8St6G918nF72L7f1zK1AzwIDAQABAoIBAG7mNYS9odWk1MKe -QSRU+zRHfH8niL5YHWDGy/0SLBu2c+RXYUe0XUOViAKsC0en/SgpRk6fBvapmTkW -PZJeV9sWTY4Bex5EHFdAbIv4Y4Jk8iqc4BdAucHMVSC334iYDE5U++Umkg1teUd0 -EBfNz05FBx2yTP9XZcrOgfcXWhLwBNmd99+gV6cQB6NF0ZFVm6TLuA7gH3joyipi -Kfhod7uonFRVXSg6vipXs3+oH6BkpgYxQ5EC9U21q7YS4/H5nyBJDQymf88Lvm0l -IkZasKC8RKkHJupROyUUrORW0n6ZV5P3jPCtsav/n6QIQStqCniR1SluONHlI/Sm -qy71VpECgYEA7APuEsSSR/AQtxMp057+jqx6VE+UjIyrtkLBFzHl6GxU4SRz9fIS -LxvI8fTv3AMpJTIQcf78l8CNBs0lpxOxOhuoFQcwqZsMb/Hg5wdS6r0t6ggKMMhO -ig0xITzGEW5cVMQ2t3mE1sHP92NT8BTx0eD8nG9b4hxDFujrNOoTMicCgYEA6Z4X -sIm5LcFRPe/mNhasLxYuh+d5sat20Om2YtNXDA349qQ9e4mC33mKLR1/EVA5dDud -yvjwOvwvefLEuC/1W8d8AxUaYUMQHtoPB4qG//D/cIGhm3YtvUuaJoXEP0kd47mq -Pr6Nu/W5b7jO/rCIBOZN6T+h2dxClCLApZ9vrRkCgYEA2+VperkFZdspZ7mGHfKk -UEApFcazrCQglIcrqrXF9MCCcOZq2Hr7MEMd/TluBbo4Kryzj9K4e5dejjizXTC+ -zloYR8dUMqIQe3iMSBSNz8IFNmjZPcxTSNKztLkP/guqIRxTsqyY9RLM9jzoZubM -y/RoyEQFAu28IGtRQhLZYb8CgYBF6e8TARRvEgSbMZlGpKBg8xV3zJlJx5OmT9sq -Vi8dx2yze1F/EBcfhAMLH2Gwr76R/2lonfle3avjpfijWo7mKZv+XClp5CUF5qJK -0nU2UUxQwiq4GLT1ipOWZb/mZJ5SUXUWk/Zcwtv9CGTCKdh7BuVYIZfxWA6AwKnA -pydHuQKBgQCMKBFNH0W5bXp+40xmm5CYuvR2hNrDlgjL0g4X4RBYEBcg6yCCq1fo -gv0OBqNe1L72LWhI6oI2qlKPveN1fdh0jsAvPpQpce/16Y0f7xsl5N3upp+yHHNk -xruDOG7npSCyHKfcQjDtaHOPKYiQ/3CuXp7OJOvjbNZFf0GJZA9XQA== ------END RSA PRIVATE KEY----- diff --git a/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pub b/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pub deleted file mode 100644 index d1447108..00000000 --- a/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXYVPzII6lwC/hb1PHsgJcf11mYKI1pEeHzcjQ8X8P7YwOj2ihikhy6IRtm38HzP7udMWjQolPUbIzNBmldt8fy6EFkZEpf7R3QziDbqw3FH6wIbQnLpCZWa9OCGRyPyPdBY//K0Ya5b/IBfG4t+KoIVwkJuSG+oYRGhCYhnAwRZ/IUwxhtbNVsS26wN+jGsaUKIWCEBbS5ccFeb9k3eovIFkELNDJVWVJsh2tyGrUd+HQ1+xQGtBUcnipJV75lwL2Z2rprnMIIuVc+A1tTNWArHccLSyfxf2kANy5jGCkwNAH1ETp3r8A5BgoFYd7NSLxK3ob3XycXvYvt/XMrUDP test4 diff --git a/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/ubuntu_1iface_cloudinit_newfile_vnfd.yaml b/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/ubuntu_1iface_cloudinit_newfile_vnfd.yaml deleted file mode 100644 index 26ed38bf..00000000 --- a/descriptor-packages/nsd/ubuntu_1iface_cloudinit_new_vnf/src/ubuntu_1iface_cloudinit_newfile_vnfd.yaml +++ /dev/null @@ -1,48 +0,0 @@ -vnfd:vnfd-catalog: - vnfd: - - id: ubuntu_1iface_cloudinit_newfile_vnfd - name: ubuntu_1iface_cloudinit_newfile_vnf - short-name: ubuntu_1iface_cloudinit_newfile_vnf - description: Generated by OSM pacakage generator - vendor: OSM - version: '1.0' - - # Place the logo as png in icons directory and provide the name here - logo: ubuntu-logo14.png - - # Management interface - mgmt-interface: - vdu-id: ubuntu_1iface_cloudinit_newfile_vnfd-VM - - # Atleast one VDU need to be specified - vdu: - - id: ubuntu_1iface_cloudinit_newfile_vnfd-VM - name: ubuntu_1iface_cloudinit_newfile_vnfd-VM - description: ubuntu_1iface_cloudinit_newfile_vnfd-VM - count: 1 - - # Flavour of the VM to be instantiated for the VDU - vm-flavor: - vcpu-count: 1 - memory-mb: 1024 - storage-gb: 10 - - # Image including the full path - image: 'ubuntu1604' - - # User-data injection - cloud-init-file: cloud_init.cfg - - interface: - # Specify the external interfaces - # There can be multiple interfaces defined - - name: eth0 - virtual-interface: - type: OM-MGMT - bandwidth: '0' - vpci: 0000:00:0a.0 - external-connection-point-ref: eth0 - - connection-point: - - name: eth0 - type: VPORT diff --git a/descriptor-packages/nsd/ubuntu_cloudinit_ns/Makefile b/descriptor-packages/nsd/ubuntu_cloudinit_ns/Makefile new file mode 100644 index 00000000..c5f5f691 --- /dev/null +++ b/descriptor-packages/nsd/ubuntu_cloudinit_ns/Makefile @@ -0,0 +1,20 @@ +# +# 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/ubuntu_cloudinit_ns/src/ubuntu_cloudinit_nsd.yaml b/descriptor-packages/nsd/ubuntu_cloudinit_ns/src/ubuntu_cloudinit_nsd.yaml new file mode 100755 index 00000000..9b442824 --- /dev/null +++ b/descriptor-packages/nsd/ubuntu_cloudinit_ns/src/ubuntu_cloudinit_nsd.yaml @@ -0,0 +1,18 @@ +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: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 diff --git a/descriptor-packages/vnfd/dns_aws_ns/Makefile b/descriptor-packages/vnfd/dns_aws_ns/Makefile deleted file mode 100644 index c5f5f691..00000000 --- a/descriptor-packages/vnfd/dns_aws_ns/Makefile +++ /dev/null @@ -1,20 +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/vnfd/dns_aws_ns/src/dns_aws_nsd.yaml b/descriptor-packages/vnfd/dns_aws_ns/src/dns_aws_nsd.yaml deleted file mode 100755 index d42568ce..00000000 --- a/descriptor-packages/vnfd/dns_aws_ns/src/dns_aws_nsd.yaml +++ /dev/null @@ -1,19 +0,0 @@ -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}}}' diff --git a/descriptor-packages/vnfd/dns_aws_ns/src/icons/dns.jpg b/descriptor-packages/vnfd/dns_aws_ns/src/icons/dns.jpg deleted file mode 100644 index 6cec5e1a..00000000 Binary files a/descriptor-packages/vnfd/dns_aws_ns/src/icons/dns.jpg and /dev/null differ diff --git a/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/Makefile b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/Makefile new file mode 100644 index 00000000..ad4b68cb --- /dev/null +++ b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/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/ubuntu_1iface_cloudinit_new_vnf/src/cloud_init/cloud_init.cfg b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/cloud_init/cloud_init.cfg new file mode 100644 index 00000000..ddc6f933 --- /dev/null +++ b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/cloud_init/cloud_init.cfg @@ -0,0 +1,14 @@ +#cloud-config + +# Add public key to the default user's authorized_keys file +ssh_authorized_keys: +- ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXYVPzII6lwC/hb1PHsgJcf11mYKI1pEeHzcjQ8X8P7YwOj2ihikhy6IRtm38HzP7udMWjQolPUbIzNBmldt8fy6EFkZEpf7R3QziDbqw3FH6wIbQnLpCZWa9OCGRyPyPdBY//K0Ya5b/IBfG4t+KoIVwkJuSG+oYRGhCYhnAwRZ/IUwxhtbNVsS26wN+jGsaUKIWCEBbS5ccFeb9k3eovIFkELNDJVWVJsh2tyGrUd+HQ1+xQGtBUcnipJV75lwL2Z2rprnMIIuVc+A1tTNWArHccLSyfxf2kANy5jGCkwNAH1ETp3r8A5BgoFYd7NSLxK3ob3XycXvYvt/XMrUDP test4 + +write_files: +- content: | + # My new helloworld file + + owner: root:root + permissions: '0644' + path: /root/helloworld.txt + diff --git a/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/icons/ubuntu-logo14.png b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/icons/ubuntu-logo14.png new file mode 100644 index 00000000..e9667839 Binary files /dev/null and b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/icons/ubuntu-logo14.png differ diff --git a/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pem b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pem new file mode 100644 index 00000000..e31971f8 --- /dev/null +++ b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pem @@ -0,0 +1,27 @@ +-----BEGIN RSA PRIVATE KEY----- +MIIEpAIBAAKCAQEA12FT8yCOpcAv4W9Tx7ICXH9dZmCiNaRHh83I0PF/D+2MDo9o +oYpIcuiEbZt/B8z+7nTFo0KJT1GyMzQZpXbfH8uhBZGRKX+0d0M4g26sNxR+sCG0 +Jy6QmVmvTghkcj8j3QWP/ytGGuW/yAXxuLfiqCFcJCbkhvqGERoQmIZwMEWfyFMM +YbWzVbEtusDfoxrGlCiFghAW0uXHBXm/ZN3qLyBZBCzQyVVlSbIdrchq1Hfh0Nfs +UBrQVHJ4qSVe+ZcC9mdq6a5zCCLlXPgNbUzVgKx3HC0sn8X9pADcuYxgpMDQB9RE +6d6/AOQYKBWHezUi8St6G918nF72L7f1zK1AzwIDAQABAoIBAG7mNYS9odWk1MKe +QSRU+zRHfH8niL5YHWDGy/0SLBu2c+RXYUe0XUOViAKsC0en/SgpRk6fBvapmTkW +PZJeV9sWTY4Bex5EHFdAbIv4Y4Jk8iqc4BdAucHMVSC334iYDE5U++Umkg1teUd0 +EBfNz05FBx2yTP9XZcrOgfcXWhLwBNmd99+gV6cQB6NF0ZFVm6TLuA7gH3joyipi +Kfhod7uonFRVXSg6vipXs3+oH6BkpgYxQ5EC9U21q7YS4/H5nyBJDQymf88Lvm0l +IkZasKC8RKkHJupROyUUrORW0n6ZV5P3jPCtsav/n6QIQStqCniR1SluONHlI/Sm +qy71VpECgYEA7APuEsSSR/AQtxMp057+jqx6VE+UjIyrtkLBFzHl6GxU4SRz9fIS +LxvI8fTv3AMpJTIQcf78l8CNBs0lpxOxOhuoFQcwqZsMb/Hg5wdS6r0t6ggKMMhO +ig0xITzGEW5cVMQ2t3mE1sHP92NT8BTx0eD8nG9b4hxDFujrNOoTMicCgYEA6Z4X +sIm5LcFRPe/mNhasLxYuh+d5sat20Om2YtNXDA349qQ9e4mC33mKLR1/EVA5dDud +yvjwOvwvefLEuC/1W8d8AxUaYUMQHtoPB4qG//D/cIGhm3YtvUuaJoXEP0kd47mq +Pr6Nu/W5b7jO/rCIBOZN6T+h2dxClCLApZ9vrRkCgYEA2+VperkFZdspZ7mGHfKk +UEApFcazrCQglIcrqrXF9MCCcOZq2Hr7MEMd/TluBbo4Kryzj9K4e5dejjizXTC+ +zloYR8dUMqIQe3iMSBSNz8IFNmjZPcxTSNKztLkP/guqIRxTsqyY9RLM9jzoZubM +y/RoyEQFAu28IGtRQhLZYb8CgYBF6e8TARRvEgSbMZlGpKBg8xV3zJlJx5OmT9sq +Vi8dx2yze1F/EBcfhAMLH2Gwr76R/2lonfle3avjpfijWo7mKZv+XClp5CUF5qJK +0nU2UUxQwiq4GLT1ipOWZb/mZJ5SUXUWk/Zcwtv9CGTCKdh7BuVYIZfxWA6AwKnA +pydHuQKBgQCMKBFNH0W5bXp+40xmm5CYuvR2hNrDlgjL0g4X4RBYEBcg6yCCq1fo +gv0OBqNe1L72LWhI6oI2qlKPveN1fdh0jsAvPpQpce/16Y0f7xsl5N3upp+yHHNk +xruDOG7npSCyHKfcQjDtaHOPKYiQ/3CuXp7OJOvjbNZFf0GJZA9XQA== +-----END RSA PRIVATE KEY----- diff --git a/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pub b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pub new file mode 100644 index 00000000..d1447108 --- /dev/null +++ b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/keys/test4.pub @@ -0,0 +1 @@ +ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDXYVPzII6lwC/hb1PHsgJcf11mYKI1pEeHzcjQ8X8P7YwOj2ihikhy6IRtm38HzP7udMWjQolPUbIzNBmldt8fy6EFkZEpf7R3QziDbqw3FH6wIbQnLpCZWa9OCGRyPyPdBY//K0Ya5b/IBfG4t+KoIVwkJuSG+oYRGhCYhnAwRZ/IUwxhtbNVsS26wN+jGsaUKIWCEBbS5ccFeb9k3eovIFkELNDJVWVJsh2tyGrUd+HQ1+xQGtBUcnipJV75lwL2Z2rprnMIIuVc+A1tTNWArHccLSyfxf2kANy5jGCkwNAH1ETp3r8A5BgoFYd7NSLxK3ob3XycXvYvt/XMrUDP test4 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 new file mode 100644 index 00000000..26ed38bf --- /dev/null +++ b/descriptor-packages/vnfd/ubuntu_1iface_cloudinit_new_vnf/src/ubuntu_1iface_cloudinit_newfile_vnfd.yaml @@ -0,0 +1,48 @@ +vnfd:vnfd-catalog: + vnfd: + - id: ubuntu_1iface_cloudinit_newfile_vnfd + name: ubuntu_1iface_cloudinit_newfile_vnf + short-name: ubuntu_1iface_cloudinit_newfile_vnf + description: Generated by OSM pacakage generator + vendor: OSM + version: '1.0' + + # Place the logo as png in icons directory and provide the name here + logo: ubuntu-logo14.png + + # Management interface + mgmt-interface: + vdu-id: ubuntu_1iface_cloudinit_newfile_vnfd-VM + + # Atleast one VDU need to be specified + vdu: + - id: ubuntu_1iface_cloudinit_newfile_vnfd-VM + name: ubuntu_1iface_cloudinit_newfile_vnfd-VM + description: ubuntu_1iface_cloudinit_newfile_vnfd-VM + count: 1 + + # Flavour of the VM to be instantiated for the VDU + vm-flavor: + vcpu-count: 1 + memory-mb: 1024 + storage-gb: 10 + + # Image including the full path + image: 'ubuntu1604' + + # User-data injection + cloud-init-file: cloud_init.cfg + + interface: + # Specify the external interfaces + # There can be multiple interfaces defined + - name: eth0 + virtual-interface: + type: OM-MGMT + bandwidth: '0' + vpci: 0000:00:0a.0 + external-connection-point-ref: eth0 + + connection-point: + - name: eth0 + type: VPORT diff --git a/descriptor-packages/vnfd/ubuntu_cloudinit_ns/Makefile b/descriptor-packages/vnfd/ubuntu_cloudinit_ns/Makefile deleted file mode 100644 index c5f5f691..00000000 --- a/descriptor-packages/vnfd/ubuntu_cloudinit_ns/Makefile +++ /dev/null @@ -1,20 +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/vnfd/ubuntu_cloudinit_ns/src/ubuntu_cloudinit_nsd.yaml b/descriptor-packages/vnfd/ubuntu_cloudinit_ns/src/ubuntu_cloudinit_nsd.yaml deleted file mode 100755 index 9b442824..00000000 --- a/descriptor-packages/vnfd/ubuntu_cloudinit_ns/src/ubuntu_cloudinit_nsd.yaml +++ /dev/null @@ -1,18 +0,0 @@ -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: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