[Batch] 2020-05-01 API Release (#12103)

* update to mgmt ver 11

* update changelog, fix test

* update docs

* simplify Identity pararm type, rerecord

* reference network csproj in sln

* update

Author: jafreck

src/Batch/Batch.Test/Batch.Test.csproj

@@ -15,7 +15,7 @@
 
   <ItemGroup>
     <PackageReference Include="Microsoft.Azure.Batch" Version="13.0.0" />
-    <PackageReference Include="Microsoft.Azure.Management.Batch" Version="10.0.0" />
+    <PackageReference Include="Microsoft.Azure.Management.Batch" Version="11.0.0" />
     <PackageReference Include="WindowsAzure.Storage" Version="9.3.0" />
     <PackageReference Include="Microsoft.Azure.Management.Network" Version="19.21.1-preview" />
   </ItemGroup>

src/Batch/Batch.Test/BatchAccounts/GetBatchAccountCommandTests.cs

@@ -84,5 +84,24 @@ public void GetBatchAccountTest()
 
             commandRuntimeMock.Verify(r => r.WriteObject(expected), Times.Once());
         }
+
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void GetBatchAccount_IdentityTest()
+        {
+            string accountName = "account01";
+            string resourceGroup = "resourceGroup";
+            BatchAccount accountResource = BatchTestHelpers.CreateAccountResource(accountName, resourceGroup, identity: new BatchAccountIdentity(ResourceIdentityType.None, string.Empty, string.Empty));
+            BatchAccountContext expected = BatchAccountContext.ConvertAccountResourceToNewAccountContext(accountResource, null);
+            batchClientMock.Setup(b => b.GetAccount(resourceGroup, accountName)).Returns(expected);
+
+            cmdlet.AccountName = accountName;
+            cmdlet.ResourceGroupName = resourceGroup;
+
+            cmdlet.ExecuteCmdlet();
+
+            commandRuntimeMock.Verify(r => r.WriteObject(expected), Times.Once());
+        }
     }
 }

src/Batch/Batch.Test/BatchTestHelpers.cs

@@ -55,7 +55,8 @@ public static BatchAccount CreateAccountResource(
             Hashtable tags = null,
             string storageId = null,
             bool dedicatedCoreQuotaPerVMFamilyEnforced = false,
-            IList<VirtualMachineFamilyCoreQuota> machineFamilyQuotas = null)
+            IList<VirtualMachineFamilyCoreQuota> machineFamilyQuotas = null,
+            BatchAccountIdentity identity = null)
         {
             string tenantUrlEnding = "batch-test.windows-int.net";
             string endpoint = string.Format("{0}.{1}", accountName, tenantUrlEnding);
@@ -79,7 +80,8 @@ public static BatchAccount CreateAccountResource(
                 autoStorage: new AutoStorageProperties() { StorageAccountId = storageId },
                 tags: tags == null ? null : TagsConversionHelper.CreateTagDictionary(tags, true),
                 dedicatedCoreQuotaPerVMFamilyEnforced: dedicatedCoreQuotaPerVMFamilyEnforced,
-                dedicatedCoreQuotaPerVMFamily: machineFamilyQuotas);
+                dedicatedCoreQuotaPerVMFamily: machineFamilyQuotas,
+                identity: identity ?? new BatchAccountIdentity(ResourceIdentityType.None));
 
             return resource;
         }
@@ -710,7 +712,7 @@ public static AzureOperationResponse<
         {
             var response = new AzureOperationResponse<ProxyModels.TaskCounts, ProxyModels.JobGetTaskCountsHeaders>();
             response.Response = new HttpResponseMessage(HttpStatusCode.OK);
-            
+
             ProxyModels.TaskCounts taskCounts = new ProxyModels.TaskCounts();
             taskCounts.Active = active;
             taskCounts.Running = running;

src/Batch/Batch.Test/ScenarioTests/BatchAccountTests.cs

@@ -48,5 +48,12 @@ public void TestCreateNewBatchAccountWithNoPublicIp()
         {
             BatchController.NewInstance.RunPsTest(_logger, "Test-CreateNewBatchAccountWithNoPublicIp");
         }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestCreateNewBatchAccountWithSystemIdentity()
+        {
+            BatchController.NewInstance.RunPsTest(_logger, "Test-CreateNewBatchAccountWithSystemIdentity");
+        }
     }
 }

src/Batch/Batch.Test/ScenarioTests/BatchAccountTests.ps1

@@ -31,7 +31,7 @@ function Test-BatchAccountEndToEnd
     $accountName = Get-BatchAccountName
     $resourceGroup = Get-ResourceGroupName
 
-    try 
+    try
     {
         $location = Get-BatchAccountProviderLocation
         $tagName = "tag1"
@@ -43,12 +43,13 @@ function Test-BatchAccountEndToEnd
 
         # Verify the properties match expectations
         Assert-AreEqual $accountName $createdAccount.AccountName
-        Assert-AreEqual $resourceGroup $createdAccount.ResourceGroupName	
+        Assert-AreEqual $resourceGroup $createdAccount.ResourceGroupName
         Assert-AreEqual $location $createdAccount.Location
         Assert-AreEqual 1 $createdAccount.Tags.Count
         Assert-AreEqual $tagValue $createdAccount.Tags[$tagName]
         Assert-True { $createdAccount.PoolQuota -gt 0 }
         Assert-True { $createdAccount.ActiveJobAndJobScheduleQuota -gt 0 }
+		Assert-AreEqual "None" $createdAccount.Identity.Type
 
         # Update the Batch account
         $newTagName = "tag2"
@@ -145,4 +146,31 @@ function Test-CreateNewBatchAccountWithNoPublicIp
     {
         Remove-AzResourceGroup $resourceGroup
     }
+}
+
+<#
+.SYNOPSIS
+Tests creating an account with identity set to Microsoft.KeyVault
+#>
+function Test-CreateNewBatchAccountWithSystemIdentity
+{
+    # Setup
+    $accountName = Get-BatchAccountName
+    $resourceGroup = Get-ResourceGroupName
+
+    try
+    {
+        $location = Get-BatchAccountProviderLocation
+        # Create a Batch account
+        New-AzResourceGroup -Name $resourceGroup -Location $location
+        $createdAccount = New-AzBatchAccount -Name $accountName -ResourceGroupName $resourceGroup -Location $location -IdentityType "SystemAssigned"
+
+		Assert-AreEqual $createdAccount.Identity.Type "SystemAssigned"
+		Assert-NotNull $createdAccount.Identity.TenantId
+		Assert-NotNull $createdAccount.Identity.PrincipalId
+    }
+    finally
+    {
+        Remove-AzResourceGroup $resourceGroup
+    }
 }

src/Batch/Batch.Test/ScenarioTests/Common.ps1

@@ -69,11 +69,11 @@ function Get-BatchAccountProviderLocation($index)
         $location = $r.Locations
 
         if ($location -eq $null)
-        {  
+        {
             return "westus"
-        } 
-        else 
-        {  
+        }
+        else
+        {
             if ($index -eq $null)
             {
                 return "westus"
@@ -82,7 +82,7 @@ function Get-BatchAccountProviderLocation($index)
             {
                 return $location[$index]
             }
-        }  
+        }
     }
 
     return "westus"