update to the new IOCB client API and new file services API

samples/ReadWriteFile.py

@@ -121,7 +121,34 @@ def do_readrecord(self, args):
             if _debug: TestConsoleCmd._debug("    - request: %r", request)
 
             # give it to the application
-            this_application.request(request)
+            iocb = this_application.request(request)
+            if _debug: TestConsoleCmd._debug("    - iocb: %r", iocb)
+
+            # wait for it to complete
+            iocb.wait()
+
+            # do something for success
+            if iocb.ioResponse:
+                apdu = iocb.ioResponse
+
+                # should be an ack
+                if not isinstance(apdu, AtomicReadFileACK):
+                    if _debug: TestConsoleCmd._debug("    - not an ack")
+                    return
+
+                # suck out the record data
+                if apdu.accessMethod.recordAccess:
+                    value = apdu.accessMethod.recordAccess.fileRecordData
+                elif apdu.accessMethod.streamAccess:
+                    value = apdu.accessMethod.streamAccess.fileData
+                if _debug: TestConsoleCmd._debug("    - value: %r", value)
+
+                sys.stdout.write(repr(value) + '\n')
+                sys.stdout.flush()
+
+            # do something for error/reject/abort
+            if iocb.ioError:
+                sys.stdout.write(str(iocb.ioError) + '\n')
 
         except Exception as error:
             TestConsoleCmd._exception("exception: %r", error)
@@ -153,7 +180,34 @@ def do_readstream(self, args):
             if _debug: TestConsoleCmd._debug("    - request: %r", request)
 
             # give it to the application
-            this_application.request(request)
+            iocb = this_application.request(request)
+            if _debug: TestConsoleCmd._debug("    - iocb: %r", iocb)
+
+            # wait for it to complete
+            iocb.wait()
+
+            # do something for success
+            if iocb.ioResponse:
+                apdu = iocb.ioResponse
+
+                # should be an ack
+                if not isinstance(apdu, AtomicReadFileACK):
+                    if _debug: TestConsoleCmd._debug("    - not an ack")
+                    return
+
+                # suck out the record data
+                if apdu.accessMethod.recordAccess:
+                    value = apdu.accessMethod.recordAccess.fileRecordData
+                elif apdu.accessMethod.streamAccess:
+                    value = apdu.accessMethod.streamAccess.fileData
+                if _debug: TestConsoleCmd._debug("    - value: %r", value)
+
+                sys.stdout.write(repr(value) + '\n')
+                sys.stdout.flush()
+
+            # do something for error/reject/abort
+            if iocb.ioError:
+                sys.stdout.write(str(iocb.ioError) + '\n')
 
         except Exception as error:
             TestConsoleCmd._exception("exception: %r", error)
@@ -187,7 +241,34 @@ def do_writerecord(self, args):
             if _debug: TestConsoleCmd._debug("    - request: %r", request)
 
             # give it to the application
-            this_application.request(request)
+            iocb = this_application.request(request)
+            if _debug: TestConsoleCmd._debug("    - iocb: %r", iocb)
+
+            # wait for it to complete
+            iocb.wait()
+
+            # do something for success
+            if iocb.ioResponse:
+                apdu = iocb.ioResponse
+
+                # should be an ack
+                if not isinstance(apdu, AtomicWriteFileACK):
+                    if _debug: TestConsoleCmd._debug("    - not an ack")
+                    return
+
+                # suck out the record data
+                if apdu.fileStartPosition is not None:
+                    value = apdu.fileStartPosition
+                elif apdu.fileStartRecord is not None:
+                    value = apdu.fileStartRecord
+                TestApplication._debug("    - value: %r", value)
+
+                sys.stdout.write(repr(value) + '\n')
+                sys.stdout.flush()
+
+            # do something for error/reject/abort
+            if iocb.ioError:
+                sys.stdout.write(str(iocb.ioError) + '\n')
 
         except Exception as error:
             TestConsoleCmd._exception("exception: %r", error)
@@ -219,7 +300,34 @@ def do_writestream(self, args):
             if _debug: TestConsoleCmd._debug("    - request: %r", request)
 
             # give it to the application
-            this_application.request(request)
+            iocb = this_application.request(request)
+            if _debug: TestConsoleCmd._debug("    - iocb: %r", iocb)
+
+            # wait for it to complete
+            iocb.wait()
+
+            # do something for success
+            if iocb.ioResponse:
+                apdu = iocb.ioResponse
+
+                # should be an ack
+                if not isinstance(apdu, AtomicWriteFileACK):
+                    if _debug: TestConsoleCmd._debug("    - not an ack")
+                    return
+
+                # suck out the record data
+                if apdu.fileStartPosition is not None:
+                    value = apdu.fileStartPosition
+                elif apdu.fileStartRecord is not None:
+                    value = apdu.fileStartRecord
+                TestApplication._debug("    - value: %r", value)
+
+                sys.stdout.write(repr(value) + '\n')
+                sys.stdout.flush()
+
+            # do something for error/reject/abort
+            if iocb.ioError:
+                sys.stdout.write(str(iocb.ioError) + '\n')
 
         except Exception as error:
             TestConsoleCmd._exception("exception: %r", error)
@@ -247,7 +355,7 @@ def main():
         )
 
     # make a simple application
-    this_application = TestApplication(this_device, args.ini.address)
+    this_application = BIPSimpleApplication(this_device, args.ini.address)
 
     # get the services supported
     services_supported = this_application.get_services_supported()

samples/ReadWriteFileServer.py

@@ -18,6 +18,7 @@
 
 from bacpypes.app import BIPSimpleApplication
 from bacpypes.service.device import LocalDeviceObject
+from bacpypes.service.file import FileServices
 
 # some debugging
 _debug = 0
@@ -61,9 +62,9 @@ def __len__(self):
 
         return len(self._record_data)
 
-    def ReadFile(self, start_record, record_count):
+    def read_record(self, start_record, record_count):
         """ Read a number of records starting at a specific record. """
-        if _debug: LocalRecordAccessFileObject._debug("ReadFile %r %r",
+        if _debug: LocalRecordAccessFileObject._debug("read_record %r %r",
                 start_record, record_count,
                 )
 
@@ -73,9 +74,9 @@ def ReadFile(self, start_record, record_count):
         return end_of_file, \
             self._record_data[start_record:start_record + record_count]
 
-    def WriteFile(self, start_record, record_count, record_data):
+    def write_record(self, start_record, record_count, record_data):
         """ Write a number of records, starting at a specific record. """
-        if _debug: LocalRecordAccessFileObject._debug("WriteFile %r %r %r",
+        if _debug: LocalRecordAccessFileObject._debug("write_record %r %r %r",
                 start_record, record_count, record_data,
                 )
 
@@ -129,9 +130,9 @@ def __len__(self):
 
         return len(self._file_data)
 
-    def ReadFile(self, start_position, octet_count):
+    def read_stream(self, start_position, octet_count):
         """ Read a chunk of data out of the file. """
-        if _debug: LocalStreamAccessFileObject._debug("ReadFile %r %r",
+        if _debug: LocalStreamAccessFileObject._debug("read_stream %r %r",
                 start_position, octet_count,
                 )
 
@@ -141,9 +142,9 @@ def ReadFile(self, start_position, octet_count):
         return end_of_file, \
             self._file_data[start_position:start_position + octet_count]
 
-    def WriteFile(self, start_position, data):
+    def write_stream(self, start_position, data):
         """ Write a number of octets, starting at a specific offset. """
-        if _debug: LocalStreamAccessFileObject._debug("WriteFile %r %r",
+        if _debug: LocalStreamAccessFileObject._debug("write_stream %r %r",
                 start_position, data,
                 )
 
@@ -193,6 +194,9 @@ def main():
     # make a sample application
     this_application = BIPSimpleApplication(this_device, args.ini.address)
 
+    # add the capability to server file content
+    this_application.add_capability(FileServices)
+
     # get the services supported
     services_supported = this_application.get_services_supported()
     if _debug: _log.debug("    - services_supported: %r", services_supported)