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

Merge pull request #17623 from dgjustice/nxos_fixes

Browse source 
Fixed transport issues when calling self.execute from Cli
This commit is contained in:
Peter Sprygada 2016-09-18 22:24:01 -04:00 committed by GitHub
commit 79d1b51dfb
1 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
lib/ansible/module_utils/nxos.py
View file

@ -43,7 +43,10 @@ class NxapiConfigMixin(object):
def load_config(self, config):
checkpoint = 'ansible_%s' % int(time.time())
self.execute(['checkpoint %s' % checkpoint], output='text')
try:
self.execute(['checkpoint %s' % checkpoint], output='text')
except TypeError:
self.execute(['checkpoint %s' % checkpoint])
try:
self.configure(config)
@ -51,14 +54,21 @@ class NxapiConfigMixin(object):
self.load_checkpoint(checkpoint)
raise
self.execute(['no checkpoint %s' % checkpoint], output='text')
try:
self.execute(['no checkpoint %s' % checkpoint], output='text')
except TypeError:
self.execute(['no checkpoint %s' % checkpoint])
def save_config(self, **kwargs):
self.execute(['copy running-config startup-config'])
def load_checkpoint(self, checkpoint):
self.execute(['rollback running-config checkpoint %s' % checkpoint,
'no checkpoint %s' % checkpoint], output='text')
try:
self.execute(['rollback running-config checkpoint %s' % checkpoint,
'no checkpoint %s' % checkpoint], output='text')
except TypeError:
self.execute(['rollback running-config checkpoint %s' % checkpoint,
'no checkpoint %s' % checkpoint])
class Nxapi(NxapiConfigMixin):