New Feature Request: Enhance descriptor package creation script

[osm/devops.git] / Makefile

diff --git a/Makefile b/Makefile
index 8fca853..6a5a4d8 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -18,7 +18,7 @@
 #
 BUILD_DIR = build
 
-NSDS := gw_corpa_ns ims_allin1_corpa mwc16_gen_ns mwc16_pe_ns
+NSDS := gw_corpa_ns ims_allin1_corpa mwc16_gen_ns mwc16_pe_ns VyOS_ns
 NSD_SRC_DIR := src/nsd
 NSD_BUILD_DIR := $(BUILD_DIR)/nsd
 
@@ -27,7 +27,7 @@ NSD_BUILD_DIRS := $(addprefix $(NSD_BUILD_DIR)/, $(NSDS))
 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
+VNFDS := 6wind_vnf gw_corpa_pe1_vnf gw_corpa_pe2_vnf ims_allin1_2p_vnf tidgen_mwc16_vnf VyOS_vnf
 VNFD_SRC_DIR := src/vnfd
 VNFD_BUILD_DIR := $(BUILD_DIR)/vnfd
 
@@ -37,6 +37,7 @@ VNFD_PKGS := $(addsuffix .tar.gz, $(VNFDS))
 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"
 
 all: $(VNFD_BUILD_PKGS) ${NSD_BUILD_PKGS}
        echo $@
@@ -50,9 +51,14 @@ $(VNFD_BUILD_DIR)/%: $(VNFD_SRC_DIR)/%
 
        src/gen_vnfd_pkg.sh $< $@
 
-$(BUILD_DIR)/clearwater-juju: $(VNFD_BUILD_DIR)/ims_allin1_2p_vnf
+$(BUILD_DIR)/clearwater-juju:
+       mkdir -p $(BUILD_DIR)
        -cd $(BUILD_DIR) && (test -e clearwater-juju || git clone $(IMS_GITHUB))
 
+$(BUILD_DIR)/juju-charms:
+       mkdir -p $(BUILD_DIR)
+       -cd $(BUILD_DIR) && (test -e juju-charms || git clone $(CHARM_REPO))
+
 $(NSD_BUILD_DIR)/%: $(NSD_SRC_DIR)/%
        mkdir -p $(NSD_BUILD_DIR)
        cp -rf $< $(NSD_BUILD_DIR)
@@ -60,11 +66,15 @@ $(NSD_BUILD_DIR)/%: $(NSD_SRC_DIR)/%
        src/gen_nsd_pkg.sh $< $@
 
 $(BUILD_DIR)/nsd_pkgs/%.tar.gz: $(NSD_BUILD_DIR)/%
-       src/generate_descriptor_pkg.sh $(BUILD_DIR)/nsd_pkgs $<
+       src/generate_descriptor_pkg.sh -d $(BUILD_DIR)/nsd_pkgs $<
 
-$(VNFD_BUILD_DIR)/ims_allin1_2p_vnf/charms/clearwater-aio-proxy: $(BUILD_DIR)/clearwater-juju
-       # Copy the IMS Charm into the IMS vnf package directory before
+$(VNFD_BUILD_DIR)/ims_allin1_2p_vnf/charms/clearwater-aio-proxy: $(VNFD_BUILD_DIR)/ims_allin1_2p_vnf $(BUILD_DIR)/clearwater-juju
+       # Copy the IMS Charm into the IMS vnf package directory before packaging
        cp -rf $(BUILD_DIR)/clearwater-juju/charms/trusty/clearwater-aio-proxy $(VNFD_BUILD_DIR)/ims_allin1_2p_vnf/charms
 
-$(BUILD_DIR)/vnfd_pkgs/%.tar.gz: $(VNFD_BUILD_DIR)/% $(VNFD_BUILD_DIR)/ims_allin1_2p_vnf/charms/clearwater-aio-proxy
-       src/generate_descriptor_pkg.sh $(BUILD_DIR)/vnfd_pkgs $<
+$(VNFD_BUILD_DIR)/6wind_vnf/charms/vpe-router: $(VNFD_BUILD_DIR)/6wind_vnf $(BUILD_DIR)/juju-charms
+       # Copy the PE Charm into the PE vnf package directory before packaging
+       cp -rf $(BUILD_DIR)/juju-charms/vpe-router $(VNFD_BUILD_DIR)/6wind_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
+       src/generate_descriptor_pkg.sh -d $(BUILD_DIR)/vnfd_pkgs $<