Add validation abilities to test cases

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

Add unit tests

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

add unit tests

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

add unit tests

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

4 files changed, 50 insertions, 39 deletions

diff --git a/tests/onap/test_cases/onap_vnftest_tc001.yaml b/tests/onap/test_cases/onap_vnftest_tc001.yaml
index 26a5672..882d172 100644
--- a/tests/onap/test_cases/onap_vnftest_tc001.yaml
+++ b/tests/onap/test_cases/onap_vnftest_tc001.yaml
@@ -27,7 +27,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "onboard/create_vlm.yaml"
+    file: "onap/onboard/create_vlm.yaml"
     input:
     -
       parameter_name: "vendor_name"
@@ -42,7 +42,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "onboard/checkin_vlm.yaml"
+    file: "onap/onboard/checkin_vlm.yaml"
     input:
     -
       parameter_name: "vendor_id"
@@ -53,7 +53,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "onboard/submit_vlm.yaml"
+    file: "onap/onboard/submit_vlm.yaml"
     input:
     -
       parameter_name: "vendor_id"
@@ -64,7 +64,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "onboard/create_vsp.yaml"
+    file: "onap/onboard/create_vsp.yaml"
     input:
     -
       parameter_name: "vendor_id"
@@ -83,7 +83,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "onboard/upload_package.yaml"
+    file: "onap/onboard/upload_package.yaml"
     input:
     -
       parameter_name: "vsp_id"
@@ -98,7 +98,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "onboard/process_package.yaml"
+    file: "onap/onboard/process_package.yaml"
     input:
     -
       parameter_name: "vsp_id"
@@ -110,7 +110,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "onboard/checkin_vsp.yaml"
+    file: "onap/onboard/checkin_vsp.yaml"
     input:
     -
       parameter_name: "vsp_id"
@@ -122,7 +122,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "onboard/submit_vsp.yaml"
+    file: "onap/onboard/submit_vsp.yaml"
     input:
     -
       parameter_name: "vsp_id"
@@ -134,7 +134,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "onboard/create_package_vsp.yaml"
+    file: "onap/onboard/create_package_vsp.yaml"
     input:
     -
       parameter_name: "vsp_id"
@@ -146,7 +146,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "onboard/import_vsp.yaml"
+    file: "onap/onboard/import_vsp.yaml"
     input:
     -
       parameter_name: "vsp_name"
@@ -166,7 +166,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "onboard/submit_resource_for_testing.yaml"
+    file: "onap/onboard/submit_resource_for_testing.yaml"
     input:
     -
       parameter_name: "resource_id"
@@ -178,7 +178,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "onboard/start_resource_test.yaml"
+    file: "onap/onboard/start_resource_test.yaml"
     input:
     -
       parameter_name: "resource_id"
@@ -190,7 +190,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "onboard/accept_resource_test.yaml"
+    file: "onap/onboard/accept_resource_test.yaml"
     input:
     -
       parameter_name: "resource_id"
@@ -219,7 +219,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "onboard/add_service.yaml"
+    file: "onap/onboard/add_service.yaml"
     input:
     -
       parameter_name: "service_name"
@@ -238,7 +238,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "onboard/add_resource_instance.yaml"
+    file: "onap/onboard/add_resource_instance.yaml"
     input:
     -
       parameter_name: "resource_instance_unique_id"
@@ -270,7 +270,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "onboard/submit_service_for_testing.yaml"
+    file: "onap/onboard/submit_service_for_testing.yaml"
     input:
     -
       parameter_name: "sdc_service_id"
@@ -282,7 +282,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "onboard/start_service_test.yaml"
+    file: "onap/onboard/start_service_test.yaml"
     input:
     -
       parameter_name: "sdc_service_id"
@@ -293,7 +293,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "onboard/accept_service_test.yaml"
+    file: "onap/onboard/accept_service_test.yaml"
     input:
     -
       parameter_name: "sdc_service_id"
@@ -309,7 +309,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "onboard/approve_distribution.yaml"
+    file: "onap/onboard/approve_distribution.yaml"
     input:
     -
       parameter_name: "service_version_id"
@@ -320,7 +320,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "onboard/distribute.yaml"
+    file: "onap/onboard/distribute.yaml"
     input:
     -
       parameter_name: "service_version_id"
@@ -354,7 +354,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "onboard/monitor_distribution.yaml"
+    file: "onap/onboard/monitor_distribution.yaml"
     input:
     -
       parameter_name: "distributed_service_id"
diff --git a/tests/onap/test_cases/onap_vnftest_tc002.yaml b/tests/onap/test_cases/onap_vnftest_tc002.yaml
index 341c1c8..5688f30 100644
--- a/tests/onap/test_cases/onap_vnftest_tc002.yaml
+++ b/tests/onap/test_cases/onap_vnftest_tc002.yaml
@@ -46,7 +46,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "lifecycle/create_region.yaml"
+    file: "onap/lifecycle/create_region.yaml"
     input:
     -
       parameter_name: "cloud_owner"
@@ -64,7 +64,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "lifecycle/create_service.yaml"
+    file: "onap/lifecycle/create_service.yaml"
   runner:
     type: Iteration
     run_step: "setup,run"
@@ -72,7 +72,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "lifecycle/create_customer.yaml"
+    file: "onap/lifecycle/create_customer.yaml"
     input:
     -
       parameter_name: "customer_name"
@@ -86,7 +86,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "lifecycle/create_service_instance.yaml"
+    file: "onap/lifecycle/create_service_instance.yaml"
     delay: 60
     input:
     -
@@ -121,7 +121,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "lifecycle/monitor_request.yaml"
+    file: "onap/lifecycle/monitor_request.yaml"
     input:
     -
       parameter_name: "request_id"
@@ -140,7 +140,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "lifecycle/create_vnf_instance.yaml"
+    file: "onap/lifecycle/create_vnf_instance.yaml"
     delay: 30
     input:
     -
@@ -197,7 +197,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "lifecycle/monitor_request.yaml"
+    file: "onap/lifecycle/monitor_request.yaml"
     input:
     -
       parameter_name: "request_id"
@@ -222,11 +222,11 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "lifecycle/preload_sdnc.yaml"
+    file: "onap/lifecycle/preload_sdnc.yaml"
     input:
     -
       parameter_name: "vnf_parameters"
-      value: {{vf_module_definition.input_parameters}}
+      value: {{vf_module_definition.vnf_parameters}}
     -
       parameter_name: "vnf_name"
       value: {{vnf_name}}
@@ -252,10 +252,13 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "lifecycle/create_vf_module.yaml"
+    file: "onap/lifecycle/create_vf_module.yaml"
     delay: 30
     input:
     -
+      parameter_name: "user_parameters"
+      value: {{vf_module_definition.user_parameters}}
+    -
       parameter_name: "service_instance_id"
       value: "{service_instance_id}"
     -
@@ -327,7 +330,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "lifecycle/monitor_request.yaml"
+    file: "onap/lifecycle/monitor_request.yaml"
     input:
     -
       parameter_name: "request_id"
@@ -346,6 +349,15 @@ steps:
   runner:
     type: Iteration
     run_step: "setup,run"
+-
+  type: VfModuleValidator
+  options:
+    vnf_instance_id: "{vnf_instance_id}"
+    vf_module_instance_id: "{vf_module_instance_id}"
+  runner:
+    type: Iteration
+    run_step: "setup,run"
+
 {% endfor %}
 context:
   type: CSAR
\ No newline at end of file
diff --git a/tests/onap/test_cases/onap_vnftest_tc003.yaml b/tests/onap/test_cases/onap_vnftest_tc003.yaml
index d3b173d..278f8ef 100644
--- a/tests/onap/test_cases/onap_vnftest_tc003.yaml
+++ b/tests/onap/test_cases/onap_vnftest_tc003.yaml
@@ -30,7 +30,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "lifecycle/delete_vf_module.yaml"
+    file: "onap/lifecycle/delete_vf_module.yaml"
     input:
     -
       parameter_name: "service_instance_id"
@@ -71,7 +71,7 @@ steps:
 -
   type: OnapApiCall
   options:
-    file: "lifecycle/monitor_request.yaml"
+    file: "onap/lifecycle/monitor_request.yaml"
     input:
     -
       parameter_name: "request_id"
diff --git a/tests/onap/test_suites/onap_basic_lifecycle.yaml b/tests/onap/test_suites/onap_basic_lifecycle.yaml
index ff5241d..eab3efe 100644
--- a/tests/onap/test_suites/onap_basic_lifecycle.yaml
+++ b/tests/onap/test_suites/onap_basic_lifecycle.yaml
@@ -17,11 +17,10 @@
 schema: "vnftest:suite:0.1"
 
 name: "onap-basic-lifecycle"
-test_cases_dir: "tests/onap/test_cases/"
 test_cases:
 -
-    file_name: onap_vnftest_tc001.yaml
+    file_name: tests/onap/test_cases/onap_vnftest_tc001.yaml
 -
-    file_name: onap_vnftest_tc002.yaml
--
-    file_name: onap_vnftest_tc003.yaml
+    file_name: tests/onap/test_cases/onap_vnftest_tc002.yaml
+#-
+#    file_name: tests/onap/test_cases/onap_vnftest_tc003.yaml