Merge "FlowNAC updated descriptors (plugtest): Fixed Makefile"

diff --combined Makefile
index 039333c,d0bc848..793f30c
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -18,24 -18,7 +18,24 @@@
  #
  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 \
 +    ref1_ns \
 +    ref2_ns \
 +    ubuntu_cirros_multidisk_ns
 +
  NSD_SRC_DIR := src/nsd
  NSD_BUILD_DIR := $(BUILD_DIR)/nsd
  
@@@ -44,30 -27,7 +44,30 @@@ 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 \
 +    ref11_vnf \
 +    ref21_vnf \
 +    ref12_vnf \
 +    ref22_vnf \
 +    ubuntu_cirros_multidisk_vnf
 +
  VNFD_SRC_DIR := src/vnfd
  VNFD_BUILD_DIR := $(BUILD_DIR)/vnfd
  
@@@ -129,5 -89,21 +129,21 @@@ $(VNFD_BUILD_DIR)/pong_vnf/charms/pingp
        # Copy the pingpong Charm into the pong vnf package directory before packaging
        cp -rf $(BUILD_DIR)/juju-charms/builds/pingpong $(VNFD_BUILD_DIR)/pong_vnf/charms
  
- $(BUILD_DIR)/vnfd_pkgs/%.tar.gz: $(VNFD_BUILD_DIR)/% $(VNFD_BUILD_DIR)/ims_allin1_2p_vnf/charms/clearwater-aio-proxy $(VNFD_BUILD_DIR)/6wind_vnf/charms/vpe-router $(VNFD_BUILD_DIR)/VyOS_vnf/charms/vyos-proxy $(VNFD_BUILD_DIR)/ping_vnf/charms/pingpong $(VNFD_BUILD_DIR)/pong_vnf/charms/pingpong
+ $(VNFD_BUILD_DIR)/knt_fnc_vnf/charms/flownac: $(VNFD_BUILD_DIR)/knt_fnc_vnf $(BUILD_DIR)/juju-charms
+       # Copy the FlowNAC Charm into the FNC vnf package directory before packaging
+       cp -rf $(BUILD_DIR)/juju-charms/builds/flownac $(VNFD_BUILD_DIR)/knt_fnc_vnf/charms
+ 
+ $(VNFD_BUILD_DIR)/knt_fne_vnf/charms/flownac: $(VNFD_BUILD_DIR)/knt_fne_vnf $(BUILD_DIR)/juju-charms
+       # Copy the FlowNAC Charm into the FNE vnf package directory before packaging
+       cp -rf $(BUILD_DIR)/juju-charms/builds/flownac $(VNFD_BUILD_DIR)/knt_fne_vnf/charms
+ 
+ $(VNFD_BUILD_DIR)/knt_fnd_vnf/charms/flownac: $(VNFD_BUILD_DIR)/knt_fnd_vnf $(BUILD_DIR)/juju-charms
+       # Copy the FlowNAC Charm into the FND vnf package directory before packaging
+       cp -rf $(BUILD_DIR)/juju-charms/builds/flownac $(VNFD_BUILD_DIR)/knt_fnd_vnf/charms
+ 
+ $(VNFD_BUILD_DIR)/knt_fnu_vnf/charms/flownac: $(VNFD_BUILD_DIR)/knt_fnu_vnf $(BUILD_DIR)/juju-charms
+       # Copy the FlowNAC Charm into the FNU vnf package directory before packaging
+       cp -rf $(BUILD_DIR)/juju-charms/builds/flownac $(VNFD_BUILD_DIR)/knt_fnu_vnf/charms
+ 
+ $(BUILD_DIR)/vnfd_pkgs/%.tar.gz: $(VNFD_BUILD_DIR)/% $(VNFD_BUILD_DIR)/ims_allin1_2p_vnf/charms/clearwater-aio-proxy $(VNFD_BUILD_DIR)/6wind_vnf/charms/vpe-router $(VNFD_BUILD_DIR)/VyOS_vnf/charms/vyos-proxy $(VNFD_BUILD_DIR)/ping_vnf/charms/pingpong $(VNFD_BUILD_DIR)/pong_vnf/charms/pingpong $(VNFD_BUILD_DIR)/knt_fnc_vnf/charms/flownac $(VNFD_BUILD_DIR)/knt_fne_vnf/charms/flownac $(VNFD_BUILD_DIR)/knt_fnd_vnf/charms/flownac $(VNFD_BUILD_DIR)/knt_fnu_vnf/charms/flownac
        src/generate_descriptor_pkg.sh -d $(BUILD_DIR)/vnfd_pkgs $<