TMSS-362: Merge remote-tracking branch 'origin/master' into TMSS-362

SAS/TMSS/client/lib/populate.py

@@ -31,18 +31,18 @@ def populate_schemas(schema_dir: str=None, templates_filename: str=None):
     with open(templates_filepath) as templates_file:
         templates = json.loads(templates_file.read())
 
-        for template in templates:
-            try:
-                with open(os.path.join(schema_dir, template.pop('file_name'))) as schema_file:
-                    try:
-                        json_schema = json.loads(schema_file.read())
+        with TMSSsession.create_from_dbcreds_for_ldap() as client:
+            for template in templates:
+                try:
+                    with open(os.path.join(schema_dir, template.pop('file_name'))) as schema_file:
+                        try:
+                            json_schema = json.loads(schema_file.read())
 
-                        template_path = template.pop('template')
-                        name = template.pop('name', json_schema.get('title', '<no name>'))
-                        description = template.pop('description', json_schema.get('description', '<no description>'))
-                        version = template.pop('version', '1')
+                            template_path = template.pop('template')
+                            name = template.pop('name', json_schema.get('title', '<no name>'))
+                            description = template.pop('description', json_schema.get('description', '<no description>'))
+                            version = template.pop('version', '1')
 
-                        with TMSSsession.create_from_dbcreds_for_ldap() as client:
                             if template_path == 'subtask_template' and 'type' in template:
                                 # override plain-text type by its url
                                 template['type'] = client.get_path_as_json_object('subtask_type/'+template.pop('type'))['url']
@@ -66,8 +66,8 @@ def populate_schemas(schema_dir: str=None, templates_filename: str=None):
                                                   description=description,
                                                   version=version,
                                                   **template)
-                    except Exception as e:
-                        logger.error(e)
-            except Exception as e:
-                logger.error(e)
+                        except Exception as e:
+                            logger.error(e)
+                except Exception as e:
+                    logger.error(e)
 

SAS/TMSS/docker-compose-scu199.yml

@@ -6,7 +6,7 @@ services:
     restart: on-failure
     env_file:
       - ./.env
-    command: bash -c 'source /opt/lofar/lofarinit.sh && ALLOWED_HOSTS=* tmss_test_environment -H 0.0.0.0 -p 8008'
+    command: bash -c 'source /opt/lofar/lofarinit.sh && ALLOWED_HOSTS=* tmss_test_environment -H 0.0.0.0 -p 8008 --data'
     ports:
       - "8008:8008"
   testprovider:

SAS/TMSS/src/tmss/tmssapp/populate.py

@@ -58,7 +58,7 @@ def populate_test_data():
 
             # create a Test Scheduling Set UC1 under project TMSS-Commissioning
             tmss_project = models.Project.objects.get(name="TMSS-Commissioning")
-            for set_nr in range(1):
+            for set_nr in range(2):
                 scheduling_set_data = SchedulingSet_test_data(name="Test Scheduling Set UC1 example %s" % (set_nr,), project=tmss_project)
                 scheduling_set = models.SchedulingSet.objects.create(**scheduling_set_data)
                 scheduling_set.tags = ["TEST", "UC1"]
@@ -66,7 +66,7 @@ def populate_test_data():
 
                 logger.info('created test scheduling_set: %s', scheduling_set.name)
 
-                for unit_nr in range(1):
+                for unit_nr in range(5):
                     strategy_template = models.SchedulingUnitObservingStrategyTemplate.objects.get(name="UC1 CTC+pipelines")
 
 

SAS/TMSS/test/test_utils.py

@@ -208,7 +208,7 @@ class TMSSDjangoServerInstance():
 
         # wait for server to be up and running....
         # or exit via TimeoutError
-        self.check_running_server(timeout=60)
+        self.check_running_server(timeout=30)
 
     def stop(self):
         '''
@@ -226,31 +226,29 @@ class TMSSDjangoServerInstance():
 
     def check_running_server(self, timeout: float = 10) -> bool:
         '''Check the running django server for a valid response'''
-        try:
-            import requests, urllib3
-            from _datetime import datetime, timedelta
-            start = datetime.utcnow()
-            while True:
-                try:
-                    response = requests.get(self.url, auth=(self.ldap_dbcreds.user, self.ldap_dbcreds.password), timeout=max(1, timeout/10))
-
-                    if response.status_code in [200, 401, 403]:
-                        logger.info("TMSS Django server is up and running at %s with database: %s and LDAP: %s",
-                                    self.url, self.database_dbcreds, self.ldap_dbcreds)
-
-                        if response.status_code in [401, 403]:
-                            logger.warning("TMSS Django server at %s could not autenticate with LDAP creds: %s", self.url, self.ldap_dbcreds)
-
-                        # TODO: logout, otherwise django remembers our login session.
-                        return True
-                except Exception as e:
-                    time.sleep(0.25)
-
-                if datetime.utcnow() - start > timedelta(seconds=timeout):
-                    raise TimeoutError("Could not get a valid response from the django server at %s" % self.url)
-        except Exception as e:
-            logger.error(e)
-            return False
+        import requests
+        from _datetime import datetime, timedelta
+        start = datetime.utcnow()
+        while True:
+            try:
+                logger.info("Checking if TMSS Django server is up and running at %s with database: %s and LDAP: %s ....",
+                            self.url, self.database_dbcreds, self.ldap_dbcreds)
+                response = requests.get(self.url, auth=(self.ldap_dbcreds.user, self.ldap_dbcreds.password), timeout=max(1, timeout/10))
+
+                if response.status_code in [200, 401, 403]:
+                    logger.info("TMSS Django server is up and running at %s with database: %s and LDAP: %s",
+                                self.url, self.database_dbcreds, self.ldap_dbcreds)
+
+                    if response.status_code in [401, 403]:
+                        logger.warning("TMSS Django server at %s could not autenticate with LDAP creds: %s", self.url, self.ldap_dbcreds)
+
+                    # TODO: logout, otherwise django remembers our login session.
+                    return True
+            except Exception as e:
+                time.sleep(0.5)
+
+            if datetime.utcnow() - start > timedelta(seconds=timeout):
+                raise TimeoutError("Could not get a valid response from the django server at %s within %s seconds" % (self.url,timeout))
 
     def __enter__(self):
         try: