Merge pull request #8 from RachelTucker/4_0_autogen

Update to 4.0.0 API

Author: Denver

ds3/ds3.py

@@ -950,6 +950,7 @@ def __init__(self):
       'LastCleaned' : None,
       'MfgSerialNumber' : None,
       'PartitionId' : None,
+      'Quiesced' : None,
       'SerialNumber' : None,
       'State' : None,
       'TapeId' : None,
@@ -992,6 +993,7 @@ def __init__(self):
       'LibraryId' : None,
       'Name' : None,
       'Quiesced' : None,
+      'SerialId' : None,
       'SerialNumber' : None,
       'State' : None
     }
@@ -1373,6 +1375,7 @@ def __init__(self):
       'LibraryId' : None,
       'Name' : None,
       'Quiesced' : None,
+      'SerialId' : None,
       'SerialNumber' : None,
       'State' : None
     }
@@ -1627,6 +1630,7 @@ def __init__(self):
       'LibraryId' : None,
       'Name' : None,
       'Quiesced' : None,
+      'SerialId' : None,
       'SerialNumber' : None,
       'State' : None
     }
@@ -4095,6 +4099,18 @@ def __init__(self):
     self.path = '/_rest_/completed_job'
     self.http_verb = HttpVerb.DELETE
 
+class CloseAggregatingJobSpectraS3Request(AbstractRequest):
+  
+  def __init__(self, job_id):
+    super(CloseAggregatingJobSpectraS3Request, self).__init__()
+    self.job_id = job_id
+    self.query_params['close_aggregating_job'] = None
+
+
+
+    self.path = '/_rest_/job/' + job_id
+    self.http_verb = HttpVerb.PUT
+
 class GetBulkJobSpectraS3Request(AbstractRequest):
 
   def __init__(self, bucket_name, object_list, aggregating=None, chunk_client_processing_order_guarantee=None, implicit_job_id_resolution=None, name=None, priority=None):
@@ -5423,14 +5439,12 @@ def __init__(self, object_name, bucket_id):
 
 class GetObjectsDetailsSpectraS3Request(AbstractRequest):
 
-  def __init__(self, bucket_id=None, folder=None, last_page=None, latest=None, name=None, page_length=None, page_offset=None, page_start_marker=None, type=None, version=None):
+  def __init__(self, bucket_id=None, last_page=None, latest=None, name=None, page_length=None, page_offset=None, page_start_marker=None, type=None, version=None):
     super(GetObjectsDetailsSpectraS3Request, self).__init__()
 
 
     if bucket_id is not None:
       self.query_params['bucket_id'] = bucket_id
-    if folder is not None:
-      self.query_params['folder'] = folder
     if last_page is not None:
       self.query_params['last_page'] = last_page
     if latest is not None:
@@ -5453,15 +5467,13 @@ def __init__(self, bucket_id=None, folder=None, last_page=None, latest=None, nam
 
 class GetObjectsWithFullDetailsSpectraS3Request(AbstractRequest):
 
-  def __init__(self, bucket_id=None, folder=None, include_physical_placement=None, last_page=None, latest=None, name=None, page_length=None, page_offset=None, page_start_marker=None, type=None, version=None):
+  def __init__(self, bucket_id=None, include_physical_placement=None, last_page=None, latest=None, name=None, page_length=None, page_offset=None, page_start_marker=None, type=None, version=None):
     super(GetObjectsWithFullDetailsSpectraS3Request, self).__init__()
     self.query_params['full_details'] = None
 
 
     if bucket_id is not None:
       self.query_params['bucket_id'] = bucket_id
-    if folder is not None:
-      self.query_params['folder'] = folder
     if include_physical_placement is not None:
       self.query_params['include_physical_placement'] = include_physical_placement
     if last_page is not None:
@@ -6906,7 +6918,7 @@ def __init__(self, tape_id):
 
 class GetTapesSpectraS3Request(AbstractRequest):
 
-  def __init__(self, assigned_to_storage_domain=None, available_raw_capacity=None, bar_code=None, bucket_id=None, eject_label=None, eject_location=None, full_of_data=None, last_page=None, last_verified=None, page_length=None, page_offset=None, page_start_marker=None, partially_verified_end_of_tape=None, partition_id=None, previous_state=None, serial_number=None, state=None, storage_domain_id=None, type=None, verify_pending=None, write_protected=None):
+  def __init__(self, assigned_to_storage_domain=None, available_raw_capacity=None, bar_code=None, bucket_id=None, eject_label=None, eject_location=None, full_of_data=None, last_page=None, last_verified=None, page_length=None, page_offset=None, page_start_marker=None, partially_verified_end_of_tape=None, partition_id=None, previous_state=None, serial_number=None, sort_by=None, state=None, storage_domain_id=None, type=None, verify_pending=None, write_protected=None):
     super(GetTapesSpectraS3Request, self).__init__()
 
 
@@ -6942,6 +6954,8 @@ def __init__(self, assigned_to_storage_domain=None, available_raw_capacity=None,
       self.query_params['previous_state'] = previous_state
     if serial_number is not None:
       self.query_params['serial_number'] = serial_number
+    if sort_by is not None:
+      self.query_params['sort_by'] = sort_by
     if state is not None:
       self.query_params['state'] = state
     if storage_domain_id is not None:
@@ -7045,6 +7059,19 @@ def __init__(self, quiesced):
     self.path = '/_rest_/tape_partition'
     self.http_verb = HttpVerb.PUT
 
+class ModifyTapeDriveSpectraS3Request(AbstractRequest):
+  
+  def __init__(self, tape_drive_id, quiesced=None):
+    super(ModifyTapeDriveSpectraS3Request, self).__init__()
+    self.tape_drive_id = tape_drive_id
+
+
+    if quiesced is not None:
+      self.query_params['quiesced'] = quiesced
+
+    self.path = '/_rest_/tape_drive/' + tape_drive_id
+    self.http_verb = HttpVerb.PUT
+
 class ModifyTapePartitionSpectraS3Request(AbstractRequest):
 
   def __init__(self, tape_partition, quiesced=None):
@@ -9205,6 +9232,13 @@ def process_response(self, response):
     self.__check_status_codes__([204])
 
 
+class CloseAggregatingJobSpectraS3Response(AbstractResponse):
+  
+  def process_response(self, response):
+    self.__check_status_codes__([200])
+    if self.response.status == 200:
+      self.result = parseModel(xmldom.fromstring(response.read()), MasterObjectList())
+
 class GetBulkJobSpectraS3Response(AbstractResponse):
 
   def process_response(self, response):
@@ -10655,6 +10689,13 @@ def process_response(self, response):
     self.__check_status_codes__([204])
 
 
+class ModifyTapeDriveSpectraS3Response(AbstractResponse):
+  
+  def process_response(self, response):
+    self.__check_status_codes__([200])
+    if self.response.status == 200:
+      self.result = parseModel(xmldom.fromstring(response.read()), TapeDrive())
+
 class ModifyTapePartitionSpectraS3Response(AbstractResponse):
 
   def process_response(self, response):
@@ -11639,6 +11680,10 @@ def clear_all_completed_jobs_spectra_s3(self, request):
     return ClearAllCompletedJobsSpectraS3Response(self.net_client.get_response(request), request)
 
 
+  def close_aggregating_job_spectra_s3(self, request):
+    return CloseAggregatingJobSpectraS3Response(self.net_client.get_response(request), request)
+
+  
   def get_bulk_job_spectra_s3(self, request):
     return GetBulkJobSpectraS3Response(self.net_client.get_response(request), request)
 
@@ -12371,6 +12416,10 @@ def modify_all_tape_partitions_spectra_s3(self, request):
     return ModifyAllTapePartitionsSpectraS3Response(self.net_client.get_response(request), request)
 
 
+  def modify_tape_drive_spectra_s3(self, request):
+    return ModifyTapeDriveSpectraS3Response(self.net_client.get_response(request), request)
+
+  
   def modify_tape_partition_spectra_s3(self, request):
     return ModifyTapePartitionSpectraS3Response(self.net_client.get_response(request), request)
 

tests/clientTests.py

@@ -573,8 +573,8 @@ def testGetObjects(self):
                 testObjects.append(obj)
 
         self.validateSearchObjects(testObjects, resources)
-        self.assertEqual(response.paging_truncated, None)
-        self.assertEqual(response.paging_total_result_count, None)
+        self.assertEqual(response.paging_truncated, 0)
+        self.assertEqual(response.paging_total_result_count, 4)
 
     def testGetObjectsWithPaging(self):
         populateTestData(self.client, bucketName, self.getDataPolicyId())