update code that integrates the connection of test xapp to get xapp.

actor/src/actions/xapp_connection.py

@@ -35,26 +35,29 @@ def send_msg(self, msg_dict):
     def waiting_server_thread(self, socket):
         # msg_handler = MessageHandler(self)
         print("Just send some fake data......")
-        for i in range(100):
-            time.sleep(2)
-            message_sent = {"type": "KPI xApp", "timestamp": str(i),
-                            "kpi1": str(i+100), "kpi2": str(i+200), "kpi3": str(i+300)}
-            self.server_connection.send_msg(message_sent)
-        return
+        #for i in range(100):
+        #    time.sleep(2)
+        #    message_sent = {"type": "KPI xApp", "timestamp": str(i),
+        #                    "kpi1": str(i+100), "kpi2": str(i+200), "kpi3": str(i+300)}
+        #    self.server_connection.send_msg(message_sent)
+        #return
 
         while True:
             # this thread is created to wait new message received from server
             data = socket.recv(1024)
-            data = data.decode("utf-8")
+            #data = data.decode("utf-8")
 
             if not data:
                 break
 
             logger.info('<<-- Receive a message from the server : {}'.format(data))
-
-            #message = json.loads(data)
+
+            message = data.decode("utf-8")
+            message = json.loads(message)
+            print("Received a KPI data from test xApp: ")
+            print(message)
             # message_handler.handle(message)
-            self.server_connection.send_msg(data)  ## forward this message to the oaic-t server
+            self.server_connection.send_msg(message)  ## forward this message to the oaic-t server
 
         # close the connection
         print('Server disconnected!')

server/src/actor_manager.py

@@ -123,8 +123,8 @@ def update_actor_rsc(self, actor_name, actor_rsc):
             self.ui.actor_rsc_updated(actor_name, float(actor_rsc.cpu), float(actor_rsc.mem))
 
     def update_kpi_xapp(self, ts, kpi_all):
-        if self.ui & kpi_all:
-            self.ui.actor_kpi_updated(ts)
+        if self.ui:
+            self.ui.actor_kpi_updated(ts, kpi_all)
 
     def update_test_status(self, test_id, status):
         test_task = self.find_test_task(test_id)

server/src/message_handler.py

@@ -62,32 +62,35 @@ def handle(self, actor, message, actor_manager):
             output_summary = message['output summary']
             actor_manager.update_test_logs(task_id, ">>>>>> Details:" + output_summary)
         elif message['type'] == "KPI xApp":
-            # print("Received KPI xApp data: ")
-            # print(message)
+            print("Received KPI xApp data: ")
+            print(message)
             message_sent = {"type": "confirmed"}
             kpi_all_dict = dict()
             ue_kpi_kept = ["PRB-Usage-DL", "PRB-Usage-UL", "QCI", "fiveQI", "MeasPeriodUEPRBUsage", "Meas-Period-PDCP", "Meas-Period-RF", "Number-of-Active-UEs"]
             cell_kpi_kept = ["PDCP-Bytes-DL", "PDCP-Bytes-UL", "Avail-PRB-DL", "Avail-PRB-UL", "Meas-Period-PDCPBytes", "MeasPeriodAvailPRB", "Total-Available-PRBs-DL",
                            "Total-Available-PRBs-UL"]
 
+            count_ue = 0
+            count_cell = 0
+            count = 0
             if "UE Metrics" in message.keys():
-                count_ue = 0
                 ue_metrics = message["UE Metrics"]
                 ue_metrics = json.loads(ue_metrics[0][0], strict=False)
                 for k in ue_metrics.keys():
                     # if k.startswith("kpi"):
                     if k in ue_kpi_kept:
-                        kpi_all_dict[count] = float(message[k])
+                        kpi_all_dict["UE_"+k] = float(ue_metrics[k])
                         count_ue += 1
+                        count += 1
             if "Cell Metrics" in message.keys():
-                count_cell = 0
                 cell_metrics = message["Cell Metrics"]
                 cell_metrics = json.loads(cell_metrics[0][0], strict=False)
                 for k in cell_metrics.keys():
                     #if k.startswith("kpi"):
                     if k in cell_kpi_kept:
-                        kpi_all_dict[count] = float(message[k])
+                        kpi_all_dict["Cell_"+k] = float(cell_metrics[k])
                         count_cell += 1
+                        count += 1
             #timestamp = message["timestamp"]
             print("KPI metrics received: " + str(count_ue) + " UE metrics, " + str(count_cell) + " Cell metrics!")
             if (count_ue + count_cell) >= 1: