Moved package zenoh as zenoh.net

Author: JEnoch

example/z_eval.py renamed to examples/zenoh-net/zn_eval.py

@@ -1,6 +1,6 @@
 import sys
 import time
-from zenoh import Zenoh, DataInfo, Z_PUT
+from zenoh.net import Session, DataInfo, Z_PUT
 
 
 def query_handler(path_selector, content_selector, send_replies):
@@ -20,14 +20,14 @@ def query_handler(path_selector, content_selector, send_replies):
         locator = sys.argv[2]
 
     print("Openning session...")
-    z = Zenoh.open(locator)
+    s = Session.open(locator)
 
     print("Declaring Eval on '{}'...".format(uri))
-    eva = z.declare_eval(uri, query_handler)
+    eva = s.declare_eval(uri, query_handler)
 
     c = '\0'
     while c != 'q':
         c = sys.stdin.read(1)
 
-    z.undeclare_eval(eva)
-    z.close()
+    s.undeclare_eval(eva)
+    s.close()

example/z_info.py renamed to examples/zenoh-net/zn_info.py

@@ -2,7 +2,7 @@
 import time
 import binascii
 import zenoh
-from zenoh import Zenoh
+from zenoh.net import Session
 
 
 if __name__ == '__main__':
@@ -11,15 +11,15 @@
         locator = sys.argv[1]
 
     print("Openning session...")
-    z = Zenoh.open(locator, {zenoh.Z_USER_KEY: "user".encode(),
-                             zenoh.Z_PASSWD_KEY: "password".encode()})
+    s = Session.open(locator, {zenoh.Z_USER_KEY: "user".encode(),
+                               zenoh.Z_PASSWD_KEY: "password".encode()})
 
-    info = z.info()
+    info = s.info()
     peer = info[zenoh.Z_INFO_PEER_KEY]
     pid = info[zenoh.Z_INFO_PID_KEY]
     peer_pid = info[zenoh.Z_INFO_PEER_PID_KEY]
     print("LOCATOR :  {}".format(peer.decode("utf-8")))
     print("PID :      {}".format(binascii.hexlify(pid).decode("ascii")))
     print("PEER PID : {}".format(binascii.hexlify(peer_pid).decode("ascii")))
 
-    z.close()
+    s.close()

example/z_pub_thr.py renamed to examples/zenoh-net/zn_pub_thr.py

@@ -1,5 +1,5 @@
 import sys
-from zenoh import Zenoh
+from zenoh.net import Session
 
 if __name__ == '__main__':
     locator = None
@@ -11,14 +11,14 @@
     if len(sys.argv) > 2:
         locator = sys.argv[2]
 
-    z = Zenoh.open(locator)
-    pub = z.declare_publisher('/test/thr')
+    s = Session.open(locator)
+    pub = s.declare_publisher('/test/thr')
 
     bs = bytearray()
     for i in range(0, size):
         bs.append(i % 10)
 
     while True:
-        z.stream_data(pub, bytes(bs))
+        s.stream_data(pub, bytes(bs))
 
-    z.close()
+    s.close()

example/z_pull.py renamed to examples/zenoh-net/zn_pull.py

@@ -1,6 +1,6 @@
 import sys
 import time
-from zenoh import Zenoh, SubscriberMode
+from zenoh.net import Session, SubscriberMode
 
 
 def listener(rname, data, info):
@@ -18,16 +18,16 @@ def listener(rname, data, info):
         locator = sys.argv[2]
 
     print("Openning session...")
-    z = Zenoh.open(locator)
+    s = Session.open(locator)
 
     print("Declaring Subscriber on '{}'...".format(uri))
-    sub = z.declare_subscriber(uri, SubscriberMode.pull(), listener)
+    sub = s.declare_subscriber(uri, SubscriberMode.pull(), listener)
 
     print("Press <enter> to pull data...")
     c = '\0'
     while c != 'q':
         c = sys.stdin.read(1)
-        z.pull(sub)
+        s.pull(sub)
 
-    z.undeclare_subscriber(sub)
-    z.close()
+    s.undeclare_subscriber(sub)
+    s.close()

example/z_query.py renamed to examples/zenoh-net/zn_query.py

@@ -1,6 +1,6 @@
 import sys
 import time
-from zenoh import Zenoh, QueryDest
+from zenoh.net import Session, QueryDest
 import zenoh
 
 
@@ -29,13 +29,13 @@ def reply_handler(reply):
         locator = sys.argv[2]
 
     print("Openning session...")
-    z = Zenoh.open(locator)
+    s = Session.open(locator)
 
     print("Sending query '{}'...".format(uri))
-    z.query(uri, "", reply_handler,
+    s.query(uri, "", reply_handler,
             dest_storages=QueryDest(QueryDest.Z_ALL),
             dest_evals=QueryDest(QueryDest.Z_ALL))
 
     time.sleep(1)
 
-    z.close()
+    s.close()

example/z_storage.py renamed to examples/zenoh-net/zn_storage.py

@@ -1,6 +1,6 @@
 import sys
 import time
-from zenoh import Zenoh
+from zenoh.net import Session, rname_intersect
 
 store = {}
 
@@ -16,7 +16,7 @@ def query_handler(path_selector, content_selector, send_replies):
           .format(path_selector, content_selector))
     replies = []
     for k, v in store.items():
-        if Zenoh.intersect(path_selector, k):
+        if rname_intersect(path_selector, k):
             replies.append((k, v))
     send_replies(replies)
 
@@ -31,14 +31,14 @@ def query_handler(path_selector, content_selector, send_replies):
         locator = sys.argv[2]
 
     print("Openning session...")
-    z = Zenoh.open(locator)
+    s = Session.open(locator)
 
     print("Declaring Storage on '{}'...".format(uri))
-    sto = z.declare_storage(uri, listener, query_handler)
+    sto = s.declare_storage(uri, listener, query_handler)
 
     c = '\0'
     while c != 'q':
         c = sys.stdin.read(1)
 
-    z.undeclare_storage(sto)
-    z.close()
+    s.undeclare_storage(sto)
+    s.close()

example/z_stream.py renamed to examples/zenoh-net/zn_stream.py

@@ -1,7 +1,7 @@
 import sys
 import time
 import itertools
-from zenoh import Zenoh
+from zenoh.net import Session
 
 
 if __name__ == '__main__':
@@ -18,16 +18,16 @@
         locator = sys.argv[3]
 
     print("Openning session...")
-    z = Zenoh.open(locator)
+    s = Session.open(locator)
 
     print("Declaring Publisher on '{}'...".format(uri))
-    pub = z.declare_publisher(uri)
+    pub = s.declare_publisher(uri)
 
     for idx in itertools.count():
         time.sleep(1)
         buf = "[{:4d}] {}".format(idx, value)
         print("Streaming Data ('{}': '{}')...".format(uri, buf))
-        z.stream_data(pub, bytes(buf, encoding='utf8'))
+        s.stream_data(pub, bytes(buf, encoding='utf8'))
 
-    z.undeclare_publisher(pub)
-    z.close()
+    s.undeclare_publisher(pub)
+    s.close()

example/z_sub.py renamed to examples/zenoh-net/zn_sub.py

@@ -1,6 +1,6 @@
 import sys
 import time
-from zenoh import Zenoh, SubscriberMode
+from zenoh.net import Session, SubscriberMode
 
 
 def listener(rname, data, info):
@@ -18,14 +18,14 @@ def listener(rname, data, info):
         locator = sys.argv[2]
 
     print("Openning session...")
-    z = Zenoh.open(locator)
+    s = Session.open(locator)
 
     print("Declaring Subscriber on '{}'...".format(uri))
-    sub = z.declare_subscriber(uri, SubscriberMode.push(), listener)
+    sub = s.declare_subscriber(uri, SubscriberMode.push(), listener)
 
     c = '\0'
     while c != 'q':
         c = sys.stdin.read(1)
 
-    z.undeclare_subscriber(sub)
-    z.close()
+    s.undeclare_subscriber(sub)
+    s.close()

example/z_sub_thr.py renamed to examples/zenoh-net/zn_sub_thr.py

@@ -1,7 +1,7 @@
 import sys
 import time
 import datetime
-from zenoh import Zenoh, SubscriberMode
+from zenoh.net import Session, SubscriberMode
 
 N = 100000
 
@@ -32,10 +32,10 @@ def listener(rname, data, info):
     if len(sys.argv) > 1:
         locator = sys.argv[1]
 
-    z = Zenoh.open(locator)
-    sub = z.declare_subscriber('/test/thr', SubscriberMode.push(), listener)
+    s = Session.open(locator)
+    sub = s.declare_subscriber('/test/thr', SubscriberMode.push(), listener)
 
     time.sleep(60)
 
-    z.undeclare_subscriber(sub)
-    z.close()
+    s.undeclare_subscriber(sub)
+    s.close()

example/z_temp_pub.py renamed to examples/zenoh-net/zn_temp_pub.py

@@ -1,4 +1,4 @@
-from zenoh import Zenoh
+from zenoh.net import Session
 import random
 import time
 import sys
@@ -10,11 +10,11 @@ def read_temp():
     return random.randint(15, 30)
 
 
-def run_sensor_loop(z, pub):
+def run_sensor_loop(s, pub):
     # read and produce e temperature every half a second
     while True:
         t = read_temp()
-        z.stream_data(pub, str(t).encode())
+        s.stream_data(pub, str(t).encode())
         time.sleep(0.1)
 
 
@@ -23,6 +23,6 @@ def run_sensor_loop(z, pub):
     if len(sys.argv) > 1:
         locator = sys.argv[1]
 
-    z = Zenoh.open(locator)
-    pub = z.declare_publisher('/myhome/kitcken/temp')
-    run_sensor_loop(z, pub)
+    s = Session.open(locator)
+    pub = s.declare_publisher('/myhome/kitcken/temp')
+    run_sensor_loop(s, pub)