Added src and Makefile for hackfest vnf and ns
Fixed Makefile for juju-charms to use "charm build"
Change-Id: I551280c5ccda09c395490237ca00693ab3d0cce9
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
diff --git a/descriptor-packages/nsd/hackfest_simplecharm_ns/Makefile b/descriptor-packages/nsd/hackfest_simplecharm_ns/Makefile
new file mode 100644
index 0000000..9c18082
--- /dev/null
+++ b/descriptor-packages/nsd/hackfest_simplecharm_ns/Makefile
@@ -0,0 +1,20 @@
+#
+# Copyright 2018 Telefonica
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+DESCRIPTORS_TOPDIR ?= ../..
+include $(DESCRIPTORS_TOPDIR)/mk/pkg.mk
+
+all: $(BUILD_DIR)/$(PKG_NAME)
diff --git a/descriptor-packages/nsd/hackfest_simplecharm_ns/hackfest_simplecharm_nsd.yaml b/descriptor-packages/nsd/hackfest_simplecharm_ns/src/hackfest_simplecharm_nsd.yaml
similarity index 100%
rename from descriptor-packages/nsd/hackfest_simplecharm_ns/hackfest_simplecharm_nsd.yaml
rename to descriptor-packages/nsd/hackfest_simplecharm_ns/src/hackfest_simplecharm_nsd.yaml
diff --git a/descriptor-packages/nsd/hackfest_simplecharm_ns/icons/osm.png b/descriptor-packages/nsd/hackfest_simplecharm_ns/src/icons/osm.png
similarity index 100%
rename from descriptor-packages/nsd/hackfest_simplecharm_ns/icons/osm.png
rename to descriptor-packages/nsd/hackfest_simplecharm_ns/src/icons/osm.png
Binary files differ
diff --git a/descriptor-packages/vnfd/hackfest_simplecharm_vnf/Makefile b/descriptor-packages/vnfd/hackfest_simplecharm_vnf/Makefile
new file mode 100644
index 0000000..3e88db7
--- /dev/null
+++ b/descriptor-packages/vnfd/hackfest_simplecharm_vnf/Makefile
@@ -0,0 +1,21 @@
+#
+# Copyright 2018 Telefonica
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+DESCRIPTORS_TOPDIR ?= ../..
+
+VNFD_CHARM = simple
+include $(DESCRIPTORS_TOPDIR)/mk/pkg.mk
+
+all: $(BUILD_DIR)/$(PKG_NAME)
diff --git a/descriptor-packages/vnfd/hackfest_simplecharm_vnf/cloud_init/cloud-config.txt b/descriptor-packages/vnfd/hackfest_simplecharm_vnf/src/cloud_init/cloud-config.txt
similarity index 100%
rename from descriptor-packages/vnfd/hackfest_simplecharm_vnf/cloud_init/cloud-config.txt
rename to descriptor-packages/vnfd/hackfest_simplecharm_vnf/src/cloud_init/cloud-config.txt
diff --git a/descriptor-packages/vnfd/hackfest_simplecharm_vnf/hackfest_simplecharm_vnfd.yaml b/descriptor-packages/vnfd/hackfest_simplecharm_vnf/src/hackfest_simplecharm_vnfd.yaml
similarity index 100%
rename from descriptor-packages/vnfd/hackfest_simplecharm_vnf/hackfest_simplecharm_vnfd.yaml
rename to descriptor-packages/vnfd/hackfest_simplecharm_vnf/src/hackfest_simplecharm_vnfd.yaml
diff --git a/descriptor-packages/vnfd/hackfest_simplecharm_vnf/icons/osm.png b/descriptor-packages/vnfd/hackfest_simplecharm_vnf/src/icons/osm.png
similarity index 100%
rename from descriptor-packages/vnfd/hackfest_simplecharm_vnf/icons/osm.png
rename to descriptor-packages/vnfd/hackfest_simplecharm_vnf/src/icons/osm.png
Binary files differ
diff --git a/juju-charms/Makefile b/juju-charms/Makefile
index d6aa754..65c3b0e 100644
--- a/juju-charms/Makefile
+++ b/juju-charms/Makefile
@@ -38,5 +38,5 @@
docker run -u $$(id -u):$$(id -g) -v$$(pwd):$$(pwd) -w$$(pwd) $(CHARM_DOCKER_TAG) charm-build -o $(BUILD_DIR) $<
else
$(CHARM_BUILD_DIR)/%: $(CHARM_SRC_DIR)/%
- charm-build -o $(BUILD_DIR) $<
+ charm build -o $(BUILD_DIR) $<
endif
