Fix stand alone mode test failure

Since listener config is hard-coded with container service name
and it is failing in standlone mode.
Added command line option to listener to read zmq_url and defact value
in config file is localhost and command line argument takes precedence.

Signed-off-by: Ramakrishna Srinivasamurthy <ramakrishna.srinivasamurthy@intel.com>

Author: Ram-srini

docker-compose.yaml

@@ -114,7 +114,7 @@ services:
       - 5555
     command: |
       bash -c "
-        avalon_listener --bind http://avalon-listener:1947 --lmdb_url http://avalon-lmdb:9090
+        avalon_listener --bind http://avalon-listener:1947 --lmdb_url http://avalon-lmdb:9090 --zmq_url tcp://avalon-enclave-manager:5555
         tail -f /dev/null
         "
     depends_on:

listener/avalon_listener/tcs_listener.py

@@ -27,6 +27,7 @@
 import sys
 import logging
 import argparse
+from urllib.parse import urlparse
 
 from avalon_listener.tcs_work_order_handler import TCSWorkOrderHandler
 from avalon_listener.tcs_work_order_handler_sync import TCSWorkOrderHandlerSync
@@ -72,8 +73,7 @@ def __init__(self, config):
             self.workorder_handler = TCSWorkOrderHandlerSync(
                 self.kv_helper,
                 config["Listener"]["max_work_order_count"],
-                config["Listener"]["zmq_url"],
-                config["Listener"]["zmq_port"])
+                config["Listener"]["zmq_url"])
         else:
             self.workorder_handler = TCSWorkOrderHandler(
                 self.kv_helper,
@@ -121,6 +121,13 @@ def parse_command_line(config, args):
         '--bind', help='URI to listen for requests ', type=str)
     parser.add_argument(
         '--lmdb_url', help='DB url to connect to LMDB ', type=str)
+    # Check if listener is running in sync work load
+    # execution mode then add additional argument zmq url
+    is_sync = config["WorkloadExecution"]["sync_workload_execution"]
+    if is_sync:
+        parser.add_argument(
+            '--zmq_url',
+            help='ZMQ url to connect to enclave manager ', type=str)
 
     options = parser.parse_args(args)
 
@@ -150,6 +157,21 @@ def parse_command_line(config, args):
             logger.error("Quit : remote_storage_url is not \
                             present in config for Listener")
             sys.exit(-1)
+    if options.zmq_url:
+        if not is_sync:
+            logger.error("Invalid option zmq_url! It should be supported"
+                         "in work order sync mode")
+            sys.exit(-1)
+        else:
+            if config.get("Listener") is None or \
+                        config["Listener"].get("zmq_url") is None:
+                logger.error("Quit : no zmq_url config found for Listener")
+                sys.exit(-1)
+            parse_res = urlparse(options.zmq_url)
+            if parse_res.scheme != "tcp" or parse_res.port == "":
+                logger.error("Invalid zmq url. It should tcp://<host>:<port>")
+                sys.exit(-1)
+            config["Listener"]["zmq_url"] = options.zmq_url
 
     return host_name, port
 

listener/avalon_listener/tcs_work_order_handler_sync.py

@@ -52,14 +52,13 @@ class TCSWorkOrderHandlerSync(TCSWorkOrderHandler):
     """
 # ------------------------------------------------------------------------------------------------
 
-    def __init__(self, kv_helper, max_wo_count, zmq_url, zmq_port):
+    def __init__(self, kv_helper, max_wo_count, zmq_url):
         """
         Function to perform init activity
         Parameters:
             - kv_helper is a object of lmdb database
         """
         self.zmq_url = zmq_url
-        self.zmq_port_number = zmq_port
         super(TCSWorkOrderHandlerSync, self).__init__(kv_helper, max_wo_count)
 
 # ---------------------------------------------------------------------------------------------
@@ -145,11 +144,11 @@ def WorkOrderSubmit(self, **params):
             # ZeroMQ for sync workorder processing
             try:
                 socket = context.socket(zmq.REQ)
-                socket.connect(self.zmq_url + self.zmq_port_number)
+                socket.connect(self.zmq_url)
                 socket.send_string(wo_id, flags=0, encoding='utf-8')
                 replymessage = socket.recv()
                 logger.info(replymessage)
-                socket.disconnect(self.zmq_url + self.zmq_port_number)
+                socket.disconnect(self.zmq_url)
             except Exception as er:
                 raise JSONRPCDispatchException(
                     WorkOrderStatus.UNKNOWN_ERROR,

listener/listener_config.toml

@@ -28,8 +28,7 @@ bind = "http://localhost:1947"
 max_work_order_count = 10
 # ZMQ configurations the listener would connect to
 # Same as the url and port of enclave manager socket
-zmq_url = "tcp://avalon-enclave-manager:"
-zmq_port = '5555'
+zmq_url = "tcp://localhost:5555"
 
 # ------------------------------------------------------------------
 # Work load execution-settings for workload execution(synchronous/asynchronous)

scripts/tcs_startup.sh

@@ -23,19 +23,21 @@ COMPONENTS="$ENCLAVE_MANAGER" # #KV_STORAGE added if -s passed
 START_STOP_AVALON_SERVICES=0 # default if -s not passed
 LMDB_URL="http://localhost:9090" # -l default
 LISTENER_URL="http://localhost:1947"
+ENCLAVE_ZMQ_URL="tcp://localhost:5555"
 # Trap handler
 trap 'stop_avalon_components' HUP INT QUIT ABRT ALRM TERM
 
+is_sync_mode()
+{
+    return grep "sync_workload_execution" ${TCF_HOME}/listener/listener_config.toml | awk -F'=' '{print $2}'
+}
+
 start_avalon_components()
 {
     if [ $START_STOP_AVALON_SERVICES = 1 ] ; then
         echo "Starting Avalon KV Storage $VERSION ..."
         $KV_STORAGE --bind $LMDB_URL & 
         echo "Avalon KV Storage started"
-
-	echo "Starting Avalon Listener $VERSION ..."
-	$LISTENER --bind $LISTENER_URL --lmdb_url $LMDB_URL &
-	echo "Avalon Listener started"
     fi
 
     # START_STOP_AVALON_SERVICES doesn't control enclave manager. It will be
@@ -44,6 +46,18 @@ start_avalon_components()
     python3 $ENCLAVE_MANAGER --lmdb_url $LMDB_URL &
     echo "Avalon Enclave Manager started"
 
+    if [ $START_STOP_AVALON_SERVICES = 1 ] ; then
+        echo "Starting Avalon Listener $VERSION ..."
+        is_sync_mode
+        is_sync_mode_on=$?
+        if [ "$is_sync_mode_on" -eq "1" ]; then
+	        $LISTENER --bind $LISTENER_URL --lmdb_url $LMDB_URL --zmq_url $ENCLAVE_ZMQ_URL &
+        else
+            $LISTENER --bind $LISTENER_URL --lmdb_url $LMDB_URL &
+        fi
+	    echo "Avalon Listener started"
+    fi
+
     sleep 5s
     check_avalon_components