[VVP] adding subnet_uuid to nested parameter check

Change-Id: If0ae761fa20c24b3839234f23037fff6b32d851b
Issue-ID: VVP-199
Signed-off-by: stark, steven <steven.stark@att.com>

diff --git a/ice_validator/tests/fixtures/test_nested_parameters/fail/base_stark.yaml b/ice_validator/tests/fixtures/test_nested_parameters/fail/base_stark.yaml
index dfe53b3..b8991e3 100755 (executable)
--- a/ice_validator/tests/fixtures/test_nested_parameters/fail/base_stark.yaml
+++ b/ice_validator/tests/fixtures/test_nested_parameters/fail/base_stark.yaml
@@ -96,6 +96,10 @@ parameters:
     type: string
     description: nlfdsa
 
+  subnet_uid:
+    type: string
+    description: nlfdsa
+
 resources:
 
   int_mummy_network:
@@ -137,3 +141,4 @@ resources:
           oam2_net_fqdn: { get_param: oam2net_fqdn }
           instance_ip_address: { get_param: instanceip_address }
           mycontrailip: { get_param: my_contrailip }
+          subnet_uuid: { get_param: subnet_uid }

diff --git a/ice_validator/tests/fixtures/test_nested_parameters/fail/stark_nested.yaml b/ice_validator/tests/fixtures/test_nested_parameters/fail/stark_nested.yaml
index e6b328a..48df735 100755 (executable)
--- a/ice_validator/tests/fixtures/test_nested_parameters/fail/stark_nested.yaml
+++ b/ice_validator/tests/fixtures/test_nested_parameters/fail/stark_nested.yaml
@@ -104,12 +104,17 @@ parameters:
     type: string
     description: njsaf
 
+  subnet_uuid:
+    type: string
+    description: njsaf
+
 resources:
 
   fw_0_oam_protected_vmi_0_IP_0:
     type: OS::ContrailV2::InstanceIp
     properties:
       instance_ip_address: { get_param: instance_ip_address }
+      subnet_uuid: { get_param: subnet_uuid }
 
   fw_0_oam_vmi_0:
     type: OS::ContrailV2::VirtualMachineInterface

diff --git a/ice_validator/tests/fixtures/test_nested_parameters/pass/base_stark.yaml b/ice_validator/tests/fixtures/test_nested_parameters/pass/base_stark.yaml
index 0f82c0b..3953df3 100755 (executable)
--- a/ice_validator/tests/fixtures/test_nested_parameters/pass/base_stark.yaml
+++ b/ice_validator/tests/fixtures/test_nested_parameters/pass/base_stark.yaml
@@ -92,6 +92,11 @@ parameters:
     type: string
     description: nlfdsa
 
+  subnet_uid:
+    type: string
+    description: nlfdsa
+
+
 resources:
 
   int_mummy_network:
@@ -132,3 +137,4 @@ resources:
           oam2_net_fqdn: { get_param: oam2_net_fqdn }
           instance_ip_address: { get_param: instance_ip_address }
           mycontrailip: { get_param: mycontrailip }
+          subnet_uid: { get_param: subnet_uid }

diff --git a/ice_validator/tests/fixtures/test_nested_parameters/pass/stark_nested.yaml b/ice_validator/tests/fixtures/test_nested_parameters/pass/stark_nested.yaml
index b2ca936..6263040 100755 (executable)
--- a/ice_validator/tests/fixtures/test_nested_parameters/pass/stark_nested.yaml
+++ b/ice_validator/tests/fixtures/test_nested_parameters/pass/stark_nested.yaml
@@ -100,13 +100,17 @@ parameters:
     type: string
     description: njsaf
 
+  subnet_uid:
+    type: string
+    description: njsaf
+
 resources:
 
   fw_0_oam_protected_vmi_0_IP_0:
     type: OS::ContrailV2::InstanceIp
     properties:
       instance_ip_address: { get_param: instance_ip_address }
-
+      subnet_uuid: { get_param: subnet_uid }
   fw_0_oam_vmi_0:
     type: OS::ContrailV2::VirtualMachineInterface
     properties:

diff --git a/ice_validator/tests/test_nested_parameters.py b/ice_validator/tests/test_nested_parameters.py
index 2622044..846a977 100644 (file)
--- a/ice_validator/tests/test_nested_parameters.py
+++ b/ice_validator/tests/test_nested_parameters.py
@@ -265,3 +265,10 @@ def test_iip_instance_ip_parameter_name_doesnt_change_in_nested_template(heat_te
     check_nested_parameter_doesnt_change(
         heat_template, "OS::ContrailV2::InstanceIp", "instance_ip_address"
     )
+
+
+@validates("R-708564")
+def test_iip_subnet_uuid_parameter_name_doesnt_change_in_nested_template(heat_template):
+    check_nested_parameter_doesnt_change(
+        heat_template, "OS::ContrailV2::InstanceIp", "subnet_uuid"
+    )