Merge branch 'preview' of https://github.com/Azure/azure-powershell into preview

Author: dedhar

documentation/development-docs/azure-powershell-design-guidelines.md

@@ -269,6 +269,8 @@ $job | Wait-Job
 $subcriptions = $job | Receive-Job
 ````
 
+To set a custom job name, please use [SetBackgroupJobDescription(string name)](https://github.com/Azure/azure-powershell/blob/preview/src/Common/Commands.Common/AzurePSCmdlet.cs#L761).  The default job description is: "Long Running Operation for '{cmdlet name}' on resource '{resource name}'"
+
 ## Argument Completers
 
 PowerShell uses Argument Completers to provide tab completion for users.  At the moment, Azure PowerShell has two specific argument completers that should be applied to relevant parameters, and one generic argument completer that can be used to tab complete with a given list of values.
@@ -307,4 +309,4 @@ using Microsoft.Azure.Commands.ResourceManager.Common.ArgumentCompleters;
 [Parameter(Mandatory = false, HelpMessage = "The tiers of the plan")]
 [PSArgumentCompleter("Basic", "Premium", "Elite")]
 public string Tier { get; set; }
-```
+```

src/Common/Commands.Common/AzurePSCmdlet.cs

@@ -18,6 +18,7 @@
 using Microsoft.WindowsAzure.Commands.Common.CustomAttributes;
 using Microsoft.Azure.ServiceManagemenet.Common.Models;
 using Microsoft.WindowsAzure.Commands.Common;
+using Microsoft.WindowsAzure.Commands.Utilities.Common;
 using System;
 using System.Collections.Concurrent;
 using System.Diagnostics;
@@ -688,22 +689,78 @@ protected override void ProcessRecord()
             }
         }
 
+        private string _implementationBackgroundJobDescription;
+
         /// <summary>
         /// Job Name paroperty iof this cmdlet is run as a job
         /// </summary>
         public virtual string ImplementationBackgroundJobDescription
         {
             get
             {
-                string name = "Long Running Azure Operation";
-                string commandName = MyInvocation?.MyCommand?.Name;
-                if (!string.IsNullOrWhiteSpace(commandName))
+                if (_implementationBackgroundJobDescription != null)
                 {
-                    name = string.Format("Long Running Operation for '{0}'", commandName);
+                    return _implementationBackgroundJobDescription;
                 }
+                else
+                {
+                    string name = "Long Running Azure Operation";
+                    string commandName = MyInvocation?.MyCommand?.Name;
+                    string objectName = null;
+                    if (this.IsBound("Name"))
+                    {
+                        objectName = MyInvocation.BoundParameters["Name"].ToString();
+                    }
+                    else if (this.IsBound("InputObject") == true)
+                    {
+                        var type = MyInvocation.BoundParameters["InputObject"].GetType();
+                        var inputObject = Convert.ChangeType(MyInvocation.BoundParameters["InputObject"], type);
+                        if (type.GetProperty("Name") != null)
+                        {
+                            objectName = inputObject.GetType().GetProperty("Name").GetValue(inputObject).ToString();
+                        }
+                        else if (type.GetProperty("ResourceId") != null)
+                        {
+                            string[] tokens = inputObject.GetType().GetProperty("ResourceId").GetValue(inputObject).ToString().Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
+                            if (tokens.Length >= 8)
+                            {
+                                objectName = tokens[tokens.Length - 1];
+                            }
+                        }
+                    }
+                    else if (this.IsBound("ResourceId") == true)
+                    {
+                        string[] tokens = MyInvocation.BoundParameters["ResourceId"].ToString().Split(new[] { '/' }, StringSplitOptions.RemoveEmptyEntries);
+                        if (tokens.Length >= 8)
+                        {
+                            objectName = tokens[tokens.Length - 1];
+                        }
+                    }
+
+                    if (!string.IsNullOrWhiteSpace(commandName))
+                    {
+                        if (!string.IsNullOrWhiteSpace(objectName))
+                        {
+                            name = string.Format("Long Running Operation for '{0}' on resource '{1}'", commandName, objectName);
+                        }
+                        else
+                        {
+                            name = string.Format("Long Running Operation for '{0}'", commandName);
+                        }
+                    }
 
-                return name;
+                    return name;
+                }
             }
+            set
+            {
+                _implementationBackgroundJobDescription = value;
+            }
+        }
+
+        public void SetBackgroundJobDescription(string jobName)
+        {
+            ImplementationBackgroundJobDescription = jobName;
         }
 
         protected virtual void Dispose(bool disposing)

src/ResourceManager/Common/Commands.Common.Authentication.ResourceManager/AzureRmProfile.cs

@@ -164,6 +164,12 @@ bool SafeDeserializeObject<T>(string serialization, out T result, JsonConverter
         private void Initialize(AzureRmProfile profile)
         {
             EnvironmentTable.Clear();
+            // Adding predefined environments
+            foreach (var env in AzureEnvironment.PublicEnvironments)
+            {
+                EnvironmentTable[env.Key] = env.Value;
+            }
+
             Contexts.Clear();
             DefaultContextKey = "Default";
             if (profile != null)

src/ResourceManager/Consumption/ChangeLog.md

@@ -18,6 +18,7 @@
         - 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

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

@@ -62,8 +62,8 @@
       <HintPath>..\..\..\packages\Microsoft.Azure.Management.Authorization.2.0.0\lib\net40\Microsoft.Azure.Management.Authorization.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Azure.Management.Consumption, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Consumption.1.1.0-preview\lib\net452\Microsoft.Azure.Management.Consumption.dll</HintPath>
+    <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>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>

src/ResourceManager/Consumption/Commands.Consumption.Test/ScenarioTests/TestController.cs

@@ -24,12 +24,11 @@
 using Microsoft.Azure.Subscriptions;
 using Microsoft.Azure.Test;
 using Microsoft.Azure.Test.HttpRecorder;
-using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
 using TestBase = Microsoft.Azure.Test.TestBase;
-using TestEnvironmentFactory = Microsoft.Rest.ClientRuntime.Azure.TestFramework.TestEnvironmentFactory;
 using TestUtilities = Microsoft.Azure.Test.TestUtilities;
+using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
 
 namespace Microsoft.Azure.Commands.Consumption.Test.ScenarioTests.ScenarioTest
 {
@@ -78,12 +77,11 @@ protected void SetupManagementClients(MockContext context)
                 ConsumptionManagementClient);
         }
 
-        public void RunPowerShellTest(ServiceManagemenet.Common.Models.XunitTracingInterceptor logger, params string[] scripts)
+        public void RunPowerShellTest(params string[] scripts)
         {
             var callingClassType = TestUtilities.GetCallingClass(2);
             var mockName = TestUtilities.GetCurrentMethodName(2);
 
-            _helper.TracingInterceptor = logger;
             RunPsTestWorkflow(
                 () => scripts,
                 // no custom initializer
@@ -179,7 +177,10 @@ private GalleryClient GetGalleryClient()
 
         private ConsumptionManagementClient GetConsumptionManagementClient(MockContext context)
         {
-            return context.GetServiceClient<ConsumptionManagementClient>(TestEnvironmentFactory.GetTestEnvironment());
+            return
+                context.GetServiceClient<ConsumptionManagementClient>(
+                    new Rest.ClientRuntime.Azure.TestFramework.TestEnvironment(
+                        Environment.GetEnvironmentVariable("TEST_CSM_ORGID_AUTHENTICATION")));
         }
     }
 }

src/ResourceManager/Consumption/Commands.Consumption.Test/ScenarioTests/UsageDetailsTests.cs

@@ -16,81 +16,60 @@
 using Microsoft.Azure.Commands.ScenarioTest;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Xunit;
+using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
+using Xunit.Abstractions;
+using Microsoft.Azure.ServiceManagemenet.Common.Models;
 
 namespace Microsoft.Azure.Commands.Consumption.Test.ScenarioTests
 {
-    public class UsageDetailsTests
+    public class UsageDetailsTests : RMTestBase
     {
-        private ServiceManagemenet.Common.Models.XunitTracingInterceptor _logger;
-
-        public UsageDetailsTests(Xunit.Abstractions.ITestOutputHelper output)
+        public UsageDetailsTests(ITestOutputHelper output)
         {
-            _logger = new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output);
-            ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
+            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
             TestExecutionHelpers.SetUpSessionAndProfile();
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListUsageDetails()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-ListUsageDetails");
-        }
-
-        [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void TestListUsageDetailsWithExpand()
-        {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-ListUsageDetailsWithExpand");
-        }
-
-        [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void TestListUsageDetailsWithFilter()
-        {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-ListUsageDetailsWithFilter");
-        }
-
-        [Fact]
-        [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void TestListInvoiceUsageDetails()
-        {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-ListInvoiceUsageDetails");
+            TestController.NewInstance.RunPowerShellTest("Test-ListUsageDetails");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void TestListInvoiceUsageDetailsWithExpand()
+        public void TestListUsageDetailsWithMeterDetailsExpand()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-ListInvoiceUsageDetailsWithExpand");
+            TestController.NewInstance.RunPowerShellTest("Test-ListUsageDetailsWithMeterDetailsExpand");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void TestListInvoiceUsageDetailsWithFilter()
+        public void TestListUsageDetailsWithDateFilter()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-ListInvoiceUsageDetailsWithFilter");
+            TestController.NewInstance.RunPowerShellTest("Test-ListUsageDetailsWithDateFilter");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestListBillingPeriodUsageDetails()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-ListBillingPeriodUsageDetails");
+            TestController.NewInstance.RunPowerShellTest("Test-ListBillingPeriodUsageDetails");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void TestListBillingPeriodUsageDetailsWithExpand()
+        public void TestListBillingPeriodUsageDetailsWithFilterOnInstanceName()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-ListBillingPeriodUsageDetailsWithExpand");
+            TestController.NewInstance.RunPowerShellTest("Test-ListBillingPeriodUsageDetailsWithFilterOnInstanceName");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
-        public void TestListBillingPeriodUsageDetailsWithFilter()
+        public void TestListBillingPeriodUsageDetailsWithDateFilter()
         {
-            TestController.NewInstance.RunPowerShellTest(_logger, "Test-ListBillingPeriodUsageDetailsWithFilter");
+            TestController.NewInstance.RunPowerShellTest("Test-ListBillingPeriodUsageDetailsWithDateFilter");
         }
 
     }