[Storage] Support ORS

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/Az.Storage.psd1

@@ -169,7 +169,9 @@ CmdletsToExport = 'Get-AzStorageAccount', 'Get-AzStorageAccountKey',
                'Disable-AzStorageBlobRestorePolicy', 
                'New-AzStorageBlobRangeToRestore', 'Restore-AzStorageBlobRange', 
                'New-AzStorageEncryptionScope', 'Update-AzStorageEncryptionScope', 
-               'Get-AzStorageEncryptionScope'
+               'Get-AzStorageEncryptionScope',
+               'New-AzStorageObjectReplicationPolicyRule', 'Set-AzStorageObjectReplicationPolicy',
+               'Get-AzStorageObjectReplicationPolicy', 'Remove-AzStorageObjectReplicationPolicy'
 
 # Variables to export from this module
 # VariablesToExport = @()

src/Storage/Storage.Management/Blob/UpdateAzureStorageBlobServiceProperties.cs

@@ -91,7 +91,7 @@ public bool EnableChangeFeed
         {
             get
             {
-                return enableChangeFeed is null? false : enableChangeFeed.Value;
+                return enableChangeFeed is null ? false : enableChangeFeed.Value;
             }
             set
             {
@@ -100,6 +100,23 @@ public bool EnableChangeFeed
         }
         private bool? enableChangeFeed = null;
 
+        [Parameter(
+        Mandatory = false,
+        HelpMessage = "Gets or sets versioning is enabled if set to true.")]
+        [ValidateNotNullOrEmpty]
+        public bool IsVersioningEnabled
+        {
+            get
+            {
+                return isVersioningEnabled is null ? false : isVersioningEnabled.Value;
+            }
+            set
+            {
+                isVersioningEnabled = value;
+            }
+        }
+        private bool? isVersioningEnabled = null;
+
         public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
@@ -133,6 +150,10 @@ public override void ExecuteCmdlet()
                     serviceProperties.ChangeFeed = new ChangeFeed();
                     serviceProperties.ChangeFeed.Enabled = enableChangeFeed;
                 }
+                if (isVersioningEnabled != null)
+                {
+                    serviceProperties.IsVersioningEnabled = isVersioningEnabled;
+                }
 
                 serviceProperties = this.StorageClient.BlobServices.SetServiceProperties(this.ResourceGroupName, this.StorageAccountName, serviceProperties);
 

src/Storage/Storage.Management/ChangeLog.md

@@ -18,6 +18,13 @@
         - Additional information about change #1
 -->
 ## Upcoming Release
+* Support enable/disable versioning on Blob Service of a Storage account
+    - `Update-AzStorageBlobServiceProperty`
+* Support Set/Get/Remove Object Replication Policy on Storage accounts
+    - `New-AzStorageObjectReplicationPolicyRule`
+    - `Set-AzStorageObjectReplicationPolicy`
+    - `Get-AzStorageObjectReplicationPolicy`
+    - `Remove-AzStorageObjectReplicationPolicy`
 
 ## Version 1.14.1
 * Supported create container and upload blob with Encryption Scope setting
@@ -31,6 +38,9 @@
     - `Get-AzStorageAccountNetworkRuleSet`
 * Fixed #11624: Skip duplicated rules when add NetworkRules, to avoid server failure
     - `Add-AzStorageAccountNetworkRule`
+* Supported create container and upload blob with Encryption Scope setting
+    - `New-AzStorageContainer`
+    - `Set-AzStorageBlobContent`
 
 ## Version 1.14.0
 * Added breaking change notice for Azure File cmdlets output change in a future release

src/Storage/Storage.Management/Models/PSBlobServiceProperties.cs

@@ -44,6 +44,7 @@ public class PSBlobServiceProperties
         [Ps1Xml(Label = "RestorePolicy.LastEnabledTime", Target = ViewControl.Table, ScriptBlock = "$_.RestorePolicy.LastEnabledTime", Position = 7)]
         public PSRestorePolicy RestorePolicy { get; set; }
         public PSCorsRules Cors { get; set; }
+        public bool? IsVersioningEnabled { get; set; }
 
         public PSBlobServiceProperties()
         { }
@@ -60,6 +61,7 @@ public PSBlobServiceProperties(BlobServiceProperties policy)
             this.DeleteRetentionPolicy = policy.DeleteRetentionPolicy is null ? null : new PSDeleteRetentionPolicy(policy.DeleteRetentionPolicy);
             this.RestorePolicy = policy.RestorePolicy is null ? null : new PSRestorePolicy(policy.RestorePolicy);
             this.ChangeFeed = policy.ChangeFeed is null ? null : new PSChangeFeed(policy.ChangeFeed);
+            this.IsVersioningEnabled = policy.IsVersioningEnabled;
         }
         public BlobServiceProperties ParseBlobServiceProperties()
         {
@@ -69,7 +71,8 @@ public BlobServiceProperties ParseBlobServiceProperties()
                 DefaultServiceVersion = this.DefaultServiceVersion,
                 DeleteRetentionPolicy = this.DeleteRetentionPolicy is null ? null : this.DeleteRetentionPolicy.ParseDeleteRetentionPolicy(),
                 RestorePolicy = this.RestorePolicy is null ? null : this.RestorePolicy.ParseRestorePolicy(),
-                ChangeFeed = this.ChangeFeed is null ? null : this.ChangeFeed.ParseChangeFeed()
+                ChangeFeed = this.ChangeFeed is null ? null : this.ChangeFeed.ParseChangeFeed(),
+                IsVersioningEnabled = this.IsVersioningEnabled                
             };
         }