resources are located by logical path

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

fix tests

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

1 files changed, 0 insertions, 363 deletions

diff --git a/tests/onap/test_cases/onap_vnftest_tc002.yaml b/tests/onap/test_cases/onap_vnftest_tc002.yaml
deleted file mode 100644
index 5688f30..0000000
--- a/tests/onap/test_cases/onap_vnftest_tc002.yaml
+++ /dev/null
@@ -1,363 +0,0 @@
-##############################################################################
-# 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 %}
-
-# 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 vf_modules_list = vf_modules_list or {}%}
-
-steps:
--
-  type: OnapApiCall
-  options:
-    file: "onap/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: "onap/lifecycle/create_service.yaml"
-  runner:
-    type: Iteration
-    run_step: "setup,run"
-
--
-  type: OnapApiCall
-  options:
-    file: "onap/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: "onap/lifecycle/create_service_instance.yaml"
-    delay: 60
-    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: "onap/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: "onap/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: "onap/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"
-
-{% for vf_module_definition in vnf_descriptor.vf_modules %}
-  {% 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
-  options:
-    file: "onap/lifecycle/preload_sdnc.yaml"
-    input:
-    -
-      parameter_name: "vnf_parameters"
-      value: {{vf_module_definition.vnf_parameters}}
-    -
-      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: {{vf_module.groupName}}
-  runner:
-    type: Iteration
-    run_step: "setup,run"
-
--
-  type: OnapApiCall
-  options:
-    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}"
-    -
-      parameter_name: "vnf_instance_id"
-      value: "{vnf_instance_id}"
-    -
-      parameter_name: "vnf_name"
-      value: {{vnf_name}}
-    -
-      parameter_name: "module_model_invariant_id"
-      value: {{vf_module.invariantUUID}}
-    -
-      parameter_name: "module_model_version_id"
-      value: {{vf_module.groupUUID}}
-    -
-      parameter_name: "vnf_type"
-      value: {{vf_module.groupName}}
-    -
-      parameter_name: "module_model_version"
-      value: {{vf_module.version}}
-    -
-      parameter_name: "module_model_customization_id"
-      value: {{vf_module.customizationUUID}}
-    -
-      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: "vf_module_instance_id"
-      value: "[requestReferences][instanceId]"
-    -
-      parameter_name: "request_id"
-      value: "[requestReferences][requestId]"
-  runner:
-    type: Iteration
-    run_step: "setup,run"
-
--
-  type: OnapApiCall
-  options:
-    file: "onap/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: 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