Update to scenario dependencies

sdk/storage/Azure.Storage.Common/src/stress/Shared/Metrics.cs

@@ -47,19 +47,16 @@ public class Metrics
     ///
     public const string ItemTransferCompleted = "ItemTransferCompleted";
 
-
     /// <summary>
     ///   This is the metric name used to collect each transfer status that occurred.
     /// </summary>
     public const string TransferStatusChanged = "TransferStatusChanged";
 
-
     /// <summary>
     ///   This is the metric name used to keep track of the failed transfer items.
     /// </summary>
     public const string TransferFailedItem = "TransferFailedItem";
 
-
     /// <summary>
     ///   This is the metric name used to keep track of the skipped transfer items
     /// </summary>

sdk/storage/Azure.Storage.DataMovement.Blobs/stress/generatedValues.yaml

@@ -1,92 +1,92 @@
 scenarios:
 - image: Dockerfile
-  imageBuildDir: ../../../..
   Scenario: uploadsingleblockblob
   testScenario: uploadsingleblockblob
+  imageBuildDir: ../../../..
   imageTag: stressstorage4okf44ko4zuos.azurecr.io/amnguye/net-stgdm-blobs/dockerfile:amnguye
 - image: Dockerfile
+  Scenario: uploaddirectoryblockblob
+  testScenario: uploaddirectoryblockblob
   imageBuildDir: ../../../..
-  Scenario: uploaddirectoryblockBlob
-  testScenario: uploaddirectoryblockBlob
   imageTag: stressstorage4okf44ko4zuos.azurecr.io/amnguye/net-stgdm-blobs/dockerfile:amnguye
 - image: Dockerfile
-  imageBuildDir: ../../../..
   Scenario: downloadsingleblockblob
   testScenario: downloadsingleblockblob
+  imageBuildDir: ../../../..
   imageTag: stressstorage4okf44ko4zuos.azurecr.io/amnguye/net-stgdm-blobs/dockerfile:amnguye
 - image: Dockerfile
-  imageBuildDir: ../../../..
   Scenario: downloaddirectoryblockblob
   testScenario: downloaddirectoryblockblob
+  imageBuildDir: ../../../..
   imageTag: stressstorage4okf44ko4zuos.azurecr.io/amnguye/net-stgdm-blobs/dockerfile:amnguye
 - image: Dockerfile
-  imageBuildDir: ../../../..
   Scenario: copysingleblockblob
   testScenario: copysingleblockblob
+  imageBuildDir: ../../../..
   imageTag: stressstorage4okf44ko4zuos.azurecr.io/amnguye/net-stgdm-blobs/dockerfile:amnguye
 - image: Dockerfile
-  imageBuildDir: ../../../..
   Scenario: copydirectoryblockblob
   testScenario: copydirectoryblockblob
+  imageBuildDir: ../../../..
   imageTag: stressstorage4okf44ko4zuos.azurecr.io/amnguye/net-stgdm-blobs/dockerfile:amnguye
 - image: Dockerfile
-  imageBuildDir: ../../../..
   Scenario: uploadsingleappendblob
   testScenario: uploadsingleappendblob
+  imageBuildDir: ../../../..
   imageTag: stressstorage4okf44ko4zuos.azurecr.io/amnguye/net-stgdm-blobs/dockerfile:amnguye
 - image: Dockerfile
-  imageBuildDir: ../../../..
   Scenario: uploaddirectoryappendblob
   testScenario: uploaddirectoryappendblob
+  imageBuildDir: ../../../..
   imageTag: stressstorage4okf44ko4zuos.azurecr.io/amnguye/net-stgdm-blobs/dockerfile:amnguye
 - image: Dockerfile
-  imageBuildDir: ../../../..
   Scenario: downloadsingleappendblob
   testScenario: downloadsingleappendblob
+  imageBuildDir: ../../../..
   imageTag: stressstorage4okf44ko4zuos.azurecr.io/amnguye/net-stgdm-blobs/dockerfile:amnguye
 - image: Dockerfile
-  imageBuildDir: ../../../..
   Scenario: downloaddirectoryappendblob
   testScenario: downloaddirectoryappendblob
+  imageBuildDir: ../../../..
   imageTag: stressstorage4okf44ko4zuos.azurecr.io/amnguye/net-stgdm-blobs/dockerfile:amnguye
 - image: Dockerfile
-  imageBuildDir: ../../../..
   Scenario: copysingleappendblob
   testScenario: copysingleappendblob
+  imageBuildDir: ../../../..
   imageTag: stressstorage4okf44ko4zuos.azurecr.io/amnguye/net-stgdm-blobs/dockerfile:amnguye
 - image: Dockerfile
-  imageBuildDir: ../../../..
   Scenario: copydirectoryappendblob
   testScenario: copydirectoryappendblob
+  imageBuildDir: ../../../..
   imageTag: stressstorage4okf44ko4zuos.azurecr.io/amnguye/net-stgdm-blobs/dockerfile:amnguye
 - image: Dockerfile
-  imageBuildDir: ../../../..
   Scenario: uploadsinglepageblob
   testScenario: uploadsinglepageblob
+  imageBuildDir: ../../../..
   imageTag: stressstorage4okf44ko4zuos.azurecr.io/amnguye/net-stgdm-blobs/dockerfile:amnguye
 - image: Dockerfile
-  imageBuildDir: ../../../..
   Scenario: uploaddirectorypageblob
   testScenario: uploaddirectorypageblob
+  imageBuildDir: ../../../..
   imageTag: stressstorage4okf44ko4zuos.azurecr.io/amnguye/net-stgdm-blobs/dockerfile:amnguye
 - image: Dockerfile
-  imageBuildDir: ../../../..
   Scenario: downloadsinglepageblob
   testScenario: downloadsinglepageblob
+  imageBuildDir: ../../../..
   imageTag: stressstorage4okf44ko4zuos.azurecr.io/amnguye/net-stgdm-blobs/dockerfile:amnguye
 - image: Dockerfile
-  imageBuildDir: ../../../..
   Scenario: downloaddirectorypageblob
   testScenario: downloaddirectorypageblob
+  imageBuildDir: ../../../..
   imageTag: stressstorage4okf44ko4zuos.azurecr.io/amnguye/net-stgdm-blobs/dockerfile:amnguye
 - image: Dockerfile
-  imageBuildDir: ../../../..
   Scenario: copysinglepageblob
   testScenario: copysinglepageblob
+  imageBuildDir: ../../../..
   imageTag: stressstorage4okf44ko4zuos.azurecr.io/amnguye/net-stgdm-blobs/dockerfile:amnguye
 - image: Dockerfile
-  imageBuildDir: ../../../..
   Scenario: copydirectorypageblob
   testScenario: copydirectorypageblob
+  imageBuildDir: ../../../..
   imageTag: stressstorage4okf44ko4zuos.azurecr.io/amnguye/net-stgdm-blobs/dockerfile:amnguye
 

sdk/storage/Azure.Storage.DataMovement.Blobs/stress/src/Azure.Storage.DataMovement.Blobs.Stress.csproj

@@ -21,7 +21,9 @@
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\..\..\Azure.Storage.DataMovement\src\Azure.Storage.DataMovement.csproj" />
-    <ProjectReference Include="$(MSBuildThisFileDirectory)..\..\..\Azure.Storage.Blobs\src\Azure.Storage.Blobs.csproj" />
+    <ProjectReference Include="$(MSBuildThisFileDirectory)..\..\..\Azure.Storage.Blobs\src\Azure.Storage.Blobs.csproj" >
+      <Aliases>BaseBlobs</Aliases>
+    </ProjectReference>
     <ProjectReference Include="$(MSBuildThisFileDirectory)..\..\src\Azure.Storage.DataMovement.Blobs.csproj" />
   </ItemGroup>
   <ItemGroup>
@@ -48,19 +50,18 @@
     <Compile Include="$(AzureStorageDataMovementTestSharedSources)DisposingLocalDirectory.cs" LinkBase="Shared\DataMovement" />
     <Compile Include="$(AzureStorageDataMovementTestSharedSources)TransferValidator.cs" LinkBase="Shared\DataMovement" />
     <Compile Include="$(AzureStorageDataMovementTestSharedSources)TransferValidator.Local.cs" LinkBase="Shared\DataMovement" />
-    <Compile Include="$(AzureStorageDataMovementTestSharedSources)../TransferValidator.Blobs.cs" LinkBase="Shared\DataMovement" />
+    <Compile Include="$(MSBuildThisFileDirectory)..\..\..\Azure.Storage.DataMovement.Blobs\tests\DisposingBlobContainer.cs" LinkBase="Shared\DataMovement" />
+    <Compile Include="$(MSBuildThisFileDirectory)..\..\..\Azure.Storage.DataMovement.Blobs\tests\TransferValidator.Blobs.cs" LinkBase="Shared\DataMovement" />
     <Compile Include="$(AzureStorageDataMovementTestSharedSources)TestEventsRaised.cs" LinkBase="Shared\DataMovement" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="$(AzureStorageStressTestSharedSources)*.cs" LinkBase="Shared\Stress" />
     <Compile Include="$(AzureStorageDataMovementTestSharedSources)..\..\stress\*.cs" LinkBase="Shared\Stress" />
   </ItemGroup>
-  <ItemGroup>
-    <Compile Include="$(MSBuildThisFileDirectory)..\..\..\Azure.Storage.Blobs\tests\DisposingContainer.cs" LinkBase="Shared\Storage" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="Resources\**">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
 </Project>
+

sdk/storage/Azure.Storage.DataMovement.Blobs/stress/src/Configurations/BlockBlobConfiguration.cs

@@ -1,7 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+extern alias BaseBlobs;
 
-using Azure.Storage.Blobs;
+using BaseBlobs::Azure.Storage.Blobs;
 
 namespace Azure.Storage.DataMovement.Blobs.Stress
 {

sdk/storage/Azure.Storage.DataMovement.Blobs/stress/src/Infrastructure/BlobTestSetupHelper.cs

@@ -1,15 +1,17 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+extern alias BaseBlobs;
+
 using System;
 using System.IO;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.Storage.Shared;
-using Azure.Storage.Blobs;
-using Azure.Storage.Blobs.Specialized;
+using BaseBlobs::Azure.Storage.Blobs;
+using BaseBlobs::Azure.Storage.Blobs.Specialized;
 using NUnit.Framework;
-using Azure.Storage.Blobs.Models;
+using BaseBlobs::Azure.Storage.Blobs.Models;
 
 namespace Azure.Storage.DataMovement.Blobs.Stress
 {

sdk/storage/Azure.Storage.DataMovement.Blobs/stress/src/Scenarios/BlobScenarioBase.cs

@@ -1,10 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+extern alias BaseBlobs;
+
 using System;
 using Azure.Core;
 using Azure.Storage.Stress;
-using Azure.Storage.Blobs;
+using BaseBlobs::Azure.Storage.Blobs;
 using System.Threading.Tasks;
 using System.IO;
 using System.Threading;

sdk/storage/Azure.Storage.DataMovement.Blobs/stress/src/Scenarios/CopyAppendBlobDirectoryScenario.cs

@@ -1,11 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+extern alias BaseBlobs;
 
 using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.Core;
-using Azure.Storage.Blobs.Models;
+using BaseBlobs::Azure.Storage.Blobs.Models;
 using Azure.Storage.Stress;
 
 namespace Azure.Storage.DataMovement.Blobs.Stress

sdk/storage/Azure.Storage.DataMovement.Blobs/stress/src/Scenarios/CopyAppendBlobSingleScenario.cs

@@ -1,11 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+extern alias BaseBlobs;
+
 using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.Core;
-using Azure.Storage.Blobs.Models;
+using BaseBlobs::Azure.Storage.Blobs.Models;
 using Azure.Storage.Stress;
 
 namespace Azure.Storage.DataMovement.Blobs.Stress

sdk/storage/Azure.Storage.DataMovement.Blobs/stress/src/Scenarios/CopyBlobDirectoryScenarioBase.cs

@@ -1,14 +1,16 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+extern alias BaseBlobs;
+
 using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.Core;
-using Azure.Storage.Blobs;
-using Azure.Storage.Blobs.Models;
-using Azure.Storage.Blobs.Tests;
+using BaseBlobs::Azure.Storage.Blobs;
+using BaseBlobs::Azure.Storage.Blobs.Models;
 using Azure.Storage.DataMovement.Tests;
+using Azure.Storage.DataMovement.Blobs.Tests;
 using Azure.Storage.Stress;
 
 namespace Azure.Storage.DataMovement.Blobs.Stress
@@ -40,9 +42,9 @@ public async Task RunTestInternalAsync(BlobType blobType, CancellationToken canc
             while (!cancellationToken.IsCancellationRequested)
             {
                 string sourceContainerName = TestSetupHelper.Randomize("container");
-                DisposingContainer sourceDisposingContainer = new(_sourceServiceClient.GetBlobContainerClient(sourceContainerName));
+                DisposingBlobContainer sourceDisposingContainer = new(_sourceServiceClient.GetBlobContainerClient(sourceContainerName));
                 string destinationContainerName = TestSetupHelper.Randomize("container");
-                DisposingContainer destinationDisposingContainer = new(_blobServiceClient.GetBlobContainerClient(destinationContainerName));
+                DisposingBlobContainer destinationDisposingContainer = new(_blobServiceClient.GetBlobContainerClient(destinationContainerName));
                 try
                 {
                     string pathPrefix = TestSetupHelper.Randomize("dir");
@@ -78,7 +80,7 @@ await BlobTestSetupHelper.CreateBlobsInDirectoryAsync(
                     }.TransferAndVerifyAsync(
                         sourceResource,
                         destinationResource,
-                        TransferValidator.Get(sourceContainerClient, pathPrefix),
+                        TransferValidator.GetBlobLister(sourceContainerClient, pathPrefix),
                         TransferValidator.GetBlobLister(destinationContainerClient, pathPrefix),
                         _blobCount,
                         _dataTransferOptions,

sdk/storage/Azure.Storage.DataMovement.Blobs/stress/src/Scenarios/CopyBlobSingleScenarioBase.cs

@@ -1,14 +1,16 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+extern alias BaseBlobs;
+
 using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.Core;
-using Azure.Storage.Blobs;
-using Azure.Storage.Blobs.Models;
-using Azure.Storage.Blobs.Specialized;
-using Azure.Storage.Blobs.Tests;
+using BaseBlobs::Azure.Storage.Blobs;
+using BaseBlobs::Azure.Storage.Blobs.Models;
+using BaseBlobs::Azure.Storage.Blobs.Specialized;
+using Azure.Storage.DataMovement.Blobs.Tests;
 using Azure.Storage.DataMovement.Tests;
 using Azure.Storage.Stress;
 
@@ -38,9 +40,9 @@ public async Task RunTestInternalAsync(BlobType blobType, CancellationToken canc
             while (!cancellationToken.IsCancellationRequested)
             {
                 string sourceContainerName = TestSetupHelper.Randomize("container");
-                DisposingContainer sourceDisposingContainer = new(_sourceServiceClient.GetBlobContainerClient(sourceContainerName));
+                DisposingBlobContainer sourceDisposingContainer = new(_sourceServiceClient.GetBlobContainerClient(sourceContainerName));
                 string destinationContainerName = TestSetupHelper.Randomize("container");
-                DisposingContainer destinationDisposingContainer = new(_blobServiceClient.GetBlobContainerClient(destinationContainerName));
+                DisposingBlobContainer destinationDisposingContainer = new(_blobServiceClient.GetBlobContainerClient(destinationContainerName));
                 try
                 {
                     BlobContainerClient sourceContainerClient = sourceDisposingContainer.Container;

sdk/storage/Azure.Storage.DataMovement.Blobs/stress/src/Scenarios/CopyBlockBlobDirectoryScenario.cs

@@ -1,11 +1,12 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
+extern alias BaseBlobs;
 
 using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.Core;
-using Azure.Storage.Blobs.Models;
+using BaseBlobs::Azure.Storage.Blobs.Models;
 using Azure.Storage.Stress;
 
 namespace Azure.Storage.DataMovement.Blobs.Stress

sdk/storage/Azure.Storage.DataMovement.Blobs/stress/src/Scenarios/CopyBlockBlobSingleScenario.cs

@@ -1,11 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+extern alias BaseBlobs;
+
 using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.Core;
-using Azure.Storage.Blobs.Models;
+using BaseBlobs::Azure.Storage.Blobs.Models;
 using Azure.Storage.Stress;
 
 namespace Azure.Storage.DataMovement.Blobs.Stress

sdk/storage/Azure.Storage.DataMovement.Blobs/stress/src/Scenarios/CopyPageBlobDirectoryScenario.cs

@@ -1,11 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+extern alias BaseBlobs;
+
 using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.Core;
-using Azure.Storage.Blobs.Models;
+using BaseBlobs::Azure.Storage.Blobs.Models;
 using Azure.Storage.Stress;
 
 namespace Azure.Storage.DataMovement.Blobs.Stress

sdk/storage/Azure.Storage.DataMovement.Blobs/stress/src/Scenarios/CopyPageBlobSingleScenario.cs

@@ -1,11 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+extern alias BaseBlobs;
+
 using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.Core;
-using Azure.Storage.Blobs.Models;
+using BaseBlobs::Azure.Storage.Blobs.Models;
 using Azure.Storage.Stress;
 
 namespace Azure.Storage.DataMovement.Blobs.Stress

sdk/storage/Azure.Storage.DataMovement.Blobs/stress/src/Scenarios/DownloadAppendBlobDirectoryScenario.cs

@@ -1,11 +1,13 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License.
 
+extern alias BaseBlobs;
+
 using System;
 using System.Threading;
 using System.Threading.Tasks;
 using Azure.Core;
-using Azure.Storage.Blobs.Models;
+using BaseBlobs::Azure.Storage.Blobs.Models;
 using Azure.Storage.Stress;
 
 namespace Azure.Storage.DataMovement.Blobs.Stress