From 1f4df7c7ad27b23773ad9cdbe4db1632ce388cf1 Mon Sep 17 00:00:00 2001 From: "stark, steven" Date: Mon, 17 Dec 2018 12:43:02 -0800 Subject: [VVP] updating validation scripts in dublin - adding backlog of new validation scripts for dublin - updating existing tests - removing outdated tests Issue-ID: VVP-123 Change-Id: Ib8260889ac957c1dd28d8ede450fc8edc6fb0ec0 Signed-off-by: stark, steven --- .../fail/invalid_naming_used_for_network.yaml | 14 ++++++++++++-- .../test_network_format/pass/valid_heat_template.yaml | 8 +++++++- 2 files changed, 19 insertions(+), 3 deletions(-) (limited to 'ice_validator/tests/fixtures/test_network_format') diff --git a/ice_validator/tests/fixtures/test_network_format/fail/invalid_naming_used_for_network.yaml b/ice_validator/tests/fixtures/test_network_format/fail/invalid_naming_used_for_network.yaml index 3a60812..7351826 100644 --- a/ice_validator/tests/fixtures/test_network_format/fail/invalid_naming_used_for_network.yaml +++ b/ice_validator/tests/fixtures/test_network_format/fail/invalid_naming_used_for_network.yaml @@ -47,14 +47,24 @@ resources: vm_type_1_int_vpnnet_0_port: type: OS::Neutron::Port properties: - network: { get_param: int_vpnnet_net } + network: { get_param: int_vpnnet_net_id } vm_type_1_extnet_net_0_port: type: OS::Neutron::Port properties: - network: { get_param: extnet_net } + network: { get_param: extnet_net_name } vm_type_1_extnet_0_port: type: OS::Neutron::Port properties: network: { get_param: extnet_net_id } + + int_oam_netork: + type: OS::Neutron::Net + properties: + name: { get_param: int_oam_net_name } + + vm_type_1_int_oam_1_port: + type: OS::Neutron::Port + properties: + gbgdfjk: { get_resource: int_oam_net } diff --git a/ice_validator/tests/fixtures/test_network_format/pass/valid_heat_template.yaml b/ice_validator/tests/fixtures/test_network_format/pass/valid_heat_template.yaml index 83358b2..136e27b 100644 --- a/ice_validator/tests/fixtures/test_network_format/pass/valid_heat_template.yaml +++ b/ice_validator/tests/fixtures/test_network_format/pass/valid_heat_template.yaml @@ -59,10 +59,16 @@ resources: properties: network: { get_param: extnet_net_id } - int_oam_net: + int_oam_network: type: OS::Neutron::Net properties: name: { get_param: int_oam_net_name } + + int_oam_subnet: + type: OS::Neutron::Subnet + properties: + network: { get_resource: int_oam_network } + vm_type_1_int_oam_1_port: type: OS::Neutron::Port properties: -- cgit 1.2.3-korg