cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Update default for dscp to not allow APIC to handle it (#39970)

Browse source
This commit is contained in:
Jacob McGill 2018-05-10 13:57:20 -04:00 committed by Dag Wieers
parent 0b1840772d
commit 67f387bc3b
1 changed files with 9 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
lib/ansible/modules/network/aci/aci_l3out.py
View file

@ -48,8 +48,8 @@ options:
dscp: dscp:
description: description:
- The target Differentiated Service (DSCP) value. - The target Differentiated Service (DSCP) value.
- The APIC defaults to C(unspecified) when unset during creation.
choices: [ AF11, AF12, AF13, AF21, AF22, AF23, AF31, AF32, AF33, AF41, AF42, AF43, CS0, CS1, CS2, CS3, CS4, CS5, CS6, CS7, EF, VA, unspecified ] choices: [ AF11, AF12, AF13, AF21, AF22, AF23, AF31, AF32, AF33, AF41, AF42, AF43, CS0, CS1, CS2, CS3, CS4, CS5, CS6, CS7, EF, VA, unspecified ]
default: unspecified
aliases: [ target ] aliases: [ target ]
route_control: route_control:
description: description:
@ -63,7 +63,6 @@ options:
description: description:
description: description:
- Description for the L3Out. - Description for the L3Out.
default:
aliases: [ descr ] aliases: [ descr ]
state: state:
description: description:
@ -219,21 +218,17 @@ def main():
argument_spec = aci_argument_spec() argument_spec = aci_argument_spec()
argument_spec.update( argument_spec.update(
l3out=dict(type='str', aliases=['l3out_name', 'name']), l3out=dict(type='str', aliases=['l3out_name', 'name']),
domain=dict(type='str', aliases=[ domain=dict(type='str', aliases=['ext_routed_domain_name', 'routed_domain']),
'ext_routed_domain_name', 'routed_domain']),
vrf=dict(type='str', aliases=['vrf_name']), vrf=dict(type='str', aliases=['vrf_name']),
tenant=dict(type='str', aliases=['tenant_name']), tenant=dict(type='str', aliases=['tenant_name']),
description=dict(type='str', aliases=['descr']), description=dict(type='str', aliases=['descr']),
route_control=dict(type='list', choices=[ route_control=dict(type='list', choices=['export', 'import'], aliases=['route_control_enforcement']),
'export', 'import'], aliases=['route_control_enforcement']), dscp=dict(type='str',
dscp=dict(type='str', default='unspecified', choices=['AF11', 'AF12', 'AF13', 'AF21', 'AF22', 'AF23', 'AF31', 'AF32', 'AF33', 'AF41', 'AF42',
choices=['AF11', 'AF12', 'AF13', 'AF21', 'AF22', 'AF23', 'AF31', 'AF32', 'AF33', 'AF41', 'AF42', 'AF43', 'AF43', 'CS0', 'CS1', 'CS2', 'CS3', 'CS4', 'CS5', 'CS6', 'CS7', 'EF', 'VA', 'unspecified'],
'CS0', 'CS1', 'CS2', 'CS3', 'CS4', 'CS5', 'CS6', 'CS7', 'EF', 'VA', 'unspecified'],
aliases=['target']), aliases=['target']),
l3protocol=dict(type='list', l3protocol=dict(type='list', choices=['static', 'bgp', 'ospf', 'pim']),
choices=['static', 'bgp', 'ospf', 'pim']), state=dict(type='str', default='present', choices=['absent', 'present', 'query'])
state=dict(type='str', default='present',
choices=['absent', 'present', 'query'])
) )
module = AnsibleModule( module = AnsibleModule(
@ -266,8 +261,7 @@ def main():
enforce_ctrl = 'export' enforce_ctrl = 'export'
else: else:
enforce_ctrl = 'export,import' enforce_ctrl = 'export,import'
child_classes = ['l3extRsL3DomAtt', 'l3extRsEctx', child_classes = ['l3extRsL3DomAtt', 'l3extRsEctx', 'bgpExtP', 'ospfExtP', 'eigrpExtP', 'pimExtP']
'bgpExtP', 'ospfExtP', 'eigrpExtP', 'pimExtP']
aci.construct_url( aci.construct_url(
root_class=dict( root_class=dict(