Add ubuntu xenial network service
Signed-off-by: Philip Joseph <philip.joseph@riftio.com>
diff --git a/src/generate_descriptor_pkg.sh b/src/generate_descriptor_pkg.sh
index ae0d7e1..cefd623 100755
--- a/src/generate_descriptor_pkg.sh
+++ b/src/generate_descriptor_pkg.sh
@@ -65,7 +65,6 @@
VCPU=2
MEMORY=4096
STORAGE=10
-CLOUD_INIT='#cloud-config '
INTERFACES=1
function usage() {
@@ -198,7 +197,7 @@
# Cloud init file
cloud-init-file: '${cif}'
EOF
- else
+ elif [[ -n ${CLOUD_INIT} ]]; then
cat >>$desc_file <<EOF
# Cloud init to use
cloud-init: '${CLOUD_INIT}'
diff --git a/src/nsd/ubuntu_xenial_ns/icons/osm_2x.png b/src/nsd/ubuntu_xenial_ns/icons/osm_2x.png
new file mode 100644
index 0000000..62012d2
--- /dev/null
+++ b/src/nsd/ubuntu_xenial_ns/icons/osm_2x.png
Binary files differ
diff --git a/src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml b/src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml
new file mode 100644
index 0000000..0c76998
--- /dev/null
+++ b/src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml
@@ -0,0 +1,58 @@
+nsd:nsd-catalog:
+ nsd:
+ - id: ubuntu_xenial_nsd
+ name: ubuntu_xenial_nsd
+ short-name: ubuntu_xenial_nsd
+ 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: osm_2x.png
+
+ # Specify the VNFDs that are part of this NSD
+ constituent-vnfd:
+ # The member-vnf-index needs to be unique, starting from 1
+ # vnfd-id-ref is the id of the VNFD
+ # Multiple constituent VNFDs can be specified
+ - member-vnf-index: 1
+ vnfd-id-ref: ubuntu_xenial_vnfd
+
+ vld:
+ # Networks for the VNFs
+ - id: ubuntu_xenial_nsd_vld1
+ name: management
+ short-name: management
+ type: ELAN
+ vim-network-name: net-mgmtOS
+ # 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: ubuntu_xenial_vnfd
+ # NOTE: Validate the entry below
+ nsd:vnfd-connection-point-ref: eth0
+ - id: ubuntu_xenial_nsd_vld2
+ name: data
+ short-name: data
+ type: ELAN
+ vim-network-name: net-corp
+ # 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: ubuntu_xenial_vnfd
+ # NOTE: Validate the entry below
+ nsd:vnfd-connection-point-ref: eth1
diff --git a/src/vnfd/ubuntu_xenial_vnf/icons/ubuntu-logo14.png b/src/vnfd/ubuntu_xenial_vnf/icons/ubuntu-logo14.png
new file mode 100644
index 0000000..e966783
--- /dev/null
+++ b/src/vnfd/ubuntu_xenial_vnf/icons/ubuntu-logo14.png
Binary files differ
diff --git a/src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml b/src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml
new file mode 100644
index 0000000..5d6ca2c
--- /dev/null
+++ b/src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml
@@ -0,0 +1,53 @@
+vnfd:vnfd-catalog:
+ vnfd:
+ - id: ubuntu_xenial_vnfd
+ name: ubuntu_xenial_vnfd
+ short-name: ubuntu_xenial_vnfd
+ 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_xenial_vnfd-VM
+
+ # Atleast one VDU need to be specified
+ vdu:
+ - id: ubuntu_xenial_vnfd-VM
+ name: ubuntu_xenial_vnfd-VM
+ description: ubuntu_xenial_vnfd-VM
+ count: 1
+
+ # Flavour of the VM to be instantiated for the VDU
+ vm-flavor:
+ vcpu-count: 2
+ memory-mb: 4096
+ storage-gb: 10
+
+ # Image including the full path
+ image: '/mnt/powervault/virtualization/vnfs/demos/ubuntu/ubuntu-16.06.img'
+
+ external-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
+ vnfd-connection-point-ref: eth0
+ - name: eth1
+ virtual-interface:
+ type: VIRTIO
+ bandwidth: '0'
+ vpci: 0000:00:0b.0
+ vnfd-connection-point-ref: eth1
+
+ connection-point:
+ - name: eth0
+ type: VPORT
+ - name: eth1
+ type: VPORT
