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

Alain Klotz
2 parents 4c0f2742 0a1f1d83
Showing 9 changed files with 93 additions and 23 deletions Show diff stats
docker/Dockerfile
docker/PYROS_DOCKER_UPDATE
pyros.py
src/core/pyros_django/api/serializers.py
src/core/pyros_django/dashboard/templates/dashboard/observation_index.html
src/core/pyros_django/env_monitor/AD_PLC.py
src/core/pyros_django/env_monitor/plc_checker.py
src/core/pyros_django/misc/fixtures/initial_fixture_dev_TZ.json
src/core/pyros_django/user_mgmt/models.py
@@ -184,6 +184,7 @@ USER pyros_user
  
 RUN mkdir -p ./vendor/guitastro/install/
 RUN mkdir -p ./install/
+RUN mkdir -p ./doc/doc_rst/
  
 # Copy local host machine files to image
 # Dockerfile contains this volume => ../..:/home/pyros_user/app
@@ -191,7 +192,7 @@ RUN mkdir -p ./install/
 COPY ./vendor/guitastro/install/requirements.in ./vendor/guitastro/install/requirements.in
 COPY ./install/requirements.txt ./install/requirements.txt 
 COPY ./install/requirements_dev.txt ./install/requirements_dev.txt 
-
+COPY ./doc/doc_rst/requirements.txt  ./doc/doc_rst/requirements.txt
 # Adding local/bin to path to avoid pip warning
 ENV PATH "$PATH:/home/pyros_user/.local/bin"
  
@@ -219,3 +220,4 @@ RUN python3 -m pip install --user -r ./vendor/guitastro/install/requirements.txt
 # Installing packages required for PyROS
 RUN python3 -m pip install --user -r ./install/requirements.txt
 RUN python3 -m pip install --user -r ./install/requirements_dev.txt
+RUN python3 -m pip install --user -r ./doc/doc_rst/requirements.txt
 #!/usr/bin/env bash
  
 # PRE-CONDITION : pyros container must be running
-
+root_folder=$(pwd 2>&1)
 # If no container is running Start it
 if ! [ $(docker ps | grep 'pyros' | wc -l) -eq 4 ]
 then
@@ -12,11 +12,35 @@ fi
  
 # 1) Update Guitastro
 echo "Updating Guitastro source code"
-(cd ../vendor/guitastro/ ; git pull)
+cd ../vendor/guitastro/
+gitpull_output=$(git pull 2>&1)
+echo $gitpull_output
+check_files=("docker-compose.yml" "Dockerfile" "install/requirements.in")
+for file in "${check_files[@]}"
+do
+    if grep -q "$file" <<< "$gitpull_output"; then    
+        echo "WARNING : One of docker related files has been changed. You should build again the PyROS Image"
+        return 1
+    fi
+done
  
 # 2) Update PyROS
+cd $root_folder
 echo "Updating PyROS source code"
-git pull
+gitpull_output=$(git pull 2>&1)
+echo $gitpull_output
+check_files=("docker-compose.yml" "Dockerfile" "install/requirements.in")
+for file in "${check_files[@]}"
+do
+    if grep -q "$file" <<< "$gitpull_output"; then    
+        echo "WARNING : One of docker related files has been changed. You should build again the PyROS Image"
+        return 1
+    fi
+done
+
+# TODO : test if git pull worked and if git pull changed dockerfile, requirements.in, docker-compose.yml
+# Tell user to rebuild
+
  
 # 3) Update all observatories with git repo
 for dir in ../../PYROS_OBSERVATORY/* ; do
@@ -84,7 +84,8 @@ AGENTS = {
     "A_Basic": "majordome/agent",
     "A_Triton": "majordome/agent",
     "A_MCO":"majordome/agent",
-    "A_Majordome":"majordome/agent"
+    "A_Majordome":"majordome/agent",
+    "AD_PLC":"env_monitor"
 }
 # AGENTS = ["agentX", "webserver", "monitoring", "majordome", "scheduler", "alert_manager"]
 # AGENTS = ["all", "webserver", "monitoring", "majordome", "scheduler", "alert"]
@@ -507,7 +508,7 @@ def shell():
  
     # execProcess("python install.py install")
     if not test_mode():
-        execProcessFromVenv("manage.py shell",foreground=True)
+        execProcess("./manage.py shell",foreground=True)
     # Go back to the initial dir
     # os.chdir("../")
     change_dir("PREVIOUS")
@@ -1009,8 +1010,8 @@ def start(agent: str, configfile: str, observatory: str, unit: str, computer_hos
             current_dir = os.getcwd()
  
             # OLD format agents: majordome, monitoring, alert...
-            cmd = "start_agent.py " + agent_name + " " + configfile
-
+            #cmd = "start_agent.py " + agent_name + " " + configfile
+            cmd = ""
             # Agent "webserver"
             if agent_name == "webserver":
                 cmd = "manage.py runserver 127.0.0.1:8080"
@@ -1022,7 +1023,7 @@ def start(agent: str, configfile: str, observatory: str, unit: str, computer_hos
             # if not test_mode(): execProcessFromVenv("start_agent.py " + agent_name + " " + configfile)
  
             # Agent "agentM", "agentA", "agentB", "agentX", ...
-            elif agent_name.startswith("A_") or agent_name.startswith("A_"):
+            elif agent_name.startswith("A_") or agent_name.startswith("AD_"):
                 # Run agent without actual commands sent to devices (FOR_REAL=False)
                 # agentX.run(FOR_REAL=True)
                 '''
@@ -1299,10 +1300,11 @@ def _update_plantuml_diags():
 def _update_api_doc():
     print(os.getcwd())
     DOC_RST_PATH = "doc/doc_rst/"
-    # 0) Upgrade pip if new version available
-    _venv_pip_install2('pip', '--upgrade')
-    # 1) install/update Sphinx requirements (only if not yet installed)
-    _venv_pip_install2(DOC_RST_PATH+'requirements.txt', '-r')
+    if not WITH_DOCKER:
+        # 0) Upgrade pip if new version available
+        _venv_pip_install2('pip', '--upgrade')
+        # 1) install/update Sphinx requirements (only if not yet installed)
+        _venv_pip_install2(DOC_RST_PATH+'requirements.txt', '-r')
     # 2) make html doc from RST doc
     # cd doc/sourcedoc/
     change_dir(DOC_RST_PATH)
@@ -1360,6 +1362,7 @@ def change_dir(path):
 def _check_agent(agent):
     # Check that agent exists
     if agent != "all" and agent not in AGENTS.keys():
+
         # Check if multiple agents:
         print("This agent does not exist")
         print("Here is the allowed list of agents:")
@@ -54,7 +54,7 @@ class SPPeriodSerializer(serializers.ModelSerializer):
     scientific_program = ScientificProgramSerializer(read_only=True)
     class Meta:
         model = SP_Period
-        fields = ["id", "scientific_program","period", "quota_remaining", "over_quota_duration_remaining", "token_remaining"]
+        fields = ["id", "scientific_program","period"]
  
 class SequenceSerializer(serializers.ModelSerializer):
     pyros_user = UserSerializer(read_only=True)
@@ -114,9 +114,10 @@
 					</div>
 				</li>
 			{% endif %}
+			{% comment %}
 			<li>
 				<div class="all-info">
-					<a href="{% url "alerts_list" %}">
+					 <a href="{% url "alerts_list" %}">
 						<h3>Alerts</h3>
 							<img src="{% static "media/alert.png" %}" alt="html5"  />
 					</a>
@@ -126,10 +127,11 @@
 				<div class="all-info">
 					<a href="{% url "current_schedule" %}">
 						<h3>Schedule</h3>
-						 <img src="{% static "media/schedule.png" %}" alt="html5"  />
+						<img src="{% static "media/schedule.png" %}" alt="html5"  />
 					</a>
 				</div>
 			</li>
+			{% endcomment %}
 			{# TBD #}
 			{% if USER_LEVEL|ifinlist:"Admin,Operator,Unit-PI,Management board member,Observer,TAC" %}
 			<li>
@@ -10,7 +10,7 @@ from src.core.pyros_django.majordome.agent.Agent import Agent, build_agent, log,
 from src.core.pyros_django.devices.PLC import PLCController
 from src.core.pyros_django.env_monitor.plc_checker import PlcChecker
 from common.models import *
-from env_monitor.models import Sensors_data_last_value
+from env_monitor.models import Sensors_data_last_value, Sensors_data
 from dashboard.config_pyros import ConfigPyros
  
  
@@ -149,11 +149,12 @@ class PlcChecker(object):
             # ok with ./start_agent agentM
             #plc_config_dir = "./src/core/pyros_django/monitoring/"
             # ok with ./pyros start agentM
-            plc_config_dir = Path("../env_monitor/")
+            #plc_config_dir = Path("../env_monitor/")
+            plc_config_dir = os.path.join(os.environ.get("DJANGO_PATH"), "env_monitor")
             # When executing test, we're not in the monitoring folder
             if("pyros_django" == os.getcwd().split("/")[-1]):
                 plc_config_dir = Path("./env_monitor/")
-            _file = open(plc_config_dir/"plc_config.json" , 'w')
+            _file = open(os.path.join(plc_config_dir,"plc_config.json") , 'w')
             _file.write(json.dumps(_struct))
             _file.close()
             logger.info("Saved : plc_config.json")
@@ -234,7 +234,14 @@
             "user": 4
         }
     },
-
+    {
+        "model": "user_mgmt.SP_Period_User",
+        "pk": 4,
+        "fields": {
+            "SP_Period": 1,
+            "user": 17
+        }
+    },
     {
         "model": "devices.telescope",
         "pk": 1,
@@ -358,7 +365,7 @@
         "pk": 2,
         "fields": {
             "name": "CNRS",
-            "f_quota": 0.2
+            "quota_f": 0.2
         }
     },
     {
@@ -366,7 +373,7 @@
         "pk": 1,
         "fields": {
             "name": "CNES",
-            "f_quota": 0.8
+            "quota_f": 0.8
         }
     },
     {
@@ -493,6 +500,37 @@
     },
     {
         "model": "user_mgmt.pyrosuser",
+        "pk": 17,
+        "fields": {
+            "password": "pbkdf2_sha256$100000$LdWOwxlQqzYU$n5YIpgps3de5U8bAx3sVmhFhwXCHgczKszJG8SuVyjs=",
+            "last_login": null,
+            "is_superuser": false,
+            "first_name": "Manuel",
+            "last_name": "Pavy",
+            "email": "Manuel.Pavy@cnes.fr",
+            "is_staff": false,
+            "date_joined": "2021-05-20T09:03:37.108Z",
+            "username": "Manuel.Pavy@cnes.fr",
+            "is_active": true,
+            "first_time": false,
+            "country": 1,
+            "desc": null,
+            "created": "2021-05-20T09:03:37.108Z",
+            "updated": "2021-05-20T09:03:37.138Z",
+            "tel": null,
+            "address": "18 Avenue Edouard Belin, 31400 Toulouse",
+            "laboratory": "CNES",
+            "institute": 1,
+            "validator": 1,
+            "groups": [],
+            "user_permissions": [],
+            "user_level": [
+                2
+            ]
+        }
+    },
+    {
+        "model": "user_mgmt.pyrosuser",
         "pk": 5,
         "fields": {
             "password": "pbkdf2_sha256$100000$LdWOwxlQqzYU$n5YIpgps3de5U8bAx3sVmhFhwXCHgczKszJG8SuVyjs=",
@@ -475,7 +475,7 @@ class ScientificProgram(models.Model):
     science_theme = models.ForeignKey(ScienceTheme, on_delete=models.DO_NOTHING, related_name="scientific_program_theme", default=1)
     is_auto_validated = models.BooleanField(default=False)
     objects = ScientificProgramManager()
-    quota = models.ForeignKey(Quota, on_delete=models.DO_NOTHING,related_name="scientific_program_quotas", blank=True, null=True)
+    quota = models.ForeignKey(Quota, on_delete=models.DO_NOTHING, related_name="scientific_program_quotas", blank=True, null=True)
     quota_f = models.FloatField(
         validators=[MinValueValidator(0), MaxValueValidator(1)], blank=True, null=True)