added support for retentionInDays parameter, updated the test records

Author: REDMOND\xizha

src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/ScenarioTests/WorkspaceTests.ps1

@@ -30,6 +30,8 @@ function Test-WorkspaceCreateUpdateDelete
     Assert-AreEqual $wsname $workspace.Name
     Assert-AreEqual $wslocation $workspace.Location
     Assert-AreEqual "STANDARD" $workspace.Sku
+    # if no value for RetentionInDays is specified, use the default value for the sku. For standard, the default is 30.
+    Assert-AreEqual 30 $workspace.RetentionInDays
     Assert-NotNull $workspace.ResourceId
     Assert-AreEqual 1 $workspace.Tags.Count
     Assert-NotNull $workspace.CustomerId
@@ -40,15 +42,19 @@ function Test-WorkspaceCreateUpdateDelete
     Assert-AreEqual $wsname $workspace.Name
     Assert-AreEqual $wslocation $workspace.Location
     Assert-AreEqual "STANDARD" $workspace.Sku
+    Assert-AreEqual 30 $workspace.RetentionInDays
     Assert-NotNull $workspace.ResourceId
     Assert-AreEqual 1 $workspace.Tags.Count
     Assert-NotNull $workspace.CustomerId
     Assert-NotNull $workspace.PortalUrl
 
     # Create a second workspace for list testing
     $wstwoname = Get-ResourceName
-    $workspacetwo = New-AzureRmOperationalInsightsWorkspace -ResourceGroupName $rgname -Name $wstwoname -Location $wslocation -Sku "STANDARD" -Force
-    
+    $workspacetwo = New-AzureRmOperationalInsightsWorkspace -ResourceGroupName $rgname -Name $wstwoname -Location $wslocation -Sku "PerNode" -RetentionInDays 60 -Force
+
+    $workspacetwo = Get-AzureRmOperationalInsightsWorkspace -ResourceGroupName $rgname -Name $wstwoname
+    Assert-AreEqual 60 $workspacetwo.RetentionInDays
+
     # List the workspaces in the subscription
     $workspaces = Get-AzureRmOperationalInsightsWorkspace
     Assert-AreEqual 1 ($workspaces | Where {$_.Name -eq $wsname}).Count
@@ -73,11 +79,12 @@ function Test-WorkspaceCreateUpdateDelete
     $workspace = $workspace | New-AzureRmOperationalInsightsWorkspace -Tags @{"foo" = "bar"} -Force
     Assert-AreEqual 1 $workspace.Tags.Count
 
-    # Clear the tags and update the sku via piping
-    $workspace | Set-AzureRmOperationalInsightsWorkspace -Tags @{} -Sku standard
+    # Clear the tags and update the sku, RetentionInDays via piping
+    $workspace | Set-AzureRmOperationalInsightsWorkspace -Tags @{} -Sku standalone -RetentionInDays 123
     $workspace = Get-AzureRmOperationalInsightsWorkspace -ResourceGroupName $rgname -Name $wsname
     Assert-AreEqual 0 $workspace.Tags.Count
-    Assert-AreEqual standard $workspace.Sku
+    Assert-AreEqual standalone $workspace.Sku
+    Assert-AreEqual 123 $workspace.RetentionInDays
 
     # Delete the original workspace via piping
     $workspace | Remove-AzureRmOperationalInsightsWorkspace -Force

src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/SessionRecords/Microsoft.Azure.Commands.OperationalInsights.Test.SearchTests/TestSearchGetSchema.json

@@ -122,7 +122,8 @@ public virtual Workspace CreateOrUpdateWorkspace(
             string location,
             string sku,
             Guid? customerId,
-            IDictionary<string, string> tags)
+            IDictionary<string, string> tags, 
+            int? retentionInDays)
         {
             Workspace properties = new Workspace()
             {
@@ -140,6 +141,11 @@ public virtual Workspace CreateOrUpdateWorkspace(
                 properties.CustomerId = customerId.Value.ToString();
             }
 
+            if (retentionInDays.HasValue)
+            {
+                properties.RetentionInDays = retentionInDays.Value;
+            }
+
             var response = OperationalInsightsManagementClient.Workspaces.CreateOrUpdate(
                 resourceGroupName,
                 workspaceName,
@@ -160,7 +166,8 @@ public virtual PSWorkspace UpdatePSWorkspace(UpdatePSWorkspaceParameters paramet
                 workspace.Location,
                 string.IsNullOrWhiteSpace(parameters.Sku) ? workspace.Sku : parameters.Sku,
                 workspace.CustomerId,
-                parameters.Tags == null ? workspace.Tags : ToDictionary(parameters.Tags));
+                parameters.Tags == null ? workspace.Tags : ToDictionary(parameters.Tags),
+                parameters.RetentionInDays);
 
             return new PSWorkspace(updatedWorkspace, parameters.ResourceGroupName);
         }
@@ -184,7 +191,8 @@ public virtual PSWorkspace CreatePSWorkspace(CreatePSWorkspaceParameters paramet
                             parameters.Location,
                             parameters.Sku,
                             parameters.CustomerId,
-                            tags),
+                            tags,
+                            parameters.RetentionInDays),
                         parameters.ResourceGroupName);
                 if (!string.Equals(workspace.ProvisioningState, OperationStatus.Succeeded.ToString(), StringComparison.OrdinalIgnoreCase))
                 {

src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/SessionRecords/Microsoft.Azure.Commands.OperationalInsights.Test.WorkspaceTests/TestWorkspaceActions.json

@@ -29,6 +29,8 @@ public class CreatePSWorkspaceParameters : OperationalInsightsParametersBase
 
         public Hashtable Tags { get; set; }
 
+        public int? RetentionInDays { get; set; }
+
         public Action<bool, string, string, string, Action, Func<bool>> ConfirmAction { get; set; }
     }
 }

src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/SessionRecords/Microsoft.Azure.Commands.OperationalInsights.Test.WorkspaceTests/TestWorkspaceCreateUpdateDelete.json

@@ -40,6 +40,7 @@ public PSWorkspace(Workspace workspace, string resourceGroupName)
             if (workspace!= null)
             {
                 this.Sku = workspace.Sku != null ? workspace.Sku.Name : null;
+                this.retentionInDays = workspace.RetentionInDays;
                 this.CustomerId = new Guid(workspace.CustomerId);
                 this.PortalUrl = workspace.PortalUrl;
                 this.ProvisioningState = workspace.ProvisioningState;
@@ -58,6 +59,8 @@ public PSWorkspace(Workspace workspace, string resourceGroupName)
 
         public string Sku { get; set; }
 
+        public int? retentionInDays { get; set; }
+
         public Guid? CustomerId { get; set; }
 
         public string PortalUrl { get; set; }

src/ResourceManager/OperationalInsights/Commands.OperationalInsights.Test/SessionRecords/Microsoft.Azure.Commands.OperationalInsights.Test.WorkspaceTests/TestWorkspaceEnableDisableListIntelligencePacks.json

@@ -21,5 +21,7 @@ public class UpdatePSWorkspaceParameters : OperationalInsightsParametersBase
         public string Sku { get; set; }
 
         public Hashtable Tags { get; set; }
+
+        public int? RetentionInDays { get; set; }
     }
 }

src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Client/OperationalInsightsClient.Workspaces.cs

@@ -39,7 +39,7 @@ public class NewAzureOperationalInsightsWorkspaceCommand : OperationalInsightsBa
 
         [Parameter(Position = 3, Mandatory = false, ValueFromPipelineByPropertyName = true,
             HelpMessage = "The service tier of the workspace.")]
-        [ValidateSet("free", "standard", "premium", IgnoreCase = true)]
+        [ValidateSet("free", "standard", "premium", "pernode","standalone", IgnoreCase = true)]
         public string Sku { get; set; }
 
         [Parameter(Position = 4, Mandatory = false, ValueFromPipelineByPropertyName = true,
@@ -50,6 +50,11 @@ public class NewAzureOperationalInsightsWorkspaceCommand : OperationalInsightsBa
             HelpMessage = "The resource tags for the workspace.")]
         public Hashtable Tags { get; set; }
 
+        [Parameter(Position = 6, Mandatory = false, ValueFromPipelineByPropertyName = true,
+            HelpMessage = "The workspace data retention in days. 730 days is the maximum allowed for all other Skus.")]
+        [ValidateNotNullOrEmpty]
+        public int? RetentionInDays { get; set; }
+
         [Parameter(Mandatory = false, HelpMessage = "Don't ask for confirmation.")]
         public SwitchParameter Force { get; set; }
 
@@ -63,6 +68,7 @@ public override void ExecuteCmdlet()
                 Sku = Sku,
                 CustomerId = CustomerId,
                 Tags = Tags,
+                RetentionInDays = RetentionInDays,
                 Force = Force.IsPresent,
                 ConfirmAction = ConfirmAction
             };

src/ResourceManager/OperationalInsights/Commands.OperationalInsights/Models/CreatePSWorkspaceParameters.cs

@@ -38,13 +38,18 @@ public class SetAzureOperationalInsightsWorkspaceCommand : OperationalInsightsBa
 
         [Parameter(Position = 3, Mandatory = false, ValueFromPipelineByPropertyName = true,
             HelpMessage = "The service tier of the workspace.")]
-        [ValidateSet("free", "standard", "premium", IgnoreCase = true)]
+        [ValidateSet("free", "standard", "premium", "pernode", "standalone", IgnoreCase = true)]
         public string Sku { get; set; }
 
         [Parameter(Position = 4, Mandatory = false, ValueFromPipelineByPropertyName = true,
             HelpMessage = "The resource tags for the workspace.")]
         public Hashtable Tags { get; set; }
 
+        [Parameter(Position = 5, Mandatory = false, ValueFromPipelineByPropertyName = true,
+            HelpMessage = "The workspace data retention in days. 730 days is the maximum allowed for all other Skus.")]
+        [ValidateNotNullOrEmpty]
+        public int? RetentionInDays { get; set; }
+
         public override void ExecuteCmdlet()
         {
             if (ParameterSetName == ByObject)
@@ -58,7 +63,8 @@ public override void ExecuteCmdlet()
                 ResourceGroupName = ResourceGroupName,
                 WorkspaceName = Name,
                 Sku = Sku,
-                Tags = Tags
+                Tags = Tags,
+                RetentionInDays = RetentionInDays
             };
 
             WriteObject(OperationalInsightsClient.UpdatePSWorkspace(parameters));