Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update ce_bgp_neighbor_af to fix bugs #60937

Merged
merged 3 commits into from Sep 18, 2019
Merged

Update ce_bgp_neighbor_af to fix bugs #60937

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9fa2fa1
Update ce_bgp_neighbor_af to fix bugs
yanzhangi Aug 20, 2019
ff261e0
Update ce_bgp_neighbor_af to fix bugs
yanzhangi Aug 20, 2019
d1a79bb
Update ce_bgp_neighbor_af to fix bugs
yanzhangi Aug 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
158 changes: 114 additions & 44 deletions lib/ansible/modules/network/cloudengine/ce_bgp_neighbor_af.py
View file
Open in desktop
Expand Up @@ -794,14 +794,15 @@ def check_bgp_neighbor_af_other(self, **kwargs):
conf_str = CE_GET_BGP_PEER_AF_HEADER % (
vrf_name, af_type, remote_address) + "<nextHopConfigure></nextHopConfigure>" + CE_GET_BGP_PEER_AF_TAIL
recv_xml = self.netconf_get_config(module=module, conf_str=conf_str)

self.exist_nexthop_configure = "null"
if "<data/>" in recv_xml:
need_cfg = True
else:
re_find = re.findall(
r'.*<nextHopConfigure>(.*)</nextHopConfigure>.*', recv_xml)

if re_find:
self.exist_nexthop_configure = re_find[0]
result["nexthop_configure"] = re_find
result["vrf_name"] = vrf_name
result["af_type"] = af_type
Expand Down Expand Up @@ -1637,7 +1638,7 @@ def check_bgp_neighbor_af_other(self, **kwargs):
adv_add_path_num = module.params['adv_add_path_num']
if adv_add_path_num:

if int(orftype) < 2 or int(orftype) > 64:
if int(adv_add_path_num) < 2 or int(adv_add_path_num) > 64:
module.fail_json(
msg='Error: The value of adv_add_path_num %s is out of [2 - 64].' % adv_add_path_num)

Expand Down Expand Up @@ -1773,13 +1774,28 @@ def merge_bgp_peer_af(self, **kwargs):
cmds = []
cmd = af_type
if af_type == "ipv4uni":
cmd = "ipv4-family unicast"
if vrf_name == "_public_":
cmd = "ipv4-family unicast"
else:
cmd = "ipv4-family vpn-instance %s" % vrf_name
elif af_type == "ipv4multi":
cmd = "ipv4-family multicast"
elif af_type == "ipv6uni":
cmd = "ipv6-family unicast"
if vrf_name == "_public_":
cmd = "ipv6-family unicast"
else:
cmd = "ipv6-family vpn-instance %s" % vrf_name
elif af_type == "evpn":
cmd = "l2vpn-family evpn"
elif af_type == "ipv4vpn":
cmd = "ipv4-family vpnv4"
elif af_type == "ipv6vpn":
cmd = "ipv6-family vpnv6"
cmds.append(cmd)
cmd = "peer %s" % remote_address
if vrf_name == "_public_":
cmd = "peer %s enable" % remote_address
else:
cmd = "peer %s" % remote_address
cmds.append(cmd)

return cmds
Expand All @@ -1803,13 +1819,28 @@ def create_bgp_peer_af(self, **kwargs):
cmds = []
cmd = af_type
if af_type == "ipv4uni":
cmd = "ipv4-family unicast"
if vrf_name == "_public_":
cmd = "ipv4-family unicast"
else:
cmd = "ipv4-family vpn-instance %s" % vrf_name
elif af_type == "ipv4multi":
cmd = "ipv4-family multicast"
elif af_type == "ipv6uni":
cmd = "ipv6-family unicast"
if vrf_name == "_public_":
cmd = "ipv6-family unicast"
else:
cmd = "ipv6-family vpn-instance %s" % vrf_name
elif af_type == "evpn":
cmd = "l2vpn-family evpn"
elif af_type == "ipv4vpn":
cmd = "ipv4-family vpnv4"
elif af_type == "ipv6vpn":
cmd = "ipv6-family vpnv6"
cmds.append(cmd)
cmd = "peer %s" % remote_address
if vrf_name == "_public_":
cmd = "peer %s enable" % remote_address
else:
cmd = "peer %s" % remote_address
cmds.append(cmd)

return cmds
Expand All @@ -1833,13 +1864,28 @@ def delete_bgp_peer_af(self, **kwargs):
cmds = []
cmd = af_type
if af_type == "ipv4uni":
cmd = "ipv4-family unicast"
if vrf_name == "_public_":
cmd = "ipv4-family unicast"
else:
cmd = "ipv4-family vpn-instance %s" % vrf_name
elif af_type == "ipv4multi":
cmd = "ipv4-family multicast"
elif af_type == "ipv6uni":
cmd = "ipv6-family unicast"
if vrf_name == "_public_":
cmd = "ipv6-family unicast"
else:
cmd = "ipv6-family vpn-instance %s" % vrf_name
elif af_type == "evpn":
cmd = "l2vpn-family evpn"
elif af_type == "ipv4vpn":
cmd = "ipv4-family vpnv4"
elif af_type == "ipv6vpn":
cmd = "ipv6-family vpnv6"
cmds.append(cmd)
cmd = "undo peer %s" % remote_address
if vrf_name == "_public_":
cmd = "undo peer %s enable" % remote_address
else:
cmd = "undo peer %s" % remote_address
cmds.append(cmd)

return cmds
Expand Down Expand Up @@ -1958,7 +2004,14 @@ def merge_bgp_peer_af_other(self, **kwargs):
elif nexthop_configure == "invariable":
cmd = "peer %s next-hop-invariable" % remote_address
cmds.append(cmd)

else:
if self.exist_nexthop_configure != "null":
if self.exist_nexthop_configure == "local":
cmd = "undo peer %s next-hop-local" % remote_address
cmds.append(cmd)
elif self.exist_nexthop_configure == "invariable":
cmd = "undo peer %s next-hop-invariable" % remote_address
cmds.append(cmd)
preferred_value = module.params['preferred_value']
if preferred_value:
conf_str += "<preferredValue>%s</preferredValue>" % preferred_value
Expand Down Expand Up @@ -2001,9 +2054,15 @@ def merge_bgp_peer_af_other(self, **kwargs):
conf_str += "<publicAsOnlyReplace>%s</publicAsOnlyReplace>" % public_as_only_replace

if public_as_only_replace == "true":
cmd = "peer %s public-as-only force replace" % remote_address
else:
cmd = "undo peer %s public-as-only force replace" % remote_address
if public_as_only_force != "no_use":
cmd = "peer %s public-as-only force replace" % remote_address
if public_as_only_limited != "no_use":
cmd = "peer %s public-as-only limited replace" % remote_address
else:
if public_as_only_force != "no_use":
cmd = "undo peer %s public-as-only force replace" % remote_address
if public_as_only_limited != "no_use":
cmd = "undo peer %s public-as-only limited replace" % remote_address
cmds.append(cmd)

public_as_only_skip_peer_as = module.params[
Expand All @@ -2012,45 +2071,53 @@ def merge_bgp_peer_af_other(self, **kwargs):
conf_str += "<publicAsOnlySkipPeerAs>%s</publicAsOnlySkipPeerAs>" % public_as_only_skip_peer_as

if public_as_only_skip_peer_as == "true":
cmd = "peer %s public-as-only force include-peer-as" % remote_address
else:
cmd = "undo peer %s public-as-only force include-peer-as" % remote_address
if public_as_only_force != "no_use":
cmd = "peer %s public-as-only force include-peer-as" % remote_address
if public_as_only_limited != "no_use":
cmd = "peer %s public-as-only limited include-peer-as" % remote_address
else:
if public_as_only_force != "no_use":
cmd = "undo peer %s public-as-only force include-peer-as" % remote_address
if public_as_only_limited != "no_use":
cmd = "undo peer %s public-as-only limited include-peer-as" % remote_address
cmds.append(cmd)

route_limit_sign = "route-limit"
if af_type == "evpn":
route_limit_sign = "mac-limit"
route_limit = module.params['route_limit']
if route_limit:
conf_str += "<routeLimit>%s</routeLimit>" % route_limit

cmd = "peer %s route-limit %s" % (remote_address, route_limit)
cmd = "peer %s %s %s" % (remote_address, route_limit_sign, route_limit)
cmds.append(cmd)

route_limit_percent = module.params['route_limit_percent']
if route_limit_percent:
conf_str += "<routeLimitPercent>%s</routeLimitPercent>" % route_limit_percent

cmd = "peer %s route-limit %s %s" % (remote_address, route_limit, route_limit_percent)
cmd = "peer %s %s %s %s" % (remote_address, route_limit_sign, route_limit, route_limit_percent)
cmds.append(cmd)

route_limit_type = module.params['route_limit_type']
if route_limit_type:
conf_str += "<routeLimitType>%s</routeLimitType>" % route_limit_type

if route_limit_type == "alertOnly":
cmd = "peer %s route-limit %s %s alert-only" % (remote_address, route_limit, route_limit_percent)
cmd = "peer %s %s %s %s alert-only" % (remote_address, route_limit_sign, route_limit, route_limit_percent)
cmds.append(cmd)
elif route_limit_type == "idleForever":
cmd = "peer %s route-limit %s %s idle-forever" % (remote_address, route_limit, route_limit_percent)
cmd = "peer %s %s %s %s idle-forever" % (remote_address, route_limit_sign, route_limit, route_limit_percent)
cmds.append(cmd)
elif route_limit_type == "idleTimeout":
cmd = "peer %s route-limit %s %s idle-timeout" % (remote_address, route_limit, route_limit_percent)
cmd = "peer %s %s %s %s idle-timeout" % (remote_address, route_limit_sign, route_limit, route_limit_percent)
cmds.append(cmd)

route_limit_idle_timeout = module.params['route_limit_idle_timeout']
if route_limit_idle_timeout:
conf_str += "<routeLimitIdleTimeout>%s</routeLimitIdleTimeout>" % route_limit_idle_timeout

cmd = "peer %s route-limit %s %s idle-timeout %s" % (remote_address, route_limit,
route_limit_percent, route_limit_idle_timeout)
cmd = "peer %s %s %s %s idle-timeout %s" % (remote_address, route_limit_sign, route_limit, route_limit_percent, route_limit_idle_timeout)
cmds.append(cmd)

rt_updt_interval = module.params['rt_updt_interval']
Expand Down Expand Up @@ -2106,14 +2173,14 @@ def merge_bgp_peer_af_other(self, **kwargs):
if import_pref_filt_name:
conf_str += "<importPrefFiltName>%s</importPrefFiltName>" % import_pref_filt_name

cmd = "peer %s filter-policy %s import" % (remote_address, import_pref_filt_name)
cmd = "peer %s ip-prefix %s import" % (remote_address, import_pref_filt_name)
cmds.append(cmd)

export_pref_filt_name = module.params['export_pref_filt_name']
if export_pref_filt_name:
conf_str += "<exportPrefFiltName>%s</exportPrefFiltName>" % export_pref_filt_name

cmd = "peer %s filter-policy %s export" % (remote_address, export_pref_filt_name)
cmd = "peer %s ip-prefix %s export" % (remote_address, export_pref_filt_name)
cmds.append(cmd)

import_as_path_filter = module.params['import_as_path_filter']
Expand Down Expand Up @@ -2149,15 +2216,19 @@ def merge_bgp_peer_af_other(self, **kwargs):
import_acl_name_or_num = module.params['import_acl_name_or_num']
if import_acl_name_or_num:
conf_str += "<importAclNameOrNum>%s</importAclNameOrNum>" % import_acl_name_or_num

cmd = "peer %s filter-policy %s import" % (remote_address, import_acl_name_or_num)
if import_acl_name_or_num.isdigit():
cmd = "peer %s filter-policy %s import" % (remote_address, import_acl_name_or_num)
else:
cmd = "peer %s filter-policy acl-name %s import" % (remote_address, import_acl_name_or_num)
cmds.append(cmd)

export_acl_name_or_num = module.params['export_acl_name_or_num']
if export_acl_name_or_num:
conf_str += "<exportAclNameOrNum>%s</exportAclNameOrNum>" % export_acl_name_or_num

cmd = "peer %s filter-policy %s export" % (remote_address, export_acl_name_or_num)
if export_acl_name_or_num.isdigit():
cmd = "peer %s filter-policy %s export" % (remote_address, export_acl_name_or_num)
else:
cmd = "peer %s filter-policy acl-name %s export" % (remote_address, export_acl_name_or_num)
cmds.append(cmd)

ipprefix_orf_enable = module.params['ipprefix_orf_enable']
Expand Down Expand Up @@ -2217,13 +2288,11 @@ def merge_bgp_peer_af_other(self, **kwargs):
cmd += "peer %s default-route-advertise" % remote_address
else:
cmd += "undo peer %s default-route-advertise" % remote_address
cmds.append(cmd)

default_rt_adv_policy = module.params['default_rt_adv_policy']
if default_rt_adv_policy:
conf_str += "<defaultRtAdvPolicy>%s</defaultRtAdvPolicy>" % default_rt_adv_policy
cmd = " route-policy %s" % default_rt_adv_policy
cmds.append(cmd)
cmd += " route-policy %s" % default_rt_adv_policy

default_rt_match_mode = module.params['default_rt_match_mode']
if default_rt_match_mode:
Expand All @@ -2234,27 +2303,25 @@ def merge_bgp_peer_af_other(self, **kwargs):
elif default_rt_match_mode == "matchany":
cmd += " conditional-route-match-any"

if cmd:
cmds.append(cmd)
if cmd:
cmds.append(cmd)

add_path_mode = module.params['add_path_mode']
if add_path_mode:
conf_str += "<addPathMode>%s</addPathMode>" % add_path_mode
if add_path_mode == "receive":
cmd += " add-path receive"
cmd = "peer %s capability-advertise add-path receive" % remote_address
elif add_path_mode == "send":
cmd += " add-path send"
cmd = "peer %s capability-advertise add-path send" % remote_address
elif add_path_mode == "both":
cmd += " add-path both"
if cmd:
cmds.append(cmd)
cmd = "peer %s capability-advertise add-path both" % remote_address
cmds.append(cmd)

adv_add_path_num = module.params['adv_add_path_num']
if adv_add_path_num:
conf_str += "<advAddPathNum>%s</advAddPathNum>" % adv_add_path_num
cmd += " advertise add-path path-number %s" % adv_add_path_num
if cmd:
cmds.append(cmd)
cmd = "peer %s advertise add-path path-number %s" % (remote_address, adv_add_path_num)
cmds.append(cmd)
origin_as_valid = module.params['origin_as_valid']
if origin_as_valid != 'no_use':
conf_str += "<originAsValid>%s</originAsValid>" % origin_as_valid
Expand Down Expand Up @@ -2585,6 +2652,9 @@ def main():
end_tmp[item] = bgp_peer_af_other_rst[item]
if end_tmp:
end_state["bgp neighbor af other"] = end_tmp
if end_state == existing:
changed = False
updates = list()

results = dict()
results['proposed'] = proposed
Expand Down