Code Review
/
vvp
/
validation-scripts.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[VVP] stand alone tool, script updates
[vvp/validation-scripts.git]
/
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
(file)
--- 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.
#
#
# ECOMP is a trademark and service mark of AT&T Intellectual Property.
#
-
import pytest
from tests import cached_yaml as yaml
import pytest
from tests import cached_yaml as yaml
-
from .helpers import validates
from .utils.vm_types import get_vm_type_for_nova_server
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, (
)
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 "
"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)
)
"".format(invalid_nova_servers)
)