Code Review
/
vvp
/
validation-scripts.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
[VVP] add bug fixes and reserve port updates
[vvp/validation-scripts.git]
/
ice_validator
/
tests
/
fixtures
/
test_reserve_port_only_in_base_template
/
fail
/
invalid_base_naming_for_fixed_ips.yaml
diff --git
a/ice_validator/tests/fixtures/test_network_format/fail/invalid_naming_used_for_internal_network_resource.yaml
b/ice_validator/tests/fixtures/test_reserve_port_only_in_base_template/fail/invalid_base_naming_for_fixed_ips.yaml
similarity index 78%
rename from
ice_validator/tests/fixtures/test_network_format/fail/invalid_naming_used_for_internal_network_resource.yaml
rename to
ice_validator/tests/fixtures/test_reserve_port_only_in_base_template/fail/invalid_base_naming_for_fixed_ips.yaml
index
26d0709
..
9d9be46
100644
(file)
--- a/
ice_validator/tests/fixtures/test_network_format/fail/invalid_naming_used_for_internal_network_resource.yaml
+++ b/
ice_validator/tests/fixtures/test_reserve_port_only_in_base_template/fail/invalid_base_naming_for_fixed_ips.yaml
@@
-6,7
+6,7
@@
# ===================================================================
#
# Unless otherwise specified, all software contained herein is licensed
# ===================================================================
#
# Unless otherwise specified, all software contained herein is licensed
-# under the Apache License, Version 2.0 (the
“License”
);
+# under the Apache License, Version 2.0 (the
"License"
);
# you may not use this software except in compliance with the License.
# You may obtain a copy of the License at
#
# you may not use this software except in compliance with the License.
# You may obtain a copy of the License at
#
@@
-21,7
+21,7
@@
#
#
# Unless otherwise specified, all documentation contained herein is licensed
#
#
# Unless otherwise specified, all documentation contained herein is licensed
-# under the Creative Commons License, Attribution 4.0 Intl. (the
“License”
);
+# under the Creative Commons License, Attribution 4.0 Intl. (the
"License"
);
# you may not use this documentation except in compliance with the License.
# You may obtain a copy of the License at
#
# you may not use this documentation except in compliance with the License.
# You may obtain a copy of the License at
#
@@
-39,27
+39,31
@@
#
---
resources:
#
---
resources:
- vm_type_1_int_intranet_0_port:
+
+ lb_1_int_intranet_port:
type: OS::Neutron::Port
properties:
network: { get_param: int_intranet_net_name }
type: OS::Neutron::Port
properties:
network: { get_param: int_intranet_net_name }
+ fixed_ips:
+ - ip_address: { get_param: lb_1_int_intranet_ip }
-
vm_type_1_int_vpnnet_0
_port:
+
lb_2_int_intranet
_port:
type: OS::Neutron::Port
properties:
type: OS::Neutron::Port
properties:
- network: { get_param: int_vpnnet_net_id }
+ network: { get_param: int_intranet_net_id }
+ fixed_ips:
+ - ip_address: { get_param: lb_2_int_intranet_floating_v6_ips }
-
vm_type_1_extnet_net_0
_port:
+
lb_1_extnet
_port:
type: OS::Neutron::Port
properties:
network: { get_param: extnet_net_name }
type: OS::Neutron::Port
properties:
network: { get_param: extnet_net_name }
+ fixed_ips:
+ - ip_address: { get_param: lb_1_extnet_floating_ip }
-
vm_type_1_extnet_0
_port:
+
lb_2_extnet
_port:
type: OS::Neutron::Port
properties:
network: { get_param: extnet_net_id }
type: OS::Neutron::Port
properties:
network: { get_param: extnet_net_id }
-
- vm_type_1_int_oam_1_port:
- type: OS::Neutron::Port
- properties:
- network: { get_resource: int_oam_net }
+ fixed_ips:
+ - ip_address: { get_param: lb_2_extnet_floating_v6_ip }
\ No newline at end of file