Addressed comments on Tag, csproj files, depreciated InvoiceName, missing parameters in PSUsage model

Author: REDMOND\chanwan

src/ResourceManager/Consumption/Commands.Consumption.Test/Commands.Consumption.Test.csproj

@@ -64,7 +64,6 @@
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Consumption, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Consumption.3.0.0\lib\net452\Microsoft.Azure.Management.Consumption.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -85,14 +84,6 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.IdentityModel.Clients.ActiveDirectory.2.28.3\lib\net45\Microsoft.IdentityModel.Clients.ActiveDirectory.WindowsForms.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Rest.ClientRuntime, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.2.3.10\lib\net452\Microsoft.Rest.ClientRuntime.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
-    <Reference Include="Microsoft.Rest.ClientRuntime.Azure, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.3.3.10\lib\net452\Microsoft.Rest.ClientRuntime.Azure.dll</HintPath>
-      <Private>True</Private>
-    </Reference>
     <Reference Include="Microsoft.Rest.ClientRuntime.Azure.Authentication, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.2.9-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>

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

@@ -14,8 +14,6 @@
   <package id="Microsoft.Bcl.Build" version="1.0.14" targetFramework="net45" />
   <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.28.3" targetFramework="net45" />
   <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
-  <package id="Microsoft.Rest.ClientRuntime" version="2.3.10" targetFramework="net452" />
-  <package id="Microsoft.Rest.ClientRuntime.Azure" version="3.3.10" targetFramework="net452" />
   <package id="Microsoft.Rest.ClientRuntime.Azure.Authentication" version="2.2.9-preview" targetFramework="net452" />
   <package id="Microsoft.Rest.ClientRuntime.Azure.TestFramework" version="1.5.1-preview" targetFramework="net452" />
   <package id="Microsoft.WindowsAzure.Management" version="4.0.1" targetFramework="net45" />

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

@@ -21,6 +21,7 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Management.Automation;
+using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 
 namespace Microsoft.Azure.Commands.Consumption.Cmdlets.UsageDetails
 {
@@ -65,7 +66,7 @@ public class GetAzureRmConsumptionUsageDetail : AzureConsumptionCmdletBase
 
         [Parameter(Mandatory = false, HelpMessage = "The tag of the usages to filter.")]
         [ValidateNotNull]
-        public string Tags { get; set; }
+        public string Tag { get; set; }
 
         [Parameter(Mandatory = false, HelpMessage = "Determine the maximum number of records to return.")]
         [ValidateNotNull]
@@ -75,6 +76,7 @@ public class GetAzureRmConsumptionUsageDetail : AzureConsumptionCmdletBase
         [ValidateNotNull]
         public int? Top { get; set; }
 
+        [CmdletParameterBreakingChange("InvoiceName", ChangeDescription = "InvoiceName is being deprecated without being replaced.")]
         [Parameter(Mandatory = false, HelpMessage = "Name of a specific invoice to get the usage details that associate with.")]
         [ValidateNotNullOrEmpty]
         public string InvoiceName { get; set; }
@@ -165,9 +167,9 @@ public override void ExecuteCmdlet()
                 }
             }
 
-            if (!string.IsNullOrWhiteSpace(this.Tags))
+            if (!string.IsNullOrWhiteSpace(this.Tag))
             {
-                string tagsFilter = "properties/tags eq " + "'" + this.Tags + "'";
+                string tagsFilter = "properties/tags eq " + "'" + this.Tag + "'";
                 if (string.IsNullOrWhiteSpace(filter))
                 {
                     filter = tagsFilter;

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

@@ -44,7 +44,6 @@
   <ItemGroup>
     <Reference Include="Microsoft.Azure.Management.Consumption, Version=3.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Consumption.3.0.0\lib\net452\Microsoft.Azure.Management.Consumption.dll</HintPath>
-      <Private>True</Private>
     </Reference>
     <Reference Include="System.Web" />
   </ItemGroup>

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

@@ -14,6 +14,7 @@
 
 using System;
 using System.Collections.Generic;
+using Microsoft.Azure.Commands.Consumption.Common;
 using ApiUsageDetail = Microsoft.Azure.Management.Consumption.Models.UsageDetail;
 using MeterDetails = Microsoft.Azure.Management.Consumption.Models.MeterDetails;
 
@@ -25,6 +26,7 @@ public class PSUsageDetail
         public string AdditionalProperties { get; set; }
         public decimal? BillableQuantity { get; set; }
         public string BillingPeriodId { get; set; }
+        public string BillingPeriodName { get; set; }
         public string ConsumedService { get; set; }
         public string CostCenter { get; set; }
         public string Currency { get; set; }
@@ -34,6 +36,7 @@ public class PSUsageDetail
         public string InstanceLocation { get; set; }
         public string InstanceName { get; set; }
         public string InvoiceId { get; set; }
+        public string InvoiceName { get; set; }
         public bool? IsEstimated { get; set; }
         public MeterDetails MeterDetails { get; set; }
         public string MeterId { get; set; }
@@ -42,7 +45,7 @@ public class PSUsageDetail
         public string Product { get; set; }
         public string SubscriptionGuid { get; set; }
         public string SubscriptionName { get; set; }
-        public IDictionary<string, string> Tags { get; private set; }
+        public IDictionary<string, string> Tag { get; private set; }
         public string Type { get; private set; }
         public DateTime? UsageEnd { get; private set; }
         public decimal? UsageQuantity { get; set; }
@@ -60,6 +63,7 @@ public PSUsageDetail(ApiUsageDetail usageDetail)
                 this.AdditionalProperties = usageDetail.AdditionalProperties;
                 this.BillableQuantity = usageDetail.BillableQuantity;
                 this.BillingPeriodId = usageDetail.BillingPeriodId;
+                this.BillingPeriodName = Utilities.GetResourceNameFromId(usageDetail.BillingPeriodId);
                 this.ConsumedService = usageDetail.ConsumedService;
                 this.CostCenter = usageDetail.CostCenter;
                 this.Currency = usageDetail.Currency;
@@ -69,6 +73,7 @@ public PSUsageDetail(ApiUsageDetail usageDetail)
                 this.InstanceLocation = usageDetail.InstanceLocation;
                 this.InstanceName = usageDetail.InstanceName;
                 this.InvoiceId = usageDetail.InvoiceId;
+                this.InvoiceName = Utilities.GetResourceNameFromId(usageDetail.InvoiceId);
                 this.IsEstimated = usageDetail.IsEstimated;
                 this.MeterDetails = usageDetail.MeterDetails;
                 this.MeterId = usageDetail.MeterId;
@@ -77,7 +82,7 @@ public PSUsageDetail(ApiUsageDetail usageDetail)
                 this.Product = usageDetail.Product;
                 this.SubscriptionGuid = usageDetail.SubscriptionGuid;
                 this.SubscriptionName = usageDetail.SubscriptionName;
-                this.Tags = usageDetail.Tags;
+                this.Tag = usageDetail.Tags;
                 this.Type = usageDetail.Type;
                 this.UsageEnd = usageDetail.UsageEnd;
                 this.UsageQuantity = usageDetail.UsageQuantity;