X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Ftest_nova_servers_resource_ids.py;fp=ice_validator%2Ftests%2Ftest_nova_servers_resource_ids.py;h=b5c87545e9590051a1f735c664b6d5afeb2ff7a5;hb=48a07b6942d3956666d30947372653feb702fdae;hp=9747e29ec6ef38d52e569833aba937b680a2b08a;hpb=43130f8b173d9053ad4f56f264376851d3fb890c;p=vvp%2Fvalidation-scripts.git 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 " - "_server_ \n" - " 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) )