Merge branch 'dev' of https://gitlab.irap.omp.eu/epallier/pyros into dev

Alexis Koralewski
2 parents 514e3287 4e617db5
Showing 3 changed files with 69 additions and 1 deletions Show diff stats
docker/PYROS_DOCKER_RUN
privatedev/config/tnc/computer_hyperion2.yml
privatedev/config/tnc/observatory_tnc.yml
@@ -36,7 +36,10 @@ echo &quot;- PLC simulator LOG file is ../../LOG_PYROS_plc_simulator.log&quot;
 # - Display log on current terminal
 #docker exec -it pyros python3 pyros.py start agentM
 # - Save log in file
-docker exec pyros python3 pyros.py -d start agentM -o tnc >> ../../LOG_PYROS_agent_monitoring.log 2>&1 &
+# NEW-START
+docker exec pyros python3 pyros.py new-start -o tnc -fg >> ../../LOG_PYROS_agents.log 2>&1 &
+# START
+####docker exec pyros python3 pyros.py -d start agentM -o tnc >> ../../LOG_PYROS_agent_monitoring.log 2>&1 &
 #docker exec pyros python3 pyros.py -d start agentM -o "guitalens" >> ../../LOG_PYROS_agent_monitoring.log 2>&1 &
 echo "- Agent Monitoring LOG file is ../../LOG_PYROS_agent_monitoring.log"
  
@@ -0,0 +1,25 @@
+# Schema file to check the syntax of this config file
+schema: schema_computer-2.0.yml
+
+# Here is the description of the configuration of an isolated computer
+COMPUTER:
+
+    inventory_label: CPT-XCY-001
+    manufacturer: XCY
+    model: X26A
+    description: "Intel(R) Core(TM) i5-4250U CPU @ 1.30GHz   1.90 GHz RAM = 4 GB"
+    sn: 00331-10000-00001-AA478
+    power:
+        voltage: 12
+        intensity: 5
+        socket: "IEC 60130-10 Type A: 5.5 mm OD, 2.5 mm ID"
+
+    hostname: hyperion2.irap.omp.eu
+    #hostname: c32f49397c28
+    virtual_machine: False
+    os: Mac
+    os_version: "10"
+    network_interfaces: 
+    - 00-A8-3D-68-22-87 # Gigabit 2
+    - 00-A8-3D-68-22-86 # Gigabit 3
+    - 16-82-FE-44-64-E8 # Wifi
@@ -143,6 +143,17 @@ OBSERVATORY:
                     # IP attributed by the Router
                 network_ip: 192.168.0.11
  
+            - COMPUTER:
+                name: IRAP_SERVER
+                file: computer_hyperion2.yml
+                    # Describe here the configuration of the computer in operation
+                role: Main
+                    # Choice of the interface to connect the computer to the network (cf.network_interfaces infile)
+                network_interface_index: 0
+                    # IP attributed by the Router
+                network_ip: 192.168.0.12
+
+
     # === Assembly of devices into units
     # A unit is a robotic telescope 
     UNITS: 
@@ -387,6 +398,35 @@ OBSERVATORY:
                     computer: EtienneComputer
                     protocol: private/plugin/agent/AgentBasic.py
  
+                # Agents IRAP SERVER
+                - AGENT:
+                    name: AgentImagesProcessor_tnc_up1_irap
+                    computer: IRAP_SERVER
+                    protocol: privatedev/plugin/agent/AgentImagesProcessor_tnc_up1.py
+                    is_active: False
+                - AGENT:
+                    name: AgentSST_irap
+                    computer: IRAP_SERVER
+                    is_active: True
+                - AGENT:
+                    name: AgentTriton_irap
+                    computer: IRAP_SERVER
+                    protocol: private/plugin/agent/AgentTriton.py
+                    path: private/plugin/agent/triton
+                    is_active: False
+                - AGENT_DEVICE:
+                    name: AgentM_irap
+                    computer: IRAP_SERVER
+                    protocol: private/plugin/agent/AgentM.py
+                    path: private/plugin/agent_devices
+                    is_active: False
+                    device: TAROT_meteo
+                    is_real: False
+                # Basic Agent (for EP, to test the Agent base class)
+                - AGENT:
+                    name: AgentBasic_irap
+                    computer: IRAP_SERVER
+                    protocol: private/plugin/agent/AgentBasic.py
  
             TOPOLOGY: