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

bug fix in netcfg replace method to handle whitespace argument #16423

Merged
merged 2 commits into from
Jul 5, 2016
Merged

bug fix in netcfg replace method to handle whitespace argument #16423

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b8c24e
bug fix in netcfg replace method to handle whitespace argument
Jun 22, 2016
2866c7a
updates netcfg to remove dependency on collections module
Jul 5, 2016
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
87 changes: 39 additions & 48 deletions lib/ansible/module_utils/netcfg.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@

import re
import time
import collections
import itertools
import shlex
import itertools
Expand Down Expand Up @@ -133,12 +132,9 @@ def lines(self):
return lines

def __str__(self):
text = ''
for item in self.items:
if not item.parents:
expand = self.get_section(item.text)
text += '%s\n' % self.get_section(item.text)
return str(text).strip()
if self._device_os == 'junos':
return self.to_lines(self.expand(self.items))
return self.to_block(self.expand(self.items))

def load(self, contents):
self._config = parse(contents, indent=self.indent)
Expand Down Expand Up @@ -180,18 +176,17 @@ def findall(self, regexp):
regexp = r'%s' % regexp
return re.findall(regexp, str(self))

def expand(self, obj, items):
block = [item.raw for item in obj.parents]
block.append(obj.raw)

current_level = items
for b in block:
if b not in current_level:
current_level[b] = collections.OrderedDict()
current_level = current_level[b]
for c in obj.children:
if c.raw not in current_level:
current_level[c.raw] = collections.OrderedDict()
def expand(self, objs):
visited = set()
expanded = list()
for o in objs:
for p in o.parents:
if p not in visited:
visited.add(p)
expanded.append(p)
expanded.append(o)
visited.add(o)
return expanded

def to_lines(self, section):
lines = list()
Expand Down Expand Up @@ -232,14 +227,6 @@ def expand_section(self, configobj, S=None):
self.expand_section(child, S)
return S

def flatten(self, data, obj=None):
if obj is None:
obj = list()
for k, v in data.items():
obj.append(k)
self.flatten(v, obj)
return obj

def get_object(self, path):
for item in self.items:
if item.text == path[-1]:
Expand Down Expand Up @@ -294,43 +281,47 @@ def difference(self, other, path=None, match='line', replace='line'):
if self._device_os == 'junos':
return updates

diffs = collections.OrderedDict()
changes = list()
for update in updates:
if replace == 'block' and update.parents:
update = update.parents[-1]
self.expand(update, diffs)

return self.flatten(diffs)
if replace == 'block':
if update.parents:
changes.append(update.parents[-1])
for child in update.parents[-1].children:
changes.append(child)
else:
changes.append(update)
else:
changes.append(update)
updates = self.expand(changes)

def replace(self, replace, text=None, regex=None, parents=None,
add_if_missing=False, ignore_whitespace=False):
match = None
return [item.text for item in updates]

parents = parents or list()
if text is None and regex is None:
raise ValueError('missing required arguments')
def replace(self, patterns, repl, parents=None, add_if_missing=False,
ignore_whitespace=True):

if not regex:
regex = ['^%s$' % text]
match = None

patterns = [re.compile(r, re.I) for r in to_list(regex)]
parents = to_list(parents) or list()
patterns = [re.compile(r, re.I) for r in to_list(patterns)]

for item in self.items:
for regexp in patterns:
string = ignore_whitespace is True and item.text or item.raw
if regexp.search(item.text):
if item.text != replace:
text = item.text
if not ignore_whitespace:
text = item.raw
if regexp.search(text):
if item.text != repl:
if parents == [p.text for p in item.parents]:
match = item
break

if match:
match.text = replace
match.text = repl
indent = len(match.raw) - len(match.raw.lstrip())
match.raw = replace.rjust(len(replace) + indent)
match.raw = repl.rjust(len(repl) + indent)

elif add_if_missing:
self.add(replace, parents=parents)
self.add(repl, parents=parents)


def add(self, lines, parents=None):
Expand Down