From 81b3a91fe595bf7861f1d2a677a3d5a2f9b06153 Mon Sep 17 00:00:00 2001 From: Jokin Garay Date: Thu, 2 Feb 2017 14:18:08 +0100 Subject: [PATCH] FlowNAC updated descriptors (plugtest) Change-Id: I5db7a877038b6c1dd43a256a590cc51487dc02b3 Signed-off-by: Jokin Garay --- Makefile | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index cea5e223..4023a78e 100644 --- a/Makefile +++ b/Makefile @@ -38,6 +38,7 @@ VNFD_BUILD_PKGS := $(addprefix $(VNFD_BUILD_DIR)_pkgs/, $(VNFD_PKGS)) IMS_GITHUB="https://github.com/Metaswitch/clearwater-juju.git" CHARM_REPO="https://osm.etsi.org/gerrit/osm/juju-charms.git" +JUJU_DIR = /home/jokin/dev/osm all: $(VNFD_BUILD_PKGS) ${NSD_BUILD_PKGS} echo $@ @@ -89,5 +90,21 @@ $(VNFD_BUILD_DIR)/pong_vnf/charms/pingpong: $(VNFD_BUILD_DIR)/pong_vnf $(BUILD_D # 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 $(JUJU_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 $(JUJU_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 $(JUJU_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 $(JUJU_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 $< -- 2.25.1