Merge pull request #21 from RachelTucker/merge_4_1

Merging 4.1 API

Author: rpmoore

ds3/ds3.py

@@ -291,8 +291,10 @@ def __init__(self):
         self.attributes = []
         self.elements = {
             'Activated': None,
+            'AllowNewJobRequests': None,
             'AutoActivateTimeoutInMins': None,
             'AutoInspect': None,
+            'CacheAvailableRetryAfterInSeconds': None,
             'DefaultImportConflictResolutionMode': None,
             'DefaultVerifyDataAfterImport': None,
             'DefaultVerifyDataPriorToImport': None,
@@ -1030,6 +1032,7 @@ def __init__(self):
             'MfgSerialNumber': None,
             'PartitionId': None,
             'Quiesced': None,
+            'ReservedTaskType': None,
             'SerialNumber': None,
             'State': None,
             'TapeId': None,
@@ -1073,6 +1076,8 @@ def __init__(self):
             'Id': None,
             'ImportExportConfiguration': None,
             'LibraryId': None,
+            'MinimumReadReservedDrives': None,
+            'MinimumWriteReservedDrives': None,
             'Name': None,
             'Quiesced': None,
             'SerialId': None,
@@ -1485,6 +1490,8 @@ def __init__(self):
             'Id': None,
             'ImportExportConfiguration': None,
             'LibraryId': None,
+            'MinimumReadReservedDrives': None,
+            'MinimumWriteReservedDrives': None,
             'Name': None,
             'Quiesced': None,
             'SerialId': None,
@@ -1758,6 +1765,8 @@ def __init__(self):
             'Id': None,
             'ImportExportConfiguration': None,
             'LibraryId': None,
+            'MinimumReadReservedDrives': None,
+            'MinimumWriteReservedDrives': None,
             'Name': None,
             'Quiesced': None,
             'SerialId': None,
@@ -3036,14 +3045,18 @@ def __init__(self, full_details=None):
 
 class ModifyDataPathBackendSpectraS3Request(AbstractRequest):
 
-    def __init__(self, activated=None, auto_activate_timeout_in_mins=None, auto_inspect=None, default_import_conflict_resolution_mode=None, default_verify_data_after_import=None, default_verify_data_prior_to_import=None, partially_verify_last_percent_of_tapes=None, unavailable_media_policy=None, unavailable_pool_max_job_retry_in_mins=None, unavailable_tape_partition_max_job_retry_in_mins=None):
+    def __init__(self, activated=None, allow_new_job_requests=None, auto_activate_timeout_in_mins=None, auto_inspect=None, cache_available_retry_after_in_seconds=None, default_import_conflict_resolution_mode=None, default_verify_data_after_import=None, default_verify_data_prior_to_import=None, partially_verify_last_percent_of_tapes=None, unavailable_media_policy=None, unavailable_pool_max_job_retry_in_mins=None, unavailable_tape_partition_max_job_retry_in_mins=None):
         super(ModifyDataPathBackendSpectraS3Request, self).__init__()
         if activated is not None:
             self.query_params['activated'] = activated
+        if allow_new_job_requests is not None:
+            self.query_params['allow_new_job_requests'] = allow_new_job_requests
         if auto_activate_timeout_in_mins is not None:
             self.query_params['auto_activate_timeout_in_mins'] = auto_activate_timeout_in_mins
         if auto_inspect is not None:
             self.query_params['auto_inspect'] = auto_inspect
+        if cache_available_retry_after_in_seconds is not None:
+            self.query_params['cache_available_retry_after_in_seconds'] = cache_available_retry_after_in_seconds
         if default_import_conflict_resolution_mode is not None:
             self.query_params['default_import_conflict_resolution_mode'] = default_import_conflict_resolution_mode
         if default_verify_data_after_import is not None:
@@ -6423,7 +6436,7 @@ def __init__(self, tape_drive_id):
 
 class GetTapeDrivesSpectraS3Request(AbstractRequest):
 
-    def __init__(self, last_page=None, page_length=None, page_offset=None, page_start_marker=None, partition_id=None, serial_number=None, state=None, type=None):
+    def __init__(self, last_page=None, page_length=None, page_offset=None, page_start_marker=None, partition_id=None, reserved_task_type=None, serial_number=None, state=None, type=None):
         super(GetTapeDrivesSpectraS3Request, self).__init__()
         if last_page is not None:
             self.query_params['last_page'] = last_page
@@ -6435,6 +6448,8 @@ def __init__(self, last_page=None, page_length=None, page_offset=None, page_star
             self.query_params['page_start_marker'] = page_start_marker
         if partition_id is not None:
             self.query_params['partition_id'] = partition_id
+        if reserved_task_type is not None:
+            self.query_params['reserved_task_type'] = reserved_task_type
         if serial_number is not None:
             self.query_params['serial_number'] = serial_number
         if state is not None:
@@ -6740,20 +6755,26 @@ def __init__(self, quiesced):
 
 class ModifyTapeDriveSpectraS3Request(AbstractRequest):
 
-    def __init__(self, tape_drive_id, quiesced=None):
+    def __init__(self, tape_drive_id, quiesced=None, reserved_task_type=None):
         super(ModifyTapeDriveSpectraS3Request, self).__init__()
         self.tape_drive_id = tape_drive_id
         if quiesced is not None:
             self.query_params['quiesced'] = quiesced
+        if reserved_task_type is not None:
+            self.query_params['reserved_task_type'] = reserved_task_type
         self.path = '/_rest_/tape_drive/' + tape_drive_id
         self.http_verb = HttpVerb.PUT
 
 
 class ModifyTapePartitionSpectraS3Request(AbstractRequest):
 
-    def __init__(self, tape_partition, quiesced=None):
+    def __init__(self, tape_partition, minimum_read_reserved_drives=None, minimum_write_reserved_drives=None, quiesced=None):
         super(ModifyTapePartitionSpectraS3Request, self).__init__()
         self.tape_partition = tape_partition
+        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:
+            self.query_params['minimum_write_reserved_drives'] = minimum_write_reserved_drives
         if quiesced is not None:
             self.query_params['quiesced'] = quiesced
         self.path = '/_rest_/tape_partition/' + tape_partition
@@ -7957,11 +7978,47 @@ def process_response(self, response):
 
 
 class HeadObjectResponse(AbstractResponse):
-    
+    def __init__(self, response, request):
+        self.blob_checksums = {}
+        self.blob_checksum_type = 'NONE'
+        super(HeadObjectResponse, self).__init__(response, request)
+
+    def __process_checksum_headers(self, headers):
+        """
+        Processes the blob checksum headers.
+        :param headers: list of tuples containing the Http response headers
+        """
+        self.__process_checksum_type(headers)
+        self.__process_blob_checksums(headers)
+
+    def __process_checksum_type(self, headers):
+        """
+        Parses the blob checksum type header. If there is no header, the default is NONE.
+        If there are multiple headers, then an error is raised
+        :param headers: list of tuples containing the Http response headers
+        """
+        checksum_type_header = [item for item in headers if item[0] == 'ds3-blob-checksum-type']
+        if len(checksum_type_header) == 0:
+            return
+        if len(checksum_type_header) > 1:
+            raise ValueError("Expected only one header with key 'ds3-blob-checksum-type' but got: " + str(checksum_type_header))
+        self.blob_checksum_type = checksum_type_header[0][1]
+
+    def __process_blob_checksums(self, headers):
+        """
+        Parses the blob checksum headers and adds them to a dictionary which maps
+        blob offset to blob checksum.
+        :param headers: list of tuples containing the Http response headers
+        """
+        # Retrieves all the headers that start with 'ds3-blob-checksum-offset-'
+        # and converts the offset at the end of the header key into an integer.
+        checksum_list = [(int(key[25:]), val) for key, val in headers if key.startswith('ds3-blob-checksum-offset-')]
+        self.blob_checksums = dict(checksum_list)
+
     def process_response(self, response):
         self.__check_status_codes__([200, 403, 404])
-        self.status_code = self.response.status
         if self.response.status == 200:
+            self.__process_checksum_headers(response.getheaders())
             self.result = HeadRequestStatus.EXISTS
         elif self.response.status == 403:
             self.result = HeadRequestStatus.NOTAUTHORIZED

tests/clientTests.py

@@ -466,12 +466,9 @@ def testDeleteObjectUnicode(self):
     def testDeleteObjectBadInput(self):
         """tests deleteObject: bad input to function"""
         self.createBucket(bucketName)
-        
-        noNameBucket = ""
+
         notHereBucket = "not-here"
-        badBuckets = {DeleteObjectRequest(noNameBucket, ""):statusCodeList(400),
-                      DeleteObjectRequest(noNameBucket, "badFile"):statusCodeList(404),
-                      DeleteObjectRequest(notHereBucket, ""): statusCodeList(404),
+        badBuckets = {DeleteObjectRequest(notHereBucket, ""): statusCodeList(404),
                       DeleteObjectRequest(notHereBucket, "badFile"): statusCodeList(404),
                       DeleteObjectRequest(bucketName, ""): statusCodeList(400),
                       DeleteObjectRequest(bucketName, "badFile"): statusCodeList(404)}
@@ -1459,3 +1456,26 @@ def testMarkSuspectBlobS3TargetsAsDegradedRequestPayload(self):
     def testMarkSuspectBlobTapesAsDegradedRequestPayload(self):
         request = MarkSuspectBlobTapesAsDegradedSpectraS3Request(id_list=self.__get_test_ids())
         self.assertEqual(request.body, self.__get_marshaled_ids())
+
+    def testHeadObject(self):
+        bucket_name = "test-bucket"
+        object_name = "test-object"
+        request = HeadObjectRequest(bucket_name=bucket_name, object_name=object_name)
+
+        response_headers = [
+            ('x-amz-meta-key', 'value'),
+            ('ds3-blob-checksum-type', 'MD5'),
+            ('ds3-blob-checksum-offset-0', '4nQGNX4nyz0pi8Hvap79PQ=='),
+            ('ds3-blob-checksum-offset-10485760', '965Aa0/n8DlO1IwXYFh4bg=='),
+            ('ds3-blob-checksum-offset-20971520', 'iV2OqJaXJ/jmqgRSb1HmFA==')
+        ]
+
+        mocked_response = MockedHttpResponse(200, headers=response_headers)
+
+        response = HeadObjectResponse(mocked_response, request)
+
+        self.assertEqual(response.blob_checksum_type, 'MD5')
+        self.assertEqual(response.blob_checksums, {
+            0: '4nQGNX4nyz0pi8Hvap79PQ==',
+            10485760: '965Aa0/n8DlO1IwXYFh4bg==',
+            20971520: 'iV2OqJaXJ/jmqgRSb1HmFA=='})