[VVP] updating nested parameter test

[vvp/validation-scripts.git] / ice_validator / tests / test_nova_servers_vm_types.py

diff --git a/ice_validator/tests/test_nova_servers_vm_types.py b/ice_validator/tests/test_nova_servers_vm_types.py
index 786973e..d3d0dbb 100644 (file)
--- a/ice_validator/tests/test_nova_servers_vm_types.py
+++ b/ice_validator/tests/test_nova_servers_vm_types.py
@@ -2,7 +2,7 @@
 # ============LICENSE_START=======================================================
 # org.onap.vvp/validation-scripts
 # ===================================================================
 # ============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
 # ===================================================================
 #
 # Unless otherwise specified, all software contained herein is licensed


@@ -35,7 +35,6 @@
 #
 # ============LICENSE_END============================================
 #
 #
 # ============LICENSE_END============================================
 #

-# ECOMP is a trademark and service mark of AT&T Intellectual Property.

 #
 
 import pytest
 #
 
 import pytest


@@ -51,12 +50,12 @@ from .utils.network_roles import get_network_roles
 
 
 @validates("R-57282")
 
 
 @validates("R-57282")

-def test_vm_type_consistent_on_nova_servers(heat_template):
+def test_vm_type_consistent_on_nova_servers(yaml_file):

     """
     Make sure all nova servers have properly formatted properties
     for their name, image and flavor
     """
     """
     Make sure all nova servers have properly formatted properties
     for their name, image and flavor
     """

-    with open(heat_template) as fh:
+    with open(yaml_file) as fh:

         yml = yaml.load(fh)
 
     # skip if resources are not defined
         yml = yaml.load(fh)
 
     # skip if resources are not defined


@@ -118,23 +117,17 @@ def test_vm_type_network_role_collision(yaml_file):
 
 @validates("R-50436", "R-45188", "R-40499")
 def test_nova_server_flavor_parameter(yaml_file):
 
 @validates("R-50436", "R-45188", "R-40499")
 def test_nova_server_flavor_parameter(yaml_file):

-
-    prop = "flavor"
-    check_nova_parameter_format(prop, yaml_file)
+    check_nova_parameter_format("flavor", yaml_file)

 
 
 @validates("R-51430", "R-54171", "R-87817")
 def test_nova_server_name_parameter(yaml_file):
 
 
 @validates("R-51430", "R-54171", "R-87817")
 def test_nova_server_name_parameter(yaml_file):

-
-    prop = "name"
-    check_nova_parameter_format(prop, yaml_file)
+    check_nova_parameter_format("name", yaml_file)

 
 
 @validates("R-71152", "R-57282", "R-58670")
 def test_nova_server_image_parameter(yaml_file):
 
 
 @validates("R-71152", "R-57282", "R-58670")
 def test_nova_server_image_parameter(yaml_file):

-
-    prop = "image"
-    check_nova_parameter_format(prop, yaml_file)
+    check_nova_parameter_format("image", yaml_file)

 
 
 def check_nova_parameter_format(prop, yaml_file):
 
 
 def check_nova_parameter_format(prop, yaml_file):