From bb492464a9a48c63426c023148598bc82923acb9 Mon Sep 17 00:00:00 2001 From: Suresh Balakrishnan Date: Thu, 6 Oct 2016 05:37:50 -0400 Subject: [PATCH] Bug 84 - Create ping pong descriptor package Change-Id: Ie4861ac1bfad521fc8b75e2949ed5f77120e4932 Signed-off-by: Suresh Balakrishnan --- Makefile | 4 +- src/nsd/ping_pong_ns/icons/rift_logo.png | Bin 0 -> 1658 bytes src/nsd/ping_pong_ns/ping_pong_nsd.yaml | 86 ++++++++++++++++++ src/vnfd/ping_vnf/icons/rift_logo.png | Bin 0 -> 1658 bytes src/vnfd/ping_vnf/ping_vnfd.yaml | 110 +++++++++++++++++++++++ src/vnfd/pong_vnf/icons/rift_logo.png | Bin 0 -> 1658 bytes src/vnfd/pong_vnf/pong_vnfd.yaml | 106 ++++++++++++++++++++++ 7 files changed, 304 insertions(+), 2 deletions(-) create mode 100644 src/nsd/ping_pong_ns/icons/rift_logo.png create mode 100644 src/nsd/ping_pong_ns/ping_pong_nsd.yaml create mode 100644 src/vnfd/ping_vnf/icons/rift_logo.png create mode 100644 src/vnfd/ping_vnf/ping_vnfd.yaml create mode 100644 src/vnfd/pong_vnf/icons/rift_logo.png create mode 100644 src/vnfd/pong_vnf/pong_vnfd.yaml diff --git a/Makefile b/Makefile index 78acdffc..a7560942 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 ubuntu_xenial_ns +NSDS := gw_corpa_ns ims_allin1_corpa mwc16_gen_ns mwc16_pe_ns VyOS_ns cirros_ns cirros_2vnf_ns ubuntu_xenial_ns ping_pong_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 ubuntu_xenial_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 ping_vnf pong_vnf VNFD_SRC_DIR := src/vnfd VNFD_BUILD_DIR := $(BUILD_DIR)/vnfd diff --git a/src/nsd/ping_pong_ns/icons/rift_logo.png b/src/nsd/ping_pong_ns/icons/rift_logo.png new file mode 100644 index 0000000000000000000000000000000000000000..09b47c7b2dc6fb3e502fa2b1618f7734b1bf574c GIT binary patch literal 1658 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\n# password=\n\ + \n# VNF specific configuration\npong_server_ip=''\nserver_port=5555\n\n# Make Rest API calls to configure\ + \ VNF\ncurl -D /dev/stdout \\\n -H \"Accept: application/vnd.yang.data+xml\"\ + \ \\\n -H \"Content-Type: application/vnd.yang.data+json\" \\\n\ + \ -X POST \\\n -d \"{\\\"ip\\\":\\\"$pong_server_ip\\\", \\\"\ + port\\\":$server_port}\" \\\n http://${pong_mgmt_ip}:${pong_mgmt_port}/api/v1/pong/server\n\ + rc=$?\nif [ $rc -ne 0 ]\nthen\n echo \"Failed to set server(own)\ + \ info for pong!\"\n exit $rc\nfi\n\n\ncurl -D /dev/stdout \\\n\ + \ -H \"Accept: application/vnd.yang.data+xml\" \\\n -H \"Content-Type:\ + \ application/vnd.yang.data+json\" \\\n -X POST \\\n -d \"{\\\ + \"enable\\\":true}\" \\\n http://${pong_mgmt_ip}:${pong_mgmt_port}/api/v1/pong/adminstatus/state\n\ + rc=$?\nif [ $rc -ne 0 ]\nthen\n echo \"Failed to enable pong service!\"\ + \n exit $rc\nfi\n\nexit 0\n" + vnfd:script: + vnfd:script-type: bash -- 2.25.1