Skip to content

Commit abcbfd4

Browse files
bluewwblueww
committed
Fix cross Blob type copy case, and add access tier track2 support
1 parent 6c740b6 commit abcbfd4

File tree

1 file changed

+22
-19
lines changed

1 file changed

+22
-19
lines changed

‎src/Storage/RegressionTests/dataplane.ps1

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -172,7 +172,8 @@ Describe "dataplane test" {
172172
$ctxsas = New-AzStorageContext -StorageAccountName $ctx.StorageAccountName -SasToken $sas
173173
$a = Set-AzStorageBlobContent -File $localSrcFile -Container $containerName -Blob test.txt -Force -Properties @{"ContentType" = "image/jpeg"; "ContentMD5" = "i727sP7HigloQDsqadNLHw=="} -Metadata @{"tag1" = "value1"; "tag2" = "value22" } -Context $ctxsas
174174
$a = Set-AzStorageBlobContent -File testfile_2048K -Container $containerName -Blob test.txt -Force -Properties @{"ContentType" = "image/jpeg"; "ContentMD5" = "i727sP7HigloQDsqadNLHw=="} -Metadata @{"tag1" = "value1"; "tag2" = "value22" } -Context $ctxsas
175-
$a = Set-AzStorageBlobContent -File .\testfile_2048K -Container $containerName -Blob test.txt -Force -Context $ctxsas -StandardBlobTier cool
175+
# upload blob with access tier
176+
$a = Set-AzStorageBlobContent -File .\testfile_2048K -Container $containerName -Blob test.txt -Force -Context $ctx -StandardBlobTier cool
176177
$a.ICloudBlob.Properties.StandardBlobTier | should -Be "Cool"
177178
$b = Get-AzStorageContainer -Name $containerName -Context $ctx |Get-AzStorageBlob
178179
$b.Count | Should -BeGreaterOrEqual 1
@@ -1153,14 +1154,16 @@ Describe "dataplane test" {
11531154
$containerSAS = New-AzStorageContainerSASToken -Name $containerName -Permission rwdl -ExpiryTime (Get-Date).AddDays(100) -Context $ctx
11541155
$sasctx = New-AzStorageContext -StorageAccountName $ctx.StorageAccountName -SasToken $containerSAS
11551156

1157+
$blobCopySrcFile10M = $localSrcFile
1158+
11561159
# Create the containers and upload the src blobs
1157-
if ($false) {
1158-
New-AzStorageContainer -Name $containerName -Context $ctx
1159-
New-AzStorageContainer -Name $containerName -Context $ctx2
1160+
if ($true) {
1161+
# New-AzStorageContainer -Name $containerName -Context $ctx
1162+
# New-AzStorageContainer -Name $containerName -Context $ctx2
11601163

11611164
foreach ($srcType in $blobTypes) {
1162-
$smallSrcBlob = Set-AzStorageBlobContent -File $blobCopySrcFile10M -Container $containerName -Blob "$($srctype)SmallSource" -Context $ctx -BlobType $srctype -Properties @{"ContentType" = "image/jpeg"} -Metadata @{"tag1" = "value1"; "tag2" = "value2"}
1163-
$largeSrcBlob = Set-AzStorageBlobContent -File $localBigSrcFile -Container $containerName -Blob "$($srctype)LargeSource" -Context $ctx -BlobType $srctype -Properties @{"ContentType" = "image/jpeg"} -Metadata @{"tag1" = "value1"; "tag2" = "value2"}
1165+
$smallSrcBlob = Set-AzStorageBlobContent -File $blobCopySrcFile10M -Container $containerName -Blob "$($srctype)SmallSource" -Context $ctx -BlobType $srctype -Properties @{"ContentType" = "image/jpeg"} -Metadata @{"tag1" = "value1"; "tag2" = "value2"} -Force
1166+
$largeSrcBlob = Set-AzStorageBlobContent -File $localBigSrcFile -Container $containerName -Blob "$($srctype)LargeSource" -Context $ctx -BlobType $srctype -Properties @{"ContentType" = "image/jpeg"} -Metadata @{"tag1" = "value1"; "tag2" = "value2"} -Force
11641167
}
11651168
}
11661169

@@ -1177,7 +1180,7 @@ Describe "dataplane test" {
11771180

11781181
# compare content
11791182
$smallDestBlob | Get-AzStorageBlobContent -Destination $localDestFile -Force
1180-
CompareFileMD5 $localBigSrcFile $localDestFile
1183+
CompareFileMD5 $blobCopySrcFile10M $localDestFile
11811184
del $localDestFile
11821185
$smallDestBlob | Remove-AzStorageBlob
11831186

@@ -1186,11 +1189,11 @@ Describe "dataplane test" {
11861189
$smallDestBlob2.Name | Should -Be "$($srctype)TO$($desttype)SmallDest2"
11871190
$smallDestBlob2.BlobProperties.ContentType | Should -Be "image/jpeg"
11881191
$smallDestBlob2.BlobProperties.ContentLength | Should -Be (Get-Item $blobCopySrcFile10M).Length
1189-
$smallDestBlob2.BlobProperties.Metadata | Should -Be 2
1192+
$smallDestBlob2.BlobProperties.Metadata.Count | Should -Be 2
11901193
$smallDestBlob2.BlobBaseClient.AccountName | Should -Be $storageAccountName
11911194

11921195
$smallDestBlob2 | Get-AzStorageBlobContent -Destination $localDestFile -Force
1193-
CompareFileMD5 $localBigSrcFile $localDestFile
1196+
CompareFileMD5 $blobCopySrcFile10M $localDestFile
11941197
del $localDestFile
11951198
$smallDestBlob2 | Remove-AzStorageBlob
11961199

@@ -1199,19 +1202,19 @@ Describe "dataplane test" {
11991202
$smallDestBlob3.Name | Should -Be "$($srctype)TO$($desttype)SmallDest3"
12001203
$smallDestBlob3.BlobProperties.ContentType | Should -Be "image/jpeg"
12011204
$smallDestBlob3.BlobProperties.ContentLength | Should -Be (Get-Item $blobCopySrcFile10M).Length
1202-
$smallDestBlob3.BlobProperties.Metadata | Should -Be 2
1205+
$smallDestBlob3.BlobProperties.Metadata.Count | Should -Be 2
12031206
$smallDestBlob3.BlobBaseClient.AccountName | Should -Be $storageAccountName2
12041207

12051208
$smallDestBlob3 | Get-AzStorageBlobContent -Destination $localDestFile -Force
1206-
CompareFileMD5 $localBigSrcFile $localDestFile
1209+
CompareFileMD5 $blobCopySrcFile10M $localDestFile
12071210
del $localDestFile
12081211
$smallDestBlob3 | Remove-AzStorageBlob
12091212

1210-
$largeDestBlob = Copy-AzStorageBlob -SrcContainer $containerName -SrcBlob "$($srcType)BigSource" -Context $ctx -DestContainer $containerName -DestBlob "$($srcType)TO$($destType)BigDest" -DestContext $ctxoauth1 -DestBlobType $destType -Force
1213+
$largeDestBlob = Copy-AzStorageBlob -SrcContainer $containerName -SrcBlob "$($srcType)LargeSource" -Context $ctx -DestContainer $containerName -DestBlob "$($srcType)TO$($destType)BigDest" -DestContext $ctxoauth1 -DestBlobType $destType -Force
12111214
$largeDestBlob.Name | Should -Be "$($srcType)TO$($destType)BigDest"
12121215
$largeDestBlob.BlobProperties.ContentType | Should -Be "image/jpeg"
1213-
$largeDestBlob.BlobProperties.ContentLength | Should -Be (Get-Item $blobCopySrcFile10M).Length
1214-
$largeDestBlob.BlobProperties.Metadata | Should -Be 2
1216+
$largeDestBlob.BlobProperties.ContentLength | Should -Be (Get-Item $localBigSrcFile).Length
1217+
$largeDestBlob.BlobProperties.Metadata.Count | Should -Be 2
12151218
$largeDestBlob.BlobBaseClient.AccountName | Should -Be $storageAccountName
12161219

12171220
$largeDestBlob | Get-AzStorageBlobContent -Destination $localDestFile -Force
@@ -1222,14 +1225,14 @@ Describe "dataplane test" {
12221225
}
12231226

12241227
# Block to block with access tier and rehydrate priority set
1225-
$blockToBlock1 = Copy-AzStorageBlob -SrcContainer $containerName -SrcBlob "BlockSmallSource" -Context $ctx -DestContainer $containerName -DestBlob "BlockToBlockWithAccessTier" -DestContext $ctx2 -DestBlobType $destType -StandardBlobTier "Cool" -RehydratePriority High -Force
1228+
$blockToBlock1 = Copy-AzStorageBlob -SrcContainer $containerName -SrcBlob "BlockSmallSource" -Context $ctx -DestContainer $containerName -DestBlob "BlockToBlockWithAccessTier" -DestContext $ctx2 -DestBlobType Block -StandardBlobTier "Cool" -RehydratePriority High -Force
12261229
$blockToBlock1.AccessTier | Should -Be "Cool"
12271230

12281231
# blob version
1229-
$smallSrcBlob = Set-AzStorageBlobContent -File $blobCopySrcFile10M -Container $containerName -Blob "$($srctype)SmallSource" -Context $ctx -BlobType $srctype -Properties @{"ContentType" = "image/jpeg"} -Metadata @{"tag1" = "value1"; "tag2" = "value2"}
1230-
$blobs = Get-AzStorageBlob -Container $containerName -Context $ctx -IncludeVersion
1231-
$blobVersion = $blob[1]
1232-
$destBlob = $blobVersion | Copy-AzStorageBlob -DestBlob "blobVersionToBlock" -DestBlobType Block -DestContext $ctx2 -Force
1232+
$smallSrcBlob = Set-AzStorageBlobContent -File $blobCopySrcFile10M -Container $containerName -Blob "$($srctype)SmallSource" -Context $ctx -BlobType $srctype -Properties @{"ContentType" = "image/jpeg"} -Metadata @{"tag1" = "value1"; "tag2" = "value2"} -Force
1233+
$blobs = Get-AzStorageBlob -Container $containerName -Context $ctx -IncludeVersion -Prefix "$($srctype)SmallSource"
1234+
$blobVersion = $blobs[1]
1235+
$destBlob = $blobVersion | Copy-AzStorageBlob -DestContainer $containerName -DestBlob "blobVersionToBlock" -DestBlobType Block -DestContext $ctx2 -Force
12331236
$destBlob.Name | Should -Be "blobVersionToBlock"
12341237

12351238
$Error.Count | should -be 0

0 commit comments

Comments
 (0)