6 files changed, 179 insertions, 2 deletions
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/src/onaptests/templates/vnf-services/clearwater-ims-service.yaml b/src/onaptests/templates/vnf-services/clearwater-ims-service.yaml
new file mode 100644
index 0000000..51543da
--- /dev/null
+++ b/src/onaptests/templates/vnf-services/clearwater-ims-service.yaml
@@ -0,0 +1,36 @@
+---
+clearwater_ims:
+    vnfs:
+        - vnf_name: clearwater_ims_vnf
+          heat_files_to_upload: templates/heat_files/clearwater_ims/clearwater_ims.zip
+          vnf_parameters: [
+              {"name": "public_net_id",
+               "value": "8b0fb448-0daf-4344-a958-74852c5a0530"},
+              {"name": "bono_image_name",
+               "value": "ubuntu-16.04-daily"},
+              {"name": "dime_image_name",
+               "value": "ubuntu-16.04-daily"},
+              {"name": "dns_image_name",
+               "value": "ubuntu-16.04-daily"},
+              {"name": "ellis_image_name",
+               "value": "ubuntu-16.04-daily"},
+              {"name": "homer_image_name",
+               "value": "ubuntu-16.04-daily"},
+              {"name": "robot_image_name",
+               "value": "ubuntu-16.04-daily"},
+              {"name": "sprout_image_name",
+               "value": "ubuntu-16.04-daily"},
+              {"name": "vellum_image_name",
+               "value": "ubuntu-16.04-daily"},
+              {"name": "dns_ip",
+               "value": "8.8.8.8"},
+              {"name": "clearwater_pub_key",
+               "value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAA\
+BAQDY15cdBmIs2XOpe4EiFCsaY6bmUmK/GysMoLl4UG51JCfJwvwoWCoA+6mDIbymZxhxq9IGx\
+ilp/yTA6WQ9s/5pBag1cUMJmFuda9PjOkXl04jgqh5tR6I+GZ97AvCg93KAECis5ubSqw1xOCj4\
+utfEUtPoF1OuzqM/lE5mY4N6VKXn+fT7pCD6cifBEs6JHhVNvs5OLLp/tO8Pa3kKYQOdyS0xc3r\
+h+t2lrzvKUSWGZbX+dLiFiEpjsUL3tDqzkEMNUn4pdv69OJuzWHCxRWPfdrY9Wg0j3mJesP29EBh\
+t+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key"
+              },
+              {"name": "clearwater_key_name",
+               "value": "cleouverte"}]
diff --git a/src/onaptests/templates/vnf-services/ubuntu16test-service.yaml b/src/onaptests/templates/vnf-services/ubuntu16test-service.yaml
new file mode 100644
index 0000000..7e865ca
--- /dev/null
+++ b/src/onaptests/templates/vnf-services/ubuntu16test-service.yaml
@@ -0,0 +1,42 @@
+---
+ubuntu16test:
+    tosca_file_from_SDC: service-Ubuntu16tha-template
+    version: "1.0"
+    subscription_type: "ubuntu16test"
+    vnfs:
+        - vnf_name: ubuntu16test
+          heat_files_to_upload: src/onaptests/templates/heat_files/ubuntu16/ubuntu16.zip
+          vnf_parameters: [
+              {"name": "ubuntu16_image_name",
+               "value": "ubuntu-16.04-daily"
+              },
+              {"name": "ubuntu16_key_name",
+               "value": "cleouverte"
+              },
+              {"name": "ubuntu16_pub_key",
+               "value": "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAA\
+BAQDY15cdBmIs2XOpe4EiFCsaY6bmUmK/GysMoLl4UG51JCfJwvwoWCoA+6mDIbymZxhxq9IGx\
+ilp/yTA6WQ9s/5pBag1cUMJmFuda9PjOkXl04jgqh5tR6I+GZ97AvCg93KAECis5ubSqw1xOCj4\
+utfEUtPoF1OuzqM/lE5mY4N6VKXn+fT7pCD6cifBEs6JHhVNvs5OLLp/tO8Pa3kKYQOdyS0xc3r\
+h+t2lrzvKUSWGZbX+dLiFiEpjsUL3tDqzkEMNUn4pdv69OJuzWHCxRWPfdrY9Wg0j3mJesP29EBh\
+t+w+EC9/kBKq+1VKdmsXUXAcjEvjovVL8l1BrX3BY0R8D imported-openssh-key"
+              },
+              {"name": "ubuntu16_flavor_name",
+               "value": "m1.small"
+              },
+              {"name": "VM_name",
+               "value": "ubuntu16test-VM-01"
+              },
+              {"name": "vnf_id",
+               "value": "ubuntu16test-VNF-instance"
+              },
+              {"name": "vf_module_id",
+               "value": "ubuntu16test-vfmodule-instance"
+              },
+              {"name": "vnf_name",
+               "value": "ubuntu16test-VNF"
+              },
+              {"name": "admin_plane_net_name",
+               "value": "admin"
+              }
+          ]