Exposed external kafka port in test env

[nonrtric.git] / test / simulator-group / sim-monitor.js
diff --git a/test/simulator-group/sim-monitor.js b/test/simulator-group/sim-monitor.js

index 56a6e6d..e118e17 100644 (file)
--- a/test/simulator-group/sim-monitor.js
+++ b/test/simulator-group/sim-monitor.js
@@ -236,7 +236,7 @@ function fetchAllMetrics_pol() {
          if (getCtr%3 == 0) {
              //Extract the port numbers from the running simulators, for every 3 calls
              const { exec } = require('child_process');
-            exec('docker ps --filter "name='+ricbasename+'" --format "{{.Names}} {{.Ports}}" | sed s/0.0.0.0:// | cut -d \'>\' -f1 | sed \'s/[[-]]*$//\'', (err, stdout, stderr) => {
+            exec('docker ps --filter "name='+ricbasename+'" --filter "network=nonrtric-docker-net" --format "{{.Names}} {{.Ports}}" | sed s/0.0.0.0:// | cut -d \'>\' -f1 | sed \'s/[[-]]*$//\'', (err, stdout, stderr) => {
  
                  var simulators = ""
                  simulators=`${stdout}`.replace(/(\r\n|\n|\r)/gm," ");
@@ -511,7 +511,8 @@ function fetchAllMetrics_ecs() {
                              var jd=JSON.parse(data);
                              var jda=jd["supported_ei_types"]
                              for(var j=0;j<jda.length;j++) {
-                                row=""+row+jda[j]["ei_type_identity"]+" "
+                                row=""+row+jda[j]+" "
+
                              }
                              tmp_ecs_producer_type_arr[idx]=row
                          }
@@ -941,14 +942,14 @@ app.get("/mon",function(req, res){
            "<html>" +
            "<head>" +
              "<meta http-equiv=\"refresh\" content=\"2\">"+  //2 sec auto refresh
-            "<title>Policy Agent and simulator monitor</title>"+
+            "<title>Policy Management Service and simulator monitor</title>"+
              "</head>" +
              "<body>" +
              "<font size=\"-3\" face=\"monospace\">" +
              "<p>Change basename in url if other ric sim prefix is used</p>" +
              "<p>Change pmsprefix in url if pms with other prefix is used</p>" +
              "</font>" +
-            "<h3>Policy agent</h3>" +
+            "<h3>Policy Management Service</h3>" +
              "<font face=\"monospace\">" +
              "Status:..............................." + formatDataRow(ag1) + "<br>" +
              "Services:............................." + formatIdRowCompact(ag2) + "<br>" +
@@ -965,7 +966,7 @@ app.get("/mon",function(req, res){
              "Fetched responses.............................." + formatDataRow(mr5) + "<br>" +
              "Current responses waiting......................" + formatDataRow(mr6) + "<br>" +
              "</font>"+
-            "<h3>Callback receiver</h3>" +
+            "<h3>Callback|Notification receiver</h3>" +
              "<font face=\"monospace\">" +
              "Callbacks received:..................." + formatDataRow(cr1) + "<br>" +
              "Callbacks fetched:...................." + formatDataRow(cr2) + "<br>" +
@@ -975,7 +976,7 @@ app.get("/mon",function(req, res){
              "<font face=\"monospace\">" +
              "Services:............................." + formatIdRowCompact(rc_services) + "<br>" +
              "</font>" +
-            "<h3>Near-RT RIC Simulators</h3>" +
+            "<h3>Near-RT RIC | A1 Simulators</h3>" +
              "<font face=\"monospace\">"
  
              htmlStr=htmlStr+padding("Near-RT RIC Simulator name", 35,"&nbsp;")