[VVP] Updating vm_type class test to proceed if no cinder

[vvp/validation-scripts.git] / ice_validator / tests / test_contrail_vn_resource_id.py

diff --git a/ice_validator/tests/test_contrail_vn_resource_id.py b/ice_validator/tests/test_contrail_vn_resource_id.py
index 4045eee..07eece5 100644 (file)
--- a/ice_validator/tests/test_contrail_vn_resource_id.py
+++ b/ice_validator/tests/test_contrail_vn_resource_id.py
@@ -2,7 +2,7 @@
 # ============LICENSE_START====================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
-# Copyright © 2017 AT&T Intellectual Property. All rights reserved.
+# Copyright © 2019 AT&T Intellectual Property. All rights reserved.
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed
@@ -35,7 +35,6 @@
 #
 # ============LICENSE_END============================================
 #
-# ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
 
 """
@@ -46,15 +45,15 @@ import pytest
 
 from .helpers import validates
 from .structures import Heat
-from .structures import ContrailV2VirtualNetwork
+from .structures import ContrailV2VirtualNetworkProcessor
 
-VERSION = "1.0.0"
+VERSION = "2.0.0"
 
 # pylint: disable=invalid-name
 
 
 @validates("R-99110")
-def test_neutron_net_resource_id(heat_template):
+def test_neutron_net_resource_id(yaml_file):
     """
     A VNF's Heat Orchestration Template's Resource
     OS::ContrailV2::VirtualNetwork Resource ID
@@ -64,8 +63,8 @@ def test_neutron_net_resource_id(heat_template):
     or
     2) int_{network-role}_RVN`` where RVN represents Resource Virtual
     """
-    heat = Heat(filepath=heat_template)
-    heat_object_class = ContrailV2VirtualNetwork
+    heat = Heat(filepath=yaml_file)
+    heat_object_class = ContrailV2VirtualNetworkProcessor
     resource_type = heat_object_class.resource_type
     resources = heat.get_resource_by_type(resource_type)
     if not resources: