X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=ice_validator%2Ftests%2Ffixtures%2Ftest_network_format%2Fpass%2Fvalid_heat_template.yaml;h=3035deb93e9fa0672afc20f048fca8be095e3f87;hb=d78c645df31a19567667d3e6d3acdf0474f39bf1;hp=8755077a73397458b1bf3106cf1b483c34ec2375;hpb=8540eb59f7e7f8ff2043a8eaf7edfc255a60874a;p=vvp%2Fvalidation-scripts.git 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 8755077..3035deb 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 @@ -38,37 +38,19 @@ # --- resources: - vm_type_1_int_intranet_0_port: - type: OS::Neutron::Port - properties: - network: { get_param: int_intranet_net_name } - - vm_type_1_int_vpnnet_0_port: - type: OS::Neutron::Port - properties: - network: { get_param: int_vpnnet_net_id } - - vm_type_1_extnet_net_0_port: - type: OS::Neutron::Port - properties: - 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_network: - type: OS::Neutron::Net - properties: - name: { get_param: int_oam_net_name } + type: OS::Neutron::Net 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 + type: OS::Neutron::Subnet + properties: + network: { get_resource: int_oam_network } + + int_other_network: + type: OS::ContrailV2::VirtualNetwork + + int_other_subnet: + type: OS::Neutron::Subnet properties: - network: { get_resource: int_oam_net } + network: { get_resource: int_other_network }