aboutsummaryrefslogtreecommitdiffstats
path: root/ice_validator/tests
diff options
context:
space:
mode:
authorSteven Wright <sw3588@att.com>2019-05-09 17:49:35 +0000
committerGerrit Code Review <gerrit@onap.org>2019-05-09 17:49:35 +0000
commite4d14d1e0d1d676c881637351010821633c1aa4b (patch)
tree905f4b9784a08e3a7708103ef24b27e3c660dc40 /ice_validator/tests
parent59c9e996728d7d4d8d1e184857933deff68d4b91 (diff)
parent2d04106b17f879fb4318bd79fd40b3314090f843 (diff)
Merge "[VVP] relaxing test_contrail_fqdn"
Diffstat (limited to 'ice_validator/tests')
-rw-r--r--ice_validator/tests/fixtures/test_contrail_fqdn/pass/pass0.yaml20
-rw-r--r--ice_validator/tests/test_contrail_fqdn.py5
2 files changed, 20 insertions, 5 deletions
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":