Fixes the enabled_vlans argument (#3061)

This argument had a couple of issues with it. First, as it was
being interpreted in the code, it did not check for idempotency.

Second, the model of having the parameters be "all_*" is going to
hinder the ability to "undo", so-to-speak, what the user did while
maintaining legibility.

Consider if the user specified "all_enabled_vlans='net1'" and then
decided they wanted to backout of this decision. What is the proper
argument to fulfill this wish? "all_enabled_vlans='...?'

This patch changes the all_enabled_vlans argument to be "enabled_vlans",
ensures that idempotency works, and also provides for a way to "undo" a
change to the enabled VLANs by allowing the user to specify the special
case VLAN named "ALL" (all capitals).

This makes the parameter more intuitive because the users will specify
which vlans they want to make the virtual available on

  * enabled_vlans="net1"

but also allows them to "undo" what they did by setting it back with
the case of all

  * enabled_vlans="ALL"
pull/18777/head
Tim Rupp 8 years ago committed by Matt Clay
parent 223d5cc7ee
commit 6f0477a780

@ -86,10 +86,11 @@ options:
- List of rules to be applied in priority order - List of rules to be applied in priority order
required: false required: false
default: None default: None
all_enabled_vlans: enabled_vlans:
version_added: "2.2" version_added: "2.2"
description: description:
- List of vlans to be enabled - List of vlans to be enabled. When a VLAN named C(ALL) is used, all
VLANs will be allowed.
required: false required: false
default: None default: None
pool: pool:
@ -132,7 +133,7 @@ EXAMPLES = '''
all_profiles: all_profiles:
- http - http
- clientssl - clientssl
all_enabled_vlans: enabled_vlans:
- /Common/vlan2 - /Common/vlan2
delegate_to: localhost delegate_to: localhost
@ -272,7 +273,7 @@ def set_profiles(api, name, profiles_list):
try: try:
if profiles_list is None: if profiles_list is None:
return False return False
current_profiles = map(lambda x: x['profile_name'], get_profiles(api, name)) current_profiles = list(map(lambda x: x['profile_name'], get_profiles(api, name)))
to_add_profiles = [] to_add_profiles = []
for x in profiles_list: for x in profiles_list:
if x not in current_profiles: if x not in current_profiles:
@ -297,25 +298,59 @@ def set_profiles(api, name, profiles_list):
except bigsuds.OperationFailed as e: except bigsuds.OperationFailed as e:
raise Exception('Error on setting profiles : %s' % e) raise Exception('Error on setting profiles : %s' % e)
def get_vlan(api, name):
return api.LocalLB.VirtualServer.get_vlan(
virtual_servers=[name]
)[0]
def set_enabled_vlans(api, name, vlans_enabled_list): def set_enabled_vlans(api, name, vlans_enabled_list):
updated = False updated = False
to_add_vlans = []
try: try:
if vlans_enabled_list is None: if vlans_enabled_list is None:
return False return updated
current_vlans = get_vlan(api, name)
to_add_vlans = []
for x in vlans_enabled_list: # Set allowed list back to default ("all")
to_add_vlans.append(x) #
# This case allows you to undo what you may have previously done.
# The default case is "All VLANs and Tunnels". This case will handle
# that situation.
if 'ALL' in vlans_enabled_list:
# The user is coming from a situation where they previously
# were specifying a list of allowed VLANs
if len(current_vlans['vlans']) > 0 or \
current_vlans['state'] is "STATE_ENABLED":
api.LocalLB.VirtualServer.set_vlan( api.LocalLB.VirtualServer.set_vlan(
virtual_servers=[name], virtual_servers=[name],
vlans = [{ 'state':'STATE_ENABLED', 'vlans':[to_add_vlans] }] vlans=[{'state': 'STATE_DISABLED', 'vlans': []}]
) )
updated = True updated = True
else:
if current_vlans['state'] is "STATE_DISABLED":
to_add_vlans = vlans_enabled_list
else:
for vlan in vlans_enabled_list:
if vlan not in current_vlans['vlans']:
updated = True
to_add_vlans = vlans_enabled_list
break
if updated:
api.LocalLB.VirtualServer.set_vlan(
virtual_servers=[name],
vlans=[{
'state': 'STATE_ENABLED',
'vlans': [to_add_vlans]
}]
)
return updated return updated
except bigsuds.OperationFailed as e: except bigsuds.OperationFailed as e:
raise Exception('Error on setting enabled vlans : %s' % e) raise Exception('Error on setting enabled vlans : %s' % e)
def set_snat(api, name, snat): def set_snat(api, name, snat):
updated = False updated = False
try: try:
@ -488,7 +523,7 @@ def main():
port=dict(type='int'), port=dict(type='int'),
all_profiles=dict(type='list'), all_profiles=dict(type='list'),
all_rules=dict(type='list'), all_rules=dict(type='list'),
all_enabled_vlans=dict(type='list'), enabled_vlans=dict(type='list'),
pool=dict(type='str'), pool=dict(type='str'),
description=dict(type='str'), description=dict(type='str'),
snat=dict(type='str'), snat=dict(type='str'),
@ -521,7 +556,13 @@ def main():
port = module.params['port'] port = module.params['port']
all_profiles = fq_list_names(partition, module.params['all_profiles']) all_profiles = fq_list_names(partition, module.params['all_profiles'])
all_rules = fq_list_names(partition, module.params['all_rules']) all_rules = fq_list_names(partition, module.params['all_rules'])
all_enabled_vlans = fq_list_names(partition, module.params['all_enabled_vlans'])
enabled_vlans = module.params['enabled_vlans']
if enabled_vlans is None or 'ALL' in enabled_vlans:
all_enabled_vlans = enabled_vlans
else:
all_enabled_vlans = fq_list_names(partition, enabled_vlans)
pool = fq_name(partition, module.params['pool']) pool = fq_name(partition, module.params['pool'])
description = module.params['description'] description = module.params['description']
snat = module.params['snat'] snat = module.params['snat']

Loading…
Cancel
Save