versionize tests due to API changes in ONAP

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

fix tests

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

6 files changed, 482 insertions, 69 deletions

diff --git a/vnftest/test_config/onap/test_cases/onap_vnftest_tc002.yaml b/vnftest/test_config/onap/test_cases/onap_vnftest_instantiate-v1.yaml
index 5688f30..addee64 100644
--- a/vnftest/test_config/onap/test_cases/onap_vnftest_tc002.yaml
+++ b/vnftest/test_config/onap/test_cases/onap_vnftest_instantiate-v1.yaml
@@ -44,9 +44,9 @@ description: >
 
 steps:
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/lifecycle/create_region.yaml"
+    file: "vnftest/onap/lifecycle/create_region.yaml"
     input:
     -
       parameter_name: "cloud_owner"
@@ -62,17 +62,17 @@ steps:
     run_step: "setup,run"
 
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/lifecycle/create_service.yaml"
+    file: "vnftest/onap/lifecycle/create_service.yaml"
   runner:
     type: Iteration
     run_step: "setup,run"
 
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/lifecycle/create_customer.yaml"
+    file: "vnftest/onap/lifecycle/create_customer.yaml"
     input:
     -
       parameter_name: "customer_name"
@@ -84,9 +84,9 @@ steps:
       parameter_name: "tenant_id"
       value: "{context.creds.tenant_id}"
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/lifecycle/create_service_instance.yaml"
+    file: "vnftest/onap/lifecycle/create_service_instance.yaml"
     delay: 60
     input:
     -
@@ -119,9 +119,9 @@ steps:
     run_step: "setup,run"
 
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/lifecycle/monitor_request.yaml"
+    file: "vnftest/onap/lifecycle/monitor_request.yaml"
     input:
     -
       parameter_name: "request_id"
@@ -138,9 +138,9 @@ steps:
     interval: 5
 
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/lifecycle/create_vnf_instance.yaml"
+    file: "vnftest/onap/lifecycle/create_vnf_instance.yaml"
     delay: 30
     input:
     -
@@ -195,9 +195,9 @@ steps:
     run_step: "setup,run"
 
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/lifecycle/monitor_request.yaml"
+    file: "vnftest/onap/lifecycle/monitor_request.yaml"
     input:
     -
       parameter_name: "request_id"
@@ -220,9 +220,9 @@ steps:
   {% set vf_module = vf_modules_list[vf_module_definition.module_name] %}
   {% set vnf_name = ['test_vnf_', rnd, '_', vf_module_definition.module_name ]|join %}
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/lifecycle/preload_sdnc.yaml"
+    file: "vnftest/onap/lifecycle/preload_sdnc.yaml"
     input:
     -
       parameter_name: "vnf_parameters"
@@ -250,9 +250,9 @@ steps:
     run_step: "setup,run"
 
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/lifecycle/create_vf_module.yaml"
+    file: "vnftest/onap/lifecycle/create_vf_module.yaml"
     delay: 30
     input:
     -
@@ -328,9 +328,9 @@ steps:
     run_step: "setup,run"
 
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/lifecycle/monitor_request.yaml"
+    file: "vnftest/onap/lifecycle/monitor_request.yaml"
     input:
     -
       parameter_name: "request_id"
diff --git a/vnftest/test_config/onap/test_cases/onap_vnftest_tc001.yaml b/vnftest/test_config/onap/test_cases/onap_vnftest_onboard-v1.yaml
index 882d172..c0fcc84 100644
--- a/vnftest/test_config/onap/test_cases/onap_vnftest_tc001.yaml
+++ b/vnftest/test_config/onap/test_cases/onap_vnftest_onboard-v1.yaml
@@ -25,9 +25,9 @@ description: >
 {% set resource_instance_unique_id = resource_instance_unique_id or ['\"\u007Bresource_version_id\u007D_', rnd, '\"']|join %}
 steps:
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/onboard/create_vlm.yaml"
+    file: "vnftest/onap/onboard/v1/create_vlm_v1.yaml"
     input:
     -
       parameter_name: "vendor_name"
@@ -40,9 +40,9 @@ steps:
     type: Iteration
     run_step: "setup,run"
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/onboard/checkin_vlm.yaml"
+    file: "vnftest/onap/onboard/v1/checkin_vlm_v1.yaml"
     input:
     -
       parameter_name: "vendor_id"
@@ -51,9 +51,9 @@ steps:
     type: Iteration
     run_step: "setup,run"
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/onboard/submit_vlm.yaml"
+    file: "vnftest/onap/onboard/v1/submit_vlm_v1.yaml"
     input:
     -
       parameter_name: "vendor_id"
@@ -62,9 +62,9 @@ steps:
     type: Iteration
     run_step: "setup,run"
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/onboard/create_vsp.yaml"
+    file: "vnftest/onap/onboard/v1/create_vsp_v1.yaml"
     input:
     -
       parameter_name: "vendor_id"
@@ -81,9 +81,9 @@ steps:
     run_step: "setup,run"
 
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/onboard/upload_package.yaml"
+    file: "vnftest/onap/onboard/v1/upload_package_v1.yaml"
     input:
     -
       parameter_name: "vsp_id"
@@ -96,9 +96,9 @@ steps:
     run_step: "setup,run"
 
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/onboard/process_package.yaml"
+    file: "vnftest/onap/onboard/v1/process_package_v1.yaml"
     input:
     -
       parameter_name: "vsp_id"
@@ -108,9 +108,9 @@ steps:
     run_step: "setup,run"
 
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/onboard/checkin_vsp.yaml"
+    file: "vnftest/onap/onboard/v1/checkin_vsp_v1.yaml"
     input:
     -
       parameter_name: "vsp_id"
@@ -120,9 +120,9 @@ steps:
     run_step: "setup,run"
 
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/onboard/submit_vsp.yaml"
+    file: "vnftest/onap/onboard/v1/submit_vsp_v1.yaml"
     input:
     -
       parameter_name: "vsp_id"
@@ -132,9 +132,9 @@ steps:
     run_step: "setup,run"
 
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/onboard/create_package_vsp.yaml"
+    file: "vnftest/onap/onboard/v1/create_package_vsp_v1.yaml"
     input:
     -
       parameter_name: "vsp_id"
@@ -144,9 +144,9 @@ steps:
     run_step: "setup,run"
 
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/onboard/import_vsp.yaml"
+    file: "vnftest/onap/onboard/v1/import_vsp_v1.yaml"
     input:
     -
       parameter_name: "vsp_name"
@@ -164,9 +164,9 @@ steps:
     run_step: "setup,run"
 
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/onboard/submit_resource_for_testing.yaml"
+    file: "vnftest/onap/onboard/v1/submit_resource_for_testing_v1.yaml"
     input:
     -
       parameter_name: "resource_id"
@@ -176,9 +176,9 @@ steps:
     run_step: "setup,run"
 
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/onboard/start_resource_test.yaml"
+    file: "vnftest/onap/onboard/v1/start_resource_test_v1.yaml"
     input:
     -
       parameter_name: "resource_id"
@@ -188,9 +188,9 @@ steps:
     run_step: "setup,run"
 
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/onboard/accept_resource_test.yaml"
+    file: "vnftest/onap/onboard/v1/accept_resource_test_v1.yaml"
     input:
     -
       parameter_name: "resource_id"
@@ -217,9 +217,9 @@ steps:
     run_step: "setup,run"
 
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/onboard/add_service.yaml"
+    file: "vnftest/onap/onboard/v1/add_service_v1.yaml"
     input:
     -
       parameter_name: "service_name"
@@ -236,9 +236,9 @@ steps:
     run_step: "setup,run"
 
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/onboard/add_resource_instance.yaml"
+    file: "vnftest/onap/onboard/v1/add_resource_instance_v1.yaml"
     input:
     -
       parameter_name: "resource_instance_unique_id"
@@ -268,9 +268,9 @@ steps:
     run_step: "setup,run"
 
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/onboard/submit_service_for_testing.yaml"
+    file: "vnftest/onap/onboard/v1/submit_service_for_testing_v1.yaml"
     input:
     -
       parameter_name: "sdc_service_id"
@@ -280,9 +280,9 @@ steps:
     run_step: "setup,run"
 
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/onboard/start_service_test.yaml"
+    file: "vnftest/onap/onboard/v1/start_service_test_v1.yaml"
     input:
     -
       parameter_name: "sdc_service_id"
@@ -291,9 +291,9 @@ steps:
     type: Iteration
     run_step: "setup,run"
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/onboard/accept_service_test.yaml"
+    file: "vnftest/onap/onboard/v1/accept_service_test_v1.yaml"
     input:
     -
       parameter_name: "sdc_service_id"
@@ -307,9 +307,9 @@ steps:
     run_step: "setup,run"
 
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/onboard/approve_distribution.yaml"
+    file: "vnftest/onap/onboard/v1/approve_distribution_v1.yaml"
     input:
     -
       parameter_name: "service_version_id"
@@ -318,9 +318,9 @@ steps:
     type: Iteration
     run_step: "setup,run"
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/onboard/distribute.yaml"
+    file: "vnftest/onap/onboard/v1/distribute_v1.yaml"
     input:
     -
       parameter_name: "service_version_id"
@@ -352,9 +352,9 @@ steps:
     type: Iteration
     run_step: "setup,run"
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/onboard/monitor_distribution.yaml"
+    file: "vnftest/onap/onboard/v1/monitor_distribution_v1.yaml"
     input:
     -
       parameter_name: "distributed_service_id"
diff --git a/vnftest/test_config/onap/test_cases/onap_vnftest_onboard-v2.yaml b/vnftest/test_config/onap/test_cases/onap_vnftest_onboard-v2.yaml
new file mode 100644
index 0000000..931974e
--- /dev/null
+++ b/vnftest/test_config/onap/test_cases/onap_vnftest_onboard-v2.yaml
@@ -0,0 +1,387 @@
+##############################################################################
+# 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 TC001 config file;
+    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: RestCall
+  options:
+    file: "vnftest/onap/onboard/v2/create_vlm_v2.yaml"
+    input:
+    -
+      parameter_name: "vendor_name"
+      value: {{vendor_name}}
+    output:
+    -
+      parameter_name: "vendor_id"
+      value: "[itemId]"
+    -
+      parameter_name: "vlm_version_id"
+      value: "[version][id]"
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+-
+  type: RestCall
+  options:
+    file: "vnftest/onap/onboard/v2/submit_vlm_v2.yaml"
+    input:
+    -
+      parameter_name: "vendor_id"
+      value: "{vendor_id}"
+    -
+      parameter_name: "vlm_version_id"
+      value: "{vlm_version_id}"
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+-
+  type: RestCall
+  options:
+    file: "vnftest/onap/onboard/v2/create_vsp_v2.yaml"
+    input:
+    -
+      parameter_name: "vendor_id"
+      value: "{vendor_id}"
+    -
+      parameter_name: "vsp_name"
+      value: {{vsp_name}}
+    output:
+    -
+      parameter_name: "vsp_id"
+      value: "[itemId]"
+    -
+      parameter_name: "vsp_version_id"
+      value: "[version][id]"
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+
+-
+  type: RestCall
+  options:
+    file: "vnftest/onap/onboard/v2/upload_package_v2.yaml"
+    input:
+    -
+      parameter_name: "vsp_id"
+      value: "{vsp_id}"
+    -
+      parameter_name: "vsp_version_id"
+      value: "{vsp_version_id}"
+    -
+      parameter_name: "package_file_path"
+      value: "{context.vnf_descriptor.package_location}"
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+
+-
+  type: RestCall
+  options:
+    file: "vnftest/onap/onboard/v2/process_package_v2.yaml"
+    input:
+    -
+      parameter_name: "vsp_id"
+      value: "{vsp_id}"
+    -
+      parameter_name: "vsp_version_id"
+      value: "{vsp_version_id}"
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+
+#-
+#  type: RestCall
+#  options:
+#    file: "vnftest/onap/onboard/v2/checkin_vsp_v2.yaml"
+#    input:
+#    -
+#      parameter_name: "vsp_id"
+#      value: "{vsp_id}"
+#    -
+#      parameter_name: "vsp_version_id"
+#      value: "{vsp_version_id}"
+#  runner:
+#    type: Iteration
+#    run_step: "setup,run"
+
+-
+  type: RestCall
+  options:
+    file: "vnftest/onap/onboard/v2/submit_vsp_v2.yaml"
+    input:
+    -
+      parameter_name: "vsp_id"
+      value: "{vsp_id}"
+    -
+      parameter_name: "vsp_version_id"
+      value: "{vsp_version_id}"
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+
+-
+  type: RestCall
+  options:
+    file: "vnftest/onap/onboard/v2/create_package_vsp_v2.yaml"
+    input:
+    -
+      parameter_name: "vsp_id"
+      value: "{vsp_id}"
+    -
+      parameter_name: "vsp_version_id"
+      value: "{vsp_version_id}"
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+
+-
+  type: RestCall
+  options:
+    file: "vnftest/onap/onboard/v2/import_vsp_v2.yaml"
+    input:
+    -
+      parameter_name: "vsp_name"
+      value: {{vsp_name}}
+    -
+      parameter_name: "vsp_id"
+      value: "{vsp_id}"
+    output:
+    -
+      parameter_name: "resource_id"
+      value: "[uniqueId]"
+
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+
+-
+  type: RestCall
+  options:
+    file: "vnftest/onap/onboard/v2/submit_resource_for_testing_v2.yaml"
+    input:
+    -
+      parameter_name: "resource_id"
+      value: "{resource_id}"
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+
+-
+  type: RestCall
+  options:
+    file: "vnftest/onap/onboard/v2/start_resource_test_v2.yaml"
+    input:
+    -
+      parameter_name: "resource_id"
+      value: "{resource_id}"
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+
+-
+  type: RestCall
+  options:
+    file: "vnftest/onap/onboard/v2/accept_resource_test_v2.yaml"
+    input:
+    -
+      parameter_name: "resource_id"
+      value: "{resource_id}"
+    output:
+    -
+      parameter_name: "resource_version_id"
+      value: "[allVersions][1.0]"
+    -
+      parameter_name: "resource_model_invariant_id"
+      value: "[invariantUUID]"
+    -
+      parameter_name: "resource_model_version_id"
+      value: "[uuid]"
+    -
+      parameter_name: "resource_model_name"
+      value: "[name]"
+    -
+      parameter_name: "resource_model_version"
+      value: "[version]"
+
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+
+-
+  type: RestCall
+  options:
+    file: "vnftest/onap/onboard/v2/add_service_v2.yaml"
+    input:
+    -
+      parameter_name: "service_name"
+      value: {{service_name}}
+    output:
+    -
+      parameter_name: "sdc_service_id"
+      value: "[uniqueId]"
+    -
+      parameter_name: "service_model_name"
+      value: "[name]"
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+
+-
+  type: RestCall
+  options:
+    file: "vnftest/onap/onboard/v2/add_resource_instance_v2.yaml"
+    input:
+    -
+      parameter_name: "resource_instance_unique_id"
+      value: {{resource_instance_unique_id}}
+    -
+      parameter_name: "resource_instance_name"
+      value: {{resource_instance_name}}
+    -
+      parameter_name: "sdc_service_id"
+      value: "{sdc_service_id}"
+    -
+      parameter_name: "resource_version_id"
+      value: "{resource_version_id}"
+    output:
+    -
+      parameter_name: "resource_model_customization_id"
+      value: "[customizationUUID]"
+    -
+      parameter_name: "resource_model_customization_name"
+      value: "[normalizedName]"
+    -
+      parameter_name: "resource_instance_model_name"
+      value: "[name]"
+
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+
+-
+  type: RestCall
+  options:
+    file: "vnftest/onap/onboard/v2/submit_service_for_testing_v2.yaml"
+    input:
+    -
+      parameter_name: "sdc_service_id"
+      value: "{sdc_service_id}"
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+
+-
+  type: RestCall
+  options:
+    file: "vnftest/onap/onboard/v2/start_service_test_v2.yaml"
+    input:
+    -
+      parameter_name: "sdc_service_id"
+      value: "{sdc_service_id}"
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+-
+  type: RestCall
+  options:
+    file: "vnftest/onap/onboard/v2/accept_service_test_v2.yaml"
+    input:
+    -
+      parameter_name: "sdc_service_id"
+      value: "{sdc_service_id}"
+    output:
+    -
+      parameter_name: "service_version_id"
+      value: "[allVersions][1.0]"
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+
+-
+  type: RestCall
+  options:
+    file: "vnftest/onap/onboard/v2/approve_distribution_v2.yaml"
+    input:
+    -
+      parameter_name: "service_version_id"
+      value: "{service_version_id}"
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+-
+  type: RestCall
+  options:
+    file: "vnftest/onap/onboard/v2/distribute_v2.yaml"
+    input:
+    -
+      parameter_name: "service_version_id"
+      value: "{service_version_id}"
+    output:
+    -
+      parameter_name: "distributed_service_id"
+      value: "[uuid]"
+    -
+      parameter_name: "service_model_invariant_id"
+      value: "[invariantUUID]"
+    -
+      parameter_name: "service_model_version_id"
+      value: "[uuid]"
+    -
+      parameter_name: "service_model_normalized_name"
+      value: "[normalizedName]"
+    -
+      parameter_name: "service_model_name"
+      value: "[name]"
+    -
+      parameter_name: "service_model_version"
+      value: "[version]"
+    -
+      parameter_name: "vf_modules_list"
+      type: VfModuleCrawler
+
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+-
+  type: RestCall
+  options:
+    file: "vnftest/onap/onboard/v2/monitor_distribution_v2.yaml"
+    input:
+    -
+      parameter_name: "distributed_service_id"
+      value: "{distributed_service_id}"
+    output:
+    -
+      parameter_name: "distribution_status"
+      value: "[distributionStatusOfServiceList][0][deployementStatus]"
+  sla:
+    action: assert
+    value: "{distribution_status}"
+    equals: "Distributed"
+    retries: 5
+    interval: 5
+
+context:
+  type: CSAR
\ No newline at end of file
diff --git a/vnftest/test_config/onap/test_cases/onap_vnftest_tc003.yaml b/vnftest/test_config/onap/test_cases/onap_vnftest_terminate.yaml
index 278f8ef..59aed7b 100644
--- a/vnftest/test_config/onap/test_cases/onap_vnftest_tc003.yaml
+++ b/vnftest/test_config/onap/test_cases/onap_vnftest_terminate.yaml
@@ -28,9 +28,9 @@ steps:
 {% for vf_module_definition in vnf_descriptor.vf_modules %}
   {% set vf_module = vf_modules_list[vf_module_definition.module_name] %}
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/lifecycle/delete_vf_module.yaml"
+    file: "vnftest/onap/lifecycle/delete_vf_module.yaml"
     input:
     -
       parameter_name: "service_instance_id"
@@ -69,9 +69,9 @@ steps:
     run_step: "setup,run"
 
 -
-  type: OnapApiCall
+  type: RestCall
   options:
-    file: "onap/lifecycle/monitor_request.yaml"
+    file: "vnftest/onap/lifecycle/monitor_request.yaml"
     input:
     -
       parameter_name: "request_id"
diff --git a/vnftest/test_config/onap/test_suites/onap_basic_lifecycle.yaml b/vnftest/test_config/onap/test_suites/onap_basic_lifecycle-v1.yaml
index 773a8e0..b3cd1d3 100644
--- a/vnftest/test_config/onap/test_suites/onap_basic_lifecycle.yaml
+++ b/vnftest/test_config/onap/test_suites/onap_basic_lifecycle-v1.yaml
@@ -19,8 +19,8 @@ schema: "vnftest:suite:0.1"
 name: "onap-basic-lifecycle"
 test_cases:
 -
-    file_name: test_config/onap/test_cases/onap_vnftest_tc001.yaml
+    file_name: vnftest/test_config/onap/test_cases/onap_vnftest_onboard-v1.yaml
 -
-    file_name: test_config/onap/test_cases/onap_vnftest_tc002.yaml
+    file_name: vnftest/test_config/onap/test_cases/onap_vnftest_instantiate-v1.yaml
 #-
-#    file_name: test_config/onap/test_cases/onap_vnftest_tc003.yaml
+#    file_name: vnftest/test_config/onap/test_cases/onap_vnftest_terminate.yaml
diff --git a/vnftest/test_config/onap/test_suites/onap_basic_lifecycle-v2.yaml b/vnftest/test_config/onap/test_suites/onap_basic_lifecycle-v2.yaml
new file mode 100644
index 0000000..670196d
--- /dev/null
+++ b/vnftest/test_config/onap/test_suites/onap_basic_lifecycle-v2.yaml
@@ -0,0 +1,26 @@
+##############################################################################
+# 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:suite:0.1"
+
+name: "onap-basic-lifecycle"
+test_cases:
+-
+    file_name: vnftest/test_config/onap/test_cases/onap_vnftest_onboard-v2.yaml
+-
+    file_name: vnftest/test_config/onap/test_cases/onap_vnftest_instantiate-v1.yaml
+#-
+#    file_name: vnftest/test_config/onap/test_cases/onap_vnftest_terminate.yaml