Migrate examples and CLIs into new model

Author: zjkmxy

examples/appv2/basic_packets/consumer.py

@@ -16,7 +16,7 @@
 # limitations under the License.
 # -----------------------------------------------------------------------------
 import logging
-from ndn import utils, appv2, types
+from ndn import utils, appv2_2, types
 from ndn import encoding as enc
 
 
@@ -26,7 +26,7 @@
                     style='{')
 
 
-app = appv2.NDNApp()
+app = appv2_2.NDNApp()
 
 
 async def main():
@@ -36,7 +36,7 @@ async def main():
         print(f'Sending Interest {enc.Name.to_str(name)}, {enc.InterestParam(must_be_fresh=True, lifetime=6000)}')
         # TODO: Write a better validator
         data_name, content, pkt_context = await app.express(
-            name, validator=appv2.pass_all,
+            name, validator=appv2_2.pass_all,
             must_be_fresh=True, can_be_prefix=False, lifetime=6000)
 
         print(f'Received Data Name: {enc.Name.to_str(data_name)}')

examples/appv2/basic_packets/producer.py

@@ -16,7 +16,7 @@
 # limitations under the License.
 # -----------------------------------------------------------------------------
 import logging
-from ndn import appv2
+from ndn import appv2_2
 from ndn import encoding as enc
 
 
@@ -26,13 +26,13 @@
                     style='{')
 
 
-app = appv2.NDNApp()
+app = appv2_2.NDNApp()
 keychain = app.default_keychain()
 
 
 @app.route('/example/testApp')
 def on_interest(name: enc.FormalName, _app_param: enc.BinaryStr | None,
-                reply: appv2.ReplyFunc, context: appv2.PktContext):
+                reply: appv2_2.ReplyFunc, context: appv2_2.PktContext):
     print(f'>> I: {enc.Name.to_str(name)}, {context["int_param"]}')
     content = b"Hello, world!"
     reply(app.make_data(name, content=content, signer=keychain.get_signer({}),

examples/appv2/forwarding_hint/consumer.py

@@ -16,7 +16,7 @@
 # limitations under the License.
 # -----------------------------------------------------------------------------
 import logging
-from ndn import utils, appv2, types
+from ndn import utils, appv2_2, types
 from ndn import encoding as enc
 
 
@@ -26,21 +26,21 @@
                     style='{')
 
 
-app = appv2.NDNApp()
+app = appv2_2.NDNApp()
 
 
 async def express_int(name, fw_hint):
     try:
         if fw_hint is None:
             print(f'Sending Interest {enc.Name.to_str(name)}, {enc.InterestParam(must_be_fresh=True, lifetime=6000)}')
             data_name, content, pkt_context = await app.express(
-                name, validator=appv2.pass_all,
+                name, validator=appv2_2.pass_all,
                 must_be_fresh=True, can_be_prefix=False, lifetime=6000)
         else:
             print(f'Sending Interest {enc.Name.to_str(name)}, '
                   f'{enc.InterestParam(must_be_fresh=True, lifetime=6000, forwarding_hint=[fw_hint])}')
             data_name, content, pkt_context = await app.express(
-                name, validator=appv2.pass_all,
+                name, validator=appv2_2.pass_all,
                 must_be_fresh=True, can_be_prefix=False, lifetime=6000, forwarding_hint=[fw_hint])
 
         print(f'Received Data Name: {enc.Name.to_str(data_name)}')

examples/appv2/forwarding_hint/producer.py

@@ -1,5 +1,5 @@
 import logging
-from ndn import appv2
+from ndn import appv2_2
 from ndn import encoding as enc
 
 
@@ -9,13 +9,13 @@
                     style='{')
 
 
-app = appv2.NDNApp()
+app = appv2_2.NDNApp()
 keychain = app.default_keychain()
 
 
 @app.route('/repo/command')
 def on_cmd(name: enc.FormalName, _app_param: enc.BinaryStr | None,
-           reply: appv2.ReplyFunc, context: appv2.PktContext):
+           reply: appv2_2.ReplyFunc, context: appv2_2.PktContext):
     print(f'>> I: {enc.Name.to_str(name)}, {context["int_param"]}')
     content = b"Hello, world!"
     reply(app.make_data(name, content=content, signer=keychain.get_signer({}),
@@ -30,7 +30,7 @@ def on_cmd(name: enc.FormalName, _app_param: enc.BinaryStr | None,
 # So we can dispatch by forwarding hints.
 @app.route('/')
 def on_fwd_hint(name: enc.FormalName, app_param: enc.BinaryStr | None,
-                reply: appv2.ReplyFunc, context: appv2.PktContext):
+                reply: appv2_2.ReplyFunc, context: appv2_2.PktContext):
     fwd_hints = context["int_param"].forwarding_hint
     if fwd_hints:
         fh_name = fwd_hints[0]

examples/appv2/keychain_cert/fetch_certificate.py

@@ -17,9 +17,9 @@
 # -----------------------------------------------------------------------------
 import sys
 import logging
-from ndn import appv2, types
+from ndn import appv2_2, types
 from ndn import encoding as enc
-from ndn.app_support import security_v2 as secv2
+from ndn.app_support import security_v2_2 as secv2
 
 
 logging.basicConfig(format='[{asctime}]{levelname}:{message}',
@@ -32,7 +32,7 @@
     logging.fatal('Please input a KEY or CERT name')
     exit(0)
 
-app = appv2.NDNApp()
+app = appv2_2.NDNApp()
 
 
 async def main():
@@ -43,7 +43,7 @@ async def main():
               f'{enc.InterestParam(must_be_fresh=True, can_be_prefix=can_be_prefix, lifetime=6000)}')
         # TODO: Write a better validator
         data_name, content, pkt_context = await app.express(
-            name, validator=appv2.pass_all,
+            name, validator=appv2_2.pass_all,
             must_be_fresh=True, can_be_prefix=can_be_prefix, lifetime=6000)
 
         print(f'Received Data Name: {enc.Name.to_str(data_name)}')

examples/appv2/keychain_cert/keychain_register.py

@@ -16,7 +16,7 @@
 # limitations under the License.
 # -----------------------------------------------------------------------------
 import logging
-from ndn import appv2
+from ndn import appv2_2
 from ndn.app_support.keychain_register import attach_keychain_register
 
 
@@ -26,7 +26,7 @@
                     style='{')
 
 
-app = appv2.NDNApp()
+app = appv2_2.NDNApp()
 keychain = app.default_keychain()
 attach_keychain_register(keychain, app)
 

examples/dpdk_experimental/udp_consumer.py

@@ -17,7 +17,7 @@
 # -----------------------------------------------------------------------------
 import logging
 import sys
-from ndn import utils, appv2, types
+from ndn import utils, appv2_2, types
 from ndn import encoding as enc
 from ndn.transport.ndn_dpdk import NdnDpdkUdpFace, DpdkRegisterer
 
@@ -42,7 +42,7 @@
 face = NdnDpdkUdpFace(gql_url, self_addr, self_port, dpdk_addr, dpdk_port)
 registerer = DpdkRegisterer(face)
 
-app = appv2.NDNApp(face=face, registerer=registerer)
+app = appv2_2.NDNApp(face=face, registerer=registerer)
 keychain = app.default_keychain()
 
 
@@ -53,7 +53,7 @@ async def main():
         print(f'Sending Interest {enc.Name.to_str(name)}, {enc.InterestParam(must_be_fresh=True, lifetime=6000)}')
         # TODO: Write a better validator
         data_name, content, pkt_context = await app.express(
-            name, validator=appv2.pass_all,
+            name, validator=appv2_2.pass_all,
             must_be_fresh=True, can_be_prefix=False, lifetime=6000)
 
         print(f'Received Data Name: {enc.Name.to_str(data_name)}')

examples/dpdk_experimental/udp_producer.py

@@ -17,7 +17,7 @@
 # -----------------------------------------------------------------------------
 import logging
 import sys
-from ndn import appv2
+from ndn import appv2_2
 from ndn import encoding as enc
 from ndn.transport.ndn_dpdk import NdnDpdkUdpFace, DpdkRegisterer
 
@@ -42,13 +42,13 @@
 face = NdnDpdkUdpFace(gql_url, self_addr, self_port, dpdk_addr, dpdk_port)
 registerer = DpdkRegisterer(face)
 
-app = appv2.NDNApp(face=face, registerer=registerer)
+app = appv2_2.NDNApp(face=face, registerer=registerer)
 keychain = app.default_keychain()
 
 
 @app.route('/example/testApp')
 def on_interest(name: enc.FormalName, _app_param: enc.BinaryStr | None,
-                reply: appv2.ReplyFunc, context: appv2.PktContext):
+                reply: appv2_2.ReplyFunc, context: appv2_2.PktContext):
     print(f'>> I: {enc.Name.to_str(name)}, {context["int_param"]}')
     content = b"Hello, world!"
     reply(app.make_data(name, content=content, signer=keychain.get_signer({}),

src/ndn/bin/nfdc/cmd_get_face.py

@@ -16,9 +16,10 @@
 # limitations under the License.
 # -----------------------------------------------------------------------------
 import argparse
-from ...appv2 import NDNApp
+from ...appv2_2 import NDNApp
 from ...encoding import Name, Component
-from ...app_support.nfd_mgmt import FaceStatusMsg, FaceQueryFilter, FaceQueryFilterValue, parse_response
+from ...encoding.tlv_model_v2 import tlv_encode, tlv_parse
+from ...app_support.nfd_mgmt_2 import FaceStatusMsg, FaceQueryFilter, FaceQueryFilterValue, parse_response
 from .utils import express_interest
 
 
@@ -35,7 +36,7 @@ def execute(args: argparse.Namespace):
     async def list_face():
         try:
             data = await express_interest(app, "/localhost/nfd/faces/list")
-            msg = FaceStatusMsg.parse(data)
+            msg = tlv_parse(FaceStatusMsg, data)
             # TODO: Should calculate the length instead of using a fixed number
             print(f'{"FaceID":7}{"RemoteURI":<30}\t{"LocalURI":<30}')
             print(f'{"------":7}{"---------":<30}\t{"--------":<30}')
@@ -53,7 +54,7 @@ async def exec_query():
                 msg = parse_response(data)
                 print('Query failed with response', msg['status_code'], msg['status_text'])
             else:
-                msg = FaceStatusMsg.parse(data)
+                msg = tlv_parse(FaceStatusMsg, data)
                 for f in msg.face_status:
                     print()
                     print(f'{"Face ID":>12}\t{f.face_id}')
@@ -78,16 +79,16 @@ async def exec_query():
         filt.face_query_filter = FaceQueryFilterValue()
         if face_id is not None:
             filt.face_query_filter.face_id = face_id
-            data_name = Name.from_str(name) + [Component.from_bytes(filt.encode())]
+            data_name = Name.from_str(name) + [Component.from_bytes(tlv_encode(filt))]
             if not await exec_query():
                 print('No face is found')
         else:
             filt.face_query_filter.uri = face_uri
-            data_name = Name.from_str(name) + [Component.from_bytes(filt.encode())]
+            data_name = Name.from_str(name) + [Component.from_bytes(tlv_encode(filt))]
             if not await exec_query():
                 filt.face_query_filter.uri = None
                 filt.face_query_filter.local_uri = face_uri
-                data_name = Name.from_str(name) + [Component.from_bytes(filt.encode())]
+                data_name = Name.from_str(name) + [Component.from_bytes(tlv_encode(filt))]
                 if not await exec_query():
                     print('No face is found')
         app.shutdown()

src/ndn/bin/nfdc/cmd_get_route.py

@@ -16,9 +16,10 @@
 # limitations under the License.
 # -----------------------------------------------------------------------------
 import argparse
-from ...appv2 import NDNApp
+from ...appv2_2 import NDNApp
 from ...encoding import Name
-from ...app_support.nfd_mgmt import FibStatus, RibStatus
+from ...encoding.tlv_model_v2 import tlv_parse
+from ...app_support.nfd_mgmt_2 import FibStatus, RibStatus
 from .utils import express_interest
 
 
@@ -36,9 +37,9 @@ def execute(args: argparse.Namespace):
     async def list_route():
         try:
             fib_data = await express_interest(app, "/localhost/nfd/fib/list")
-            fib_msg = FibStatus.parse(fib_data)
+            fib_msg = tlv_parse(FibStatus, fib_data)
             rib_data = await express_interest(app, "/localhost/nfd/rib/list")
-            rib_msg = RibStatus.parse(rib_data)
+            rib_msg = tlv_parse(RibStatus, rib_data)
             # TODO: Should calculate the length instead of using a fixed number
             print('Forwarding Table (FIB)')
             for ent in fib_msg.entries: