From: velandy <rajesh.velandy@riftio.com>
Date: Wed, 29 Mar 2017 20:47:01 +0000 (-0400)
Subject: Revert "FlowNAC updated descriptors (plugtest)"
X-Git-Tag: v2.0.2~6^2~11^2
X-Git-Url: https://osm.etsi.org/gitweb/?a=commitdiff_plain;h=6e77fe1c47ebf9c1175dd2052ead45bb143000f6;p=osm%2Fdevops.git

Revert "FlowNAC updated descriptors (plugtest)"

This reverts commit fc29c45c2c63425ca1f634347f00e829ab14d9e3.
---

diff --git a/Makefile b/Makefile
index 358036e6..f41ed9f0 100644
--- a/Makefile
+++ b/Makefile
@@ -38,7 +38,6 @@ 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 $@
@@ -90,21 +89,5 @@ $(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
 
-$(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
+$(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
 	src/generate_descriptor_pkg.sh -d $(BUILD_DIR)/vnfd_pkgs $<