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_nova_servers_resource_ids.py | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

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

diff --git a/ice_validator/tests/test_nova_servers_resource_ids.py b/ice_validator/tests/test_nova_servers_resource_ids.py
index 9747e29..b5c8754 100644
--- a/ice_validator/tests/test_nova_servers_resource_ids.py
+++ b/ice_validator/tests/test_nova_servers_resource_ids.py
@@ -37,10 +37,8 @@
 #
 # ECOMP is a trademark and service mark of AT&T Intellectual Property.
 #
-
 import pytest
 from tests import cached_yaml as yaml
-
 from .helpers import validates
 from .utils.vm_types import get_vm_type_for_nova_server
 
@@ -102,9 +100,9 @@ def test_nova_servers_valid_resource_ids(yaml_file):
                     )
 
     assert not invalid_nova_servers, (
-        "Invalid OS::Nova::Server resource ids detected {}\n"
+        "Invalid OS::Nova::Server resource ids detected {}. "
         "OS::Nova::Server resource ids must be in the form "
-        "<vm_type>_server_<vm_type_index> \n"
-        "<vm_type> is derived from flavor, image and name properties "
+        "{{vm_type}}_server_{{vm_type_index}} where "
+        "{{vm_type}} is derived from flavor, image and name properties."
         "".format(invalid_nova_servers)
     )
-- 
cgit 1.2.3-korg