[Don't use Squash and merge] merge preview changes to new storage branch.

src/EventGrid/EventGrid.Test/EventGrid.Test.csproj

@@ -15,7 +15,7 @@
     <PackageReference Include="Microsoft.Azure.Management.EventHub" Version="2.5.0" />
     <PackageReference Include="Microsoft.Azure.Management.Relay" Version="2.0.2" />
     <PackageReference Include="Microsoft.Azure.Management.ServiceBus" Version="2.1.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="15.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Storage" Version="16.0.0" />
   </ItemGroup>
 
 </Project>

src/Storage/Storage.Management.Test/ScenarioTests/StorageAccountTests.cs

@@ -204,5 +204,12 @@ public void TestNewAzureStorageAccountQueueTableEncrytionKeyType()
         {
             TestRunner.RunTestScript("Test-NewAzureStorageAccountQueueTableEncrytionKeyType");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestNewSetAStorageAccount_RoutingPreference()
+        {
+            TestRunner.RunTestScript("Test-NewSetAzStorageAccount_RoutingPreference");
+        }        
     }
 }

src/Storage/Storage.Management.Test/ScenarioTests/StorageAccountTests.ps1

@@ -1331,4 +1331,80 @@ function Test-NewAzureStorageAccountQueueTableEncrytionKeyType
         # Cleanup
         Clean-ResourceGroup $rgname
     }
+}
+
+	<#
+.SYNOPSIS
+Test Test-NewSetAzStorageAccount_RoutingPreference
+.DESCRIPTION
+SmokeTest
+#>
+function Test-NewSetAzStorageAccount_RoutingPreference
+{
+    # Setup
+    $rgname = Get-StorageManagementTestResourceName;
+
+    try
+    {
+        # Test
+        $stoname = 'sto' + $rgname;
+        $stotype = 'Standard_LRS';
+        $loc = Get-ProviderLocation_Canary ResourceManagement;
+        $kind = 'StorageV2'
+
+        New-AzResourceGroup -Name $rgname -Location $loc;
+        Write-Output ("Resource Group created")
+
+        New-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -Location $loc -SkuName $stotype -PublishMicrosoftEndpoint $true -PublishInternetEndpoint $true -RoutingChoice MicrosoftRouting;
+
+        Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname; }
+        Assert-AreEqual $stoname $sto.StorageAccountName;
+        Assert-AreEqual $stotype $sto.Sku.Name;
+        Assert-AreEqual $loc.ToLower().Replace(" ", "") $sto.Location;
+        Assert-AreEqual $kind $sto.Kind;
+		Assert-AreEqual $true $sto.RoutingPreference.PublishMicrosoftEndpoints
+		Assert-AreEqual $true $sto.RoutingPreference.PublishInternetEndpoints
+		Assert-AreEqual "MicrosoftRouting" $sto.RoutingPreference.RoutingChoice
+		Assert-AreNotEqual $null $sto.PrimaryEndpoints.MicrosoftEndpoints
+		Assert-AreNotEqual $null $sto.PrimaryEndpoints.InternetEndpoints
+
+        Set-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -RoutingChoice InternetRouting;
+        Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname; }
+		Assert-AreEqual $true $sto.RoutingPreference.PublishMicrosoftEndpoints
+		Assert-AreEqual $true $sto.RoutingPreference.PublishInternetEndpoints
+		Assert-AreEqual "InternetRouting" $sto.RoutingPreference.RoutingChoice
+		Assert-AreNotEqual $null $sto.PrimaryEndpoints.MicrosoftEndpoints
+		Assert-AreNotEqual $null $sto.PrimaryEndpoints.InternetEndpoints
+
+        Set-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -PublishMicrosoftEndpoint $false ;
+        Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname; }
+		Assert-AreEqual $false $sto.RoutingPreference.PublishMicrosoftEndpoints
+		Assert-AreEqual $true $sto.RoutingPreference.PublishInternetEndpoints
+		Assert-AreEqual "InternetRouting" $sto.RoutingPreference.RoutingChoice
+		Assert-AreEqual $null $sto.PrimaryEndpoints.MicrosoftEndpoints
+		Assert-AreNotEqual $null $sto.PrimaryEndpoints.InternetEndpoints
+
+        Set-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -PublishInternetEndpoint $false;
+        Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname; }
+		Assert-AreEqual $false $sto.RoutingPreference.PublishMicrosoftEndpoints
+		Assert-AreEqual $false $sto.RoutingPreference.PublishInternetEndpoints
+		Assert-AreEqual "InternetRouting" $sto.RoutingPreference.RoutingChoice
+		Assert-AreEqual $null $sto.PrimaryEndpoints.MicrosoftEndpoints
+		Assert-AreEqual $null $sto.PrimaryEndpoints.InternetEndpoints
+
+        Set-AzStorageAccount -ResourceGroupName $rgname -Name $stoname -PublishMicrosoftEndpoint $true -PublishInternetEndpoint $false -RoutingChoice MicrosoftRouting;
+        Retry-IfException { $global:sto = Get-AzStorageAccount -ResourceGroupName $rgname -Name $stoname; }
+		Assert-AreEqual $true $sto.RoutingPreference.PublishMicrosoftEndpoints
+		Assert-AreEqual $false $sto.RoutingPreference.PublishInternetEndpoints
+		Assert-AreEqual "MicrosoftRouting" $sto.RoutingPreference.RoutingChoice
+		Assert-AreNotEqual $null $sto.PrimaryEndpoints.MicrosoftEndpoints
+		Assert-AreEqual $null $sto.PrimaryEndpoints.InternetEndpoints
+
+        Remove-AzStorageAccount -Force -ResourceGroupName $rgname -Name $stoname;
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
 }

src/Storage/Storage.Management.Test/ScenarioTests/StorageBlobTests.cs

@@ -72,5 +72,12 @@ public void TestStorageBlobRestore()
         {
             TestController.NewInstance.RunPsTest(_logger, "Test-StorageBlobRestore");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestStorageBlobORS()
+        {
+            TestController.NewInstance.RunPsTest(_logger, "Test-StorageBlobORS");
+        }
     }
 }

src/Storage/Storage.Management.Test/ScenarioTests/StorageBlobTests.ps1

@@ -533,3 +533,107 @@ function Test-StorageBlobRestore
 }
 
 
+<#
+.SYNOPSIS
+Test StorageAccount Object Replication
+.DESCRIPTION
+SmokeTest
+#>
+function Test-StorageBlobORS
+{
+    # Setup
+    $rgname = Get-StorageManagementTestResourceName;
+
+    try
+    {
+        # Test
+        $stoname1 = 'sto' + $rgname + 'src';
+        $stoname2 = 'sto' + $rgname + 'dest';
+        $stotype = 'Standard_LRS';
+        $loc = Get-ProviderLocation ResourceManagement;
+        $kind = 'StorageV2'
+
+        Write-Verbose "RGName: $rgname | Loc: $loc"
+        New-AzResourceGroup -Name $rgname -Location $loc;
+
+        $loc = Get-ProviderLocation_Canary ResourceManagement;
+        New-AzStorageAccount -ResourceGroupName $rgname -Name $stoname1 -Location $loc -Type $stotype -Kind $kind 
+        New-AzStorageAccount -ResourceGroupName $rgname -Name $stoname2 -Location $loc -Type $stotype -Kind $kind 
+
+		# Enable Blob Enable Changefeed and versioning
+		Update-AzStorageBlobServiceProperty -ResourceGroupName $rgname -StorageAccountName $stoname1 -EnableChangeFeed $true -IsVersioningEnabled $true
+		Update-AzStorageBlobServiceProperty -ResourceGroupName $rgname -StorageAccountName $stoname2 -EnableChangeFeed $true -IsVersioningEnabled $true
+		$property1 = Get-AzStorageBlobServiceProperty -ResourceGroupName $rgname -StorageAccountName $stoname1
+		Assert-AreEqual $true $property1.ChangeFeed.Enabled
+		Assert-AreEqual $true $property1.IsVersioningEnabled 
+		$property2 = Get-AzStorageBlobServiceProperty -ResourceGroupName $rgname -StorageAccountName $stoname2
+		Assert-AreEqual $true $property2.ChangeFeed.Enabled
+		Assert-AreEqual $true $property2.IsVersioningEnabled 
+
+		# create containers		
+		Get-AzStorageAccount -ResourceGroupName $rgname -StorageAccountName $stoname1  | New-AzRmStorageContainer -name src
+		Get-AzStorageAccount -ResourceGroupName $rgname -StorageAccountName $stoname2 | New-AzRmStorageContainer -name dest
+		Get-AzStorageAccount -ResourceGroupName $rgname -StorageAccountName $stoname1  | New-AzRmStorageContainer -name src1
+		Get-AzStorageAccount -ResourceGroupName $rgname -StorageAccountName $stoname2 | New-AzRmStorageContainer -name dest1
+
+		# create rules
+		$minCreationTime = "2019-01-01T16:00:00Z"
+		$rule1 = New-AzStorageObjectReplicationPolicyRule -SourceContainer src1 -DestinationContainer dest1 
+		$rule2 = New-AzStorageObjectReplicationPolicyRule -SourceContainer src -DestinationContainer dest -MinCreationTime $minCreationTime -PrefixMatch a,abc,dd #-Tag t1,t2,t3 
+
+		# set policy to dest account
+		$destPolicy = Set-AzStorageObjectReplicationPolicy -ResourceGroupName $rgname -StorageAccountName $stoname2 -PolicyId default -SourceAccount $stoname1  -Rule $rule1,$rule2
+		$policyID = $destPolicy.PolicyId
+		Assert-AreEqual $stoname1 $destPolicy.SourceAccount
+		Assert-AreEqual $stoname2 $destPolicy.DestinationAccount
+		Assert-AreEqual 2 $destPolicy.Rules.Count
+		Assert-AreEqual src1 $destPolicy.Rules[0].SourceContainer
+		Assert-AreEqual dest1 $destPolicy.Rules[0].DestinationContainer
+		Assert-AreEqual $null $destPolicy.Rules[0].Filters
+		Assert-AreEqual src $destPolicy.Rules[1].SourceContainer
+		Assert-AreEqual dest $destPolicy.Rules[1].DestinationContainer
+		Assert-AreEqual 3 $destPolicy.Rules[1].Filters.PrefixMatch.Count
+		Assert-AreEqual $minCreationTime ($destPolicy.Rules[1].Filters.MinCreationTime.ToUniversalTime().ToString("s")+"Z")
+		$destPolicy = Get-AzStorageObjectReplicationPolicy -ResourceGroupName $rgname -StorageAccountName $stoname2 -PolicyId $destPolicy.PolicyId
+		Assert-AreEqual $policyID $destPolicy.PolicyId
+		Assert-AreEqual $stoname1 $destPolicy.SourceAccount
+		Assert-AreEqual $stoname2 $destPolicy.DestinationAccount
+		Assert-AreEqual 2 $destPolicy.Rules.Count
+		Assert-AreEqual src1 $destPolicy.Rules[0].SourceContainer
+		Assert-AreEqual dest1 $destPolicy.Rules[0].DestinationContainer
+		Assert-AreEqual $null $destPolicy.Rules[0].Filters
+		Assert-AreEqual src $destPolicy.Rules[1].SourceContainer
+		Assert-AreEqual dest $destPolicy.Rules[1].DestinationContainer
+		Assert-AreEqual 3 $destPolicy.Rules[1].Filters.PrefixMatch.Count
+		Assert-AreEqual $minCreationTime ($destPolicy.Rules[1].Filters.MinCreationTime.ToUniversalTime().ToString("s")+"Z")
+
+		#Set policy to source account
+		Set-AzStorageObjectReplicationPolicy -ResourceGroupName $rgname -StorageAccountName $stoname1 -InputObject $destPolicy
+		$srcPolicy = Get-AzStorageObjectReplicationPolicy -ResourceGroupName $rgname -StorageAccountName $stoname1
+		Assert-AreEqual $policyID $srcPolicy.PolicyId
+		Assert-AreEqual $stoname1 $srcPolicy.SourceAccount
+		Assert-AreEqual $stoname2 $srcPolicy.DestinationAccount
+		Assert-AreEqual 2 $srcPolicy.Rules.Count
+		Assert-AreEqual src1 $srcPolicy.Rules[0].SourceContainer
+		Assert-AreEqual dest1 $srcPolicy.Rules[0].DestinationContainer
+		Assert-AreEqual $null $srcPolicy.Rules[0].Filters
+		Assert-AreEqual src $srcPolicy.Rules[1].SourceContainer
+		Assert-AreEqual dest $srcPolicy.Rules[1].DestinationContainer
+		Assert-AreEqual 3 $srcPolicy.Rules[1].Filters.PrefixMatch.Count
+		Assert-AreEqual $minCreationTime ($srcPolicy.Rules[1].Filters.MinCreationTime.ToUniversalTime().ToString("s")+"Z")
+
+		#remove policies		
+		Remove-AzStorageObjectReplicationPolicy -ResourceGroupName $rgname -StorageAccountName $stoname2 -PolicyId $destPolicy.PolicyId
+		Remove-AzStorageObjectReplicationPolicy -ResourceGroupName $rgname -StorageAccountName $stoname1 -PolicyId $srcPolicy.PolicyId
+
+        Remove-AzStorageAccount -Force -ResourceGroupName $rgname -Name $stoname1;
+        Remove-AzStorageAccount -Force -ResourceGroupName $rgname -Name $stoname2;
+    }
+    finally
+    {
+        # Cleanup
+        Clean-ResourceGroup $rgname
+    }
+}
+
+

src/Storage/Storage.Management.Test/ScenarioTests/StorageDataPlaneTests.ps1

@@ -277,6 +277,17 @@ function Test-Blob
 		$immutabilityPolicy = Get-AzRmStorageContainerImmutabilityPolicy -ResourceGroupName $ResourceGroupName -StorageAccountName $StorageAccountName -ContainerName $containerName
 		Remove-AzRmStorageContainerImmutabilityPolicy -ResourceGroupName $ResourceGroupName -StorageAccountName $StorageAccountName -ContainerName $containerName -Etag $immutabilityPolicy.Etag
 
+		# Encryption Scope Test
+		$scopename = "testscope"
+		$containerName2 = "testscopecontainer"
+		New-AzStorageEncryptionScope -ResourceGroupName $ResourceGroupName -StorageAccountName $storageAccountName -EncryptionScopeName $scopename -StorageEncryption
+		$container = New-AzStorageContainer -Name $containerName2 -Context $storageContext -DefaultEncryptionScope $scopeName2 -PreventEncryptionScopeOverride $true
+		Assert-AreEqual $scopename $container.BlobContainerProperties.DefaultEncryptionScope
+		Assert-AreEqual $true $container.BlobContainerProperties.PreventEncryptionScopeOverride
+		$blob = Set-AzStorageBlobContent -Context $storageContext -File $localSrcFile -Container $containerName -Blob encryscopetest  -EncryptionScope $scopename
+		Assert-AreEqual $scopename $blob.BlobProperties.EncryptionScope
+		Remove-AzStorageContainer -Name $containerName2 -Force -Context $storageContext
+
         # Clean Storage Account
         Remove-AzStorageContainer -Name $containerName -Force -Context $storageContext