handle config as text in load and merge functions

napalm_vyos/vyos.py

@@ -22,6 +22,7 @@ Read napalm.readthedocs.org for more information.
 
 import re
 import os
+import tempfile
 
 import vyattaconfparser
 
@@ -33,8 +34,9 @@ from netmiko import SCPConn
 import napalm.base.constants as C
 from napalm.base.utils import py23_compat
 from napalm.base.base import NetworkDriver
-from napalm.base.exceptions import ConnectionException, \
-                                   MergeConfigException, ReplaceConfigException
+from napalm.base.exceptions import ConnectionException, MergeConfigException, \
+                                   ReplaceConfigException, CommitError, \
+                                   CommandErrorException
 
 
 class VyOSDriver(NetworkDriver):
@@ -121,9 +123,21 @@ class VyOSDriver(NetworkDriver):
         Due to the OS nature,  we do not
         support a replace using a configuration string.
         """
-        if filename is not None:
-            if os.path.exists(filename) is True:
-                self._scp_client.scp_transfer_file(filename, self._DEST_FILENAME)
+        if not filename and not config:
+            raise ReplaceConfigException('filename or config param must be provided.')
+
+        if filename is None:
+            temp_file = tempfile.NamedTemporaryFile()
+            temp_file.write(config)
+            temp_file.flush()
+            cfg_filename = temp_file.name
+        else:
+            cfg_filename = filename
+
+
+
+        if os.path.exists(cfg_filename) is True:
+            self._scp_client.scp_transfer_file(cfg_filename, self._DEST_FILENAME)
             self.device.send_command("cp "+self._BOOT_FILENAME+" "+self._BACKUP_FILENAME)
             output_loadcmd = self.device.send_config_set(['load '+self._DEST_FILENAME])
             match_loaded = re.findall("Load complete.", output_loadcmd)
@@ -141,16 +155,27 @@ class VyOSDriver(NetworkDriver):
 
         else:
             raise ReplaceConfigException("config file is not found")
-        else:
-            raise ReplaceConfigException("no configuration found")
+
 
     def load_merge_candidate(self, filename=None, config=None):
         """
         Only configuration in set-format is supported with load_merge_candidate.
         """
-        if filename is not None:
-            if os.path.exists(filename) is True:
-                with open(filename) as f:
+
+        if not filename and not config:
+            raise MergeConfigException('filename or config param must be provided.')
+
+        if filename is None:
+            temp_file = tempfile.NamedTemporaryFile()
+            temp_file.write(config)
+            temp_file.flush()
+            cfg_filename = temp_file.name
+        else:
+            cfg_filename = filename
+
+
+        if os.path.exists(cfg_filename) is True:
+            with open(cfg_filename) as f:
                 self.device.send_command("cp "+self._BOOT_FILENAME+" "
                                          + self._BACKUP_FILENAME)
                 self._new_config = f.read()
@@ -164,10 +189,7 @@ class VyOSDriver(NetworkDriver):
                                                + output_loadcmd)
         else:
             raise MergeConfigException("config file is not found")
-        elif config is not None:
-            self._new_config = config
-        else:
-            raise MergeConfigException("no configuration found")
+
 
     def discard_config(self):
         self.device.exit_config_mode()
@@ -183,7 +205,11 @@ class VyOSDriver(NetworkDriver):
             return diff
 
     def commit_config(self):
-        if self.device.commit():
+        try:
+            self.device.commit()
+        except ValueError:
+            raise CommitError("Failed to commit config on the device")
+
         self.device.send_config_set(['save'])
         self.device.exit_config_mode()
 
@@ -478,6 +504,8 @@ class VyOSDriver(NetworkDriver):
                     received_prefixes = int(state_prefix)
                     is_up = True
                 except ValueError:
+                    state_prefix = -1
+                    received_prefixes = -1
                     is_up = False
 
                 if bgp_version == "4":