From c737a09a0b99a810b7f8bc3b650ffb8d7de42ebd Mon Sep 17 00:00:00 2001 From: Philip Joseph Date: Tue, 27 Sep 2016 12:34:32 +0530 Subject: [PATCH] Add ubuntu xenial network service Signed-off-by: Philip Joseph --- Makefile | 4 +- src/generate_descriptor_pkg.sh | 3 +- src/nsd/ubuntu_xenial_ns/icons/osm_2x.png | Bin 0 -> 55888 bytes .../ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml | 58 ++++++++++++++++++ .../ubuntu_xenial_vnf/icons/ubuntu-logo14.png | Bin 0 -> 10499 bytes .../ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml | 53 ++++++++++++++++ 6 files changed, 114 insertions(+), 4 deletions(-) create mode 100644 src/nsd/ubuntu_xenial_ns/icons/osm_2x.png create mode 100644 src/nsd/ubuntu_xenial_ns/ubuntu_xenial_nsd.yaml create mode 100644 src/vnfd/ubuntu_xenial_vnf/icons/ubuntu-logo14.png create mode 100644 src/vnfd/ubuntu_xenial_vnf/ubuntu_xenial_vnfd.yaml diff --git a/Makefile b/Makefile index 5ec633e2..45dc061e 100644 --- a/Makefile +++ b/Makefile @@ -18,7 +18,7 @@ # BUILD_DIR = build -NSDS := gw_corpa_ns ims_allin1_corpa mwc16_gen_ns mwc16_pe_ns VyOS_ns cirros_ns cirros_2vnf_ns +NSDS := gw_corpa_ns ims_allin1_corpa mwc16_gen_ns mwc16_pe_ns VyOS_ns cirros_ns cirros_2vnf_ns ubuntu_xenial_ns NSD_SRC_DIR := src/nsd NSD_BUILD_DIR := $(BUILD_DIR)/nsd @@ -27,7 +27,7 @@ NSD_BUILD_DIRS := $(addprefix $(NSD_BUILD_DIR)/, $(NSDS)) NSD_PKGS := $(addsuffix .tar.gz, $(NSDS)) NSD_BUILD_PKGS := $(addprefix $(NSD_BUILD_DIR)_pkgs/, $(NSD_PKGS)) -VNFDS := 6wind_vnf gw_corpa_pe1_vnf gw_corpa_pe2_vnf ims_allin1_2p_vnf tidgen_mwc16_vnf VyOS_vnf cirros_vnf +VNFDS := 6wind_vnf gw_corpa_pe1_vnf gw_corpa_pe2_vnf ims_allin1_2p_vnf tidgen_mwc16_vnf VyOS_vnf cirros_vnf ubuntu_xenial_vnf VNFD_SRC_DIR := src/vnfd VNFD_BUILD_DIR := $(BUILD_DIR)/vnfd diff --git a/src/generate_descriptor_pkg.sh b/src/generate_descriptor_pkg.sh index ae0d7e10..cefd6239 100755 --- a/src/generate_descriptor_pkg.sh +++ b/src/generate_descriptor_pkg.sh @@ -65,7 +65,6 @@ INTF_TYPE='VIRTIO' VCPU=2 MEMORY=4096 STORAGE=10 -CLOUD_INIT='#cloud-config ' INTERFACES=1 function usage() { @@ -198,7 +197,7 @@ EOF # Cloud init file cloud-init-file: '${cif}' EOF - else + elif [[ -n ${CLOUD_INIT} ]]; then cat >>$desc_file <ZASk;E3aIGrzPH8Qr`y-xuB*GQy6#gH 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 QVa%F-+q93SJpA+j4_IIKX8-^I literal 0 HcmV?d00001 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 00000000..0c769989 --- /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: + # 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: 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: + # 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: 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 0000000000000000000000000000000000000000..e966783957c267898a0383159c8dbb5c81ea1da2 GIT binary patch literal 10499 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