Merge pull request #5790 from wilcobmsft/wilcob/enrollmentAccounts

[Billing RP] Get-AzureRmEnrollmentAccount

Author: cormacpayne

src/ResourceManager/Billing/AzureRM.Billing.Netcore.psd1

@@ -72,7 +72,7 @@ NestedModules = @('.\Microsoft.Azure.Commands.Billing.dll')
 FunctionsToExport = @()
 
 # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
-CmdletsToExport = 'Get-AzureRmBillingInvoice', 'Get-AzureRmBillingPeriod'
+CmdletsToExport = 'Get-AzureRmBillingInvoice', 'Get-AzureRmBillingPeriod', 'Get-AzureRmEnrollmentAccount'
 
 # Variables to export from this module
 # VariablesToExport = @()

src/ResourceManager/Billing/AzureRM.Billing.psd1

@@ -72,7 +72,7 @@ NestedModules = @('.\Microsoft.Azure.Commands.Billing.dll')
 FunctionsToExport = @()
 
 # Cmdlets to export from this module, for best performance, do not use wildcards and do not delete the entry, use an empty array if there are no cmdlets to export.
-CmdletsToExport = 'Get-AzureRmBillingInvoice', 'Get-AzureRmBillingPeriod'
+CmdletsToExport = 'Get-AzureRmBillingInvoice', 'Get-AzureRmBillingPeriod', 'Get-AzureRmEnrollmentAccount'
 
 # Variables to export from this module
 # VariablesToExport = @()

src/ResourceManager/Billing/ChangeLog.md

@@ -18,6 +18,8 @@
         - Additional information about change #1
 -->
 ## Current Release
+* New Cmdlet Get-AzureRmEnrollmentAccount
+  - cmdlet to retrieve enrollment accounts
 * Updated to the latest version of the Azure ClientRuntime
 
 ## Version 0.14.0
@@ -44,8 +46,8 @@
 * New Cmdlet Get-AzureRmBillingPeriod
     - cmdlet to retrieve azure billing periods of the subscription.
 * Update Cmdlet Get-AzureRmBillingInvoice
-	- new property BillingPeriodNames
-	- output in list view
+    - new property BillingPeriodNames
+    - output in list view
 
 ## Version 0.11.0
 

src/ResourceManager/Billing/Commands.Billing.Test/Commands.Billing.Test.csproj

@@ -63,7 +63,7 @@
       <Private>True</Private>
     </Reference>
     <Reference Include="Microsoft.Azure.Management.Billing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
-      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Billing.2.0.0-preview\lib\net452\Microsoft.Azure.Management.Billing.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Azure.Management.Billing.2.1.0-preview\lib\net452\Microsoft.Azure.Management.Billing.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.Azure.ResourceManager, Version=2.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
@@ -86,12 +86,12 @@
     </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>
+      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.Authentication.2.3.1\lib\net452\Microsoft.Rest.ClientRuntime.Azure.Authentication.dll</HintPath>
       <Private>True</Private>
     </Reference>
-    <Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework, Version=1.5.1.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+    <Reference Include="Microsoft.Rest.ClientRuntime.Azure.TestFramework, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.5.1-preview\lib\net45\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.Rest.ClientRuntime.Azure.TestFramework.1.7.2\lib\net452\Microsoft.Rest.ClientRuntime.Azure.TestFramework.dll</HintPath>
       <Private>True</Private>
     </Reference>
     <Reference Include="Newtonsoft.Json, Version=6.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
@@ -131,13 +131,17 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Properties\AssemblyInfo.cs" />
+    <Compile Include="ScenarioTests\EnrollmentAccountTests.cs" />
     <Compile Include="ScenarioTests\BillingPeriodsTests.cs" />
     <Compile Include="ScenarioTests\InvoicesTests.cs" />
     <Compile Include="ScenarioTests\TestController.cs" />
   </ItemGroup>
   <ItemGroup>
     <None Include="MSSharedLibKey.snk" />
     <None Include="packages.config" />
+    <None Include="ScenarioTests\EnrollmentAccountTests.ps1">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="ScenarioTests\BillingPeriodsTests.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
@@ -174,6 +178,12 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.Billing.Test.ScenarioTests.InvoicesTests\TestListInvoicesWithMaxCount.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Billing.Test.ScenarioTests.EnrollmentAccountTests\TestGetEnrollmentAccountWithName.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.Billing.Test.ScenarioTests.EnrollmentAccountTests\TestListEnrollmentAccounts.json">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </None>
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Common\Commands.Common.Authentication.Abstractions\Commands.Common.Authentication.Abstractions.csproj">

src/ResourceManager/Billing/Commands.Billing.Test/ScenarioTests/BillingPeriodsTests.ps1

@@ -18,14 +18,14 @@ List billing periods
 #>
 function Test-ListBillingPeriods
 {
-    $billingBillingPeriods = Get-AzureRmBillingPeriod
+    $billingPeriods = Get-AzureRmBillingPeriod
 
-    Assert-True {$billingBillingPeriods.Count -ge 1}
-	Assert-NotNull $billingBillingPeriods[0].Name
-	Assert-NotNull $billingBillingPeriods[0].Id
-	Assert-NotNull $billingBillingPeriods[0].Type
-	Assert-NotNull $billingBillingPeriods[0].BillingPeriodStartDate
-	Assert-NotNull $billingBillingPeriods[0].BillingPeriodEndDate
+    Assert-True {$billingPeriods.Count -ge 1}
+	Assert-NotNull $billingPeriods[0].Name
+	Assert-NotNull $billingPeriods[0].Id
+	Assert-NotNull $billingPeriods[0].Type
+	Assert-NotNull $billingPeriods[0].BillingPeriodStartDate
+	Assert-NotNull $billingPeriods[0].BillingPeriodEndDate
 }
 
 <#
@@ -34,14 +34,14 @@ List billing periods with MaxCount
 #>
 function Test-ListBillingPeriodsWithMaxCount
 {
-    $billingBillingPeriods = Get-AzureRmBillingPeriod -MaxCount 1
+    $billingPeriods = Get-AzureRmBillingPeriod -MaxCount 1
 
-    Assert-True {$billingBillingPeriods.Count -eq 1}
-	Assert-NotNull $billingBillingPeriods[0].Name
-	Assert-NotNull $billingBillingPeriods[0].Id
-	Assert-NotNull $billingBillingPeriods[0].Type
-	Assert-NotNull $billingBillingPeriods[0].BillingPeriodStartDate
-	Assert-NotNull $billingBillingPeriods[0].BillingPeriodEndDate
+    Assert-True {$billingPeriods.Count -eq 1}
+	Assert-NotNull $billingPeriods[0].Name
+	Assert-NotNull $billingPeriods[0].Id
+	Assert-NotNull $billingPeriods[0].Type
+	Assert-NotNull $billingPeriods[0].BillingPeriodStartDate
+	Assert-NotNull $billingPeriods[0].BillingPeriodEndDate
 }
 
 <#
@@ -50,7 +50,12 @@ Get billing period with specified name
 #>
 function Test-GetBillingPeriodWithName
 {
-	$billingPeriodName = "201705-1"
+    $billingPeriods = Get-AzureRmBillingPeriod | where { $_.InvoiceNames.Count -eq 1 }
+    Assert-True {$billingPeriods.Count -ge 1}
+
+	$billingPeriodName = $billingPeriods[0].Name
+	$billingInvoiceName = $billingPeriods[0].InvoiceNames[0]
+
     $billingPeriod = Get-AzureRmBillingPeriod -Name $billingPeriodName
 
 	Assert-AreEqual $billingPeriodName $billingPeriod.Name
@@ -60,7 +65,7 @@ function Test-GetBillingPeriodWithName
 	Assert-NotNull $billingPeriod.BillingPeriodEndDate
 	Assert-NotNull $billingPeriod.InvoiceNames
 	Assert-AreEqual 1 $billingPeriod.InvoiceNames.Count
-	Assert-AreEqual "201705-217994100075389" $billingPeriod.InvoiceNames
+	Assert-AreEqual $billingInvoiceName $billingPeriod.InvoiceNames
 }
 
 <#
@@ -69,17 +74,18 @@ Get billing period with specified names
 #>
 function Test-GetBillingPeriodWithNames
 {
-	$billingPeriodNames = "201705-1", "201704-1", "201703-1"
-    $billingBillingPeriods = Get-AzureRmBillingPeriod -Name $billingPeriodNames
+    $sampleBillingPeriods = Get-AzureRmBillingPeriod
+    Assert-True {$sampleBillingPeriods.Count -gt 1}
+
+	$billingPeriodNames = $sampleBillingPeriods | %{ $_.Name }
+    $billingPeriods = Get-AzureRmBillingPeriod -Name $billingPeriodNames
 
-    Assert-True {$billingBillingPeriods.Count -eq 3}
-	Foreach($billingPeriod in $billingBillingPeriods)
+    Assert-AreEqual $sampleBillingPeriods.Count $billingPeriods.Count
+	Foreach($billingPeriod in $billingPeriods)
 	{
 		Assert-NotNull $billingPeriod.Id
 		Assert-NotNull $billingPeriod.Type
 		Assert-NotNull $billingPeriod.BillingPeriodStartDate
 		Assert-NotNull $billingPeriod.BillingPeriodEndDate
-		Assert-NotNull $billingPeriod.InvoiceNames
-		Assert-AreEqual 1 $billingPeriod.InvoiceNames.Count
 	}
 }

src/ResourceManager/Billing/Commands.Billing.Test/ScenarioTests/EnrollmentAccountTests.cs

@@ -0,0 +1,47 @@
+// ----------------------------------------------------------------------------------
+//
+// Copyright Microsoft Corporation
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+// http://www.apache.org/licenses/LICENSE-2.0
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+// ----------------------------------------------------------------------------------
+
+using Microsoft.Azure.Commands.Billing.Test.ScenarioTests.ScenarioTest;
+using Microsoft.Azure.Commands.ScenarioTest;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
+using Xunit;
+
+namespace Microsoft.Azure.Commands.Billing.Test.ScenarioTests
+{
+    public class EnrollmentAccountTests
+    {
+        private ServiceManagemenet.Common.Models.XunitTracingInterceptor _logger;
+
+        public EnrollmentAccountTests(Xunit.Abstractions.ITestOutputHelper output)
+        {
+            _logger = new ServiceManagemenet.Common.Models.XunitTracingInterceptor(output);
+            ServiceManagemenet.Common.Models.XunitTracingInterceptor.AddToContext(_logger);
+            TestExecutionHelpers.SetUpSessionAndProfile();
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestListEnrollmentAccounts()
+        {
+            TestController.NewInstance.RunPowerShellTest(_logger, "Test-ListEnrollmentAccounts");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestGetEnrollmentAccountWithName()
+        {
+            TestController.NewInstance.RunPowerShellTest(_logger, "Test-GetEnrollmentAccountWithName");
+        }
+    }
+}

src/ResourceManager/Billing/Commands.Billing.Test/ScenarioTests/EnrollmentAccountTests.ps1

@@ -0,0 +1,48 @@
+# ----------------------------------------------------------------------------------
+#
+# Copyright Microsoft Corporation
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+# http://www.apache.org/licenses/LICENSE-2.0
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+# ----------------------------------------------------------------------------------
+
+# NOTE: This test requires manual setup in your current environment. The following is required:
+# 1. An enrollment account in EA. Please go to http://ea.azure.com/ to add and manage enrollment accounts.
+# 2. Run your test as either a user with an enrollment in EA.
+#    2b. Alternatively, you can grant a service principal access to your enrollment account using RBAC by running the following:
+#           New-AzureRmRoleAssignment -Scope /providers/Microsoft.Billing/enrollmentAccounts/<object id of the user with an enrollment in EA> -RoleDefinitionName Contributor -ServicePrincipalName <SPN>
+#        You can then run the tests below using this service principal.
+
+<#
+.SYNOPSIS
+List billing periods
+#>
+function Test-ListEnrollmentAccounts
+{
+    $enrollmentAccounts = Get-AzureRmEnrollmentAccount
+
+    Assert-True {$enrollmentAccounts.Count -ge 1}
+	Assert-NotNull $enrollmentAccounts[0].ObjectId
+	Assert-NotNull $enrollmentAccounts[0].PrincipalName
+}
+
+<#
+.SYNOPSIS
+Get billing period with specified name
+#>
+function Test-GetEnrollmentAccountWithName
+{
+    $enrollmentAccounts = @(Get-AzureRmEnrollmentAccount)
+
+	$enrollmentAccountObjectId = $enrollmentAccounts[0].ObjectId
+    $enrollmentAccount = Get-AzureRmEnrollmentAccount -ObjectId $enrollmentAccountObjectId
+
+	Assert-AreEqual $enrollmentAccountObjectId $enrollmentAccount.ObjectId
+	Assert-NotNull $enrollmentAccount.PrincipalName
+}

src/ResourceManager/Billing/Commands.Billing.Test/ScenarioTests/InvoicesTests.ps1

@@ -89,19 +89,12 @@ Get invoice with specified name
 #>
 function Test-GetInvoiceWithName
 {
-	$invoiceName = "201705-217994100075389"
-    $invoice = Get-AzureRmBillingInvoice -Name $invoiceName
+    $sampleInvoices = Get-AzureRmBillingInvoice
+    Assert-True { $sampleInvoices.Count -ge 1 }
 
-	Assert-AreEqual $invoiceName $invoice.Name
-	Assert-NotNull $invoice.Id
-	Assert-NotNull $invoice.Type
-	Assert-NotNull $invoice.InvoicePeriodStartDate
-	Assert-NotNull $invoice.InvoicePeriodEndDate
-	Assert-NotNull $invoice.DownloadUrl
-	Assert-NotNull $invoice.DownloadUrlExpiry
-	Assert-NotNull $invoice.BillingPeriodNames
-	Assert-AreEqual 1 $invoice.BillingPeriodNames.Count
-	Assert-AreEqual "201705-1" $invoice.BillingPeriodNames
+	$invoice = Get-AzureRmBillingInvoice -Name $sampleInvoices[0].Name
+
+	Assert-AreEqual $invoice.Id $sampleInvoices[0].Id
 }
 
 <#
@@ -110,19 +103,10 @@ Get invoice with specified names
 #>
 function Test-GetInvoiceWithNames
 {
-	$invoiceNames = "201705-217994100075389", "201704-117049130068772", "201703-117646100066812"
-    $billingInvoices = Get-AzureRmBillingInvoice -Name $invoiceNames
+	$sampleInvoices = Get-AzureRmBillingInvoice
+    Assert-True { $sampleInvoices.Count -gt 1 }
+
+    $billingInvoices = Get-AzureRmBillingInvoice -Name $sampleInvoices.Name
 
-    Assert-True {$billingInvoices.Count -eq 3}
-	Foreach($invoice in $billingInvoices)
-	{
-		Assert-NotNull $invoice.Id
-		Assert-NotNull $invoice.Type
-		Assert-NotNull $invoice.InvoicePeriodStartDate
-		Assert-NotNull $invoice.InvoicePeriodEndDate
-		Assert-NotNull $invoice.DownloadUrl
-		Assert-NotNull $invoice.DownloadUrlExpiry	
-		Assert-NotNull $invoice.BillingPeriodNames
-		Assert-AreEqual 1 $invoice.BillingPeriodNames.Count
-	}
+    Assert-AreEqual $sampleInvoices.Count $billingInvoices.Count
 }