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>
---
 .../tests/test_contrail_vmi_resource_id.py         | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

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

diff --git a/ice_validator/tests/test_contrail_vmi_resource_id.py b/ice_validator/tests/test_contrail_vmi_resource_id.py
index 35f16e6..9e9641d 100644
--- a/ice_validator/tests/test_contrail_vmi_resource_id.py
+++ b/ice_validator/tests/test_contrail_vmi_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
@@ -37,25 +37,25 @@
 #
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
-import pytest
-
-from .structures import Heat
-from .structures import ContrailV2VirtualMachineInterface
-from .helpers import validates
 
 """
 resources:
 {vm-type}_server_{vm-type_index}
 """
+import pytest
+
+from .structures import Heat
+from .structures import ContrailV2VirtualMachineInterfaceProcessor
+from .helpers import validates
 
-VERSION = "1.0.0"
+VERSION = "2.0.0"
 
 
 def run_test(heat_template, regex_name, network_flavor):
     """run test
     """
     heat = Heat(filepath=heat_template)
-    heat_object_class = ContrailV2VirtualMachineInterface
+    heat_object_class = ContrailV2VirtualMachineInterfaceProcessor
     resource_type = heat_object_class.resource_type
     resources = heat.get_resource_by_type(resource_type=resource_type)
     if not resources:
@@ -94,7 +94,7 @@ def test_contrail_instance_ip_resource_id_external(heat_template):
     run_test(
         heat_template,
         regex_name="vmi_external",
-        network_flavor=ContrailV2VirtualMachineInterface.network_flavor_external,
+        network_flavor=ContrailV2VirtualMachineInterfaceProcessor.network_flavor_external,
     )
 
 
@@ -111,7 +111,7 @@ def test_contrail_instance_ip_resource_id_internal(heat_template):
     run_test(
         heat_template,
         regex_name="vmi_internal",
-        network_flavor=ContrailV2VirtualMachineInterface.network_flavor_internal,
+        network_flavor=ContrailV2VirtualMachineInterfaceProcessor.network_flavor_internal,
     )
 
 
@@ -128,5 +128,5 @@ def test_contrail_instance_ip_resource_id_subint(heat_template):
     run_test(
         heat_template,
         regex_name="vmi_subint",
-        network_flavor=ContrailV2VirtualMachineInterface.network_flavor_subint,
+        network_flavor=ContrailV2VirtualMachineInterfaceProcessor.network_flavor_subint,
     )
-- 
cgit 1.2.3-korg