[Edge] Support MQTT-hybrid connection

 - Support MQTT-hybrid connection for edgesrc and edgesink.

Signed-off-by: gichan <gichan2.jang@samsung.com>

diff --git a/gst/edge/edge_common.c b/gst/edge/edge_common.c
index dd3a1d1..627efac 100644 (file)
--- a/gst/edge/edge_common.c
+++ b/gst/edge/edge_common.c
@@ -27,6 +27,8 @@ gst_edge_get_connect_type (void)
     static GEnumValue protocols[] = {
       {NNS_EDGE_CONNECT_TYPE_TCP, "TCP",
           "Directly sending stream frames via TCP connections."},
+      {NNS_EDGE_CONNECT_TYPE_HYBRID, "HYBRID",
+          "Connect with MQTT brokers and directly sending stream frames via TCP connections."},
       {NNS_EDGE_CONNECT_TYPE_AITT, "AITT",
           "Sending stream frames via AITT connections."},
       {0, NULL, NULL},

diff --git a/gst/edge/edge_sink.c b/gst/edge/edge_sink.c
index 68f0b8c..83d7d27 100644 (file)
--- a/gst/edge/edge_sink.c
+++ b/gst/edge/edge_sink.c
@@ -258,7 +258,7 @@ gst_edgesink_start (GstBaseSink * basesink)
   char *port = NULL;
 
   ret =
-      nns_edge_create_handle ("TEMP_ID_EDGE_SINK", self->connect_type,
+      nns_edge_create_handle (NULL, self->connect_type,
       NNS_EDGE_NODE_TYPE_PUB, &self->edge_h);
 
   if (NNS_EDGE_ERROR_NONE != ret) {

diff --git a/gst/edge/edge_src.c b/gst/edge/edge_src.c
index 687c87f..821aeee 100644 (file)
--- a/gst/edge/edge_src.c
+++ b/gst/edge/edge_src.c
@@ -272,6 +272,17 @@ _nns_edge_event_cb (nns_edge_event_h event_h, void *user_data)
       g_async_queue_push (self->msg_queue, data);
       break;
     }
+    case NNS_EDGE_EVENT_CONNECTION_CLOSED:
+    {
+      nns_edge_disconnect (self->edge_h);
+      ret = nns_edge_connect (self->edge_h, self->dest_host, self->dest_port);
+      if (NNS_EDGE_ERROR_NONE != ret) {
+        nns_edge_data_h data_h;
+        nns_edge_data_create (&data_h);
+        g_async_queue_push (self->msg_queue, data_h);
+      }
+      break;
+    }
     default:
       break;
   }
@@ -291,7 +302,7 @@ gst_edgesrc_start (GstBaseSrc * basesrc)
   char *port = NULL;
 
   ret =
-      nns_edge_create_handle ("TEMP_ID_EDGE_SRC", self->connect_type,
+      nns_edge_create_handle (NULL, self->connect_type,
       NNS_EDGE_NODE_TYPE_SUB, &self->edge_h);
 
   if (NNS_EDGE_ERROR_NONE != ret) {

diff --git a/tests/nnstreamer_edge/edge/runTest.sh b/tests/nnstreamer_edge/edge/runTest.sh
index 650ead3..4ac146c 100644 (file)
--- a/tests/nnstreamer_edge/edge/runTest.sh
+++ b/tests/nnstreamer_edge/edge/runTest.sh
@@ -185,34 +185,65 @@ callCompareTestIfExist raw5_$((num+2)).log result5_2.log 5-5 "Compare 5-5" 1 0
 kill -9 $pid &> /dev/null
 wait $pid
 
+if [ -f /usr/sbin/mosquitto ]
+then
+  testResult 1 9-0 "mosquitto mqtt broker search" 1
+else
+  testResult 0 9-0 "mosquitto mqtt broker search" 1
+  rm *.log
+  report
+  exit
+fi
+
+# Launch mosquitto
+PORT=`python3 ../../get_available_port.py`
+/usr/sbin/mosquitto -p ${PORT}&
+mospid=$!
+
+gstTestBackground "--gst-plugin-path=${PATH_TO_PLUGIN} \
+    videotestsrc is-live=true ! videoconvert ! videoscale ! video/x-raw,width=300,height=300,format=RGB ! tee name=t \
+        t. ! queue ! multifilesink location=raw_%1d.log \
+        t. ! queue ! edgesink port=0 connect-type=HYBRID dest-host=127.0.0.1 dest-port=${PORT} topic=tempTopic async=false" 6-1 0 0 30
+gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} \
+    edgesrc port=0 connect-type=HYBRID dest-host=127.0.0.1 dest-port=${PORT} topic=tempTopic num-buffers=10 ! multifilesink location=result6_0_%1d.log" 6-2 0 0 $PERFORMANCE
+findFirstMatchedFileNumber "raw6_" ".log" "result6_0_0.log" 6-4
+callCompareTestIfExist raw6_$((num+0)).log result6_0_0.log 6-4 "Compare 6-4" 1 0
+callCompareTestIfExist raw6_$((num+1)).log result6_0_1.log 6-5 "Compare 6-5" 1 0
+callCompareTestIfExist raw6_$((num+2)).log result6_0_2.log 6-6 "Compare 6-6" 1 0
+kill -9 $pid &> /dev/null
+wait $pid
+
 # Check AITT lib is exist or not.
 /sbin/ldconfig -p | grep libaitt.so >/dev/null 2>&1
 if [[ "$?" != 0 ]]; then
     echo "AITT lib is not installed. Skip AITT test."
     rm *.log
     report
+    kill -9 $mospid &> /dev/null
     exit
 fi
 
 gstTestBackground "--gst-plugin-path=${PATH_TO_PLUGIN} \
     videotestsrc is-live=true ! videoconvert ! videoscale ! video/x-raw,width=300,height=300,format=RGB ! tee name=t \
-        t. ! queue ! multifilesink location=raw6_%1d.log \
-        t. ! queue ! edgesink port=0 connect-type=AITT dest-host=127.0.0.1 dest-port=1883 topic=tempTopic async=false" 6-1 0 0 30
+        t. ! queue ! multifilesink location=raw7_%1d.log \
+        t. ! queue ! edgesink port=0 connect-type=AITT dest-host=127.0.0.1 dest-port=${PORT} topic=tempTopic async=false" 7-1 0 0 30
 gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} \
-    edgesrc port=0 connect-type=AITT dest-host=127.0.0.1 dest-port=1883 topic=tempTopic num-buffers=10 ! multifilesink location=result6_0_%1d.log" 6-2 0 0 $PERFORMANCE
+    edgesrc port=0 connect-type=AITT dest-host=127.0.0.1 dest-port=${PORT} topic=tempTopic num-buffers=10 ! multifilesink location=result7_0_%1d.log" 7-2 0 0 $PERFORMANCE
 gstTest "--gst-plugin-path=${PATH_TO_PLUGIN} \
-    edgesrc port=0 connect-type=AITT dest-host=127.0.0.1 dest-port=1883 topic=tempTopic num-buffers=10 ! multifilesink location=result6_1_%1d.log" 6-3 0 0 $PERFORMANCE
-findFirstMatchedFileNumber "raw6_" ".log" "result6_0_0.log" 6-4
-callCompareTestIfExist raw6_$((num+0)).log result6_0_0.log 2-4 "Compare 6-4" 1 0
-callCompareTestIfExist raw6_$((num+1)).log result6_0_1.log 2-5 "Compare 6-5" 1 0
-callCompareTestIfExist raw6_$((num+2)).log result6_0_2.log 2-6 "Compare 6-6" 1 0
-findFirstMatchedFileNumber "raw6_" ".log" "result6_1_0.log" 6-7
-callCompareTestIfExist raw6_$((num+0)).log result6_1_0.log 2-7 "Compare 6-7" 1 0
-callCompareTestIfExist raw6_$((num+1)).log result6_1_1.log 2-8 "Compare 6-8" 1 0
-callCompareTestIfExist raw6_$((num+2)).log result6_1_2.log 2-9 "Compare 6-9" 1 0
+    edgesrc port=0 connect-type=AITT dest-host=127.0.0.1 dest-port=${PORT} topic=tempTopic num-buffers=10 ! multifilesink location=result7_1_%1d.log" 7-3 0 0 $PERFORMANCE
+findFirstMatchedFileNumber "raw7_" ".log" "result7_0_0.log" 7-4
+callCompareTestIfExist raw7_$((num+0)).log result7_0_0.log 7-4 "Compare 7-4" 1 0
+callCompareTestIfExist raw7_$((num+1)).log result7_0_1.log 7-5 "Compare 7-5" 1 0
+callCompareTestIfExist raw7_$((num+2)).log result7_0_2.log 7-6 "Compare 7-6" 1 0
+findFirstMatchedFileNumber "raw7_" ".log" "result7_1_0.log" 7-7
+callCompareTestIfExist raw7_$((num+0)).log result7_1_0.log 7-7 "Compare 7-7" 1 0
+callCompareTestIfExist raw7_$((num+1)).log result7_1_1.log 7-8 "Compare 7-8" 1 0
+callCompareTestIfExist raw7_$((num+2)).log result7_1_2.log 7-9 "Compare 7-9" 1 0
 kill -9 $pid &> /dev/null
 wait $pid
 
+kill -9 $mospid &> /dev/null
+
 rm *.log
 report
 exit