From: Steven Wright <sw3588@att.com>
Date: Thu, 9 May 2019 17:49:35 +0000 (+0000)
Subject: Merge "[VVP] relaxing test_contrail_fqdn"
X-Git-Tag: 5.0.0~40
X-Git-Url: https://gerrit.onap.org/r/gitweb?p=vvp%2Fvalidation-scripts.git;a=commitdiff_plain;h=e4d14d1e0d1d676c881637351010821633c1aa4b;hp=59c9e996728d7d4d8d1e184857933deff68d4b91

Merge "[VVP] relaxing test_contrail_fqdn"
---

diff --git a/ice_validator/tests/fixtures/test_contrail_fqdn/pass/pass0.yaml b/ice_validator/tests/fixtures/test_contrail_fqdn/pass/pass0.yaml
index 81faeb2..5d61de5 100644
--- a/ice_validator/tests/fixtures/test_contrail_fqdn/pass/pass0.yaml
+++ b/ice_validator/tests/fixtures/test_contrail_fqdn/pass/pass0.yaml
@@ -40,16 +40,26 @@
 
 ---
 parameters:
-  bialy_net_fqdn:
+  oam_net_fqdn:
+    type: string
+  huey:
+    type: string
+  dewey:
     type: string
 
 resources:
 
-  vm_typeX_0_bialy_port_2:
+  fw_0_oam_vmi_0:
+    type: OS::ContrailV2::VirtualMachineInterface
+    properties:
+      virtual_network_refs:
+        - get_param: oam_net_fqdn
+
+  fw_0_int_internal_vmi_0:
     type: OS::ContrailV2::VirtualMachineInterface
     properties:
       virtual_network_refs:
-      - get_param: huey
-      - get_param: dewey
-      - get_param: bialy_net_fqdn
+        - get_resource: { int_internal_network }
 
+  int_internal_network:
+    type: OS::Neutron::Net
diff --git a/ice_validator/tests/test_contrail_fqdn.py b/ice_validator/tests/test_contrail_fqdn.py
index f90553f..178ce8d 100644
--- a/ice_validator/tests/test_contrail_fqdn.py
+++ b/ice_validator/tests/test_contrail_fqdn.py
@@ -108,6 +108,11 @@ def validate_virtual_network_refs(heat, virtual_network_refs, network_role):
     expect = "%s_net_fqdn" % network_role
     for vn_ref in virtual_network_refs:
         param = heat.nested_get(vn_ref, "get_param")
+
+        # skip if not connecting via get_param
+        if not param:
+            return None
+
         if param == expect:
             param_type = heat.nested_get(heat.parameters, param, "type")
             if param_type != "string":