update container name, zipfile handling

Author: tomkralidis

README.md

@@ -55,14 +55,17 @@ vim local.env  # update accordingly
 # MSC_WIS2NODE_BROKER_USERNAME: username of the MQTT broker to publish to=admin
 # MSC_WIS2NODE_BROKER_PASSWORD: password of the MQTT broker to publish to
 # MSC_WIS2NODE_MSC_DATAMART_AMQP: URL to MSC Datamart notification service
-# MSC_WIS2NODE_DISCOVERY_METADATA_ZIP_URL: URL to SSC GitLab zipfile of MSC discovery metadata
+# MSC_WIS2NODE_DISCOVERY_METADATA_ZIP: zipfile of MSC discovery metadata (file or URL)
 # MSC_WIS2NODE_TOPIC_PREFIX: base topic prefix for publication (i.e. origin/a/wis2/ca-eccc-msc)
 # MSC_WIS2NODE_CACHE: optional memcache instance
+# MSC_WIS2NODE_CACHE_EXPIRY_SECONDS: number of seconds for cache items to expire (default 86400 [1 day])
+# MSC_WIS2NODE_CENTRE_ID: centre identifier
+# MSC_WIS2NODE_WIS2_GDC: URL to a WIS2 GDC (default is Canada GDC)
 
 source local.env
 
-# setup dataset configuration based on zipfile defined in $MSC_WIS2NODE_DISCOVERY_METADATA_ZIP_URL
-# note: $MSC_WIS2NODE_DISCOVERY_METADATA_ZIP_URL can be overridden with the --metadata-zipfile option
+# setup dataset configuration based on zipfile defined in $MSC_WIS2NODE_DISCOVERY_METADATA_ZIP
+# note: $MSC_WIS2NODE_DISCOVERY_METADATA_ZIP can be overridden with the --metadata-zipfile option
 # on the command line
 #
 # the output is written to $MSC_WIS2NODE_DATASET_CONFIG by default, and can be overriden with the --output

docker-compose.yml

@@ -37,7 +37,7 @@ services:
 
   msc-wis2node-management:
     image: msc-wis2node-management
-    container_name: msc-wis2node
+    container_name: msc-wis2node-management
     build:
       context: msc-wis2node-management/
     env_file:

msc-wis2node-management/msc_wis2node/dataset.py

@@ -36,7 +36,7 @@
 from msc_wis2node import cli_options
 from msc_wis2node.env import (BROKER_HOSTNAME, BROKER_PORT, BROKER_USERNAME,
                               BROKER_PASSWORD, CENTRE_ID, DATASET_CONFIG,
-                              DISCOVERY_METADATA_ZIP_URL, TOPIC_PREFIX,
+                              DISCOVERY_METADATA_ZIP, TOPIC_PREFIX,
                               WIS2_GDC)
 from msc_wis2node.util import get_mqtt_client_id, get_mqtt_tls_settings
 
@@ -71,11 +71,13 @@ def create_datasets_conf(metadata_zipfile: Union[Path, None],
         'datasets': []
     }
 
-    if metadata_zipfile is not None:
+    if metadata_zipfile is not None or not DISCOVERY_METADATA_ZIP.startswith('http'):  # noqa
+        LOGGER.debug('zipfile is a local file')
         with metadata_zipfile.open('rb') as fh:
             zipfile_content = fh.read()
     else:
-        zipfile_content = urlopen(DISCOVERY_METADATA_ZIP_URL).read()
+        LOGGER.debug('zipfile is a URL')
+        zipfile_content = urlopen(DISCOVERY_METADATA_ZIP).read()
 
     with tempfile.TemporaryDirectory() as td:
         fh = BytesIO(zipfile_content)

msc-wis2node-management/msc_wis2node/env.py

@@ -30,9 +30,9 @@
 MSC_DATAMART_AMQP = os.environ.get('MSC_WIS2NODE_MSC_DATAMART_AMQP')
 DATASET_CONFIG = os.environ.get('MSC_WIS2NODE_DATASET_CONFIG')
 TOPIC_PREFIX = os.environ.get('MSC_WIS2NODE_TOPIC_PREFIX', 'origin/a/wis2')
-DISCOVERY_METADATA_ZIP_URL = os.environ.get('MSC_WIS2NODE_DISCOVERY_METADATA_ZIP_URL')  # noqa
+DISCOVERY_METADATA_ZIP = os.environ.get('MSC_WIS2NODE_DISCOVERY_METADATA_ZIP')
 CACHE = os.environ.get('MSC_WIS2NODE_CACHE')
-CACHE_EXPIRY_SECONDS = int(os.environ.get('MSC_WIS2NODE_CACHE_EXPIRY_SECONDS', 86400))  # noqa
+CACHE_EXPIRY_SECONDS = int(os.environ.get('MSC_WIS2NODE_CACHE_EXPIRY_SECONDS',86400))  # noqa
 CENTRE_ID = os.environ.get('MSC_WIS2NODE_CENTRE_ID')
 WIS2_GDC = os.environ.get('MSC_WIS2NODE_WIS2_GDC')