Reworked simulator architecture

Jeremy
1 parent 86dd6e43
Showing 42 changed files with 73 additions and 58 deletions Show diff stats
pyrosrun.sh
src/simulator/__init__.py -> simulators/__init__.py
src/simulator/alertSimulator/ALERTsimulator.py -> simulators/alert/ALERTsimulator.py
src/simulator/alertSimulator/__init__.py -> simulators/alert/__init__.py
simulators/Camera.py -> simulators/camera/Camera.py
simulators/CameraNIR.py -> simulators/camera/CameraNIR.py
simulators/CameraVIS.py -> simulators/camera/CameraVIS.py
src/simulator/plcSimulator/__init__.py -> simulators/camera/__init__.py
simulators/grammar.json -> simulators/config/grammar.json
simulators/config/s1.json
simulators/socket_config.ini -> simulators/config/socket_config.ini
simulators/Device.py -> simulators/device/Device.py
src/simulator/userSimulator/migrations/__init__.py -> simulators/device/__init__.py
src/misc/fixtures/simulation/simulation.json -> simulators/fixtures/simulation.json
src/misc/fixtures/simulation/simulation1.json -> simulators/fixtures/simulation1.json
src/misc/fixtures/simulation/simulation2.json -> simulators/fixtures/simulation2.json
simulators/kill_all.sh
simulators/PLC.py -> simulators/plc/PLC.py
src/simulator/plcSimulator/PLCsimulator.py -> simulators/plc/PLCsimulator.py
simulators/plc/__init__.py
@@ -85,11 +85,11 @@ case &quot;$1&quot; in
      cd -
 	;;
      "simulator")
-     scripts/simulator_launch.sh
+     ../simulators/scripts/simulator_launch.sh
 #     python manage.py test --pattern="testRoutine*.py" --keepdb
 	;;
      "kill_simulation")
-     scripts/kill_simulation.sh
+     ../simulators/scripts/kill_simulation.sh
 	;;
      "sim")
      celery worker -A pyros -Q simulator_q -n pyros@simulator -c 1 &
@@ -2,10 +2,16 @@ import socket
 from enum import Enum
 import time
 import os
+import sys
 from random import randint
-from Device import Device
  
-IMAGES_FOLDER = '../src/misc/images'
+PACKAGE_PARENT = '..'
+SCRIPT_DIR = os.path.dirname(os.path.realpath(os.path.join(os.getcwd(), os.path.expanduser(__file__))))
+sys.path.append(os.path.normpath(os.path.join(SCRIPT_DIR, PACKAGE_PARENT)))
+
+from device.Device import Device
+
+IMAGES_FOLDER = '../../src/misc/images'
  
 EXPOSURE_TIME = 5
 SHUTTER_TIME = 3
@@ -5,7 +5,7 @@ import os
 from random import randint
 from Camera import Camera
  
-IMAGES_FOLDER = '../src/misc/images'
+IMAGES_FOLDER = '../../src/misc/images'
  
 EXPOSURE_TIME = 5
 SHUTTER_TIME = 3
@@ -0,0 +1,3 @@
+{
+  "Request" : {"id" : 1, "time" : 4}
+}
@@ -3,9 +3,9 @@ import socket
 import json
 from pydoc import locate
  
-IMAGES_FOLDER = '../src/images'
-CONFIG_FILE = "socket_config.ini"
-GRAMMAR_FILE = "grammar.json"
+IMAGES_FOLDER = '../../src/images'
+CONFIG_FILE = "../config/socket_config.ini"
+GRAMMAR_FILE = "../config/grammar.json"
  
 class Device():
     """
@@ -1,4 +0,0 @@
-ps aux | grep "python Telescope.py" | awk '{print $2}' | xargs kill -9
-ps aux | grep "python CameraVIS.py" | awk '{print $2}' | xargs kill -9
-ps aux | grep "python CameraNIR.py" | awk '{print $2}' | xargs kill -9
-ps aux | grep "python PLC.py" | awk '{print $2}' | xargs kill -9
 import socket
 from enum import Enum
-from Device import Device
+import os
+import sys
+
+PACKAGE_PARENT = '..'
+SCRIPT_DIR = os.path.dirname(os.path.realpath(os.path.join(os.getcwd(), os.path.expanduser(__file__))))
+sys.path.append(os.path.normpath(os.path.join(SCRIPT_DIR, PACKAGE_PARENT)))
+
+from device.Device import Device
  
 class PLC(Device):
  
@@ -1,12 +0,0 @@
-SCRIPT_PATH=$0
-SCRIPT_PATH=${SCRIPT_PATH%/*}
-
-./kill_all.sh
-
-source ../private/venv_py3_pyros/bin/activate
-
-python Telescope.py &
-python CameraVIS.py &
-python CameraNIR.py &
-python PLC.py &
-
@@ -0,0 +1,4 @@
+ps aux | grep "python ../telescope/Telescope.py" | awk '{print $2}' | xargs kill -9
+ps aux | grep "python ../camera/CameraVIS.py" | awk '{print $2}' | xargs kill -9
+ps aux | grep "python ../camera/CameraNIR.py" | awk '{print $2}' | xargs kill -9
+ps aux | grep "python ../plc/PLC.py" | awk '{print $2}' | xargs kill -9
-SCRIPT_PATH=$0
-SCRIPT_PATH=${SCRIPT_PATH%/*}
-
-cd $SCRIPT_PATH/..
-
 #Reseting
 sed -i -e "s/CELERY_TEST = True/CELERY_TEST = False/g" pyros/settings.py
-sed -i -e "s/.*SIMULATOR_VALUE = .*/SIMULATOR_VALUE = None/g" simulator/userSimulator/tasks.py
+sed -i -e "s/.*SIMULATOR_VALUE = .*/SIMULATOR_VALUE = None/g" userSimulator/tasks.py
  
 #Kill web server
 fuser -k 8000/tcp
@@ -0,0 +1,15 @@
+SCRIPT_PATH=$0
+SCRIPT_PATH=${SCRIPT_PATH%/*}
+
+./kill_all.sh
+
+cd ../../src/
+
+source ../private/venv_py3_pyros/bin/activate
+
+cd -
+
+python ../telescope/Telescope.py &
+python ../camera/CameraVIS.py &
+python ../camera/CameraNIR.py &
+python ../plc/PLC.py &
 # setting
-SCRIPT_PATH=$0
-SCRIPT_PATH=${SCRIPT_PATH%/*}
  
-cd $SCRIPT_PATH/..
+SIM_FIXTURES="../simulators/fixtures/"
+SIM_PATH="../simulators/"
  
 echo -n "Existing simulations : "
-ls misc/fixtures/simulation/
+ls "$SIM_FIXTURES"
 echo -n "Enter which simulation you want to launch : "
 read -r line
  
-if [ ! -f misc/fixtures/simulation/"$line" ]; then
+if [ ! -f "$SIM_FIXTURES"/"$line" ]; then
   echo "This simulation doesn't exist"
   exit
 fi
  
-sed -i -e "s/SIMULATOR_VALUE = None/SIMULATOR_VALUE = '$line'/g" simulator/userSimulator/tasks.py
+sed -i -e "s/SIMULATOR_VALUE = None/SIMULATOR_VALUE = '$line'/g" userSimulator/tasks.py
 sed -i -e "s/CELERY_TEST = False/CELERY_TEST = True/g" pyros/settings.py
  
 trap ctrl_c INT
@@ -32,7 +31,7 @@ rm -f testdb.sqlite3
 python manage.py migrate
 python manage.py loaddata misc/fixtures/initial_fixture.json
  
-python manage.py loaddata misc/fixtures/simulation/"$line"
+python manage.py loaddata "$SIM_FIXTURES"/"$line"
  
 echo "----------------LAUNCHING WEB SERVER----------------"
 python manage.py runserver &
@@ -54,12 +53,12 @@ echo &quot;&quot;
 read -n1 -r -p "Press any key to continue..." key
  
 #launch simulator workers
-./scripts/start_simulator_worker.sh 2>&1 /dev/null
+./../simulators/scripts/start_simulator_worker.sh 2>&1 /dev/null
  
 #launch simulators binaries
-python simulator/alertSimulator/ALERTsimulator.py "$line" &
+python "$SIM_PATH"/alert/ALERTsimulator.py "$line" &
 ALERTPID=$!
-python simulator/plcSimulator/PLCsimulator.py "$line" &
+python "$SIM_PATH"/plc/PLCsimulator.py "$line" &
 PLCPID=$!
  
 echo ""
 # Kill and re-launch simulator workers
  
-SCRIPT_PATH=$0
-SCRIPT_PATH=${SCRIPT_PATH%/*}
-
-cd $SCRIPT_PATH/..
-
 source ../private/venv_py3_pyros/bin/activate
  
 ./scripts/kill_celery_workers.sh
 import socket
 from enum import Enum
 import time
-from Device import Device
+import os
+import sys
+
+PACKAGE_PARENT = '..'
+SCRIPT_DIR = os.path.dirname(os.path.realpath(os.path.join(os.getcwd(), os.path.expanduser(__file__))))
+sys.path.append(os.path.normpath(os.path.join(SCRIPT_DIR, PACKAGE_PARENT)))
+
+from device.Device import Device
  
 DOORS_TIME = 5
 MOVE_TIME = 5
@@ -4,8 +4,8 @@ import configparser
 import json
 from pydoc import locate
  
-CONFIG_FILE = "../simulators/socket_config.ini"
-GRAMMAR_FILE = "../simulators/grammar.json"
+CONFIG_FILE = "../simulators/config/socket_config.ini"
+GRAMMAR_FILE = "../simulators/config/grammar.json"
  
 class DeviceController():
     '''
@@ -20,9 +20,9 @@ class monitoring(Task):
     '''
         Infinite task created at the program's start.
         It initilize all the external connections, and starts the alert_listener.
-        
+
         This is the place to put the starting configurations.
-        
+
         Once the starting configurations are done, it becomes a loop that checks the PLC and instruments status.
         It also handles the beginning and the end of the night, recalculating them at each end of night.
     '''
@@ -104,7 +104,7 @@ class monitoring(Task):
             Infinite loop for the different timers :
                 - Every TIMER_CHECK seconds, check PLC and instruments status (+ analyse them and send them to the IC)
                 - 2 minutes before the night start, make a scheduling
-                - At the end of the night, do calibration files and computes the next night limits + make a scheduling with the new schedule  
+                - At the end of the night, do calibration files and computes the next night limits + make a scheduling with the new schedule
         '''
  
         timer_status = TIMER_CHECK
@@ -9,11 +9,11 @@ from django.conf import settings
 @worker_ready.connect
 def start_permanent_tasks(signal, sender):
     import monitoring.tasks
-    import simulator.userSimulator.tasks
+    import userSimulator.tasks
  
     print(sender.hostname)
     if sender.hostname == "pyros@simulator":
-        simulator.userSimulator.tasks.simulator.delay()
+        userSimulator.tasks.simulator.delay()
  
     if sender.hostname == "pyros@monitoring":
         monitoring.tasks.monitoring.delay()
@@ -242,7 +242,7 @@ CELERY_IMPORTS = (
     "monitoring.tasks",
     "observation_manager.tasks",
     "scheduler.tasks",
-    "simulator.userSimulator.tasks",
+    "userSimulator.tasks",
 )
  
 # This config allows only 1 process / queue. We replace it by the -c option at celery workers creation.
@@ -278,7 +278,7 @@ CELERY_ROUTES = {
     "observation_manager.tasks.execute_plan_nir": {"queue": "execute_plan_nir_q"},
     "observation_manager.tasks.create_calibrations": {"queue": "create_calibrations_q"},
     "scheduler.tasks.scheduling": {"queue": "scheduling_q"},
-    "simulator.userSimulator.tasks.simulator": {"queue": "simulator_q"},
+    "userSimulator.tasks.simulator": {"queue": "simulator_q"},
 }
  
 ''' Removes pickle warning '''
@@ -37,7 +37,7 @@ python manage.py migrate
 python manage.py loaddata misc/fixtures/initial_fixture.json
  
 # Starts the simulators
-cd ../simulators 2>&1 /dev/null
+cd ../simulators/scripts 2>&1 /dev/null
 ./run_all.sh
 cd -
  
@@ -59,6 +59,6 @@ cd scripts/
 ./kill_celery_workers.sh
  
 # Stops simulators
-cd ../../simulators
+cd ../../simulators/scripts/
 ./kill_all.sh
 cd -