rename ExcpectSession to AbstractSession

QualiSystems · Jul 31, 2019 · af60403 · af60403
1 parent dab9bb2
commit af60403
Show file tree

Hide file tree

Showing 14 changed files with 349 additions and 391 deletions.
diff --git a/cloudshell/cli/service/command_mode_helper.py b/cloudshell/cli/service/command_mode_helper.py
@@ -2,7 +2,6 @@
 
 from cloudshell.cli.service.command_mode import CommandMode, CommandModeException
 from cloudshell.cli.service.node import NodeOperations
-from cloudshell.cli.session.session import Session
 from functools import reduce
 
 

diff --git a/cloudshell/cli/service/session_pool.py b/cloudshell/cli/service/session_pool.py
@@ -1,13 +1,12 @@
 from abc import ABCMeta, abstractmethod
-from cloudshell.cli.session.session import Session
 
 
 class SessionPool(object, metaclass=ABCMeta):
     @abstractmethod
     def get_session(self, new_sessions, prompt, logger):
-        """
-        Get session from pool
-        :rtype Session
+        """Get session from pool
+
+        :rtype: cloudshell.cli.session.session.AbstractSession
         """
         pass
 

diff --git a/cloudshell/cli/service/session_pool_context_manager.py b/cloudshell/cli/service/session_pool_context_manager.py
@@ -1,6 +1,6 @@
 from cloudshell.cli.service.cli_service_impl import CliServiceImpl as CliService
 from cloudshell.cli.service.command_mode_helper import CommandModeHelper
-from cloudshell.cli.session.expect_session import CommandExecutionException
+from cloudshell.cli.session.session_exceptions import CommandExecutionException
 
 
 class SessionPoolContextManager(object):
@@ -53,7 +53,7 @@ def __enter__(self):
 
     def __exit__(self, exc_type, exc_val, exc_tb):
         if self._active_session:
-            if exc_type and not issubclass(exc_type, self.IGNORED_EXCEPTIONS) or not self._active_session.active():
+            if exc_type and not issubclass(exc_type, self.IGNORED_EXCEPTIONS) or not self._active_session.active:
                 self._session_pool.remove_session(self._active_session, self._logger)
             else:
                 self._session_pool.return_session(self._active_session, self._logger)
diff --git a/cloudshell/cli/service/session_pool_manager.py b/cloudshell/cli/service/session_pool_manager.py
@@ -4,7 +4,6 @@
 
 from cloudshell.cli.service.cli_exception import CliException
 from cloudshell.cli.service.session_pool import SessionPool
-from cloudshell.cli.session.session import Session
 from cloudshell.cli.service.session_manager_impl import SessionManagerImpl as SessionManager
 
 
@@ -48,7 +47,7 @@ def get_session(self, defined_sessions, prompt, logger):
         :param prompt:
         :param logger:
         :return:
-        :rtype: Session
+        :rtype: cloudshell.cli.session.session.AbstractSession
         """
 
         call_time = time.time()

diff --git a/cloudshell/cli/session/expect_session.py b/cloudshell/cli/session/expect_session.py