GROS RENOMMAGE des chemins des modules des devices controller...

(les paths vers les modules étaient trop longs et redondants)

GROS RENOMMAGE des chemins des modules des devices controller...
(les paths vers les modules étaient trop longs et redondants)
Etienne Pallier
1 parent 0f78ae38
Showing 38 changed files with 363 additions and 62 deletions Show diff stats
.gitignore
HOWTO_TEST.txt
pyros.py
src/core/pyros_django/agent/Agent.py
src/core/pyros_django/agent/AgentDevice.py
src/core/pyros_django/agent/AgentDeviceSBIG.py
src/core/pyros_django/agent/AgentDeviceTelescopeGemini.py
src/core/pyros_django/agent/AgentMultiRequester.py
src/core/pyros_django/majordome/doc/AgentMajordome_object_diag.pu
src/devices_controller/.gitignore -> src/device_controller/.gitignore
src/devices_controller/README.md -> src/device_controller/README.md
src/devices_controller/__init__.py -> src/device_controller/__init__.py
src/devices_controller/devices_controller_abstract_component/device_controller_abstract.py -> src/device_controller/abstract_component/base.py
src/devices_controller/devices_controller_abstract_component/device_controller_detector_sensor.py -> src/device_controller/abstract_component/detector_sensor.py
src/devices_controller/devices_controller_abstract_component/device_controller_detector_shutter.py -> src/device_controller/abstract_component/detector_shutter.py
src/devices_controller/devices_controller_abstract_component/device_controller_filter_selector.py -> src/device_controller/abstract_component/filter_selector.py
src/devices_controller/devices_controller_abstract_component/device_controller_plc.py -> src/device_controller/abstract_component/plc.py
src/devices_controller/devices_controller_abstract_component/device_controller_telescope.py -> src/device_controller/abstract_component/telescope.py
src/devices_controller/channels/client_channel.py -> src/device_controller/channels/client_channel.py
src/devices_controller/channels/client_channel_serial.py -> src/device_controller/channels/client_channel_serial.py
 .DS_Store
 /private
 /venv*/
+.mypy_cache
 __pycache__
 *.pyc
 *.py.bak
@@ -20,7 +20,9 @@
 		$ ./pyros.py -ts start agentDeviceTelescopeGemini,agentTelescopeRequester
 	- test with REAL telescope :
 		$ ./pyros.py -t start agentDeviceTelescopeGemini,agentTelescopeRequester
-	
+- (3) Test with  agentMultiRequester (AgentMajordome like) sending commands to several device agents at once : the Gemini telescope device agent (or its simulator), and the SBIG device agent :
+		$ ./pyros.py -t start agentDeviceTelescopeGemini,agentMultiRequester
+	 
 (C) Interactive testing:
 	$ ./pyros.py shell
@@ -35,8 +35,10 @@ AGENTS = {
     "agentB" : "AgentB", 
     "agentM" : "AgentM", 
     #"agentDevice" : "AgentDevice", 
-    "agentDeviceTelescopeGemini" : "agentDeviceTelescopeGemini",
+    "agentDeviceTelescopeGemini" : "AgentDeviceTelescopeGemini",
+    "agentDeviceSBIG" : "AgentDeviceSBIG",
     "agentTelescopeRequester" : "AgentTelescopeRequester", 
+    "agentMultiRequester" : "AgentMultiRequester", 
     "webserver" : "webserver", 
     "monitoring" : "monitoring", 
     "majordome" : "majordome", 
@@ -362,6 +362,8 @@ class Agent:
     _current_specific_cmd = None
     _current_specific_thread = None
+    # List of agents I will send commands to
+    _my_client_agents = {}
     _iter_num = None
@@ -401,6 +403,16 @@ class Agent:
         if self.config.get_last_errno() != self.config.NO_ERROR:
             raise Exception(f"Bad config file name '{config_filename}', error {str(self.config.get_last_errno())}: {str(self.config.get_last_errmsg())}")
+        #TODO: : à mettre dans la config
+        self._my_client_agents = {
+            '''
+            'AgentDeviceTelescope1': 'AgentDeviceTelescopeGemini',
+            'AgentDeviceFilterSelector1': 'AgentDeviceSBIG',
+            'AgentDeviceShutter1': 'AgentDeviceSBIG',
+            'AgentDeviceSensor1': 'AgentDeviceSBIG',
+            '''
+        }
+
         ### self._agent_logs = AgentLogs.objects.create(name=self.name, message="Step __init__")
         self.printdb("Step __init__")
@@ -460,6 +472,17 @@ class Agent:
         else:
             time.sleep(nbsec)
+    def _get_real_agent_name_for_alias(self, agent_alias_name:str):
+        if not self._my_client_agents: return agent_alias_name
+        return self._my_client_agents[agent_alias_name]
+
+    def build_cmd(self, recipient_agent_alias_name, cmd_name):
+        return Command(
+            sender=self.name,
+            recipient=self._get_real_agent_name_for_alias(recipient_agent_alias_name),
+            name=cmd_name
+        )
+
     def run(self, nb_iter:int=None, FOR_REAL:bool=True):
         """
             FOR_REAL: set to False if you don't want Agent to send commands to devices but just print messages without really doing anything
@@ -568,7 +591,7 @@ class Agent:
         self.print("-"*20, "MAIN LOOP ITERATION (END)", "-"*20)
         #self.do_log(LOG_DEBUG, "Ending main loop iteration")
-        # (simulator only) Exit if max duration is reached
+        # (Test only) Exit if max duration is reached
         if self.TEST_MAX_DURATION_SEC and (time.time()-self.start_time > self.TEST_MAX_DURATION_SEC):
             self.print("Exit because of max duration set to ", self.TEST_MAX_DURATION_SEC, "s")
             self.kill_running_specific_cmd_if_exists(self.name)
@@ -831,7 +854,7 @@ class Agent:
         #ex: send_command(“AgentX”,”GENERIC”,”EVAL”,“3+4”)
         ex: send_command(“AgentX”,"EVAL”,“3+4”)
         """
-        return Command.send_command(self.name, to_agent, cmd_name, cmd_args)
+        return Command.send_command(self.name, self._get_real_agent_name_for_alias(to_agent), cmd_name, cmd_args)
     def get_next_valid_and_not_running_command(self)->Command:
         """
@@ -1144,11 +1167,13 @@ class Agent:
         self.WITH_SIMULATOR=mode
     def simulator_get_next_command_to_send(self)->Command:
-        cmd_name = next(self.TEST_COMMANDS, None)
+        cmd = next(self.TEST_COMMANDS, None)
         #return cmd_name
-        if cmd_name is None: return None
-        recipient_agent = self.name if self.TEST_COMMANDS_DEST=="myself" else self.TEST_COMMANDS_DEST
-        return Command(sender=self.name, recipient=recipient_agent, name=cmd_name)
+        if cmd is None: return None
+        agent_recipient,cmd_name = cmd.split(':')
+        ##recipient_agent = self.name if self.TEST_COMMANDS_DEST=="myself" else self.TEST_COMMANDS_DEST
+        #return Command(sender=self.name, recipient=recipient_agent, name=cmd_name)
+        return self.build_cmd(agent_recipient, cmd_name)
     """
     def simulator_send_next_command(self):
@@ -10,7 +10,9 @@ import time
 sys.path.append("..")
 from agent.Agent import Agent, build_agent
 from common.models import AgentDeviceStatus, get_or_create_unique_row_from_model
+
 sys.path.append("../../..")
+from device_controller.abstract_component.base import DeviceControllerAbstract
 ##log = L.setupLogger("AgentXTaskLogger", "AgentX")
@@ -81,7 +83,7 @@ class AgentDevice(Agent):
     # @override
     #def __init__(self, name:str=None, config_filename=None, RUN_IN_THREAD=True, device_controller, host, port):
     #def __init__(self, name:str, config_filename, RUN_IN_THREAD, device_controller, host, port, device_simulator):
-    def __init__(self, config_filename, RUN_IN_THREAD, device_controller, host, port, device_simulator):
+    def __init__(self, config_filename, RUN_IN_THREAD, device_controller:DeviceControllerAbstract, host, port, device_simulator):
         ##if name is None: name = self.__class__.__name__
         #super().__init__(name, config_filename, RUN_IN_THREAD)
         super().__init__(config_filename, RUN_IN_THREAD)
@@ -234,7 +236,7 @@ class AgentDevice(Agent):
     # Define your own command step(s) here
     def cmd_step(self, step:int):
-        cmd = self._current_specific_cmd 
+        cmd = self._current_specific_cmd
         res = self._device_ctrl.execute_cmd(cmd.name)
         cmd.set_result(str(res))
         print("result is", str(res))
@@ -11,11 +11,11 @@ sys.path.append(&quot;..&quot;)
 from agent.AgentDevice import AgentDevice, build_agent
 from common.models import AgentDeviceTelescopeStatus, get_or_create_unique_row_from_model
 sys.path.append("../../..")
-##from devices_controller.devices_controller_concrete.device_simulator_common.server_udp_or_tcp import get_SocketServer_UDP_TCP
+##from device_controller.concrete_component.device_simulator_common.server_udp_or_tcp import get_SocketServer_UDP_TCP
-from devices_controller.devices_controller_concrete.device_controller_Gemini.telescope_gemini_simulator import TelescopeGEMINISimulator
+from device_controller.concrete_component.sbig.device_simulator_SBIG import DeviceSimulatorSBIG
-from devices_controller.devices_controller_concrete.device_controller_Gemini.telescope_controller_gemini import TelescopeControllerGEMINI
+from device_controller.concrete_component.sbig.SBIG import DeviceControllerSBIG
 ##log = L.setupLogger("AgentXTaskLogger", "AgentX")
@@ -66,9 +66,9 @@ class AgentDeviceSBIG(AgentDevice):
         super().__init__(
                          config_filename,
                          RUN_IN_THREAD,
-                         device_controller=TelescopeControllerGEMINI,
+                         device_controller=DeviceControllerSBIG,
                          host=self.HOST, port=self.PORT,
-                         device_simulator=TelescopeGEMINISimulator)
+                         device_simulator=DeviceSimulatorSBIG)
         # Initialize the device table status
         # If table is empty, create a default 1st row
@@ -86,7 +86,7 @@ class AgentDeviceSBIG(AgentDevice):
         # Port local AK 8085 = redirigé sur l’IP du tele 192.168.0.12 sur port 11110
         ##HOST, PORT = "82.64.28.71", 11110
         #HOST, PORT = "localhost", 11110
-        ##self.tele_ctrl = TelescopeControllerGEMINI(HOST, PORT, True)
+        ##self.tele_ctrl = TelescopeControllerGemini(HOST, PORT, True)
         ##self._log.print(f"init done for {name}")
@@ -101,7 +101,7 @@ class AgentDeviceSBIG(AgentDevice):
         #HOST, PORT = "localhost", 11110
         #with get_SocketServer_UDP_TCP(HOST, PORT, "UDP") as myserver:
         #with get_SocketServer_UDP_TCP(self.HOST, self.PORT, "UDP") as myserver: myserver.serve_forever()
-        TelescopeGEMINISimulator.serve_forever(self.PORT)
+        TelescopeGeminiSimulator.serve_forever(self.PORT)
         '''
         myserver = get_SocketServer_UDP_TCP(self.HOST, self.PORT, "UDP")
         myserver.serve_forever()
@@ -171,7 +171,7 @@ if __name__ == &quot;__main__&quot;:
     # with process
     #RUN_IN_THREAD=False
-    agent = build_agent(AgentDeviceTelescopeGemini, RUN_IN_THREAD=RUN_IN_THREAD)
+    agent = build_agent(AgentDeviceSBIG, RUN_IN_THREAD=RUN_IN_THREAD)
     '''
     TEST_MODE, WITH_SIM, configfile = extract_parameters()
     #agent = AgentX()
@@ -11,11 +11,11 @@ sys.path.append(&quot;..&quot;)
 from agent.AgentDevice import AgentDevice, build_agent
 from common.models import AgentDeviceTelescopeStatus, get_or_create_unique_row_from_model
 sys.path.append("../../..")
-##from devices_controller.devices_controller_concrete.device_simulator_common.server_udp_or_tcp import get_SocketServer_UDP_TCP
+##from device_controller.concrete_component.device_simulator_common.server_udp_or_tcp import get_SocketServer_UDP_TCP
-from devices_controller.devices_controller_concrete.device_controller_Gemini.device_simulator_telescope_gemini import DeviceSimulatorTelescopeGemini 
+from device_controller.concrete_component.gemini.gemini_telescope_simulator import DeviceSimulatorTelescopeGemini 
-from devices_controller.devices_controller_concrete.device_controller_Gemini.device_controller_telescope_gemini import DeviceControllerTelescopeGemini
+from device_controller.concrete_component.gemini.gemini_telescope_controller import DeviceControllerTelescopeGemini
 ##log = L.setupLogger("AgentXTaskLogger", "AgentX")
@@ -0,0 +1,268 @@
+#!/usr/bin/env python3
+
+
+import sys
+##import utils.Logger as L
+
+##from .Agent import Agent
+sys.path.append("..")
+from agent.Agent import Agent, build_agent
+
+
+##log = L.setupLogger("AgentXTaskLogger", "AgentX")
+
+
+
+class AgentMultiRequester(Agent):
+
+    # FOR TEST ONLY
+    # Run this agent in simulator mode
+    TEST_MODE = True
+    # Run the assertion tests at the end
+    TEST_WITH_FINAL_TEST = True
+    #TEST_MAX_DURATION_SEC = None
+    TEST_MAX_DURATION_SEC = 75
+    # Who should I send commands to ?
+    #TEST_COMMANDS_DEST = "myself"
+    #TEST_COMMANDS_DEST = "AgentDeviceTelescopeGemini"
+    # Scenario to be executed
+    TEST_COMMANDS_LIST = [
+        # Ask receiver to delete all its previous commands 
+        'AgentDeviceTelescope1:flush_commands',
+        'AgentDeviceFilterSelector1:flush_commands',
+        'AgentDeviceShutter1:flush_commands',
+        'AgentDeviceSensor1:flush_commands',
+
+        'AgentDeviceTelescope1:go_active',
+
+        # Because of this command, the receiver agent :
+        # - will no more send any new command
+        # - will only execute "generic" commands (and not the "specific" ones)
+        'AgentDeviceTelescope1:go_idle',
+
+        # Not executed (skipped) because receiver agent is now "idle"
+        #"specific0",
+
+        # Because of this command, the receiver agent
+        # will now be able to send new commands
+        'AgentDeviceTelescope1:go_active',
+
+        # Executed because recipient agent is now "active"
+        #"specific1",
+        'AgentDeviceTelescope1:get radec',
+        # should abort previous command (specific1)
+        #"abort",
+
+        # Executed completely because no abort
+        #"specific2",
+
+        # fully executed, result is 7
+        #"eval 4+3",
+
+        'AgentDeviceTelescope1:go_idle',
+
+        # Now stop all my device agent clients:
+        'AgentDeviceTelescope1:exit',
+        'AgentDeviceFilterSelector1:exit',
+        'AgentDeviceShutter1:exit',
+        'AgentDeviceSensor1:exit',
+
+    ]
+
+
+
+    """
+    =================================================================
+        FUNCTIONS RUN INSIDE MAIN THREAD
+    =================================================================
+    """
+
+    # @override
+    #def __init__(self, name:str=None, config_filename=None, RUN_IN_THREAD=True):
+    def __init__(self, config_filename=None, RUN_IN_THREAD=True):
+        ##if name is None: name = self.__class__.__name__
+        #super().__init__(name, config_filename, RUN_IN_THREAD)
+        super().__init__(config_filename, RUN_IN_THREAD)
+
+        #TODO: : à mettre dans la config
+        self._my_client_agents = {
+            'AgentDeviceTelescope1': 'AgentDeviceTelescopeGemini',
+            'AgentDeviceFilterSelector1': 'AgentDeviceSBIG',
+            'AgentDeviceShutter1': 'AgentDeviceSBIG',
+            'AgentDeviceSensor1': 'AgentDeviceSBIG',
+        }
+
+        #self._log.print(f"init done for {self.name}")
+        self._log.print(f"init done")
+
+    # @override
+    def init(self):
+        super().init()
+        # --- Set the mode according the startmode value
+        ##agent_alias = self.__class__.__name__
+        ##self.set_mode_from_config(agent_alias)
+
+    '''
+    # @override
+    def load_config(self):
+        super().load_config()
+    '''
+
+    '''
+    # @override
+    def update_survey(self):
+        super().update_survey()
+    '''
+
+    '''
+    # @override
+    def get_next_command(self):
+        return super().get_next_command()
+    '''
+
+    # @override
+    def do_log(self):
+        super().do_log()
+
+
+
+    """
+    =================================================================
+        FUNCTIONS RUN INSIDE A SUB-THREAD (OR A PROCESS) (thread_*())
+    =================================================================
+    """
+
+    # Define your own command step(s) here
+    def cmd_step1(self, step:int):
+        cmd = self._current_specific_cmd
+        cmd.result = f"in step #{step}/{self._thread_total_steps_number}"
+        cmd.save()
+        """
+        if self.RUN_IN_THREAD:
+            print("(save from thread)")
+            cmd.save()
+        else:
+            #@transaction.atomic
+            print("(save from process)")
+            with transaction.atomic():
+                cmd.save()
+                #Command.objects.select_for_update()
+        """
+
+    def cmd_step2(self, step:int):
+        self.cmd_step1(step)
+    def cmd_step3(self, step:int):
+        self.cmd_step1(step)
+    def cmd_step4(self, step:int):
+        self.cmd_step1(step)
+
+    """
+    # @override
+    def thread_exec_specific_cmd_step(self, step:int, sleep_time:float=1.0):
+        self.thread_stop_if_asked()
+        cmd = self._current_specific_cmd
+        print(f">>>>> Thread (cmd {cmd.name}): step #{step}/5")
+        self.sleep(sleep_time)
+    """
+
+    '''
+    # @override
+    def exec_specific_cmd_start(self, cmd:Command, from_thread=True):
+        super().exec_specific_cmd_start(cmd, from_thread)
+    '''
+
+
+    # @override
+    def thread_exec_specific_cmd_main(self):
+        # This is optional
+        self.thread_set_total_steps_number(5)
+
+        # HERE, write your own scenario
+
+        # scenario OK
+        self.thread_exec_specific_cmd_step(1, self.cmd_step1, 1)
+        self.thread_exec_specific_cmd_step(2, self.cmd_step2, 3)
+        self.thread_exec_specific_cmd_step(3, self.cmd_step1, 5)
+        self.thread_exec_specific_cmd_step(4, self.cmd_step3, 10)
+        self.thread_exec_specific_cmd_step(5, self.cmd_step1, 4)
+        # ... as many as you need
+
+        """ autre scenario
+        self.thread_exec_specific_cmd_step(1, self.cmd_step1, 1)
+        self.thread_exec_specific_cmd_step(2, self.cmd_step2, 2)
+        self.thread_exec_specific_cmd_step(3, self.cmd_step1, 2)
+        self.thread_exec_specific_cmd_step(4, self.cmd_step3, 2)
+        self.thread_exec_specific_cmd_step(5, self.cmd_step1, 3)
+        """
+
+    '''
+    # @override
+    def exec_specific_cmd_end(self, cmd:Command, from_thread=True):
+        super().exec_specific_cmd_end(cmd, from_thread)
+    '''
+
+    # @override
+    def simulator_test_results_main(self, commands):
+        nb_asserted = 0
+        for cmd in commands:
+            if cmd.name == "flush_commands":
+                assert cmd.is_executed()
+                nb_asserted+=1
+            # 2 times
+            if cmd.name == "go_active":
+                assert cmd.is_executed()
+                nb_asserted+=1
+            # 2 times
+            if cmd.name == "go_idle":
+                assert cmd.is_executed()
+                nb_asserted+=1
+            if cmd.name == "get radec":
+                assert cmd.is_executed()
+                #assert cmd.result == "06:10:38,+89:41:02"
+                nb_asserted+=1
+            """
+            if cmd.name == "specific0":
+                assert cmd.is_skipped()
+                assert cmd.result == "in step #5/5"
+                nb_asserted+=1
+            if cmd.name == "specific1":
+                assert cmd.is_killed()
+                nb_asserted+=1
+            if cmd.name == "specific2":
+                assert cmd.is_executed()
+                assert cmd.result == "in step #5/5"
+                nb_asserted+=1
+            if cmd.name == "eval 4+3":
+                assert cmd.is_executed()
+                assert cmd.get_result() == "7"
+                nb_asserted+=1
+            if cmd.name in ("abort"):
+                assert cmd.is_executed()
+                nb_asserted+=1
+            """
+            if cmd.name in ("exit"):
+                assert cmd.is_executed()
+                nb_asserted+=1
+        return nb_asserted
+
+
+"""
+=================================================================
+    MAIN FUNCTION
+=================================================================
+"""
+if __name__ == "__main__":
+    # with thread
+    RUN_IN_THREAD=True
+    # with process
+    #RUN_IN_THREAD=False
+
+    agent = build_agent(AgentMultiRequester, RUN_IN_THREAD=RUN_IN_THREAD)
+    '''
+    TEST_MODE, WITH_SIM, configfile = extract_parameters()
+    #agent = AgentX()
+    agent = AgentTelescopeRequester("AgentTelescopeRequester", configfile, RUN_IN_THREAD)
+    agent.setSimulatorMode(TEST_MODE)
+    print(agent)
+    '''
+    agent.run()
@@ -52,11 +52,11 @@ object AgentDeviceShutter2
 /' Use l,r,u,d for left, right, up, or down row alignement '/
-AgentMajordome -d-> AgentDeviceFilterSelector1 : sends command to
-AgentMajordome -d-> AgentDeviceShutter1 : sends command to
-AgentMajordome -d-> AgentDeviceSensor1 : sends command to
-AgentMajordome -d-> AgentDeviceTelescope1 : sends command to
-AgentMajordome -d-> AgentDeviceShutter2 : sends command to
+AgentMajordome -d-> AgentDeviceFilterSelector1 : sends cmd to
+AgentMajordome -d-> AgentDeviceShutter1 : sends cmd to
+AgentMajordome -d-> AgentDeviceSensor1 : sends cmd to
+AgentMajordome -d-> AgentDeviceTelescope1 : sends cmd to
+AgentMajordome -d-> AgentDeviceShutter2 : sends cmd to
 object AgentDeviceSBIG_CXZ347 <<Singleton>>
@@ -22,9 +22,10 @@ import time
 sys.path.append("..")
 # from src_socket/client/
 sys.path.append("../../..")
+sys.path.append("../../../..")
 #import src.core.pyros_django.utils.celme as celme
 import src.core.celme as celme
-from devices_controller.logs import *
+from device_controller.logs import *
 # Local application imports
@@ -32,9 +33,9 @@ from devices_controller.logs import *
 #from src.client.socket_client_abstract import UnknownCommandException, SocketClientAbstract
 ##from src_socket.client.socket_client_abstract import *
 ##from src_device.client.client_channel import *
-from devices_controller.channels.client_channel_socket import ClientChannelSocket
-from devices_controller.channels.client_channel_serial import ClientChannelSerial
-from devices_controller.channels.client_channel_usb import ClientChannelUSB
+from device_controller.channels.client_channel_socket import ClientChannelSocket
+from device_controller.channels.client_channel_serial import ClientChannelSerial
+from device_controller.channels.client_channel_usb import ClientChannelUSB
@@ -19,9 +19,9 @@ import src.core.celme as celme
 # Local application imports
-#from devices_controller.devices_controller_abstract_component.device_controller_abstract import *
+#from device_controller.abstract_component.base import *
 sys.path.append("../..")
-from devices_controller.devices_controller_abstract_component.device_controller_abstract import *
+from device_controller.abstract_component.base import *
 # Default timeouts
@@ -19,9 +19,9 @@ import src.core.celme as celme
 # Local application imports
-#from devices_controller.devices_controller_abstract_component.device_controller_abstract import *
+#from device_controller.abstract_component.base import *
 sys.path.append("../..")
-from devices_controller.devices_controller_abstract_component.device_controller_abstract import *
+from device_controller.abstract_component.base import *
 # Default timeouts
@@ -19,9 +19,9 @@ import src.core.celme as celme
 # Local application imports
-#from devices_controller.devices_controller_abstract_component.device_controller_abstract import *
+#from device_controller.abstract_component.base import *
 sys.path.append("../..")
-from devices_controller.devices_controller_abstract_component.device_controller_abstract import *
+from device_controller.abstract_component.base import *
 # Default timeouts
@@ -27,7 +27,7 @@ import src.core.celme as celme
 # Local application imports
 #sys.path.append('../..')
 #from src.client.socket_client_abstract import UnknownCommandException, SocketClientAbstract
-from src_device.client.device_controller_abstract import *
+from src_device.client.base import *
@@ -28,7 +28,7 @@ import src.core.celme as celme
 #sys.path.append('../..')
 #from src.client.socket_client_abstract import UnknownCommandException, SocketClientAbstract
 ##from src_socket.client.socket_client_abstract import *
-from devices_controller.devices_controller_abstract_component.device_controller_abstract import *
+from device_controller.abstract_component.base import *
@@ -12,7 +12,7 @@ To be used as a base class (interface) for any concrete socket client class
 # None
 # Local application imports
-from devices_controller.logs import *
+from device_controller.logs import *
@@ -11,7 +11,7 @@
 # None
 # Local application imports
-from devices_controller.channels.client_channel import *
+from device_controller.channels.client_channel import *
@@ -12,7 +12,7 @@ import socket
 # None
 # Local application imports
-from devices_controller.channels.client_channel import *
+from device_controller.channels.client_channel import *
@@ -11,7 +11,7 @@
 # None
 # Local application imports
-from devices_controller.channels.client_channel import *
+from device_controller.channels.client_channel import *
@@ -8,13 +8,13 @@ import sys
 '''
 (1)
 sys.path.append("../../..")
-from devices_controller.devices_controller_concrete.device_controller_Gemini.telescope_controller_gemini import TelescopeControllerGemini
+from device_controller.concrete_component.gemini.telescope_controller_gemini import TelescopeControllerGemini
 ou (2)
 #sys.path.append("..")
-#from device_controller_Gemini.telescope_controller_gemini import TelescopeControllerGemini
+#from gemini.telescope_controller_gemini import TelescopeControllerGemini
 ou (3) 
 '''
-from device_controller_telescope_gemini import DeviceControllerTelescopeGemini
+from gemini_telescope_controller import DeviceControllerTelescopeGemini
 #DEBUG = False
 DEBUG = True
@@ -15,10 +15,11 @@ import time
 # Local application imports
 sys.path.append('../../..')
+from device_controller.abstract_component.base import UnknownCommandException
 #from src.client.socket_client_telescope_abstract import Position, UnknownCommandException, TimeoutException, SocketClientTelescopeAbstract
 ##from src_socket.client.socket_client_telescope_abstract import *
-#from devices_controller.devices_controller_abstract_component.telescope_controller_abstract import *
-from devices_controller.devices_controller_abstract_component.device_controller_telescope import *
+#from device_controller.abstract_component.telescope_controller_abstract import *
+from device_controller.abstract_component.telescope import *
 # Default timeouts
 TIMEOUT_SEND = 10
@@ -6,9 +6,9 @@ import sys
 #sys.path.append("..")
 #sys.path.append("../..")
 #sys.path.append("../../..")
-#from devices_controller.devices_controller_concrete.device_simulator_common.server_udp_or_tcp import get_SocketServer_UDP_TCP
+#from device_controller.concrete_component.device_simulator_common.server_udp_or_tcp import get_SocketServer_UDP_TCP
 #from device_simulator_common.server_udp_or_tcp import get_SocketServer_UDP_TCP
-from devices_controller.devices_controller_concrete.device_simulator_common.server_udp_or_tcp import get_SocketServer_UDP_TCP
+from device_controller.concrete_component.device_simulator_common.server_udp_or_tcp import get_SocketServer_UDP_TCP
 #from server.server_udp_or_tcp import get_SocketServer_UDP_TCP
 HOST = "localhost"
@@ -4,7 +4,7 @@ import sys
 sys.path.append("..")
-#from devices_controller.devices_controller_concrete.device_simulator_common.server_udp_or_tcp import get_SocketServer_UDP_TCP
+#from device_controller.concrete_component.device_simulator_common.server_udp_or_tcp import get_SocketServer_UDP_TCP
 from device_simulator_common.server_udp_or_tcp import get_SocketServer_UDP_TCP
 #from server.server_udp_or_tcp import get_SocketServer_UDP_TCP
@@ -16,22 +16,21 @@ import time
 # Local application imports
-# devices_controller/
+# device_controller/
 sys.path.append('../../..')
 # src/
 sys.path.append('../../../..')
-#from src.client.socket_client_telescope_abstract import Position, UnknownCommandException, TimeoutException, SocketClientTelescopeAbstract
-##from src_socket.client.socket_client_telescope_abstract import *
-#from devices_controller.devices_controller_abstract_component.telescope_controller_abstract import *
+from device_controller.abstract_component.base import UnknownCommandException
+#from device_controller.abstract_component.telescope_controller_abstract import *
 #TODO: Heritage ou plutot COMPOSITION ?
 # The SBIG controller has 3 capabilities : filter selector, detector sensor, and detector shutter
-#from devices_controller.devices_controller_abstract_component.device_controller_abstract import *
-from devices_controller.devices_controller_abstract_component.device_controller_filter_selector import DeviceControllerFilterSelector
-from devices_controller.devices_controller_abstract_component.device_controller_detector_sensor import DeviceControllerDetectorSensor
-from devices_controller.devices_controller_abstract_component.device_controller_detector_shutter import DeviceControllerDetectorShutter
+#from device_controller.abstract_component.base import *
+from device_controller.abstract_component.filter_selector import DeviceControllerFilterSelector
+from device_controller.abstract_component.detector_sensor import DeviceControllerDetectorSensor
+from device_controller.abstract_component.detector_shutter import DeviceControllerDetectorShutter
 # Default timeouts
 TIMEOUT_SEND = 10
@@ -6,9 +6,9 @@ import sys
 #sys.path.append("..")
 #sys.path.append("../..")
 #sys.path.append("../../..")
-#from devices_controller.devices_controller_concrete.device_simulator_common.server_udp_or_tcp import get_SocketServer_UDP_TCP
+#from device_controller.concrete_component.device_simulator_common.server_udp_or_tcp import get_SocketServer_UDP_TCP
 #from device_simulator_common.server_udp_or_tcp import get_SocketServer_UDP_TCP
-from devices_controller.devices_controller_concrete.device_simulator_common.server_udp_or_tcp import get_SocketServer_UDP_TCP
+from device_controller.concrete_component.device_simulator_common.server_udp_or_tcp import get_SocketServer_UDP_TCP
 #from server.server_udp_or_tcp import get_SocketServer_UDP_TCP
 HOST = "localhost"
@@ -7,9 +7,9 @@ import unittest
 import sys
 sys.path.append('..')
 sys.path.append('../..')
-from devices_controller.devices_controller_concrete.device_simulator_common.server_udp_or_tcp import get_SocketServer_UDP_TCP
+from device_controller.concrete_component.device_simulator_common.server_udp_or_tcp import get_SocketServer_UDP_TCP
 #from src_socket.client.socket_client_telescope_gemini import SocketClientTelescopeGemini
-import devices_controller.devices_controller_concrete.device_controller_Gemini.device_controller_telescope_gemini as gemini 
+import device_controller.concrete_component.gemini.gemini_telescope_controller as gemini 
 #HOST, PORT = "localhost", 9999
 #HOST, PORT = "localhost", 20001