PYROS-IRAP / pyros

Commit 28fec2f271d0886c1790583069e528dfc0c4db14

Authored by Etienne Pallier
1 parent d82e7d8c
Exists in dev

Restructuration du projet - phase 3 : 

/devices_channel/ => /src/devices_controller/
Showing 12 changed files with 18 additions and 18 deletions   Show diff stats
Inline Side-by-side
@@ -71,12 +71,11 @@ Date: 14/06/2019 @@ -71,12 +71,11 @@ Date: 14/06/2019
71 71
72 Author: E. Pallier (epallier@irap.omp.eu) 72 Author: E. Pallier (epallier@irap.omp.eu)
73 73
74 -VERSION: 0.30.4 74 +VERSION: 0.30.5
75 75
76 -Comment : Restructuration du projet - phase 2 : /pyros_django/ => /src/core/pyros_django/ 76 +Comment : Restructuration du projet - phase 3 : /devices_channel/ => /src/devices_controller/
77 77
78 TODO (coming) : 78 TODO (coming) :
79 -- Restructuration du projet - phase 3 : /devices_channel/ => /src/devices_controller/  
80 - Restructuration du projet - phase 4 : /src/core/pyros_django/utils/celme/ => /src/core/celme/ 79 - Restructuration du projet - phase 4 : /src/core/pyros_django/utils/celme/ => /src/core/celme/
81 - Restructuration du projet - phase 5 : /devices_channel/ => réorganisation interne 80 - Restructuration du projet - phase 5 : /devices_channel/ => réorganisation interne
82 81
@@ -118,6 +117,7 @@ The list below is obsolete. The new official changes history is here : https:// @@ -118,6 +117,7 @@ The list below is obsolete. The new official changes history is here : https://
118 **14/06/2019 : v0.30.3-4 (EP)** 117 **14/06/2019 : v0.30.3-4 (EP)**
119 - Restructuration du projet - phase 1 : /src/ => /pyros_django/ 118 - Restructuration du projet - phase 1 : /src/ => /pyros_django/
120 - Restructuration du projet - phase 2 : /pyros_django/ => /src/core/pyros_django/ 119 - Restructuration du projet - phase 2 : /pyros_django/ => /src/core/pyros_django/
  120 + - Restructuration du projet - phase 3 : /devices_channel/ => /src/devices_controller/
121 121
122 **11/06/2019 : v0.30.2 (EP)** 122 **11/06/2019 : v0.30.2 (EP)**
123 - Ajouté options "test" et "testall" dans pyros.py pour exécution des (anciens) tests unitaires 123 - Ajouté options "test" et "testall" dans pyros.py pour exécution des (anciens) tests unitaires
src/core/pyros_django/agent/AgentDevice.py
  Diff comments   View file @28fec2f
@@ -9,7 +9,7 @@ import time @@ -9,7 +9,7 @@ import time
9 sys.path.append("..") 9 sys.path.append("..")
10 from agent.Agent import Agent, extract_parameters 10 from agent.Agent import Agent, extract_parameters
11 from common.models import AgentDeviceTelescopeStatus, get_or_create_unique_row_from_model 11 from common.models import AgentDeviceTelescopeStatus, get_or_create_unique_row_from_model
12 -from devices_channel.client.telescope_controller_gemini import TelescopeControllerGEMINI 12 +from devices_controller.client.telescope_controller_gemini import TelescopeControllerGEMINI
13 13
14 ##log = L.setupLogger("AgentXTaskLogger", "AgentX") 14 ##log = L.setupLogger("AgentXTaskLogger", "AgentX")
15 15
src/devices_controller/client/channel/client_channel.py
  Diff comments   View file @28fec2f
@@ -12,7 +12,7 @@ To be used as a base class (interface) for any concrete socket client class @@ -12,7 +12,7 @@ To be used as a base class (interface) for any concrete socket client class
12 # None 12 # None
13 13
14 # Local application imports 14 # Local application imports
15 -from devices_channel.client.logs import * 15 +from devices_controller.client.logs import *
16 16
17 17
18 18
src/devices_controller/client/channel/client_channel_serial.py
  Diff comments   View file @28fec2f
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 # None 11 # None
12 12
13 # Local application imports 13 # Local application imports
14 -from devices_channel.client.channel.client_channel import * 14 +from devices_controller.client.channel.client_channel import *
15 15
16 16
17 17
src/devices_controller/client/channel/client_channel_socket.py
  Diff comments   View file @28fec2f
@@ -12,7 +12,7 @@ import socket @@ -12,7 +12,7 @@ import socket
12 # None 12 # None
13 13
14 # Local application imports 14 # Local application imports
15 -from devices_channel.client.channel.client_channel import * 15 +from devices_controller.client.channel.client_channel import *
16 16
17 17
18 18
src/devices_controller/client/channel/client_channel_usb.py
  Diff comments   View file @28fec2f
@@ -11,7 +11,7 @@ @@ -11,7 +11,7 @@
11 # None 11 # None
12 12
13 # Local application imports 13 # Local application imports
14 -from devices_channel.client.channel.client_channel import * 14 +from devices_controller.client.channel.client_channel import *
15 15
16 16
17 17
src/devices_controller/client/devices_abstract/device_controller_abstract.py
  Diff comments   View file @28fec2f
@@ -23,7 +23,7 @@ sys.path.append("..") @@ -23,7 +23,7 @@ sys.path.append("..")
23 # from src_socket/client/ 23 # from src_socket/client/
24 sys.path.append("../../..") 24 sys.path.append("../../..")
25 import src.core.pyros_django.utils.celme as celme 25 import src.core.pyros_django.utils.celme as celme
26 -from devices_channel.client.logs import * 26 +from devices_controller.client.logs import *
27 27
28 28
29 # Local application imports 29 # Local application imports
@@ -31,9 +31,9 @@ from devices_channel.client.logs import * @@ -31,9 +31,9 @@ from devices_channel.client.logs import *
31 #from src.client.socket_client_abstract import UnknownCommandException, SocketClientAbstract 31 #from src.client.socket_client_abstract import UnknownCommandException, SocketClientAbstract
32 ##from src_socket.client.socket_client_abstract import * 32 ##from src_socket.client.socket_client_abstract import *
33 ##from src_device.client.client_channel import * 33 ##from src_device.client.client_channel import *
34 -from devices_channel.client.channel.client_channel_socket import ClientChannelSocket  
35 -from devices_channel.client.channel.client_channel_serial import ClientChannelSerial  
36 -from devices_channel.client.channel.client_channel_usb import ClientChannelUSB 34 +from devices_controller.client.channel.client_channel_socket import ClientChannelSocket
  35 +from devices_controller.client.channel.client_channel_serial import ClientChannelSerial
  36 +from devices_controller.client.channel.client_channel_usb import ClientChannelUSB
37 37
38 38
39 39
src/devices_controller/client/devices_abstract/telescope_controller_abstract.py
  Diff comments   View file @28fec2f
@@ -27,7 +27,7 @@ import src.core.pyros_django.utils.celme as celme @@ -27,7 +27,7 @@ import src.core.pyros_django.utils.celme as celme
27 #sys.path.append('../..') 27 #sys.path.append('../..')
28 #from src.client.socket_client_abstract import UnknownCommandException, SocketClientAbstract 28 #from src.client.socket_client_abstract import UnknownCommandException, SocketClientAbstract
29 ##from src_socket.client.socket_client_abstract import * 29 ##from src_socket.client.socket_client_abstract import *
30 -from devices_channel.client.devices_abstract.device_controller_abstract import * 30 +from devices_controller.client.devices_abstract.device_controller_abstract import *
31 31
32 32
33 33
src/devices_controller/client/telescope_controller_gemini.py
  Diff comments   View file @28fec2f
@@ -17,7 +17,7 @@ import time @@ -17,7 +17,7 @@ import time
17 sys.path.append('../..') 17 sys.path.append('../..')
18 #from src.client.socket_client_telescope_abstract import Position, UnknownCommandException, TimeoutException, SocketClientTelescopeAbstract 18 #from src.client.socket_client_telescope_abstract import Position, UnknownCommandException, TimeoutException, SocketClientTelescopeAbstract
19 ##from src_socket.client.socket_client_telescope_abstract import * 19 ##from src_socket.client.socket_client_telescope_abstract import *
20 -from devices_channel.client.devices_abstract.telescope_controller_abstract import * 20 +from devices_controller.client.devices_abstract.telescope_controller_abstract import *
21 21
22 # Default timeouts 22 # Default timeouts
23 TIMEOUT_SEND = 10 23 TIMEOUT_SEND = 10
src/devices_controller/client_telescope_controller_gemini_run.py
  Diff comments   View file @28fec2f
@@ -6,7 +6,7 @@ import sys @@ -6,7 +6,7 @@ import sys
6 6
7 7
8 sys.path.append("..") 8 sys.path.append("..")
9 -from devices_channel.client.telescope_controller_gemini import TelescopeControllerGEMINI 9 +from devices_controller.client.telescope_controller_gemini import TelescopeControllerGEMINI
10 10
11 #DEBUG = False 11 #DEBUG = False
12 DEBUG = True 12 DEBUG = True
src/devices_controller/server_telescope_gemini_simulator_run.py
  Diff comments   View file @28fec2f
@@ -4,7 +4,7 @@ import sys @@ -4,7 +4,7 @@ import sys
4 4
5 5
6 sys.path.append("..") 6 sys.path.append("..")
7 -from devices_channel.server.server_udp_or_tcp import get_SocketServer_UDP_TCP 7 +from devices_controller.server.server_udp_or_tcp import get_SocketServer_UDP_TCP
8 #from server.server_udp_or_tcp import get_SocketServer_UDP_TCP 8 #from server.server_udp_or_tcp import get_SocketServer_UDP_TCP
9 9
10 HOST, PORT = "localhost", 11110 10 HOST, PORT = "localhost", 11110
src/devices_controller/test/test_client_gemini.py
  Diff comments   View file @28fec2f
@@ -7,9 +7,9 @@ import unittest @@ -7,9 +7,9 @@ import unittest
7 import sys 7 import sys
8 sys.path.append('..') 8 sys.path.append('..')
9 sys.path.append('../..') 9 sys.path.append('../..')
10 -from devices_channel.server.server_udp_or_tcp import get_SocketServer_UDP_TCP 10 +from devices_controller.server.server_udp_or_tcp import get_SocketServer_UDP_TCP
11 #from src_socket.client.socket_client_telescope_gemini import SocketClientTelescopeGEMINI 11 #from src_socket.client.socket_client_telescope_gemini import SocketClientTelescopeGEMINI
12 -import devices_channel.client.telescope_controller_gemini as gemini 12 +import devices_controller.client.telescope_controller_gemini as gemini
13 13
14 #HOST, PORT = "localhost", 9999 14 #HOST, PORT = "localhost", 9999
15 #HOST, PORT = "localhost", 20001 15 #HOST, PORT = "localhost", 20001