Merge pull request #46 from RachelTucker/BP-API-5-3

Generated 5.3.x BP API from contract commit 1996817.

Author: bensont

ds3/ds3.py

@@ -1097,6 +1097,7 @@ def __init__(self):
             'ForceTapeRemoval': None,
             'Id': None,
             'LastCleaned': None,
+            'MaxFailedTapes': None,
             'MfgSerialNumber': None,
             'MinimumTaskPriority': None,
             'PartitionId': None,
@@ -1141,6 +1142,8 @@ def __init__(self):
         self.attributes = []
         self.elements = {
             'AutoCompactionEnabled': None,
+            'AutoQuiesceEnabled': None,
+            'DriveIdleTimeoutInMinutes': None,
             'DriveType': None,
             'ErrorMessage': None,
             'Id': None,
@@ -1461,6 +1464,7 @@ def __init__(self):
         self.elements = {
             'AvailableCapacityInBytes': None,
             'CacheFilesystem': CacheFilesystem(),
+            'JobLockedCacheInBytes': None,
             'Summary': None,
             'TotalCapacityInBytes': None,
             'UnavailableCapacityInBytes': None,
@@ -1560,6 +1564,8 @@ def __init__(self):
         self.attributes = []
         self.elements = {
             'AutoCompactionEnabled': None,
+            'AutoQuiesceEnabled': None,
+            'DriveIdleTimeoutInMinutes': None,
             'DriveType': None,
             'ErrorMessage': None,
             'Id': None,
@@ -1837,6 +1843,8 @@ def __init__(self):
         self.attributes = []
         self.elements = {
             'AutoCompactionEnabled': None,
+            'AutoQuiesceEnabled': None,
+            'DriveIdleTimeoutInMinutes': None,
             'DriveType': None,
             'ErrorMessage': None,
             'Id': None,
@@ -6979,6 +6987,16 @@ def __init__(self, tape_id, task_priority=None):
         self.http_verb = HttpVerb.PUT
 
 
+class MarkTapeForCompactionSpectraS3Request(AbstractRequest):
+    
+    def __init__(self, tape_id):
+        super(MarkTapeForCompactionSpectraS3Request, self).__init__()
+        self.tape_id = tape_id
+        self.query_params['operation'] = 'mark_for_compaction'
+        self.path = '/_rest_/tape/' + tape_id
+        self.http_verb = HttpVerb.PUT
+
+
 class ModifyAllTapePartitionsSpectraS3Request(AbstractRequest):
 
     def __init__(self, quiesced):
@@ -6990,9 +7008,11 @@ def __init__(self, quiesced):
 
 class ModifyTapeDriveSpectraS3Request(AbstractRequest):
 
-    def __init__(self, tape_drive_id, minimum_task_priority=None, quiesced=None, reserved_task_type=None):
+    def __init__(self, tape_drive_id, max_failed_tapes=None, minimum_task_priority=None, quiesced=None, reserved_task_type=None):
         super(ModifyTapeDriveSpectraS3Request, self).__init__()
         self.tape_drive_id = tape_drive_id
+        if max_failed_tapes is not None:
+            self.query_params['max_failed_tapes'] = max_failed_tapes
         if minimum_task_priority is not None:
             self.query_params['minimum_task_priority'] = minimum_task_priority
         if quiesced is not None:
@@ -7005,11 +7025,15 @@ def __init__(self, tape_drive_id, minimum_task_priority=None, quiesced=None, res
 
 class ModifyTapePartitionSpectraS3Request(AbstractRequest):
 
-    def __init__(self, tape_partition, auto_compaction_enabled=None, minimum_read_reserved_drives=None, minimum_write_reserved_drives=None, quiesced=None, serial_number=None):
+    def __init__(self, tape_partition, auto_compaction_enabled=None, auto_quiesce_enabled=None, drive_idle_timeout_in_minutes=None, minimum_read_reserved_drives=None, minimum_write_reserved_drives=None, quiesced=None, serial_number=None):
         super(ModifyTapePartitionSpectraS3Request, self).__init__()
         self.tape_partition = tape_partition
         if auto_compaction_enabled is not None:
             self.query_params['auto_compaction_enabled'] = auto_compaction_enabled
+        if auto_quiesce_enabled is not None:
+            self.query_params['auto_quiesce_enabled'] = auto_quiesce_enabled
+        if drive_idle_timeout_in_minutes is not None:
+            self.query_params['drive_idle_timeout_in_minutes'] = drive_idle_timeout_in_minutes
         if minimum_read_reserved_drives is not None:
             self.query_params['minimum_read_reserved_drives'] = minimum_read_reserved_drives
         if minimum_write_reserved_drives is not None:
@@ -10900,6 +10924,14 @@ def process_response(self, response):
             self.result = parseModel(xmldom.fromstring(response.read()), Tape())
 
 
+class MarkTapeForCompactionSpectraS3Response(AbstractResponse):
+    
+    def process_response(self, response):
+        self.__check_status_codes__([200])
+        if self.response.status == 200:
+            self.result = parseModel(xmldom.fromstring(response.read()), Tape())
+
+
 class ModifyAllTapePartitionsSpectraS3Response(AbstractResponse):
 
     def process_response(self, response):
@@ -13034,6 +13066,11 @@ def inspect_tape_spectra_s3(self, request):
             raise TypeError('request for inspect_tape_spectra_s3 should be of type InspectTapeSpectraS3Request but was ' + request.__class__.__name__)
         return InspectTapeSpectraS3Response(self.net_client.get_response(request), request)
 
+    def mark_tape_for_compaction_spectra_s3(self, request):
+        if not isinstance(request, MarkTapeForCompactionSpectraS3Request):
+            raise TypeError('request for mark_tape_for_compaction_spectra_s3 should be of type MarkTapeForCompactionSpectraS3Request but was ' + request.__class__.__name__)
+        return MarkTapeForCompactionSpectraS3Response(self.net_client.get_response(request), request)
+    
     def modify_all_tape_partitions_spectra_s3(self, request):
         if not isinstance(request, ModifyAllTapePartitionsSpectraS3Request):
             raise TypeError('request for modify_all_tape_partitions_spectra_s3 should be of type ModifyAllTapePartitionsSpectraS3Request but was ' + request.__class__.__name__)

setup.py

@@ -14,7 +14,7 @@
 from distutils.core import setup
 
 setup(name='DS3 SDK',
-    version='5.2.3',
+    version='5.3.0',
     description='Python3 SDK and CLI for Spectra S3',
     author_email='[email protected]',
     packages=['ds3'])

tests/clientTests.py

@@ -1498,7 +1498,7 @@ def testHeadObject(self):
             20971520: 'iV2OqJaXJ/jmqgRSb1HmFA=='})
 
     def testStageObjects(self):
-        expected_request_payload = b"<Objects><Object Name=\"obj1\" /><Object Length=\"20\" Name=\"obj2\" Offset=\"2\" /><Object Name=\"obj3\" VersionId=\"version-id\" /></Objects>"
+        expected_request_payload = b"<Objects><Object Name=\"obj1\" /><Object Name=\"obj2\" Length=\"20\" Offset=\"2\" /><Object Name=\"obj3\" VersionId=\"version-id\" /></Objects>"
         response_payload = "<MasterObjectList Aggregating=\"false\" BucketName=\"default_bucket_name\" CachedSizeInBytes=\"0\" ChunkClientProcessingOrderGuarantee=\"IN_ORDER\" CompletedSizeInBytes=\"0\" EntirelyInCache=\"false\" JobId=\"1e66c043-e741-436a-8f5c-561320922fda\" Naked=\"false\" Name=\"GET by null\" OriginalSizeInBytes=\"0\" Priority=\"LOW\" RequestType=\"GET\" StartDate=\"2017-03-23T23:24:06.000Z\" Status=\"IN_PROGRESS\" UserId=\"fcc976f8-afda-4a3c-a4f8-565cea8b9c08\" UserName=\"default_user_name\"><Nodes><Node EndPoint=\"NOT_INITIALIZED_YET\" Id=\"acda9183-9b30-4de6-88cc-3f073051e978\"/></Nodes><Objects ChunkId=\"5aaa294b-45b0-458d-92a2-a6ca0ae6068c\" ChunkNumber=\"1\"><Object Id=\"0b56d39c-5711-4d9f-b161-c730b3acf1ae\" InCache=\"false\" Latest=\"true\" Length=\"10\" Name=\"o2\" Offset=\"0\" VersionId=\"2af042b1-4543-4e88-a4f9-554570fcf50d\"/></Objects><Objects ChunkId=\"80f5f6f2-a3e4-4b15-ac68-c0184eed38f2\" ChunkNumber=\"2\"><Object Id=\"5008ebef-95fa-4cf6-9be0-88d0ed20f450\" InCache=\"false\" Latest=\"true\" Length=\"10\" Name=\"o1\" Offset=\"0\" VersionId=\"2af042b1-4543-4e88-a4f9-554570fcf50d\"/></Objects></MasterObjectList>"
 
         bucket_name = bucketName