make os_security_group_rule idempotent (#23707)

* Fix issue #19610
(cherry picked from commit 6b6e5665aa)
pull/30252/head
Andrea Tosatto 7 years ago committed by Toshio Kuratomi
parent 7b3999560b
commit 61acd35da4

@ -208,10 +208,15 @@ def _ports_match(protocol, module_min, module_max, rule_min, rule_max):
if module_max and int(module_max) == -1: if module_max and int(module_max) == -1:
module_max = None module_max = None
# Check if user is supplying None values for full TCP/UDP port range. # Check if the user is supplying -1 or None values for full TPC/UDP port range.
if protocol in ['tcp', 'udp'] and module_min is None and module_max is None: if protocol in ['tcp', 'udp'] or protocol is None:
if (rule_min and int(rule_min) == 1 if module_min and module_max and int(module_min) == int(module_max) == -1:
and rule_max and int(rule_max) == 65535): module_min = None
module_max = None
if ((module_min is None and module_max is None) and
(rule_min and int(rule_min) == 1 and
rule_max and int(rule_max) == 65535)):
# (None, None) == (1, 65535) # (None, None) == (1, 65535)
return True return True

Loading…
Cancel
Save