X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_neutron_net_resource_id.py;h=d86cf7a1005f05b5040897c5ded2f40bfe3ec127;hb=0c4e64d87728b89aa9cd4d41d738f5bfe64ceee3;hp=36e77fa575714247b6f60c9b256739492f401e30;hpb=1f4df7c7ad27b23773ad9cdbe4db1632ce388cf1;p=vvp%2Fvalidation-scripts.git

diff --git a/ice_validator/tests/test_neutron_net_resource_id.py b/ice_validator/tests/test_neutron_net_resource_id.py
index 36e77fa..d86cf7a 100644
--- a/ice_validator/tests/test_neutron_net_resource_id.py
+++ b/ice_validator/tests/test_neutron_net_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,28 +45,27 @@ import pytest
 
 from .helpers import validates
 from .structures import Heat
-from .structures import NeutronNet
+from .structures import NeutronNetProcessor
 
-VERSION = "1.1.0"
+VERSION = "2.0.0"
 
 # pylint: disable=invalid-name
 
 
 @validates("R-25720")
-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::Neutron::Net
     Resource ID **MUST** use the naming convention
 
     * int_{network-role}_network
     """
-    heat = Heat(filepath=heat_template)
-    neutron_nets = heat.get_resource_by_type(NeutronNet.resource_type)
+    heat = Heat(filepath=yaml_file)
+    neutron_nets = heat.get_resource_by_type(NeutronNetProcessor.resource_type)
     if not neutron_nets:
         pytest.skip("No neutron nets found")
-    neutron_net = NeutronNet()
     bad = []
     for rid in neutron_nets:
-        if not neutron_net.get_rid_match_tuple(rid)[0]:
+        if not NeutronNetProcessor.get_rid_match_tuple(rid)[0]:
             bad.append("Neutron Net %s does not match any known format" % rid)
     assert not bad, "; ".join(bad)