X-Git-Url: https://osm.etsi.org/gitweb/?a=blobdiff_plain;f=systest%2FMakefile;h=ce5c68a6eeee2e4836cec8b9b3396b03b339a1ce;hb=b884a463086b9841ef3f7b324f320db5e6e11492;hp=fb296cca7aaeb2d7d3a70e9ef2470242d0629223;hpb=9829cae3e6c071bde28a69d5411bb895d967f010;p=osm%2Fdevops.git

diff --git a/systest/Makefile b/systest/Makefile
index fb296cca..ce5c68a6 100644
--- a/systest/Makefile
+++ b/systest/Makefile
@@ -18,18 +18,20 @@
 # the make invocation.
 # eg. 
 #    export OSM_HOSTNAME=1.2.3.4:8008
-#    export OS_URL=https://<keystoneserver>:5000/v2.0
+#    export OS_AUTH_URL=https://<keystoneserver>:5000/v2.0
 #    export OS_USERNAME=admin
 #    export OS_PASSWORD=admin
 #    export OS_PROJECT_NAME=admin
 OSM_HOSTNAME ?=
-OS_URL ?=
+OS_AUTH_URL ?=
 OS_USERNAME ?=
 OS_PASSWORD_NAME ?=
 OS_PROJECT_NAME ?=
 
-ifdef OS_URL
-    OPTION_OS_URL=--os-url $(OS_URL)
+TOPDIR=$(shell readlink -f .|sed -e 's/systest.*//')
+
+ifdef OS_AUTH_URL
+    OPTION_OS_AUTH_URL=--os-url $(OS_AUTH_URL)
 endif
 ifdef OS_USERNAME
     OPTION_OS_USERNAME=--os-username $(OS_USERNAME)
@@ -48,9 +50,7 @@ ifdef TEST_NSD_DESCRIPTORS
     OPTION_TEST_NSD_DESCRIPTORS=--osm-nsd-descriptor-packages $(TEST_NSD_DESCRIPTORS)
 endif
 
-DESCRIPTOR_REPO_NAME=descriptor-packages
-DESCRIPTOR_BUILD_DIR := $(shell pwd)/$(DESCRIPTOR_REPO_NAME)/build
-OPTION_DESCRIPTOR_BUILD_DIR=--osm-descriptor-packages $(DESCRIPTOR_BUILD_DIR)
+DESCRIPTOR_DIR ?= $(TOPDIR)/descriptor-packages
 
 TEST_OSM_NS_NAME_PREFIX=pytest-$(shell date +%D-%T)-
 OPTION_TEST_OSM_NS_NAME_PREFIX=--osm-ns-name-prefix $(TEST_OSM_NS_NAME_PREFIX)
@@ -62,9 +62,6 @@ JUNITXML ?= pytest-output.xml
 PYTEST_OPTIONS=
 Q=@
 
-DESCRIPTOR_REPO ?= https://osm.etsi.org/gerrit/osm/$(DESCRIPTOR_REPO_NAME)
-
-
 TEST_VNFD_DESCRIPTORS ?= None
 TEST_NSD_DESCRIPTORS  ?= None
 
@@ -79,24 +76,20 @@ check_OSM_HOSTNAME:
 	$(call check_env_var,OSM_HOSTNAME)
 
 check_openstack_env:
-	$(call check_env_var,OS_URL)
+	$(call check_env_var,OS_AUTH_URL)
 	$(call check_env_var,OS_USERNAME)
 	$(call check_env_var,OS_PASSWORD)
 	$(call check_env_var,OS_PROJECT_NAME)
 
 .PHONY: check_openstack_env check_OSM_HOSTNAME
 
-$(DESCRIPTOR_REPO_NAME):
-	@test -e $(DESCRIPTOR_REPO_NAME) || git clone $(DESCRIPTOR_REPO)
-	make -C $(DESCRIPTOR_REPO_NAME)
-
 report_dir:
 	@mkdir -p reports
 
-_run_test: $(DESCRIPTOR_REPO_NAME) report_dir
+_run_test: report_dir
 	$(Q)py.test \
         --osmhost $(OSM_HOSTNAME) \
-        $(OPTION_OS_URL) \
+        $(OPTION_OS_AUTH_URL) \
         $(OPTION_OS_USERNAME) \
         $(OPTION_OS_PASSWORD) \
         $(OPTION_OS_PROJECT_NAME) \
@@ -107,13 +100,30 @@ _run_test: $(DESCRIPTOR_REPO_NAME) report_dir
         --junitxml $(JUNITXML_DIR)/$(JUNITXML) \
         $(PYTEST_OPTIONS)
 
-cirros: check_OSM_HOSTNAME check_openstack_env
+$(DESCRIPTOR_DIR)/vnfd/cirros_vnf/build/%.tar.gz:
+	$(MAKE) -C $(DESCRIPTOR_DIR)/vnfd/cirros_vnf
+
+$(DESCRIPTOR_DIR)/nsd/cirros_ns/build/%.tar.gz:
+	$(MAKE) -C $(DESCRIPTOR_DIR)/nsd/cirros_ns
+
+cirros: check_OSM_HOSTNAME check_openstack_env \
+        $(DESCRIPTOR_DIR)/vnfd/cirros_vnf/build/cirros_vnf.tar.gz \
+        $(DESCRIPTOR_DIR)/nsd/cirros_ns/build/cirros_ns.tar.gz
 	$(Q)$(MAKE) \
-        TEST_VNFD_DESCRIPTORS=$(DESCRIPTOR_BUILD_DIR)/vnfd_pkgs/cirros_vnf.tar.gz \
-        TEST_NSD_DESCRIPTORS=$(DESCRIPTOR_BUILD_DIR)/nsd_pkgs/cirros_ns.tar.gz \
+        TEST_VNFD_DESCRIPTORS=$(DESCRIPTOR_DIR)/vnfd/cirros_vnf/build/cirros_vnf.tar.gz \
+        TEST_NSD_DESCRIPTORS=$(DESCRIPTOR_DIR)/nsd/cirros_ns/build/cirros_ns.tar.gz \
         JUNITXML=pytest-$@.xml \
         PYTEST_OPTIONS="$(PYTEST_OPTIONS) -m vnf" _run_test
 
+ns_scale: check_OSM_HOSTNAME check_openstack_env \
+        $(DESCRIPTOR_DIR)/vnfd/cirros_vnf/build/cirros_vnf.tar.gz \
+        $(DESCRIPTOR_DIR)/nsd/cirros_ns/build/cirros_ns.tar.gz
+	$(Q)$(MAKE) \
+        TEST_VNFD_DESCRIPTORS=$(DESCRIPTOR_DIR)/vnfd/cirros_vnf/build/cirros_vnf.tar.gz \
+        TEST_NSD_DESCRIPTORS=$(DESCRIPTOR_DIR)/nsd/cirros_ns/build/cirros_ns.tar.gz \
+        JUNITXML=pytest-$@.xml \
+        PYTEST_OPTIONS="$(PYTEST_OPTIONS) -m ns_scale" _run_test
+
 smoke: check_OSM_HOSTNAME
 	$(Q)$(MAKE) \
         JUNITXML=pytest-$@.xml \
@@ -124,10 +134,19 @@ vim: check_OSM_HOSTNAME check_openstack_env
         JUNITXML=pytest-$@.xml \
         PYTEST_OPTIONS="$(PYTEST_OPTIONS) -m vim" _run_test
 
+$(DESCRIPTOR_DIR)/vnfd/ping_vnf/build/%.tar.gz:
+	$(MAKE) -C $(DESCRIPTOR_DIR)/vnfd/ping_vnf
+
+$(DESCRIPTOR_DIR)/vnfd/pong_vnf/build/%.tar.gz:
+	$(MAKE) -C $(DESCRIPTOR_DIR)/vnfd/pong_vnf
+
+$(DESCRIPTOR_DIR)/vnfd/ping_pong_ns/build/%.tar.gz:
+	$(MAKE) -C $(DESCRIPTOR_DIR)/nsd/ping_pong_ns
+
 ping_pong: check_OSM_HOSTNAME check_openstack_env
 	$(Q)$(MAKE) \
-        TEST_VNFD_DESCRIPTORS="$(DESCRIPTOR_BUILD_DIR)/vnfd_pkgs/ping_vnf.tar.gz,$(DESCRIPTOR_BUILD_DIR)/vnfd_pkgs/pong_vnf.tar.gz" \
-        TEST_NSD_DESCRIPTORS="$(DESCRIPTOR_BUILD_DIR)/nsd_pkgs/ping_pong_ns.tar.gz" \
+        TEST_VNFD_DESCRIPTORS="$(DESCRIPTOR_DIR)/vnfd/ping_vnf/build/ping_vnf.tar.gz $(DESCRIPTOR_DIR)/vnfd/pong_vnf/build/pong_vnf.tar.gz" \
+        TEST_NSD_DESCRIPTORS=$(DESCRIPTOR_DIR)/nsd/ping_pong_ns/build/ping_pong_ns.tar.gz \
         JUNITXML=pytest-$@.xml \
         PYTEST_OPTIONS="$(PYTEST_OPTIONS) -m vnf" _run_test