Updated onboarding steps and customer creation and added HEAT files

Updated README to comply styleguide - hopefully now
Issue-ID: TEST-260

Signed-off-by: andreasgeissler <andreas-geissler@telekom.de>
Change-Id: I29b9709452ab7cccc1bca54e8e3f8a187c560d14

diff --git a/README.md b/README.md
new file mode 100644 (file)
index 0000000..f275115
--- /dev/null
+++ b/README.md
@@ -0,0 +1,61 @@
+# pythonsdk-tests
+
+This project is a wrapper to use onapsdk toolkit to onboard and
+instantiate services on ONAP
+
+## Temporary help section
+
+A basic example is implemented in the python file
+
+- run.py
+
+The global datas defined in these files (see input_datas) shall be
+adapted to your environment.
+
+In addition you must define your service in directory templates/vnf-services
+and create zip file for heat template templates/heat_files.
+See ubuntu16test as example
+
+### Prepare your environment and run tests
+
+- Clone the project (using instantiation branch)
+  ```shell
+  git clone https://gerrit.onap.org/r/testsuite/pythonsdk-tests.git
+  ```
+
+- Create a virtual environment and clone the python-onapsdk
+  ```shell
+  virtualenv my_test
+  source my_test/bin/activate
+  git clone git@gitlab.com:Orange-OpenSource/lfn/onap/python-onapsdk.
+  git -b develop
+  cd python-onapsdk
+  pip install -e .
+  cd ..
+  pip install -e .
+  ```
+
+- Set global settings configuration files with all required input datas
+  including the dynamic forwarding port for ssh tunnel in
+  src/onaptests/configuration/settings.py
+
+- Export the setting file in a environment variable
+  ```shell
+  export ONAP_PYTHON_SDK_SETTINGS="onaptests.configuration.settings"
+  ```
+
+- (optional) Open ssh tunnel towards your openlab setting a dynamic
+  port forward (by default 1080):
+  ```shell
+  ssh user@onap.pod4.opnfv.fr -D 1080
+  ```
+
+- Once the different input datas are updated in run\_\*.py files and
+  that the templates files for your service are defined, start to run
+  the different steps:
+  ```shell
+  python run.py
+  ```
+
+- By default, all the logs are stored in the file pythonsdk.debug.log.
+  The file name and location can be set in the settings.py

diff --git a/run.py b/run.py
index 144edde..22bdb25 100644 (file)
--- a/run.py
+++ b/run.py
@@ -1,6 +1,6 @@
 import logging.config
 from onapsdk.configuration import settings
-from onaptests.steps.instantiate.service_ala_carte import ServiceAlaCarteInstantiateStep
+from onaptests.steps.instantiate.service_ala_carte import YamlTemplateServiceAlaCarteInstantiateStep
 
 
 
@@ -9,5 +9,6 @@ if __name__ == "__main__":
     # Correction requested in onapsdk to avoid having this duplicate code
     logging.config.dictConfig(settings.LOG_CONFIG)
 
-    service_inst = ServiceAlaCarteInstantiateStep()
+    service_inst = YamlTemplateServiceAlaCarteInstantiateStep()
+    #service_inst = ServiceAlaCarteInstantiateStep()
     service_inst.execute()

diff --git a/src/onaptests/steps/cloud/customer_service_subscription_create.py b/src/onaptests/steps/cloud/customer_service_subscription_create.py
index c797d56..ebe478f 100644 (file)
--- a/src/onaptests/steps/cloud/customer_service_subscription_create.py
+++ b/src/onaptests/steps/cloud/customer_service_subscription_create.py
@@ -25,6 +25,7 @@ class CustomerServiceSubscriptionCreateStep(BaseStep):
          - GLOBAL_CUSTOMER_ID,
          - SERVICE_NAME.
         """
+        super().execute()
         service = Service(name=settings.SERVICE_NAME)
         customer = Customer.get_by_global_customer_id(settings.GLOBAL_CUSTOMER_ID)
         customer.subscribe_service(service)

diff --git a/src/onaptests/steps/onboard/service.py b/src/onaptests/steps/onboard/service.py
index 0143908..42a1db4 100644 (file)
--- a/src/onaptests/steps/onboard/service.py
+++ b/src/onaptests/steps/onboard/service.py
@@ -84,5 +84,5 @@ class YamlTemplateServiceOnboardStep(YamlTemplateBaseStep):
         super().execute()
         service: Service = Service(name=self.service_name,
                                    resources=[Vf(name=vnf["vnf_name"]) \
-                                                for vnf in self.yaml_template[self.name]["vnfs"]])
+                                                for vnf in self.yaml_template[self.service_name]["vnfs"]])
         service.onboard()

diff --git a/src/onaptests/steps/onboard/vf.py b/src/onaptests/steps/onboard/vf.py
index 6d19b9a..2cda931 100644 (file)
--- a/src/onaptests/steps/onboard/vf.py
+++ b/src/onaptests/steps/onboard/vf.py
@@ -54,7 +54,7 @@ class YamlTemplateVfOnboardStep(YamlTemplateBaseStep):
             dict: YAML template
 
         """
-        return self.parent.yaml_template[self.parent.name]
+        return self.parent.yaml_template[self.parent.service_name]
 
     def execute(self):
         """Onboard Vfs from YAML template."""

diff --git a/src/onaptests/steps/onboard/vsp.py b/src/onaptests/steps/onboard/vsp.py
index f1eec1f..75055de 100644 (file)
--- a/src/onaptests/steps/onboard/vsp.py
+++ b/src/onaptests/steps/onboard/vsp.py
@@ -33,7 +33,7 @@ class VspOnboardStep(BaseStep):
         vsp.onboard()
 
 
-class YamlTemplateVspOnboardStep(VspOnboardStep, YamlTemplateBaseStep):
+class YamlTemplateVspOnboardStep(YamlTemplateBaseStep):
     """Vsp onboard using YAML template step."""
 
     @property

diff --git a/templates/heat_files/ubuntu16/ubuntu16.zip b/templates/heat_files/ubuntu16/ubuntu16.zip
new file mode 100644 (file)
index 0000000..9a98baa
Binary files /dev/null and b/templates/heat_files/ubuntu16/ubuntu16.zip differ

diff --git a/templates/vnf-services/ubuntu16test-service.yaml b/templates/vnf-services/ubuntu16test-service.yaml
index bc09df8..c088313 100644 (file)
--- a/templates/vnf-services/ubuntu16test-service.yaml
+++ b/templates/vnf-services/ubuntu16test-service.yaml
@@ -5,7 +5,7 @@ ubuntu16test:
     subscription_type: "ubuntu16test"
     vnfs:
         - vnf_name: ubuntu16test
-          heat_files_to_upload: ubuntu16/ubuntu16.zip
+          heat_files_to_upload: templates/heat_files/ubuntu16/ubuntu16.zip
           vnf_parameters: [
               {"name": "ubuntu16_image_name",
                "value": "ubuntu-16.04-daily"