add new test case for vnf deletion

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

4 files changed, 146 insertions, 0 deletions

diff --git a/tests/onap/test_cases/onap_vnftest_tc002.yaml b/tests/onap/test_cases/onap_vnftest_tc002.yaml
index 0af871e..d2e2bee 100644
--- a/tests/onap/test_cases/onap_vnftest_tc002.yaml
+++ b/tests/onap/test_cases/onap_vnftest_tc002.yaml
@@ -313,6 +313,9 @@ steps:
 
     output:
     -
+      parameter_name: "vf_module_instance_id"
+      value: "[requestReferences][instanceId]"
+    -
       parameter_name: "request_id"
       value: "[requestReferences][requestId]"
   runner:
diff --git a/tests/onap/test_cases/onap_vnftest_tc003.yaml b/tests/onap/test_cases/onap_vnftest_tc003.yaml
new file mode 100644
index 0000000..304513a
--- /dev/null
+++ b/tests/onap/test_cases/onap_vnftest_tc003.yaml
@@ -0,0 +1,96 @@
+##############################################################################
+# 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 TC003 config file;
+    Delete VF module
+
+{% set service_instance_id = service_instance_id or '\"\u007Bservice_instance_id\u007D\"' %}
+{% set vnf_instance_id = vnf_instance_id or '\"\u007Bvnf_instance_id\u007D\"' %}
+{% set vf_module_instance_id = vf_module_instance_id or '\"\u007Bvf_module_instance_id\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\"' %}
+{% set service_model_customization_id = service_model_customization_id or '\"\u007Bservice_model_customization_id\u007D\"' %}
+
+steps:
+-
+  type: OnapApiCall
+  options:
+    file: "lifecycle/delete_vf_module.yaml"
+    input:
+    -
+      parameter_name: "service_instance_id"
+      value: {{service_instance_id}}
+    -
+      parameter_name: "vnf_instance_id"
+      value: {{vnf_instance_id}}
+    -
+      parameter_name: "vf_module_instance_id"
+      value: {{vf_module_instance_id}}
+    -
+      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}"
+    
+    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 508f068..ff5241d 100644
--- a/tests/onap/test_suites/onap_basic_lifecycle.yaml
+++ b/tests/onap/test_suites/onap_basic_lifecycle.yaml
@@ -23,3 +23,5 @@ test_cases:
     file_name: onap_vnftest_tc001.yaml
 -
     file_name: onap_vnftest_tc002.yaml
+-
+    file_name: onap_vnftest_tc003.yaml
diff --git a/vnftest/onap/lifecycle/delete_vf_module.yaml b/vnftest/onap/lifecycle/delete_vf_module.yaml
new file mode 100644
index 0000000..a806c92
--- /dev/null
+++ b/vnftest/onap/lifecycle/delete_vf_module.yaml
@@ -0,0 +1,45 @@
+##############################################################################
+# 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
+##############################################################################
+
+---
+method: "DELETE"
+url: "http://{mso_ip}/ecomp/mso/infra/serviceInstances/v5/{service_instance_id}/vnfs/{vnf_instance_id}/vfModules/{vf_module_instance_id}"
+headers: {
+        "Content-Type": "application/json",
+        "Authorization": "Basic SW5mcmFQb3J0YWxDbGllbnQ6cGFzc3dvcmQxJA==",
+        "X-FromAppId": "MSO",
+        "X-TransactionId": "demo",
+        "Accept": "application/json"
+        }
+body: {
+        "requestDetails": {
+          "modelInfo": {
+            "modelType": "vfModule",
+            "modelInvariantId": "{module_model_invariant_id}",
+            "modelVersionId": "{module_model_version_id}",
+            "modelName": "{vnf_type}",
+            "modelVersion": "{module_model_version}",
+            "modelCustomizationId": "{service_model_customization_id}",
+            "modelCustomizationName": "{vnf_type}"
+          },
+          "requestInfo": {
+            "source": "VID",
+            "requestorId": "vid1"
+          },
+          "cloudConfiguration": {
+            "lcpCloudRegionId": "RegionOne",
+            "tenantId": "{tenant_id}"
+          }
+        }
+      }