Commit 01ef8ec67bf612ffe476d06392fd0565edaf58dc

Authored by Alexis Koralewski
2 parents f63b45d8 0da7f422
Exists in dev

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

privatedev/config/tnc/computer_Dell_Precision5550_snLW2134IRC3.yml
... ... @@ -14,7 +14,7 @@ COMPUTER:
14 14 intensity: 6.5
15 15 socket: "USB-C"
16 16  
17   - hostname: 4f5c62ec592d
  17 + hostname: ORION
18 18  
19 19 virtual_machine: False
20 20 os: Windows x64
... ...
privatedev/plugin/agent/AgentImagesProcessor_tnc_up1.py
  1 +#!/usr/bin/env python3
  2 +#
  3 +# To launch this agent from the root of Pyros:
  4 +# verify this agent is associated to the computer in the obs config at UNITS/UNIT/AGENTS/AGENT/computer: AKlotzPersoComputer
  5 +# cd /srv/develop/pyros
  6 +# .\PYROS -t new-start -o tnc -fg
  7 +#
  8 +# ---------------------------------------------------
  9 +
1 10 import sys
2 11  
3 12 import os
... ...
src/core/pyros_django/observation_manager/AgentImagesProcessor.py
... ... @@ -21,14 +21,12 @@ for short_path in short_paths:
21 21 sys.path.insert(0, path)
22 22  
23 23 from src.core.pyros_django.agent.Agent import Agent, build_agent, log
  24 +from src.core.pyros_django.common.models import *
24 25  
25 26 # = Specials
26 27 import glob
27 28 import shutil
28 29 import guitastro
29   -#path = os.path.join(pwd, "vendor/guitastro/src/guitastro")
30   -#if path not in sys.path:
31   -# sys.path.append(path)
32 30  
33 31 class AgentImagesProcessor(Agent):
34 32  
... ... @@ -47,8 +45,8 @@ class AgentImagesProcessor(Agent):
47 45 # Scenario to be executed
48 46 # "self do_stop_current_processing"
49 47 TEST_COMMANDS_LIST = [
50   - ("self do_create_test_images_1", 200, None, CMD_STATUS.CMD_EXECUTED),
51   - ("self do_exit", 500, "STOPPING", CMD_STATUS.CMD_EXECUTED),
  48 + ("self do_create_test_images_1", 200, None, AgentCmd.CMD_STATUS_CODE.CMD_EXECUTED),
  49 + ("self do_exit", 500, "STOPPING", AgentCmd.CMD_STATUS_CODE.CMD_EXECUTED),
52 50 ]
53 51  
54 52 '''
... ...