From 48a07b6942d3956666d30947372653feb702fdae Mon Sep 17 00:00:00 2001
From: "stark, steven" <steven.stark@att.com>
Date: Mon, 28 Jan 2019 14:59:01 -0800
Subject: [VVP] stand alone tool, script updates

1) Validation script updates:
    Various bug fixes and script enhancements

    New tests for:
    R-18683
    R-94669
    R-304011
    R-01455
    R-86476
    R-708564
    R-85734
    R-18683
    R-94669
    R-304011
    R-01455
    R-86476
    R-86476
    R-589037

    Removed tests for:
    R-75202
    R-62954
    R-22441
    R-49177
    R-16576
    R-86237
    R-44491
    R-70757
    R-01896
    R-26124

2) Stand Alone tool introduced
3) Added optional "categories" capability

Change-Id: I193cd5c267750791d97b350e91fc36faa72d8d5f
Issue-ID: VVP-143
Signed-off-by: stark, steven <steven.stark@att.com>
---
 ice_validator/tests/test_neutron_net_resource_id.py | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

(limited to 'ice_validator/tests/test_neutron_net_resource_id.py')

diff --git a/ice_validator/tests/test_neutron_net_resource_id.py b/ice_validator/tests/test_neutron_net_resource_id.py
index 36e77fa..1b0b322 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
@@ -46,9 +46,9 @@ 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
 
@@ -62,12 +62,11 @@ def test_neutron_net_resource_id(heat_template):
     * int_{network-role}_network
     """
     heat = Heat(filepath=heat_template)
-    neutron_nets = heat.get_resource_by_type(NeutronNet.resource_type)
+    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)
-- 
cgit 1.2.3-korg