PYROS-IRAP / pyros

Commit c6c8be74bf541385175f3184983f4b67bce3f054

Authored by Etienne Pallier
1 parent 189f28a3
Exists in dev

Restructuration du projet - phase 4 : 

/src/core/pyros_django/utils/celme/ => /src/core/celme/



TODO (coming) :
- Restructuration du projet - phase 5 : /devices_channel/ =>
réorganisation interne

	RAPPELS SUR L'UTILISATION :

	- (TEST) Scenarios de test :
		1) ./pyros test
		2) ./pyros testall
		3) Lancer agents A et B en mode simu (option -t):
			./pyros.py -t start agentA,agentB
			Attendre 1 à 2mn jusqu'à obtenir les 2 résultats suivants:
			(AgentA): Finished testing => result is ok
			(AgentB): Finished testing => result is ok
		4) Lancer agentDevice et agentTelescopeRequester en mode simu (-t) :
			./pyros.py -t start agentTelescopeRequester,agentDevice

	- (RUN) Mode opératoire pour lancer un agent (en mode normal, hors
test) :
		- pour lancer agentA seulement : ./pyros.py start agentA [-c
configfile]
		- pour lancer plusieurs agents : ./pyros.py start agentA,agentB,...
[-c configfile]
		(ou encore: activer l'environnement virtuel, puis lancer "cd
src/.../agent/ ; ./AgentA.py configfile")
		- pour utiliser thread ou processus : il suffit de mettre la constante
RUN_IN_THREAD de AgentA (ou AgentB ou AgentX) à False ou True
Showing 7 changed files with 26 additions and 10 deletions   Show diff stats
Inline Side-by-side
@@ -71,12 +71,12 @@ Date: 14/06/2019 @@ -71,12 +71,12 @@ 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.5 74 +VERSION: 0.30.6
75 75
76 -Comment : Restructuration du projet - phase 3 : /devices_channel/ => /src/devices_controller/ 76 +Comment :
  77 +- Restructuration du projet - phase 4 : /src/core/pyros_django/utils/celme/ => /src/core/celme/
77 78
78 TODO (coming) : 79 TODO (coming) :
79 -- Restructuration du projet - phase 4 : /src/core/pyros_django/utils/celme/ => /src/core/celme/  
80 - Restructuration du projet - phase 5 : /devices_channel/ => réorganisation interne 80 - Restructuration du projet - phase 5 : /devices_channel/ => réorganisation interne
81 81
82 82
@@ -114,10 +114,11 @@ Full list of commits: https://gitlab.irap.omp.eu/epallier/pyros/commits/master @@ -114,10 +114,11 @@ Full list of commits: https://gitlab.irap.omp.eu/epallier/pyros/commits/master
114 114
115 The list below is obsolete. The new official changes history is here : https://tinyurl.com/pyros-dev#heading=h.2r55bflctpt5 115 The list below is obsolete. The new official changes history is here : https://tinyurl.com/pyros-dev#heading=h.2r55bflctpt5
116 116
117 -**14/06/2019 : v0.30.3-4 (EP)** 117 +**14/06/2019 : v0.30.3-6 (EP)**
118 - Restructuration du projet - phase 1 : /src/ => /pyros_django/ 118 - Restructuration du projet - phase 1 : /src/ => /pyros_django/
119 - 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/ 120 - Restructuration du projet - phase 3 : /devices_channel/ => /src/devices_controller/
  121 + - Restructuration du projet - phase 4 : /src/core/pyros_django/utils/celme/ => /src/core/celme/
121 122
122 **11/06/2019 : v0.30.2 (EP)** 123 **11/06/2019 : v0.30.2 (EP)**
123 - Ajouté options "test" et "testall" dans pyros.py pour exécution des (anciens) tests unitaires 124 - Ajouté options "test" et "testall" dans pyros.py pour exécution des (anciens) tests unitaires
src/core/pyros_django/agent/logpyros.py
  Diff comments   View file @c6c8be7
@@ -9,8 +9,9 @@ py_pwd = os.getcwd() + "/../utils" @@ -9,8 +9,9 @@ py_pwd = os.getcwd() + "/../utils"
9 if (py_pwd not in py_path): 9 if (py_pwd not in py_path):
10 (os.sys.path).append(py_pwd) 10 (os.sys.path).append(py_pwd)
11 11
12 -import utils.celme as celme  
13 #import celme 12 #import celme
  13 +#import utils.celme as celme
  14 +import src.core.celme as celme
14 15
15 class LogPyros: 16 class LogPyros:
16 17
src/core/pyros_django/dashboard/views.py
  Diff comments   View file @c6c8be7
  1 +import sys
  2 +
1 from django.http import HttpResponse 3 from django.http import HttpResponse
2 from django.shortcuts import render, redirect 4 from django.shortcuts import render, redirect
3 5
@@ -23,7 +25,12 @@ from devices.CameraNIRRemoteControlDefault import CameraNIRRemoteControlDefault @@ -23,7 +25,12 @@ from devices.CameraNIRRemoteControlDefault import CameraNIRRemoteControlDefault
23 from devices import PLC 25 from devices import PLC
24 from django.core.mail import send_mail 26 from django.core.mail import send_mail
25 import time 27 import time
26 -import utils.celme as celme 28 +
  29 +sys.path.append("../../..")
  30 +#import utils.celme as celme
  31 +import src.core.celme as celme
  32 +
  33 +
27 from collections import OrderedDict 34 from collections import OrderedDict
28 35
29 SUN_ELEV_DAY_THRESHOLD = -10 36 SUN_ELEV_DAY_THRESHOLD = -10
src/core/pyros_django/utils/report/status_json.py
  Diff comments   View file @c6c8be7
@@ -2,6 +2,7 @@ @@ -2,6 +2,7 @@
2 import doctest 2 import doctest
3 import json 3 import json
4 import os 4 import os
  5 +import sys
5 6
6 # --- update the path of Python 7 # --- update the path of Python
7 py_path = os.sys.path 8 py_path = os.sys.path
@@ -15,7 +16,10 @@ py_pwd = os.getcwd() + "/../.." @@ -15,7 +16,10 @@ py_pwd = os.getcwd() + "/../.."
15 if (py_pwd not in py_path): 16 if (py_pwd not in py_path):
16 (os.sys.path).append(py_pwd) 17 (os.sys.path).append(py_pwd)
17 18
18 -import utils.celme as celme 19 +
  20 +#import utils.celme as celme
  21 +#sys.path.append('..')
  22 +import src.core.celme as celme
19 23
20 # ======================================================== 24 # ========================================================
21 # ======================================================== 25 # ========================================================
src/devices_controller/client/devices_abstract/device_controller_abstract.py
  Diff comments   View file @c6c8be7
@@ -22,7 +22,8 @@ import time @@ -22,7 +22,8 @@ import time
22 sys.path.append("..") 22 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 +import src.core.celme as celme
26 from devices_controller.client.logs import * 27 from devices_controller.client.logs import *
27 28
28 29
src/devices_controller/client/devices_abstract/plc_controller_abstract.py
  Diff comments   View file @c6c8be7
@@ -20,7 +20,8 @@ import time @@ -20,7 +20,8 @@ import time
20 sys.path.append("..") 20 sys.path.append("..")
21 # from src_socket/client/ 21 # from src_socket/client/
22 sys.path.append("../../..") 22 sys.path.append("../../..")
23 -import src.core.pyros_django.utils.celme as celme 23 +#import src.core.pyros_django.utils.celme as celme
  24 +import src.core.celme as celme
24 25
25 26
26 # Local application imports 27 # Local application imports
src/devices_controller/client/devices_abstract/telescope_controller_abstract.py
  Diff comments   View file @c6c8be7
@@ -20,7 +20,8 @@ import time @@ -20,7 +20,8 @@ import time
20 sys.path.append("..") 20 sys.path.append("..")
21 # from src_socket/client/ 21 # from src_socket/client/
22 sys.path.append("../../..") 22 sys.path.append("../../..")
23 -import src.core.pyros_django.utils.celme as celme 23 +#import src.core.pyros_django.utils.celme as celme
  24 +import src.core.celme as celme
24 25
25 26
26 # Local application imports 27 # Local application imports