Fix for situation where config dont change

This commit is contained in:
Pieprzycki Piotr
2016-11-02 11:35:24 +01:00
parent f8bab84a8b
commit 9d933d748f

View File

@@ -102,10 +102,19 @@ class VyOSDriver(NetworkDriver):
self._scp_client.scp_transfer_file(filename, self._DEST_FILENAME)
print self._device.send_command("cp "+self._BOOT_FILENAME+" "+self._BACKUP_FILENAME)
output_loadcmd = self._device.send_config_set(['load '+self._DEST_FILENAME])
match = re.findall("Load complete.", output_loadcmd)
if not match:
match_loaded = re.findall("Load complete.", output_loadcmd)
match_notchanged = re.findall("No configuration changes to commit", output_loadcmd)
match_failed = re.findall("Failed to parse specified config file", output_loadcmd)
if match_failed:
raise ReplaceConfigException("Failed replace config: "
+output_loadcmd)
if not match_loaded:
if not match_notchanged:
raise ReplaceConfigException("Failed replace config: "
+output_loadcmd)
else:
raise ReplaceConfigException("config file is not found")
else:
@@ -138,7 +147,7 @@ class VyOSDriver(NetworkDriver):
match = re.findall("No changes between working and active configurations",
output_compare)
if match:
return
return ""
else:
return output_compare