Merge pull request #56 from RachelTucker/merge_4_1

shabtaisharon · web-flow · commit 24b2582ecc88 · 2018-03-19T11:41:36.000-07:00
Merging 4.1 API into master branch
diff --git a/ds3/ds3Client_test.go b/ds3/ds3Client_test.go
@@ -1911,3 +1911,31 @@ func TestVerifyPhysicalPlacementForObjectsWithFullDetailsSpectraS3(t *testing.T)
     }
     ds3Testing.AssertBool(t, "WriteProtected", false, tape.WriteProtected)
 }
+
+func TestHeadObject(t *testing.T) {
+    bucketName := "bucket1"
+    objectName := "obj1"
+
+    responseHeaders := &http.Header{}
+    responseHeaders.Add("x-amz-meta-key", "value")
+    responseHeaders.Add("ds3-blob-checksum-type", "MD5")
+    responseHeaders.Add("ds3-blob-checksum-offset-0", "4nQGNX4nyz0pi8Hvap79PQ==")
+    responseHeaders.Add("ds3-blob-checksum-offset-10485760", "965Aa0/n8DlO1IwXYFh4bg==")
+    responseHeaders.Add("ds3-blob-checksum-offset-20971520", "iV2OqJaXJ/jmqgRSb1HmFA==")
+
+    response, err := mockedClient(t).
+        Expecting(HTTP_VERB_HEAD, "/" + bucketName + "/" + objectName, &url.Values{}, &http.Header{}, nil).
+        Returning(200, "", responseHeaders).
+        HeadObject(models.NewHeadObjectRequest(bucketName, objectName))
+
+    ds3Testing.AssertNilError(t, err)
+
+    if response.BlobChecksumType != models.CHECKSUM_TYPE_MD5 {
+        t.Fatalf("Expected checksum type to be 'MD5' but was '%s'.", response.BlobChecksumType.String())
+    }
+
+    ds3Testing.AssertInt(t, "# of blob checksums", 3, len(response.BlobChecksums))
+    ds3Testing.AssertString(t, "checksum at offset '0'", "4nQGNX4nyz0pi8Hvap79PQ==", response.BlobChecksums[0])
+    ds3Testing.AssertString(t, "checksum at offset '10485760'", "965Aa0/n8DlO1IwXYFh4bg==", response.BlobChecksums[10485760])
+    ds3Testing.AssertString(t, "checksum at offset '20971520'", "iV2OqJaXJ/jmqgRSb1HmFA==", response.BlobChecksums[20971520])
+}
diff --git a/ds3/ds3Deletes.go b/ds3/ds3Deletes.go
@@ -305,6 +305,7 @@ func (client *Client) ClearSuspectBlobDs3TargetsSpectraS3(request *models.ClearS
         WithHttpVerb(HTTP_VERB_DELETE).
         WithPath("/_rest_/suspect_blob_ds3_target").
         WithOptionalVoidQueryParam("force", request.Force).
+        WithReadCloser(buildIdListPayload(request.Ids)).
         Build(client.connectionInfo)
 
     if err != nil {
diff --git a/ds3/ds3Gets.go b/ds3/ds3Gets.go
@@ -3205,6 +3205,7 @@ func (client *Client) GetTapeDrivesSpectraS3(request *models.GetTapeDrivesSpectr
         WithOptionalQueryParam("page_offset", networking.IntPtrToStrPtr(request.PageOffset)).
         WithOptionalQueryParam("page_start_marker", request.PageStartMarker).
         WithOptionalQueryParam("partition_id", request.PartitionId).
+        WithOptionalQueryParam("reserved_task_type", networking.InterfaceToStrPtr(request.ReservedTaskType)).
         WithOptionalQueryParam("serial_number", request.SerialNumber).
         WithOptionalQueryParam("state", networking.InterfaceToStrPtr(request.State)).
         WithOptionalQueryParam("type", networking.InterfaceToStrPtr(request.TapeDriveType)).
diff --git a/ds3/ds3Puts.go b/ds3/ds3Puts.go
@@ -178,8 +178,10 @@ func (client *Client) ModifyDataPathBackendSpectraS3(request *models.ModifyDataP
         WithHttpVerb(HTTP_VERB_PUT).
         WithPath("/_rest_/data_path_backend").
         WithOptionalQueryParam("activated", networking.BoolPtrToStrPtr(request.Activated)).
+        WithOptionalQueryParam("allow_new_job_requests", networking.BoolPtrToStrPtr(request.AllowNewJobRequests)).
         WithOptionalQueryParam("auto_activate_timeout_in_mins", networking.IntPtrToStrPtr(request.AutoActivateTimeoutInMins)).
         WithOptionalQueryParam("auto_inspect", networking.InterfaceToStrPtr(request.AutoInspect)).
+        WithOptionalQueryParam("cache_available_retry_after_in_seconds", networking.IntPtrToStrPtr(request.CacheAvailableRetryAfterInSeconds)).
         WithOptionalQueryParam("default_import_conflict_resolution_mode", networking.InterfaceToStrPtr(request.DefaultImportConflictResolutionMode)).
         WithOptionalQueryParam("default_verify_data_after_import", networking.InterfaceToStrPtr(request.DefaultVerifyDataAfterImport)).
         WithOptionalQueryParam("default_verify_data_prior_to_import", networking.BoolPtrToStrPtr(request.DefaultVerifyDataPriorToImport)).
@@ -1986,6 +1988,7 @@ func (client *Client) ModifyTapeDriveSpectraS3(request *models.ModifyTapeDriveSp
         WithHttpVerb(HTTP_VERB_PUT).
         WithPath("/_rest_/tape_drive/" + request.TapeDriveId).
         WithOptionalQueryParam("quiesced", networking.InterfaceToStrPtr(request.Quiesced)).
+        WithOptionalQueryParam("reserved_task_type", networking.InterfaceToStrPtr(request.ReservedTaskType)).
         Build(client.connectionInfo)
 
     if err != nil {
@@ -2009,6 +2012,8 @@ func (client *Client) ModifyTapePartitionSpectraS3(request *models.ModifyTapePar
     httpRequest, err := networking.NewHttpRequestBuilder().
         WithHttpVerb(HTTP_VERB_PUT).
         WithPath("/_rest_/tape_partition/" + request.TapePartition).
+        WithOptionalQueryParam("minimum_read_reserved_drives", networking.IntPtrToStrPtr(request.MinimumReadReservedDrives)).
+        WithOptionalQueryParam("minimum_write_reserved_drives", networking.IntPtrToStrPtr(request.MinimumWriteReservedDrives)).
         WithOptionalQueryParam("quiesced", networking.InterfaceToStrPtr(request.Quiesced)).
         Build(client.connectionInfo)
 
diff --git a/ds3/models/clearSuspectBlobDs3TargetsSpectraS3Request.go b/ds3/models/clearSuspectBlobDs3TargetsSpectraS3Request.go
@@ -15,10 +15,12 @@ package models
 
 type ClearSuspectBlobDs3TargetsSpectraS3Request struct {
     Force bool
+    Ids []string
 }
 
-func NewClearSuspectBlobDs3TargetsSpectraS3Request() *ClearSuspectBlobDs3TargetsSpectraS3Request {
+func NewClearSuspectBlobDs3TargetsSpectraS3Request(ids []string) *ClearSuspectBlobDs3TargetsSpectraS3Request {
     return &ClearSuspectBlobDs3TargetsSpectraS3Request{
+        Ids: ids,
     }
 }
 
diff --git a/ds3/models/dataPathBackend.go b/ds3/models/dataPathBackend.go
@@ -15,8 +15,10 @@ package models
 
 type DataPathBackend struct {
     Activated bool
+    AllowNewJobRequests bool
     AutoActivateTimeoutInMins *int
     AutoInspect AutoInspectMode
+    CacheAvailableRetryAfterInSeconds int
     DefaultImportConflictResolutionMode ImportConflictResolutionMode
     DefaultVerifyDataAfterImport *Priority
     DefaultVerifyDataPriorToImport bool
diff --git a/ds3/models/dataPathBackendParser.go b/ds3/models/dataPathBackendParser.go
@@ -22,10 +22,14 @@ func (dataPathBackend *DataPathBackend) parse(xmlNode *XmlNode, aggErr *Aggregat
         switch child.XMLName.Local {
         case "Activated":
             dataPathBackend.Activated = parseBool(child.Content, aggErr)
+        case "AllowNewJobRequests":
+            dataPathBackend.AllowNewJobRequests = parseBool(child.Content, aggErr)
         case "AutoActivateTimeoutInMins":
             dataPathBackend.AutoActivateTimeoutInMins = parseNullableInt(child.Content, aggErr)
         case "AutoInspect":
             parseEnum(child.Content, &dataPathBackend.AutoInspect, aggErr)
+        case "CacheAvailableRetryAfterInSeconds":
+            dataPathBackend.CacheAvailableRetryAfterInSeconds = parseInt(child.Content, aggErr)
         case "DefaultImportConflictResolutionMode":
             parseEnum(child.Content, &dataPathBackend.DefaultImportConflictResolutionMode, aggErr)
         case "DefaultVerifyDataAfterImport":
diff --git a/ds3/models/detailedTapePartition.go b/ds3/models/detailedTapePartition.go
@@ -20,6 +20,8 @@ type DetailedTapePartition struct {
     Id string
     ImportExportConfiguration ImportExportConfiguration
     LibraryId string
+    MinimumReadReservedDrives int
+    MinimumWriteReservedDrives int
     Name *string
     Quiesced Quiesced
     SerialId *string
diff --git a/ds3/models/detailedTapePartitionParser.go b/ds3/models/detailedTapePartitionParser.go
@@ -34,6 +34,10 @@ func (detailedTapePartition *DetailedTapePartition) parse(xmlNode *XmlNode, aggE
             parseEnum(child.Content, &detailedTapePartition.ImportExportConfiguration, aggErr)
         case "LibraryId":
             detailedTapePartition.LibraryId = parseString(child.Content)
+        case "MinimumReadReservedDrives":
+            detailedTapePartition.MinimumReadReservedDrives = parseInt(child.Content, aggErr)
+        case "MinimumWriteReservedDrives":
+            detailedTapePartition.MinimumWriteReservedDrives = parseInt(child.Content, aggErr)
         case "Name":
             detailedTapePartition.Name = parseNullableString(child.Content)
         case "Quiesced":
diff --git a/ds3/models/getTapeDrivesSpectraS3Request.go b/ds3/models/getTapeDrivesSpectraS3Request.go
@@ -19,6 +19,7 @@ type GetTapeDrivesSpectraS3Request struct {
     PageOffset *int
     PageStartMarker *string
     PartitionId *string
+    ReservedTaskType ReservedTaskType
     SerialNumber *string
     State TapeDriveState
     TapeDriveType TapeDriveType
@@ -54,6 +55,11 @@ func (getTapeDrivesSpectraS3Request *GetTapeDrivesSpectraS3Request) WithPartitio
     return getTapeDrivesSpectraS3Request
 }
 
+func (getTapeDrivesSpectraS3Request *GetTapeDrivesSpectraS3Request) WithReservedTaskType(reservedTaskType ReservedTaskType) *GetTapeDrivesSpectraS3Request {
+    getTapeDrivesSpectraS3Request.ReservedTaskType = reservedTaskType
+    return getTapeDrivesSpectraS3Request
+}
+
 func (getTapeDrivesSpectraS3Request *GetTapeDrivesSpectraS3Request) WithSerialNumber(serialNumber string) *GetTapeDrivesSpectraS3Request {
     getTapeDrivesSpectraS3Request.SerialNumber = &serialNumber
     return getTapeDrivesSpectraS3Request
diff --git a/ds3/models/headObjectResponse.go b/ds3/models/headObjectResponse.go
@@ -18,7 +18,8 @@ import (
 )
 
 type HeadObjectResponse struct {
-    
+    BlobChecksumType ChecksumType
+    BlobChecksums map[int64]string
     Headers *http.Header
 }
 
@@ -29,7 +30,15 @@ func NewHeadObjectResponse(webResponse WebResponse) (*HeadObjectResponse, error)
 
     switch code := webResponse.StatusCode(); code {
     case 200:
-        return &HeadObjectResponse{Headers: webResponse.Header()}, nil
+        checksumType, err := getBlobChecksumType(webResponse.Header())
+        if err != nil {
+            return nil, err
+        }
+        checksumMap, err := getBlobChecksumMap(webResponse.Header())
+        if err != nil {
+            return nil, err
+        }
+        return &HeadObjectResponse{BlobChecksumType: checksumType, BlobChecksums: checksumMap, Headers: webResponse.Header()}, nil
     default:
         return nil, buildBadStatusCodeError(webResponse, expectedStatusCodes)
     }
diff --git a/ds3/models/modifyDataPathBackendSpectraS3Request.go b/ds3/models/modifyDataPathBackendSpectraS3Request.go
@@ -15,8 +15,10 @@ package models
 
 type ModifyDataPathBackendSpectraS3Request struct {
     Activated *bool
+    AllowNewJobRequests *bool
     AutoActivateTimeoutInMins *int
     AutoInspect AutoInspectMode
+    CacheAvailableRetryAfterInSeconds *int
     DefaultImportConflictResolutionMode ImportConflictResolutionMode
     DefaultVerifyDataAfterImport Priority
     DefaultVerifyDataPriorToImport *bool
@@ -36,6 +38,11 @@ func (modifyDataPathBackendSpectraS3Request *ModifyDataPathBackendSpectraS3Reque
     return modifyDataPathBackendSpectraS3Request
 }
 
+func (modifyDataPathBackendSpectraS3Request *ModifyDataPathBackendSpectraS3Request) WithAllowNewJobRequests(allowNewJobRequests bool) *ModifyDataPathBackendSpectraS3Request {
+    modifyDataPathBackendSpectraS3Request.AllowNewJobRequests = &allowNewJobRequests
+    return modifyDataPathBackendSpectraS3Request
+}
+
 func (modifyDataPathBackendSpectraS3Request *ModifyDataPathBackendSpectraS3Request) WithAutoActivateTimeoutInMins(autoActivateTimeoutInMins int) *ModifyDataPathBackendSpectraS3Request {
     modifyDataPathBackendSpectraS3Request.AutoActivateTimeoutInMins = &autoActivateTimeoutInMins
     return modifyDataPathBackendSpectraS3Request
@@ -46,6 +53,11 @@ func (modifyDataPathBackendSpectraS3Request *ModifyDataPathBackendSpectraS3Reque
     return modifyDataPathBackendSpectraS3Request
 }
 
+func (modifyDataPathBackendSpectraS3Request *ModifyDataPathBackendSpectraS3Request) WithCacheAvailableRetryAfterInSeconds(cacheAvailableRetryAfterInSeconds int) *ModifyDataPathBackendSpectraS3Request {
+    modifyDataPathBackendSpectraS3Request.CacheAvailableRetryAfterInSeconds = &cacheAvailableRetryAfterInSeconds
+    return modifyDataPathBackendSpectraS3Request
+}
+
 func (modifyDataPathBackendSpectraS3Request *ModifyDataPathBackendSpectraS3Request) WithDefaultImportConflictResolutionMode(defaultImportConflictResolutionMode ImportConflictResolutionMode) *ModifyDataPathBackendSpectraS3Request {
     modifyDataPathBackendSpectraS3Request.DefaultImportConflictResolutionMode = defaultImportConflictResolutionMode
     return modifyDataPathBackendSpectraS3Request
diff --git a/ds3/models/modifyTapeDriveSpectraS3Request.go b/ds3/models/modifyTapeDriveSpectraS3Request.go
@@ -15,6 +15,7 @@ package models
 
 type ModifyTapeDriveSpectraS3Request struct {
     Quiesced Quiesced
+    ReservedTaskType ReservedTaskType
     TapeDriveId string
 }
 
@@ -29,3 +30,8 @@ func (modifyTapeDriveSpectraS3Request *ModifyTapeDriveSpectraS3Request) WithQuie
     return modifyTapeDriveSpectraS3Request
 }
 
+func (modifyTapeDriveSpectraS3Request *ModifyTapeDriveSpectraS3Request) WithReservedTaskType(reservedTaskType ReservedTaskType) *ModifyTapeDriveSpectraS3Request {
+    modifyTapeDriveSpectraS3Request.ReservedTaskType = reservedTaskType
+    return modifyTapeDriveSpectraS3Request
+}
+
diff --git a/ds3/models/modifyTapePartitionSpectraS3Request.go b/ds3/models/modifyTapePartitionSpectraS3Request.go
@@ -14,6 +14,8 @@
 package models
 
 type ModifyTapePartitionSpectraS3Request struct {
+    MinimumReadReservedDrives *int
+    MinimumWriteReservedDrives *int
     Quiesced Quiesced
     TapePartition string
 }
@@ -24,6 +26,16 @@ func NewModifyTapePartitionSpectraS3Request(tapePartition string) *ModifyTapePar
     }
 }
 
+func (modifyTapePartitionSpectraS3Request *ModifyTapePartitionSpectraS3Request) WithMinimumReadReservedDrives(minimumReadReservedDrives int) *ModifyTapePartitionSpectraS3Request {
+    modifyTapePartitionSpectraS3Request.MinimumReadReservedDrives = &minimumReadReservedDrives
+    return modifyTapePartitionSpectraS3Request
+}
+
+func (modifyTapePartitionSpectraS3Request *ModifyTapePartitionSpectraS3Request) WithMinimumWriteReservedDrives(minimumWriteReservedDrives int) *ModifyTapePartitionSpectraS3Request {
+    modifyTapePartitionSpectraS3Request.MinimumWriteReservedDrives = &minimumWriteReservedDrives
+    return modifyTapePartitionSpectraS3Request
+}
+
 func (modifyTapePartitionSpectraS3Request *ModifyTapePartitionSpectraS3Request) WithQuiesced(quiesced Quiesced) *ModifyTapePartitionSpectraS3Request {
     modifyTapePartitionSpectraS3Request.Quiesced = quiesced
     return modifyTapePartitionSpectraS3Request
diff --git a/ds3/models/namedDetailedTapePartition.go b/ds3/models/namedDetailedTapePartition.go
@@ -20,6 +20,8 @@ type NamedDetailedTapePartition struct {
     Id string
     ImportExportConfiguration ImportExportConfiguration
     LibraryId string
+    MinimumReadReservedDrives int
+    MinimumWriteReservedDrives int
     Name *string
     Quiesced Quiesced
     SerialId *string
diff --git a/ds3/models/namedDetailedTapePartitionParser.go b/ds3/models/namedDetailedTapePartitionParser.go
@@ -34,6 +34,10 @@ func (namedDetailedTapePartition *NamedDetailedTapePartition) parse(xmlNode *Xml
             parseEnum(child.Content, &namedDetailedTapePartition.ImportExportConfiguration, aggErr)
         case "LibraryId":
             namedDetailedTapePartition.LibraryId = parseString(child.Content)
+        case "MinimumReadReservedDrives":
+            namedDetailedTapePartition.MinimumReadReservedDrives = parseInt(child.Content, aggErr)
+        case "MinimumWriteReservedDrives":
+            namedDetailedTapePartition.MinimumWriteReservedDrives = parseInt(child.Content, aggErr)
         case "Name":
             namedDetailedTapePartition.Name = parseNullableString(child.Content)
         case "Quiesced":
diff --git a/ds3/models/reservedTaskType.go b/ds3/models/reservedTaskType.go
@@ -0,0 +1,62 @@
+// Copyright 2014-2017 Spectra Logic Corporation. All Rights Reserved.
+// Licensed under the Apache License, Version 2.0 (the "License"). You may not use
+// this file except in compliance with the License. A copy of the License is located at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// or in the "license" file accompanying this file.
+// This file is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+// CONDITIONS OF ANY KIND, either express or implied. See the License for the
+// specific language governing permissions and limitations under the License.
+
+// This code is auto-generated, do not modify
+
+package models
+
+import (
+    "errors"
+    "fmt"
+    "bytes"
+    "log"
+)
+
+type ReservedTaskType Enum
+
+const (
+    RESERVED_TASK_TYPE_ANY ReservedTaskType = 1 + iota
+    RESERVED_TASK_TYPE_READ ReservedTaskType = 1 + iota
+    RESERVED_TASK_TYPE_WRITE ReservedTaskType = 1 + iota
+)
+
+func (reservedTaskType *ReservedTaskType) UnmarshalText(text []byte) error {
+    var str string = string(bytes.ToUpper(text))
+    switch str {
+        case "": *reservedTaskType = UNDEFINED
+        case "ANY": *reservedTaskType = RESERVED_TASK_TYPE_ANY
+        case "READ": *reservedTaskType = RESERVED_TASK_TYPE_READ
+        case "WRITE": *reservedTaskType = RESERVED_TASK_TYPE_WRITE
+        default:
+            *reservedTaskType = UNDEFINED
+            return errors.New(fmt.Sprintf("Cannot marshal '%s' into ReservedTaskType", str))
+    }
+    return nil
+}
+
+func (reservedTaskType ReservedTaskType) String() string {
+    switch reservedTaskType {
+        case RESERVED_TASK_TYPE_ANY: return "ANY"
+        case RESERVED_TASK_TYPE_READ: return "READ"
+        case RESERVED_TASK_TYPE_WRITE: return "WRITE"
+        default:
+            log.Printf("Error: invalid ReservedTaskType represented by '%d'", reservedTaskType)
+            return ""
+    }
+}
+
+func (reservedTaskType ReservedTaskType) StringPtr() *string {
+    if reservedTaskType == UNDEFINED {
+        return nil
+    }
+    result := reservedTaskType.String()
+    return &result
+}
diff --git a/ds3/models/responseParsingUtil.go b/ds3/models/responseParsingUtil.go
@@ -14,10 +14,53 @@ package models
 import (
     "strconv"
     "log"
+    "strings"
+    "net/http"
 )
 
 // Contains utils used by model parsers to parse response payloads.
 
+const BLOB_CHECKSUM_TYPE_HEADER string = "ds3-blob-checksum-type"
+const BLOB_CHECKSUM_HEADER string = "ds3-blob-checksum-offset-"
+
+// Parses blob checksum header if exists. This is used by HeadObjectResponse.
+func getBlobChecksumType(headers *http.Header) (ChecksumType, error) {
+    checksumStr := headers.Get(BLOB_CHECKSUM_TYPE_HEADER)
+    if len(checksumStr) == 0 {
+        return NONE, nil
+    }
+    var checksumEnum ChecksumType
+    err := checksumEnum.UnmarshalText([]byte(checksumStr))
+    if err != nil {
+        return UNDEFINED, err
+    }
+    return checksumEnum, nil
+}
+
+// Parses response headers and creates a map of blob offset to blob checksum
+// for all occurrences of headers with prefix defined in BLOB_CHECKSUM_HEADER.
+// This is used by HeadObjectResponse.
+func getBlobChecksumMap(headers *http.Header) (map[int64]string, error) {
+    blobChecksumMap := make(map[int64]string)
+
+    if headers == nil || len(*headers) == 0 {
+        return blobChecksumMap, nil
+    }
+
+    for key := range *headers {
+        if strings.HasPrefix(strings.ToLower(key), strings.ToLower(BLOB_CHECKSUM_HEADER)) {
+            offsetStr := strings.TrimPrefix(strings.ToLower(key), strings.ToLower(BLOB_CHECKSUM_HEADER))
+            offset, err := strconv.ParseInt(offsetStr, 10, 64)
+            if err != nil {
+                return blobChecksumMap, err
+            }
+            blobChecksumMap[offset] = headers.Get(key)
+        }
+    }
+
+    return blobChecksumMap, nil
+}
+
 // Interface defined for spectra defined enums.
 // Used for generic parsing of enums.
 type Ds3Enum interface {
diff --git a/ds3/models/tapeDrive.go b/ds3/models/tapeDrive.go
diff --git a/ds3/models/tapeDriveParser.go b/ds3/models/tapeDriveParser.go
diff --git a/ds3/models/tapePartition.go b/ds3/models/tapePartition.go
diff --git a/ds3/models/tapePartitionParser.go b/ds3/models/tapePartitionParser.go

Original file line number	Diff line number	Diff line change
`@@ -15,10 +15,12 @@ package models`
`15`	`15`
`16`	`16`	`type ClearSuspectBlobDs3TargetsSpectraS3Request struct {`
`17`	`17`	`Force bool`
	`18`	`+ Ids []string`
`18`	`19`	`}`
`19`	`20`
`20`		`-func NewClearSuspectBlobDs3TargetsSpectraS3Request() *ClearSuspectBlobDs3TargetsSpectraS3Request {`
	`21`	`+func NewClearSuspectBlobDs3TargetsSpectraS3Request(ids []string) *ClearSuspectBlobDs3TargetsSpectraS3Request {`
`21`	`22`	`return &ClearSuspectBlobDs3TargetsSpectraS3Request{`
	`23`	`+ Ids: ids,`
`22`	`24`	`}`
`23`	`25`	`}`
`24`	`26`