From 74e94f27126f18561aa702ab18690d668a0ce231 Mon Sep 17 00:00:00 2001 From: Robert Marsa Date: Tue, 17 Mar 2015 13:49:53 -0700 Subject: [PATCH] Added multiple allowed ranges. --- cloud/google/gce_net.py | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/cloud/google/gce_net.py b/cloud/google/gce_net.py index bafe6d1d43a..8a9b1bf4f6b 100644 --- a/cloud/google/gce_net.py +++ b/cloud/google/gce_net.py @@ -33,7 +33,7 @@ description: options: allowed: description: - - the protocol:ports to allow ('tcp:80' or 'tcp:80,443' or 'tcp:80-800') + - the protocol:ports to allow ('tcp:80' or 'tcp:80,443' or 'tcp:80-800;udp:1-25') required: false default: null aliases: [] @@ -136,9 +136,8 @@ except ImportError: "msg='libcloud with GCE support required for this module.'") sys.exit(1) - -def format_allowed(allowed): - """Format the 'allowed' value so that it is GCE compatible.""" +def format_allowed_section(allowed): + """Format each section of the allowed list""" if allowed.count(":") == 0: protocol = allowed ports = [] @@ -153,8 +152,18 @@ def format_allowed(allowed): return_val = {"IPProtocol": protocol} if ports: return_val["ports"] = ports - return [return_val] + return return_val +def format_allowed(allowed): + """Format the 'allowed' value so that it is GCE compatible.""" + return_value = [] + if allowed.count(";") == 0: + return [format_allowed_section(allowed)] + else: + sections = allowed.split(";") + for section in sections: + return_value.append(format_allowed_section(section)) + return return_value def main(): module = AnsibleModule(