Merge "Bug 84 - Create ping pong descriptor package"

diff --combined Makefile
index c926c59,a756094..1199c09
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -18,7 -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 +27,7 @@@ NSD_BUILD_DIRS := $(addprefix $(NSD_BUI
  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
  
@@@ -58,7 -58,6 +58,7 @@@ $(BUILD_DIR)/clearwater-juju
  $(BUILD_DIR)/juju-charms:
        mkdir -p $(BUILD_DIR)
        -cd $(BUILD_DIR) && (test -e juju-charms || git clone $(CHARM_REPO))
 +      -cd $(BUILD_DIR)/juju-charms && make
  
  $(NSD_BUILD_DIR)/%: $(NSD_SRC_DIR)/%
        mkdir -p $(NSD_BUILD_DIR)