New test case - instantiate vnf

Issue-ID: VNFSDK-181
Change-Id: Ic160a125452473a228d8861ecc457e3c021a2dfb
Signed-off-by: Moshe <moshehoa@amdocs.com>

3 files changed, 370 insertions, 19 deletions

diff --git a/tests/onap/test_cases/onap_vnftest_tc001.yaml b/tests/onap/test_cases/onap_vnftest_tc001.yaml
index 185cc1a..0bc34aa 100644
--- a/tests/onap/test_cases/onap_vnftest_tc001.yaml
+++ b/tests/onap/test_cases/onap_vnftest_tc001.yaml
@@ -16,13 +16,13 @@
 schema: "vnftest:task:0.1"
 description: >
     Vnftest TC001 config file;
-    Create VLM in SDC
-
-{% set vsp_name = vsp_name or ['test_vsp_', range(10000)|random ]|join %}
-{% set vendor_name = vendor_name or ['test_vendor_', range(10000)|random ]|join %}
-{% set service_name = service_name or ['test_service_', range(10000)|random ]|join %}
-{% set resource_instance_name = resource_instance_name or ["test_resource_instance_", range(10000)|random ]|join %}
-
+    Onboard VNF package to SDC
+{% set rnd = range(10000)|random %}
+{% set vsp_name = vsp_name or ['test_vsp_', rnd ]|join %}
+{% set vendor_name = vendor_name or ['test_vendor_', rnd ]|join %}
+{% set service_name = service_name or ['test_service_', rnd ]|join %}
+{% set resource_instance_name = resource_instance_name or ["test_resource_instance_", rnd ]|join %}
+{% set resource_instance_unique_id = resource_instance_unique_id or ['\"\u007Bresource_version_id\u007D_', rnd, '\"']|join %}
 steps:
 -
   type: OnapApiCall
@@ -81,13 +81,16 @@ steps:
     run_step: "setup,run"
 
 -
-  type: PackageUpload
+  type: OnapApiCall
   options:
     file: "onboard/upload_package.yaml"
     input:
     -
       parameter_name: "vsp_id"
       value: "{vsp_id}"
+    -
+      parameter_name: "package_file_path"
+      value: "{context|vnf_descriptor|csar_package_location}"
   runner:
     type: Iteration
     run_step: "setup,run"
@@ -238,7 +241,7 @@ steps:
       value: {{service_name}}
     output:
     -
-      parameter_name: "service_id"
+      parameter_name: "sdc_service_id"
       value: "[uniqueId]"
     -
       parameter_name: "service_model_name"
@@ -254,13 +257,13 @@ steps:
     input:
     -
       parameter_name: "resource_instance_unique_id"
-      value: {{ ["U+007B", "resource_version_id", "U+007D", range(10000)|random ]|join }}
+      value: {{resource_instance_unique_id}}
     -
       parameter_name: "resource_instance_name"
       value: {{resource_instance_name}}
     -
-      parameter_name: "service_id"
-      value: "{service_id}"
+      parameter_name: "sdc_service_id"
+      value: "{sdc_service_id}"
     -
       parameter_name: "resource_version_id"
       value: "{resource_version_id}"
@@ -285,8 +288,8 @@ steps:
     file: "onboard/submit_service_for_testing.yaml"
     input:
     -
-      parameter_name: "service_id"
-      value: "{service_id}"
+      parameter_name: "sdc_service_id"
+      value: "{sdc_service_id}"
   runner:
     type: Iteration
     run_step: "setup,run"
@@ -297,8 +300,8 @@ steps:
     file: "onboard/start_service_test.yaml"
     input:
     -
-      parameter_name: "service_id"
-      value: "{service_id}"
+      parameter_name: "sdc_service_id"
+      value: "{sdc_service_id}"
   runner:
     type: Iteration
     run_step: "setup,run"
@@ -308,8 +311,8 @@ steps:
     file: "onboard/accept_service_test.yaml"
     input:
     -
-      parameter_name: "service_id"
-      value: "{service_id}"
+      parameter_name: "sdc_service_id"
+      value: "{sdc_service_id}"
     output:
     -
       parameter_name: "service_version_id"
@@ -358,7 +361,7 @@ steps:
       value: "[version]"
     -
       parameter_name: "service_model_customization_id"
-      value: "[componentInstances]"
+      value: "[componentInstances][0][groupInstances][0][customizationUUID]"
   runner:
     type: Iteration
     run_step: "setup,run"
diff --git a/tests/onap/test_cases/onap_vnftest_tc002.yaml b/tests/onap/test_cases/onap_vnftest_tc002.yaml
new file mode 100644
index 0000000..0af871e
--- /dev/null
+++ b/tests/onap/test_cases/onap_vnftest_tc002.yaml
@@ -0,0 +1,346 @@
+##############################################################################
+# Copyright 2018 EuropeanSoftwareMarketingLtd.
+# ===================================================================
+#  Licensed under the ApacheLicense, Version2.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
+#
+# 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
+##############################################################################
+
+---
+schema: "vnftest:task:0.1"
+description: >
+    Vnftest TC002 config file;
+    Instantiate VNF
+
+{% set rnd = rnd or range(10000)|random %}
+# Optional input parameters
+{% set cloud_owner = cloud_owner or ['test_cloud_', rnd ]|join %}
+{% set customer_name = customer_name or ['test_customer_', rnd ]|join %}
+{% set service_instance_name = service_instance_name or ['test_service_instance_', rnd ]|join %}
+{% set vnf_instance_name = vnf_instance_name or ['test_vnf_instance_', rnd ]|join %}
+{% set vnf_name = vnf_name or ['test_vnf_', rnd ]|join %}
+
+# Mandatory input parameters
+{% set service_model_version_id = service_model_version_id or '\"\u007Bservice_model_version_id\u007D\"' %}
+{% set service_model_version = service_model_version or '\"\u007Bservice_model_version\u007D\"' %}
+{% set service_model_normalized_name = service_model_normalized_name or '\"\u007Bservice_model_normalized_name\u007D\"' %}
+{% set service_model_invariant_id = service_model_invariant_id or '\"\u007Bservice_model_invariant_id\u007D\"' %}
+{% set service_model_name = service_model_name or '\"\u007Bservice_model_name\u007D\"' %}
+{% set service_model_customization_id = service_model_customization_id or '\"\u007Bservice_model_customization_id\u007D\"' %}
+{% set resource_model_invariant_id = resource_model_invariant_id or '\"\u007Bresource_model_invariant_id\u007D\"' %}
+{% set resource_model_version_id = resource_model_version_id or '\"\u007Bresource_model_version_id\u007D\"' %}
+{% set resource_model_name = resource_model_name or '\"\u007Bresource_model_name\u007D\"' %}
+{% set resource_model_version = resource_model_version or '\"\u007Bresource_model_version\u007D\"' %}
+{% set resource_model_customization_id = resource_model_customization_id or '\"\u007Bresource_model_customization_id\u007D\"' %}
+{% set resource_model_customization_name = resource_model_customization_name or '\"\u007Bresource_model_customization_name\u007D\"' %}
+{% set distributed_service_id = distributed_service_id or '\"\u007Bdistributed_service_id\u007D\"' %}
+{% set resource_instance_model_name = resource_instance_model_name or '\"\u007Bresource_instance_model_name\u007D\"' %}
+{% set vnf_type = vnf_type or '\"\u007Bvnf_type\u007D\"' %}
+{% set module_model_invariant_id = module_model_invariant_id or '\"\u007Bmodule_model_invariant_id\u007D\"' %}
+{% set module_model_version_id = module_model_version_id or '\"\u007Bmodule_model_version_id\u007D\"' %}
+{% set module_model_version = module_model_version or '\"\u007Bmodule_model_version\u007D\"' %}
+
+steps:
+-
+  type: OnapApiCall
+  options:
+    file: "lifecycle/create_region.yaml"
+    input:
+    -
+      parameter_name: "cloud_owner"
+      value: {{cloud_owner}}
+    -
+      parameter_name: "tenant_id"
+      value: "{context|creds|tenant_id}"
+    -
+      parameter_name: "tenant_name"
+      value: "{context|creds|tenant_name}"
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+
+-
+  type: OnapApiCall
+  options:
+    file: "lifecycle/create_service.yaml"
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+
+-
+  type: OnapApiCall
+  options:
+    file: "lifecycle/create_customer.yaml"
+    input:
+    -
+      parameter_name: "customer_name"
+      value: {{customer_name}}
+    -
+      parameter_name: "cloud_owner"
+      value: {{cloud_owner}}
+    -
+      parameter_name: "tenant_id"
+      value: "{context|creds|tenant_id}"
+-
+  type: OnapApiCall
+  options:
+    file: "lifecycle/create_service_instance.yaml"
+    delay: 30
+    input:
+    -
+      parameter_name: "service_instance_name"
+      value: {{service_instance_name}}
+    -
+      parameter_name: "service_model_version_id"
+      value: {{service_model_version_id}}
+    -
+      parameter_name: "service_model_version"
+      value: {{service_model_version}}
+    -
+      parameter_name: "service_model_normalized_name"
+      value: {{service_model_normalized_name}}
+    -
+      parameter_name: "service_model_invariant_id"
+      value: {{service_model_invariant_id}}
+    -
+      parameter_name: "customer_name"
+      value: {{customer_name}}
+    output:
+    -
+      parameter_name: "service_instance_id"
+      value: "[requestReferences][instanceId]"
+    -
+      parameter_name: "request_id"
+      value: "[requestReferences][requestId]"
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+
+-
+  type: OnapApiCall
+  options:
+    file: "lifecycle/monitor_request.yaml"
+    input:
+    -
+      parameter_name: "request_id"
+      value: "{request_id}"
+    output:
+    -
+      parameter_name: "request_state"
+      value: "[request][requestStatus][requestState]"
+  sla:
+    action: assert
+    value: "{request_state}"
+    equals: "COMPLETE"
+    retries: 15
+    interval: 5
+
+-
+  type: OnapApiCall
+  options:
+    file: "lifecycle/create_vnf_instance.yaml"
+    delay: 30
+    input:
+    -
+      parameter_name: "service_instance_id"
+      value: "{service_instance_id}"
+    -
+      parameter_name: "vnf_instance_name"
+      value: {{vnf_instance_name}}
+    -
+      parameter_name: "resource_model_invariant_id"
+      value: {{resource_model_invariant_id}}
+    -
+      parameter_name: "resource_model_version_id"
+      value: {{resource_model_version_id}}
+    -
+      parameter_name: "resource_model_name"
+      value: {{resource_model_name}}
+    -
+      parameter_name: "resource_model_version"
+      value: {{resource_model_version}}
+    -
+      parameter_name: "resource_model_customization_id"
+      value: {{resource_model_customization_id}}
+    -
+      parameter_name: "resource_model_customization_name"
+      value: {{resource_model_customization_name}}
+    -
+      parameter_name: "tenant_id"
+      value: "{context|creds|tenant_id}"
+    -
+      parameter_name: "service_model_name"
+      value: {{service_model_name}}
+    -
+      parameter_name: "service_model_invariant_id"
+      value: {{service_model_invariant_id}}
+    -
+      parameter_name: "service_model_version"
+      value: {{service_model_version}}
+    -
+      parameter_name: "distributed_service_id"
+      value: {{distributed_service_id}}
+
+    output:
+    -
+      parameter_name: "vnf_instance_id"
+      value: "[requestReferences][instanceId]"
+    -
+      parameter_name: "request_id"
+      value: "[requestReferences][requestId]"
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+
+-
+  type: OnapApiCall
+  options:
+    file: "lifecycle/monitor_request.yaml"
+    input:
+    -
+      parameter_name: "request_id"
+      value: "{request_id}"
+    output:
+    -
+      parameter_name: "request_state"
+      value: "[request][requestStatus][requestState]"
+  sla:
+    action: assert
+    value: "{request_state}"
+    equals: "COMPLETE"
+    retries: 15
+    interval: 5
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+
+-
+  type: OnapApiCall
+  options:
+    file: "lifecycle/preload_sdnc.yaml"
+    input:
+    -
+      parameter_name: "vnf_name"
+      value: {{vnf_name}}
+    -
+      parameter_name: "vnf_instance_name"
+      value: {{vnf_instance_name}}
+    -
+      parameter_name: "service_model_name"
+      value: {{service_model_name}}
+    -
+      parameter_name: "resource_instance_model_name"
+      value: {{resource_instance_model_name}}
+    -
+      parameter_name: "service_instance_id"
+      value: "{service_instance_id}"
+    -
+      parameter_name: "vnf_type"
+      value: {{vnf_type}}
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+
+-
+  type: OnapApiCall
+  options:
+    file: "lifecycle/create_vf_module.yaml"
+    delay: 30
+    input:
+    -
+      parameter_name: "service_instance_id"
+      value: "{service_instance_id}"
+    -
+      parameter_name: "vnf_instance_id"
+      value: "{vnf_instance_id}"
+    -
+      parameter_name: "vnf_name"
+      value: {{vnf_name}}
+    -
+      parameter_name: "module_model_invariant_id"
+      value: {{module_model_invariant_id}}
+    -
+      parameter_name: "module_model_version_id"
+      value: {{module_model_version_id}}
+    -
+      parameter_name: "vnf_type"
+      value: {{vnf_type}}
+    -
+      parameter_name: "module_model_version"
+      value: {{module_model_version}}
+    -
+      parameter_name: "service_model_customization_id"
+      value: {{service_model_customization_id}}
+    -
+      parameter_name: "tenant_id"
+      value: "{context|creds|tenant_id}"
+    -
+      parameter_name: "service_model_name"
+      value: {{service_model_name}}
+    -
+      parameter_name: "service_model_invariant_id"
+      value: {{service_model_invariant_id}}
+    -
+      parameter_name: "service_model_version"
+      value: {{service_model_version}}
+    -
+      parameter_name: "distributed_service_id"
+      value: {{distributed_service_id}}
+    -
+      parameter_name: "resource_model_name"
+      value: {{resource_model_name}}
+    -
+      parameter_name: "resource_model_invariant_id"
+      value: {{resource_model_invariant_id}}
+    -
+      parameter_name: "resource_model_version"
+      value: {{resource_model_version}}
+    -
+      parameter_name: "resource_model_version_id"
+      value: {{resource_model_version_id}}
+    -
+      parameter_name: "resource_model_customization_id"
+      value: {{resource_model_customization_id}}
+    -
+      parameter_name: "resource_model_customization_name"
+      value: {{resource_model_customization_name}}
+
+    output:
+    -
+      parameter_name: "request_id"
+      value: "[requestReferences][requestId]"
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+
+-
+  type: OnapApiCall
+  options:
+    file: "lifecycle/monitor_request.yaml"
+    input:
+    -
+      parameter_name: "request_id"
+      value: "{request_id}"
+    output:
+    -
+      parameter_name: "request_state"
+      value: "[request][requestStatus][requestState]"
+  sla:
+    action: assert
+    value: "{request_state}"
+    equals: "COMPLETE"
+    retries: 15
+    interval: 5
+
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+
+context:
+  type: CSAR
\ No newline at end of file
diff --git a/tests/onap/test_suites/onap_basic_lifecycle.yaml b/tests/onap/test_suites/onap_basic_lifecycle.yaml
index ee4a15f..508f068 100644
--- a/tests/onap/test_suites/onap_basic_lifecycle.yaml
+++ b/tests/onap/test_suites/onap_basic_lifecycle.yaml
@@ -21,3 +21,5 @@ test_cases_dir: "tests/onap/test_cases/"
 test_cases:
 -
     file_name: onap_vnftest_tc001.yaml
+-
+    file_name: onap_vnftest_tc002.yaml