updated version and HOWTO_RUN

+ keep test database "test_pyros" after tests

updated version and HOWTO_RUN
+ keep test database "test_pyros" after tests
Etienne Pallier
1 parent 32d5d60e
Showing 3 changed files with 44 additions and 8 deletions Show diff stats
HOWTO_RUN.txt
README.md
pyros.py
@@ -8,9 +8,11 @@
 (A) Command-line running (no web interface):
 -------------------------------------------
  
+
 (1) Running pyros interactively:
 $  [python] ./pyros.py shell
  
+
 (2) Launching an agent:
 $  [python] ./pyros.py start <agent-name>
 => Ex: to start the env-monitoring agent:
@@ -18,7 +20,32 @@ $  [python] ./pyros.py start monitoring
 => Ex: to start agentA:
 $ [python] ./pyros.py start agentA
  
-(3) Launching many agents:
+
+(3) Launching the Environment Monitoring (version A)
+a) Activate the venv
+b) Launch the PLC simulator
+(venv) $ cd simulators/plc/
+(ven) $ [python] ./plcSimulator.py 
+c) Launch the Monitoring agent (from another terminal) 
+$ [python] ./pyros.py start agentM
+
+
+(4) Launching the Environment Monitoring (version B)
+
+- From terminal 1 :
+a) Activate the venv
+b) Launch the Telescope simulator
+(venv) $ cd simulators/telescope/
+(venv) $ [python] ./telescopeSimulator.py 
+
+- From terminal 2 :
+a) Activate the venv
+b) Launch the Telescope Monitoring agent
+(venv) $ cd src/core/pyros_django/agent/monitoring/
+(venv) $ [python] ./start_agent_telescope_monitoring.py
+
+
+(5) Launching many agents:
 $ [python] ./pyros.py start <agent1-name>,<agent2-name>,.
 => Ex: start agentA and agentB
 $ [python] ./pyros.py start agentA,agentB
@@ -67,15 +67,17 @@ This software has been tested and validated with the following configurations :
 --------------------------------------------------------------------------------------------
 ## LAST VERSION
  
-Date: 18/06/2019
+Date: 19/06/2019
  
 Author: E. Pallier (epallier@irap.omp.eu)
  
-VERSION: 0.30.10
-
-Comment : 
-- Ajouté 2 HOWTO (pour test et run) à la racine du projet
+VERSION: 0.30.11
  
+Comment :
+- Bugfixed AgentM
+- Named test database "test_pyros" explicitely
+- Keep test database test_pyros (do not delete it after tests)
+ 
  
 	RAPPELS SUR L'UTILISATION :
  
@@ -129,6 +131,7 @@ Full list of commits: https://gitlab.irap.omp.eu/epallier/pyros/commits/master
 		- migrer le dossier devices_controller/server/ => devices_controller/devices_controller_concrete/server/
 		- rename server/ => device_simulator_common/	
 	- Deplacement de tous les devices concrets dans leurs dossiers respectifs (Gemini, AK, ...)
+	- Ajouté 2 HOWTO (pour test et run) à la racine du projet
  
  
 **11/06/2019 : v0.30.2 (EP)**
@@ -314,7 +314,10 @@ def test():
     for app in apps:
         _loaddata() or die()
         change_dir(PYROS_DJANGO_BASE_DIR)
-        execProcessFromVenv('manage.py test ' + app) or die()
+        # Delete test_pyros database after tests
+        #execProcessFromVenv('manage.py test ' + app) or die()
+        # KEEP test_pyros database after tests
+        execProcessFromVenv('manage.py test --keep ' + app) or die()
         change_dir("PREVIOUS")
     # execProcess("python install.py install")
     return True
@@ -322,7 +325,10 @@ def test():
 @pyros_launcher.command(help="Run ALL tests")
 def testall():
     change_dir(PYROS_DJANGO_BASE_DIR)
-    execProcessFromVenvAsync("manage.py test")
+    # Delete test_pyros database after tests
+    # execProcessFromVenvAsync("manage.py test")
+    # KEEP test_pyros database after tests
+    execProcessFromVenvAsync("manage.py test --keep")
     change_dir("PREVIOUS")
     return True