Merge pull request #22 from QualiSystems/7.0_refactoring

Fixed commit error_map
QualiSystems · Aug 30, 2016 · d53d440 · d53d440
2 parents 47a2161 + 5197527
commit d53d440
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/cloudshell/networking/juniper/cli/juniper_cli_service.py b/cloudshell/networking/juniper/cli/juniper_cli_service.py
@@ -1,3 +1,5 @@
+from copy import copy
+
 from cloudshell.cli.service.cli_exceptions import CommandExecutionException
 from cloudshell.cli.service.cli_service import CliService
 from cloudshell.configuration.cloudshell_cli_binding_keys import SESSION
@@ -7,7 +9,6 @@
 
 
 class JuniperCliService(CliService):
-
     @inject.params(logger=LOGGER, session=SESSION)
     def send_config_command(self, command, expected_str=None, expected_map=None, error_map=None, logger=None,
                             session=None, **optional_args):
@@ -27,7 +28,7 @@ def send_config_command(self, command, expected_str=None, expected_map=None, err
                                                                       logger, session, **optional_args)
         except CommandExecutionException:
             self.rollback()
-            raise 
+            raise
 
     @inject.params(logger=LOGGER, session=SESSION)
     def commit(self, expected_map=None, logger=None, session=None):
@@ -39,8 +40,11 @@ def commit(self, expected_map=None, logger=None, session=None):
         :return:
         """
         logger.debug('Commit called')
+        error_map = copy(self._error_map)
+        error_map[r'[Ee]rror|ERROR'] = 'Commit error, see logs for more details'
         try:
-            self._send_command(commit_rollback.COMMIT.get_command(), expected_map=expected_map, session=session)
+            self._send_command(commit_rollback.COMMIT.get_command(), expected_map=expected_map, error_map=error_map,
+                               session=session)
         except CommandExecutionException:
             self.rollback()
             raise