Added dome simulator / manager

Jeremy
1 parent ef4dd9e1
Showing 8 changed files with 128 additions and 11 deletions Show diff stats
config/socket_config.ini
pyros.py
simulators/dome/__init__.py
simulators/dome/domeSimulator.py
src/common/models.py
src/devices/Dome.py
src/majordome/tasks.py
src/pyros/settings.py.bak
@@ -13,3 +13,7 @@ port=5002
 [PLC]
 ip=127.0.0.1
 port=5003
+
+[Dome]
+ip=127.0.0.1
+port=5004
@@ -468,7 +468,7 @@ class Pyros(AManager):
  
     def simulator(self):
         self.changeDirectory("src")
-        self.replacePatternInFile("CELERY_TEST = True", "CELERY_TEST = False", "pyros/settings.py")
+        self.replacePatternInFile("CELERY_TEST = False", "CELERY_TEST = True", "pyros/settings.py")
         self.execProcess("rm -f testdb.sqlite3")
         self.changeDirectory("..")
         self.migrate()
@@ -504,6 +504,7 @@ class Pyros(AManager):
             return 0
         self.execProcessAsync("fuser -k 8000/tcp")
         self.execProcessAsync("rm -f testdb.sqlite3")
+        self.execProcessAsync("ps aux | grep \" domeSimulator.py\" | awk '{ print $2 }' | xargs kill")
         self.execProcessAsync("ps aux | grep \" userSimulator.py\" | awk '{ print $2 }' | xargs kill")
         self.execProcessAsync("ps aux | grep \" alertSimulator.py\" | awk '{ print $2 }' | xargs kill")
         self.execProcessAsync("ps aux | grep \" plcSimulator.py\" | awk '{ print $2 }' | xargs kill")
@@ -524,6 +525,9 @@ class Pyros(AManager):
             self.printColor(Colors.FAIL, "The simulation file " + conf + " does not exist")
             return 1
         self.changeDirectory("..")
+        self.changeDirectory("dome")
+        self.execProcessFromVenvAsync(self.venv_bin + " domeSimulator.py " + conf)
+        self.changeDirectory("..")
         self.changeDirectory("user")
         self.execProcessFromVenvAsync(self.venv_bin + " userSimulator.py " + conf)
         self.changeDirectory("..")
@@ -0,0 +1,72 @@
+import sys
+import os
+
+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 utils.Device import Device
+from utils.StatusManager import StatusManager
+
+class DomeSimulator(Device, StatusManager):
+    status = {"status": "VALID"}
+
+    def __init__(self, argv):
+        super().__init__(argv)
+        self.setDevice("Dome")
+        self.setStatusManager("domeSimulator", argv)
+
+    def domePrint(self, string: str):
+        print("DomeSimulator : " + string)
+
+    def handleConnections(self):
+        for co in self.connections:
+            data = self.readBytes(128, co)
+
+            answer = ""
+            cut_data = data.split(" ")
+
+            if (len(cut_data) < 2):
+                self.domePrint("Received invalid message on socket : " + data)
+                continue
+            cmd_type = cut_data[0]
+            cmd = cut_data[1]
+            args = cut_data[2:]
+            if (cmd_type == "GET"):
+                if (cmd == "STATUS"):
+                    answer = self.create_status()
+                else:
+                    answer = "Invalid cmd for GET: " + cmd
+                    self.domePrint(answer)
+            else:
+                self.domePrint("Ignored message " + data)
+
+            if (len(answer) > 0):
+                self.sendMessage(answer, co)
+        return (0)
+
+    def loop(self):
+        i = 0
+
+        if (self.ended == 0):
+            self.domePrint("Not entry for telescope found in config file : " + self.config_file)
+            return (0)
+        while (True):
+            self.updateStatus(i)
+            if (self.isConnected()):
+                self.handleConnections()
+            i += 1
+            if (i > self.ended):
+                return (0)
+        return (1)
+
+    def run(self):
+        print("Dome simulator running")
+        self.parse()
+        self.configSocket()
+        self.loop()
+        return (0)
+
+if __name__ == "__main__":
+    sim = DomeSimulator(sys.argv)
+    sim.run()
@@ -505,6 +505,12 @@ class TaskId(models.Model):
     def __str__(self):
         return (str(self.task) + " - " + str(self.task_id))
  
+# TODO class dome define content
+# class Dome(Device):
+#     DOME = "Dome"
+
+
+
  
 class Telescope(Device):
     TELESCOPE = "Telescope"
@@ -0,0 +1,25 @@
+from common.models import *
+import abc
+from .Device import DeviceController
+
+'''
+    Device controller for Telescope.
+    This class must implement set, get and do functions (DeviceController is an abstract)
+'''
+class DomeController(DeviceController):
+
+    def __init__(self):
+        super().__init__("Telescope")
+
+    def get(self, command: str, *args):
+        message = "GET " + command + " " + " ".join([str(arg) for arg in args])
+        self.sendMessage(message)
+        return (self.blockAndReadMessage())
+
+    def set(self, command: str, *args):
+        message = "SET " + command + " " + " ".join([str(arg) for arg in args])
+        return (self.sendMessage(message))
+
+    def do(self, command: str, *args):
+        message = "DO " + command + " " + " ".join([str(arg) for arg in args])
+        return (self.sendMessage(message))
@@ -10,10 +10,12 @@ from common.models import *
 from devices.Telescope import TelescopeController
 from devices.CameraVIS import VISCameraController
 from devices.CameraNIR import NIRCameraController
+from devices.Dome import DomeController
 from devices.PLC import PLCController
 from django.conf import settings
 from utils.JDManipulator import *
 import utils.config as L
+
 log = L.setupLogger("MajordomeTaskLogger", "Majordome")
  
 '''
@@ -32,6 +34,7 @@ class Majordome(Task):
     status_tel = ""
     status_nir = ""
     status_vis = ""
+    status_dom = ""
     timers = {}
     functions = {}
     schedule = None
@@ -51,6 +54,7 @@ class Majordome(Task):
         self.vis_camera = VISCameraController()
         self.nir_camera = NIRCameraController()
         self.plc = PLCController()
+        self.dom = DomeController()
         return (0)
  
     '''
@@ -85,15 +89,12 @@ class Majordome(Task):
         Loop to wait for the device to be idle avec the starting configurations.
     '''
     def waitDevices(self):
-        nir_st = ""
-        vis_st = ""
-        tel_st = ""
-
-        while nir_st != "IDLE" or vis_st != "IDLE" and tel_st != "IDLE":
-            nir_st = self.nir_camera.get("STATUS")
-            vis_st = self.vis_camera.get("STATUS")
-            tel_st = self.tel.get("STATUS")
-
+        # TODO Maybe remove comment if we need to wait the devices connection / valid status
+        # while self.status_vis == "" and self.status_tel == "" and self.status_nir == "" and self.status_dom == "":
+        self.status_vis = self.vis_camera.get("STATUS")
+        self.status_nir = self.nir_camera.get("STATUS")
+        self.status_tel = self.tel.get("STATUS")
+        self.status_dom = self.dom.get("STATUS")
         print("Devices ready !")
         return (0)
  
@@ -180,6 +181,7 @@ class Majordome(Task):
         self.status_tel = self.tel.get("STATUS")
         self.status_nir = self.nir_camera.get("STATUS")
         self.status_vis = self.vis_camera.get("STATUS")
+        self.status_dom = self.dom.get("STATUS")
         self.handleStatus()
         return (0)
  
@@ -366,6 +368,10 @@ class Majordome(Task):
         telescope = Telescope.objects.first()
         camera_nir = Detector.objects.get(name="Cagire")
         camera_vis = Detector.objects.get(name="Visible camera")
+        # TODO Dome in database
+        # dome = ???.objects.get(name="Dome")
+        # dome.status = self.status_dom
+        # dome.save()
         # TODO adapt the status (must be short)
         telescope.status = self.status_tel
         camera_nir.status = self.status_nir
@@ -119,7 +119,7 @@ LOGIN_URL = &quot;/&quot;
  
 # EP modif
  
-CELERY_TEST = False
+CELERY_TEST = True
  
 if not CELERY_TEST:
     if not MYSQL: