Merge "Prepare python package to integrate it in xtesting docker"

11 files changed, 114 insertions, 5 deletions

diff --git a/MANIFEST.in b/MANIFEST.in
new file mode 100644
index 0000000..3571ddd
--- /dev/null
+++ b/MANIFEST.in
@@ -0,0 +1 @@
+recursive-include src/onaptests/templates *
diff --git a/requirements.txt b/requirements.txt
index 40637d1..db1ffea 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,3 @@
+xtesting
 openstacksdk
 -e git+https://gitlab.com/Orange-OpenSource/lfn/onap/python-onapsdk.git@develop#egg=onapsdk
diff --git a/setup.cfg b/setup.cfg
index 1db30bf..c8056a3 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -4,7 +4,7 @@ name = onaptests
 version = 0.0.1
 description = Test SDK to use ONAP Programatically
 long_description = file: README.md
-url = https://gitlab.com/Orange-OpenSource/lfn/onap/pythonsdk-tests
+url = https://git.onap.org/testsuite/pythonsdk-tests
 author = Orange OpenSource
 license = Apache 2.0
 classifiers =
@@ -41,3 +41,8 @@ addopts =
   --cov=src  --maxfail=1
 
 testpaths = tests
+
+[entry_points]
+xtesting.testcase =
+  basic_vm = onaptests.scenario.basic_vm:BasicVm
+  clearwater_ims = onaptests.scenario.clearwater_ims:ClearwaterIms
diff --git a/setup.py b/setup.py
index acfdb5d..8b44c49 100644
--- a/setup.py
+++ b/setup.py
@@ -4,4 +4,7 @@
 
 from setuptools import setup
 
-setup()
+setup(
+    setup_requires=['pbr','setuptools'],
+    pbr=True
+)
diff --git a/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py b/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py
index 3f410c0..360a8bf 100644
--- a/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py
+++ b/src/onaptests/configuration/ubuntu16_nomulticloud_settings.py
@@ -12,7 +12,7 @@ USE_MULTICLOUD = False
 # Set ONLY_INSTANTIATE to true to run an instantiation without repeating
 # onboarding and related AAI configuration (Cloud config)
 ONLY_INSTANTIATE= False
-SERVICE_YAML_TEMPLATE = "templates/vnf-services/ubuntu16test-service.yaml"
+SERVICE_YAML_TEMPLATE = "src/onaptests/templates/vnf-services/ubuntu16test-service.yaml"
 CLEANUP_FLAG = True
 CLEANUP_ACTIVITY_TIMER = 10  # nb of seconds before cleanup in case cleanup option is set
 VENDOR_NAME = "basicvm_vendor"
@@ -45,7 +45,7 @@ PLATFORM = "basicvm-platform"
 
 SERVICE_INSTANCE_NAME = "basicvm_ubuntu16_service_instance"
 
-VSP_FILE_PATH = "templates/heat_files/ubuntu16/ubuntu16.zip"
+VSP_FILE_PATH = "src/onaptests/templates/templates/heat_files/ubuntu16/ubuntu16.zip"
 
 
 # The cloud Part
diff --git a/src/onaptests/scenario/__init__.py b/src/onaptests/scenario/__init__.py
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/src/onaptests/scenario/__init__.py
diff --git a/src/onaptests/scenario/basic_vm.py b/src/onaptests/scenario/basic_vm.py
new file mode 100644
index 0000000..2295fbf
--- /dev/null
+++ b/src/onaptests/scenario/basic_vm.py
@@ -0,0 +1,49 @@
+#!/usr/bin/env python
+"""Basic VM test case."""
+import logging
+import time
+
+from xtesting.core import testcase
+from onapsdk.configuration import settings
+from onaptests.steps.instantiate.vf_module_ala_carte import YamlTemplateVfModuleAlaCarteInstantiateStep
+
+class BasicVm(testcase.TestCase):
+    """Onboard then instantiate a simple VM though ONAP."""
+
+    __logger = logging.getLogger(__name__)
+
+    def __init__(self, **kwargs):
+        """Init BasicVM."""
+        # import ubuntu16_nomulticloud_settings needed
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = 'basic_vm'
+        super(BasicVm, self).__init__(**kwargs)
+        self.__logger.debug("BasicVm init started")
+        self.test = YamlTemplateVfModuleAlaCarteInstantiateStep(
+                cleanup=settings.CLEANUP_FLAG)
+        self.start_time = None
+        self.stop_time = None
+        self.result = 0
+
+    def run(self):
+        """Run onap_tests with ubuntu16 VM."""
+        self.start_time = time.time()
+        self.__logger.debug("start time")
+        self.test.execute()
+        self.__logger.info("VNF basic_vm successfully created")
+        if not settings.CLEANUP_FLAG:
+            self.result = 100
+            self.stop_time = time.time()
+            return testcase.TestCase.EX_OK
+
+    def clean(self):
+        """Clean VNF."""
+        if settings.CLEANUP_FLAG:
+            time.sleep(settings.CLEANUP_ACTIVITY_TIMER)
+        try:
+            self.test.cleanup()
+        except ValueError as error:
+            self.__logger.info("service instance deleted as expected {0}".format(error))
+            self.result = 100
+            self.stop_time = time.time()
+            return testcase.TestCase.EX_OK
diff --git a/src/onaptests/scenario/clearwater_ims.py b/src/onaptests/scenario/clearwater_ims.py
new file mode 100644
index 0000000..ab3ad48
--- /dev/null
+++ b/src/onaptests/scenario/clearwater_ims.py
@@ -0,0 +1,50 @@
+#!/usr/bin/env python
+"""vIMS VM test case."""
+import logging
+import time
+
+from xtesting.core import testcase
+from onapsdk.configuration import settings
+from onaptests.steps.instantiate.vf_module_ala_carte import YamlTemplateVfModuleAlaCarteInstantiateStep
+
+class ClearwaterIms(testcase.TestCase):
+    """Onboard then instantiate a simple VM though ONAP."""
+
+    __logger = logging.getLogger(__name__)
+
+    def __init__(self, **kwargs):
+        """Init Clearwater IMS."""
+        # import clearwater_ims_nomulticloud_settings needed
+        if "case_name" not in kwargs:
+            kwargs["case_name"] = 'clearwater_ims'
+        super(ClearwaterIms, self).__init__(**kwargs)
+        self.__logger.debug("vIMS init started")
+        self.test = YamlTemplateVfModuleAlaCarteInstantiateStep(
+                cleanup=settings.CLEANUP_FLAG)
+        self.start_time = None
+        self.stop_time = None
+        self.result = 0
+
+    def run(self):
+        """Run vIMS test."""
+        self.start_time = time.time()
+        self.__logger.debug("start time")
+        self.test.execute()
+        self.__logger.info("vIMS successfully created")
+        # Space for running additional tests on the deployed VNF here
+        if not settings.CLEANUP_FLAG:
+            self.result = 100
+            self.stop_time = time.time()
+            return testcase.TestCase.EX_OK
+
+    def clean(self):
+        """Clean VNF."""
+        if settings.CLEANUP_FLAG:
+            time.sleep(settings.CLEANUP_ACTIVITY_TIMER)
+        try:
+            self.test.cleanup()
+        except ValueError as error:
+            self.__logger.info("service instance deleted as expected {0}".format(error))
+            self.result = 100
+            self.stop_time = time.time()
+            return testcase.TestCase.EX_OK
diff --git a/templates/vnf-services/clearwater-ims-service.yaml b/src/onaptests/templates/vnf-services/clearwater-ims-service.yaml
index 51543da..51543da 100644
--- a/templates/vnf-services/clearwater-ims-service.yaml
+++ b/src/onaptests/templates/vnf-services/clearwater-ims-service.yaml
diff --git a/templates/vnf-services/ubuntu16test-service.yaml b/src/onaptests/templates/vnf-services/ubuntu16test-service.yaml
index c088313..7e865ca 100644
--- a/templates/vnf-services/ubuntu16test-service.yaml
+++ b/src/onaptests/templates/vnf-services/ubuntu16test-service.yaml
@@ -5,7 +5,7 @@ ubuntu16test:
     subscription_type: "ubuntu16test"
     vnfs:
         - vnf_name: ubuntu16test
-          heat_files_to_upload: templates/heat_files/ubuntu16/ubuntu16.zip
+          heat_files_to_upload: src/onaptests/templates/heat_files/ubuntu16/ubuntu16.zip
           vnf_parameters: [
               {"name": "ubuntu16_image_name",
                "value": "ubuntu-16.04-daily"
diff --git a/templates/heat_files/ubuntu16/ubuntu16.zip b/templates/heat_files/ubuntu16/ubuntu16.zip
deleted file mode 100644
index 9a98baa..0000000
--- a/templates/heat_files/ubuntu16/ubuntu16.zip
+++ /dev/null