X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=examples%2Fping_xapp.py;h=c247ee30d5a639c19164718ef74e44869ca00750;hb=2a106ad96542db8fc7613170f7fa96f3922d4456;hp=d7066e9bb022c523a40edc5a053958244e54a6a5;hpb=99a0b48593f885940b66e80edbdc2840242b5fd8;p=ric-plt%2Fxapp-frame-py.git

diff --git a/examples/ping_xapp.py b/examples/ping_xapp.py
index d7066e9..c247ee3 100644
--- a/examples/ping_xapp.py
+++ b/examples/ping_xapp.py
@@ -21,37 +21,42 @@ Test xapp 1
 
 import time
 import json
-from threading import Thread
-from rmr import rmr
 from ricxappframe.xapp_frame import Xapp
 
-# Now we use the framework to echo back the acks
-class MyXapp(Xapp):
-    def entrypoint(self):
-        my_ns = "myxapp"
-        number = 0
-        while True:
-            # test healthcheck
-            print("Healthy? {}".format(xapp.healthcheck()))
 
-            # rmr send
-            val = json.dumps({"test_send": number}).encode()
-            self.rmr_send(val, 60000)
-            number += 1
+def entry(self):
+    my_ns = "myxapp"
+    number = 0
+    while True:
+        # test healthcheck
+        print("ping is healthy? {}".format(xapp.healthcheck()))
 
-            # store it in SDL and read it back; delete and read
-            self.sdl_set(my_ns, "numba", number)
-            print((self.sdl_get(my_ns, "numba"), self.sdl_find_and_get(my_ns, "num")))
-            self.sdl_delete(my_ns, "numba")
-            print(self.sdl_get(my_ns, "numba"))
+        # rmr send to default handler
+        self.rmr_send(json.dumps({"ping": number}).encode(), 6660666)
 
-            # rmr receive
-            for (summary, sbuf) in self.rmr_get_messages():
-                print(summary)
-                self.rmr_free(sbuf)
+        # rmr send 60000, should trigger registered callback
+        val = json.dumps({"test_send": number}).encode()
+        self.rmr_send(val, 60000)
+        number += 1
 
-            time.sleep(1)
+        # store it in SDL and read it back; delete and read
+        self.sdl_set(my_ns, "ping", number)
+        self.logger.info(self.sdl_get(my_ns, "ping"))
+        self.logger.info(self.sdl_find_and_get(my_ns, "pin"))
+        self.sdl_delete(my_ns, "ping")
+        self.logger.info(self.sdl_get(my_ns, "ping"))
 
+        # rmr receive
+        for (summary, sbuf) in self.rmr_get_messages():
+            # summary is a dict that contains bytes so we can't use json.dumps on it
+            # so we have no good way to turn this into a string to use the logger unfortunately
+            # print is more "verbose" than the ric logger
+            # if you try to log this you will get: TypeError: Object of type bytes is not JSON serializable
+            print("ping: {0}".format(summary))
+            self.rmr_free(sbuf)
 
-xapp = MyXapp(4564, use_fake_sdl=True)
+        time.sleep(2)
+
+
+xapp = Xapp(entrypoint=entry, rmr_port=4564, use_fake_sdl=True)
 xapp.run()