Bug 85: Fix VyOS package build

Signed-off-by: Philip Joseph <philip.joseph@riftio.com>

diff --git a/Makefile b/Makefile
index 1199c09..cf0f8cd 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -77,9 +77,9 @@ $(VNFD_BUILD_DIR)/6wind_vnf/charms/vpe-router: $(VNFD_BUILD_DIR)/6wind_vnf $(BUI
        # Copy the PE Charm into the PE vnf package directory before packaging
        cp -rf $(BUILD_DIR)/juju-charms/builds/vpe-router $(VNFD_BUILD_DIR)/6wind_vnf/charms
 
-$(VNFD_BUILD_DIR)/VyOS_vnf/charms/VyOS-proxy: $(VNFD_BUILD_DIR)/VyOS_vnf $(BUILD_DIR)/juju-charms
+$(VNFD_BUILD_DIR)/VyOS_vnf/charms/vyos-proxy: $(VNFD_BUILD_DIR)/VyOS_vnf $(BUILD_DIR)/juju-charms
        # Copy the PE Charm into the PE vnf package directory before packaging
-       cp -rf $(BUILD_DIR)/juju-charms/builds/VyOS-proxy $(VNFD_BUILD_DIR)/VyOS_vnf/charms
+       cp -rf $(BUILD_DIR)/juju-charms/builds/vyos-proxy $(VNFD_BUILD_DIR)/VyOS_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
+$(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
        src/generate_descriptor_pkg.sh -d $(BUILD_DIR)/vnfd_pkgs $<

diff --git a/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml b/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml
index 79a11e5..0ac926f 100644 (file)
--- a/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml
+++ b/src/vnfd/VyOS_vnf/VyOS__vnfd.yaml
@@ -40,7 +40,7 @@ vnfd:vnfd-catalog:
                     value: vyos
                 seq: '1'
             juju:
-                charm: VyOS-proxy
+                charm: vyos-proxy
         connection-point:
         -   name: eth0
             type: VPORT