From: velandy <rajesh.velandy@riftio.com>
Date: Tue, 11 Apr 2017 18:05:11 +0000 (-0400)
Subject: Merged v1.1 to master
X-Git-Tag: v2.0.2~6^2~11
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=f08794a5de226cd17cac4d7a077b0940fbcb9425;p=osm%2Fdevops.git

Merged v1.1 to master

Signed-off-by: velandy <rajesh.velandy@riftio.com>
---

f08794a5de226cd17cac4d7a077b0940fbcb9425
diff --cc Makefile
index 73cd1b9c,f41ed9f0..cb564681
--- a/Makefile
+++ b/Makefile
@@@ -18,7 -18,7 +18,23 @@@
  #
  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 ping_pong_ns knt_flownac_ns knt_flownac-us_ns sandvine_pts_ns ref1_ns ref2_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 knt_flownac_ns knt_flownac-us_ns sandvine_pts_ns sonussbc_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 \
++    knt_flownac_ns \
++    knt_flownac-us_ns \
++    sandvine_pts_ns \
++    sonussbc_ns \
++    ref1_ns \
++    ref2_ns
++
  NSD_SRC_DIR := src/nsd
  NSD_BUILD_DIR := $(BUILD_DIR)/nsd
  
@@@ -27,7 -27,7 +43,29 @@@ 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 ping_vnf pong_vnf knt_fnc_vnf knt_fne_vnf knt_fnu_vnf knt_fnd_vnf sandvine_pts_vnf ref11_vnf ref21_vnf ref12_vnf ref22_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 knt_fnc_vnf knt_fne_vnf knt_fnu_vnf knt_fnd_vnf sandvine_pts_vnf sonus_sbc_vnf sonus_test_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 \
++    knt_fnc_vnf \
++    knt_fne_vnf \
++    knt_fnu_vnf \
++    knt_fnd_vnf \
++    sandvine_pts_vnf \
++    sonus_sbc_vnf \
++    sonus_test_vnf \
++    ref11_vnf \
++    ref21_vnf \
++    ref12_vnf \
++    ref22_vnf
++
  VNFD_SRC_DIR := src/vnfd
  VNFD_BUILD_DIR := $(BUILD_DIR)/vnfd