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_static_route to fix bugs #62498

Merged
merged 1 commit into from
Sep 19, 2019
Merged

update ce_static_route to fix bugs #62498

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
40 changes: 21 additions & 19 deletions lib/ansible/modules/network/cloudengine/ce_static_route.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -471,8 +471,10 @@ def set_update_cmd(self):
if not self.changed:
return
if self.aftype == "v4":
aftype = "ip"
maskstr = self.convert_len_to_mask(self.mask)
else:
aftype = "ipv6"
maskstr = self.mask
if self.next_hop is None:
next_hop = ''
Expand All @@ -493,38 +495,38 @@ def set_update_cmd(self):
if self.state == "present":
if self.vrf != "_public_":
if self.destvrf != "_public_":
self.updates_cmd.append('ip route-static vpn-instance %s %s %s vpn-instance %s %s'
% (vrf, self.prefix, maskstr, destvrf, next_hop))
self.updates_cmd.append('%s route-static vpn-instance %s %s %s vpn-instance %s %s'
% (aftype, vrf, self.prefix, maskstr, destvrf, next_hop))
else:
self.updates_cmd.append('ip route-static vpn-instance %s %s %s %s %s'
% (vrf, self.prefix, maskstr, nhp_interface, next_hop))
self.updates_cmd.append('%s route-static vpn-instance %s %s %s %s %s'
% (aftype, vrf, self.prefix, maskstr, nhp_interface, next_hop))
elif self.destvrf != "_public_":
self.updates_cmd.append('ip route-static %s %s vpn-instance %s %s'
% (self.prefix, maskstr, self.destvrf, next_hop))
self.updates_cmd.append('%s route-static %s %s vpn-instance %s %s'
% (aftype, self.prefix, maskstr, self.destvrf, next_hop))
else:
self.updates_cmd.append('ip route-static %s %s %s %s'
% (self.prefix, maskstr, nhp_interface, next_hop))
self.updates_cmd.append('%s route-static %s %s %s %s'
% (aftype, self.prefix, maskstr, nhp_interface, next_hop))
if self.pref:
self.updates_cmd.append(' preference %s' % (self.pref))
self.updates_cmd[0] += ' preference %s' % (self.pref)
if self.tag:
self.updates_cmd.append(' tag %s' % (self.tag))
self.updates_cmd[0] += ' tag %s' % (self.tag)
if self.description:
self.updates_cmd.append(' description %s' % (self.description))
self.updates_cmd[0] += ' description %s' % (self.description)

if self.state == "absent":
if self.vrf != "_public_":
if self.destvrf != "_public_":
self.updates_cmd.append('undo ip route-static vpn-instance %s %s %s vpn-instance %s %s'
% (vrf, self.prefix, maskstr, destvrf, next_hop))
self.updates_cmd.append('undo %s route-static vpn-instance %s %s %s vpn-instance %s %s'
% (aftype, vrf, self.prefix, maskstr, destvrf, next_hop))
else:
self.updates_cmd.append('undo ip route-static vpn-instance %s %s %s %s %s'
% (vrf, self.prefix, maskstr, nhp_interface, next_hop))
self.updates_cmd.append('undo %s route-static vpn-instance %s %s %s %s %s'
% (aftype, vrf, self.prefix, maskstr, nhp_interface, next_hop))
elif self.destvrf != "_public_":
self.updates_cmd.append('undo ip route-static %s %s vpn-instance %s %s'
% (self.prefix, maskstr, self.destvrf, self.next_hop))
self.updates_cmd.append('undo %s route-static %s %s vpn-instance %s %s'
% (aftype, self.prefix, maskstr, self.destvrf, self.next_hop))
else:
self.updates_cmd.append('undo ip route-static %s %s %s %s'
% (self.prefix, maskstr, nhp_interface, next_hop))
self.updates_cmd.append('undo %s route-static %s %s %s %s'
% (aftype, self.prefix, maskstr, nhp_interface, next_hop))

def operate_static_route(self, version, prefix, mask, nhp_interface, next_hop, vrf, destvrf, state):
"""operate ipv4 static route"""
Expand Down