summaryrefslogtreecommitdiff
path: root/lib/ansible/module_utils/nxos.py
diff options
context:
space:
mode:
Diffstat (limited to 'lib/ansible/module_utils/nxos.py')
-rw-r--r--lib/ansible/module_utils/nxos.py18
1 files changed, 14 insertions, 4 deletions
diff --git a/lib/ansible/module_utils/nxos.py b/lib/ansible/module_utils/nxos.py
index 7ba3018317..058c0b946f 100644
--- a/lib/ansible/module_utils/nxos.py
+++ b/lib/ansible/module_utils/nxos.py
@@ -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):