Addressed comments on parameter type and typo, and regenerated test sessions

Author: REDMOND\chanwan

src/ResourceManager/Consumption/ChangeLog.md

@@ -18,10 +18,10 @@
         - Additional information about change #1
 -->
 ## Current Release
+* Add new parameters Expand, ResourceGroup, InstanceName, InstanceId, Tags, and Top on Cmdlet Get-AzureRmConsumptionUsageDetail
 
 ## Version 0.3.2
 * Set minimum dependency of module to PowerShell 5.0
-* Add new parameters Expand, ResourceGroup, InstanceName, InstanceId, Tags, and Top on Cmdlet Get-AzureRmConsumptionUsageDetail
 
 ## Version 0.3.1
 * Updated to the latest version of the Azure ClientRuntime

src/ResourceManager/Consumption/Commands.Consumption.Test/SessionRecords/Microsoft.Azure.Commands.Consumption.Test.ScenarioTests.UsageDetailsTests/TestListBillingPeriodUsageDetails.json

@@ -34,7 +34,7 @@ public class GetAzureRmConsumptionUsageDetail : AzureConsumptionCmdletBase
         [ValidateNotNullOrEmpty]
         public string BillingPeriodName { get; set; }
 
-        [Parameter(Mandatory = false, HelpMessage = "Expand the usages based on MeterDetails, or AdditionalProperties.")]
+        [Parameter(Mandatory = false, HelpMessage = "Expand the usages based on MeterDetails, or AdditionalInfo.")]
         [ValidateNotNull]
         public string Expand { get; set; }
 
@@ -91,7 +91,7 @@ public override void ExecuteCmdlet()
                 expand = "properties/meterDetails";
             }
             if (!string.IsNullOrWhiteSpace(this.Expand) &&
-                this.Expand.Equals(Constants.Expands.AdditionalProperties, StringComparison.InvariantCultureIgnoreCase) ||
+                this.Expand.Equals(Constants.Expands.AdditionalInfo, StringComparison.InvariantCultureIgnoreCase) ||
                 this.IncludeAdditionalProperties.IsPresent)
             {
                 if (expand == default(string))

src/ResourceManager/Consumption/Commands.Consumption.Test/SessionRecords/Microsoft.Azure.Commands.Consumption.Test.ScenarioTests.UsageDetailsTests/TestListBillingPeriodUsageDetailsWithDateFilter.json

@@ -26,6 +26,7 @@ public class ParameterSetNames
         public class Expands
         {
             public const string MeterDetails = "meterDetails";
+            public const string AdditionalInfo = "additionalInfo";
             public const string AdditionalProperties = "additionalProperties";
         }
 

src/ResourceManager/Consumption/Commands.Consumption.Test/SessionRecords/Microsoft.Azure.Commands.Consumption.Test.ScenarioTests.UsageDetailsTests/TestListBillingPeriodUsageDetailsWithFilterOnInstanceName.json

@@ -23,7 +23,8 @@ namespace Microsoft.Azure.Commands.Consumption.Models
     public class PSUsageDetail
     {
         public string AccountName { get; set; }
-        public string AdditionalProperties { get; set; }
+        public string AdditionalInfo { get; set; }
+        public IDictionary<string, string> AdditionalProperties { get; set; }
         public decimal? BillableQuantity { get; set; }
         public string BillingPeriodId { get; set; }
         public string BillingPeriodName { get; set; }
@@ -45,7 +46,7 @@ public class PSUsageDetail
         public string Product { get; set; }
         public string SubscriptionGuid { get; set; }
         public string SubscriptionName { get; set; }
-        public IDictionary<string, string> Tag { get; private set; }
+        public IDictionary<string, string> Tags { get; private set; }
         public string Type { get; private set; }
         public DateTime? UsageEnd { get; private set; }
         public decimal? UsageQuantity { get; set; }
@@ -60,7 +61,7 @@ public PSUsageDetail(ApiUsageDetail usageDetail)
             if (usageDetail != null)
             {
                 this.AccountName = usageDetail.AccountName;
-                this.AdditionalProperties = usageDetail.AdditionalProperties;
+                this.AdditionalInfo = usageDetail.AdditionalProperties;
                 this.BillableQuantity = usageDetail.BillableQuantity;
                 this.BillingPeriodId = usageDetail.BillingPeriodId;
                 this.BillingPeriodName = Utilities.GetResourceNameFromId(usageDetail.BillingPeriodId);
@@ -82,7 +83,7 @@ public PSUsageDetail(ApiUsageDetail usageDetail)
                 this.Product = usageDetail.Product;
                 this.SubscriptionGuid = usageDetail.SubscriptionGuid;
                 this.SubscriptionName = usageDetail.SubscriptionName;
-                this.Tag = usageDetail.Tags;
+                this.Tags = usageDetail.Tags;
                 this.Type = usageDetail.Type;
                 this.UsageEnd = usageDetail.UsageEnd;
                 this.UsageQuantity = usageDetail.UsageQuantity;

src/ResourceManager/Consumption/Commands.Consumption.Test/SessionRecords/Microsoft.Azure.Commands.Consumption.Test.ScenarioTests.UsageDetailsTests/TestListUsageDetails.json

@@ -15,7 +15,7 @@ Get usage details of the subscription.
 ```
 Get-AzureRmConsumptionUsageDetail [-BillingPeriodName <String>] [-Expand <String>] [-IncludeMeterDetails]
  [-IncludeAdditionalProperties] [-StartDate <DateTime>] [-EndDate <DateTime>] [-ResourceGroup <String>]
- [-InstanceName <String>] [-InstanceId <String>] [-Tags <String>] [-MaxCount <Int32>] [-Top <Int32>]
+ [-InstanceName <String>] [-InstanceId <String>] [-Tag <String>] [-MaxCount <Int32>] [-Top <Int32>]
  [-InvoiceName <String>] [-DefaultProfile <IAzureContextContainer>] [<CommonParameters>]
 ```
 
@@ -227,7 +227,7 @@ Accept pipeline input: False
 Accept wildcard characters: False
 ```
 
-### -Tags
+### -Tag
 The tag of the usages to filter.
 
 ```yaml

src/ResourceManager/Consumption/Commands.Consumption.Test/SessionRecords/Microsoft.Azure.Commands.Consumption.Test.ScenarioTests.UsageDetailsTests/TestListUsageDetailsWithDateFilter.json

@@ -26,4 +26,4 @@
 -->
 
 # Upcoming Breaking Changes
-* Remove parameter InvoiceName on Cmdlet Get-AzureRmConsumptionUsageDetail
+* Remove input parameter InvoiceName and output parameter AdditionalProperties on Cmdlet Get-AzureRmConsumptionUsageDetail