Resolve test case failures with ResourcesClient

Author: unknown

src/ResourceManager/Resources/Commands.Resources.Test/Models.ResourceGroups/ResourceClientTests.cs

@@ -29,7 +29,6 @@
 using Microsoft.Azure.Management.Authorization;
 using Microsoft.Azure.Management.Resources;
 using Microsoft.Azure.Management.Resources.Models;
-using Microsoft.Azure.Subscriptions;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
 using Moq;
@@ -46,8 +45,6 @@ public class ResourceClientTests : RMTestBase
 
         private Mock<IAuthorizationManagementClient> authorizationManagementClientMock;
 
-        private Mock<ISubscriptionClient> subscriptionClientMock;
-
         private Mock<IDeploymentOperations> deploymentsMock;
 
         private Mock<IResourceGroupOperations> resourceGroupMock;
@@ -155,8 +152,7 @@ public ResourceClientTests()
                 galleryTemplatesClientMock.Object,
                 // TODO: http://vstfrd:8080/Azure/RD/_workitems#_a=edit&id=3247094
                 //eventsClientMock.Object,
-                authorizationManagementClientMock.Object, 
-                subscriptionClientMock.Object)
+                authorizationManagementClientMock.Object)
                 {
                     VerboseLogger = progressLoggerMock.Object,
                     ErrorLogger = errorLoggerMock.Object

src/ResourceManager/Resources/Commands.Resources/Commands.Resources.csproj

@@ -141,6 +141,7 @@
     <Compile Include="Models.Authorization\AuthorizationHelper.cs" />
     <Compile Include="Models.Authorization\FilterRoleDefinitionOptions.cs" />
     <Compile Include="Models.ResourceGroups\PSResourceProviderOperation.cs" />
+    <Compile Include="Models.ResourceGroups\SubscriptionsClient.cs" />
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DesignTime>True</DesignTime>

src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourceClient.cs

@@ -63,8 +63,6 @@ public partial class ResourcesClient
 
         public IAuthorizationManagementClient AuthorizationManagementClient { get; set; }
 
-        public ISubscriptionClient SubscriptionClient { get; set; }
-
         public GalleryTemplatesClient GalleryTemplatesClient { get; set; }
 
         public Action<string> VerboseLogger { get; set; }
@@ -81,8 +79,7 @@ public ResourcesClient(AzureContext context)
             : this(
                 AzureSession.ClientFactory.CreateClient<ResourceManagementClient>(context, AzureEnvironment.Endpoint.ResourceManager),
                 new GalleryTemplatesClient(context),
-                AzureSession.ClientFactory.CreateClient<AuthorizationManagementClient>(context, AzureEnvironment.Endpoint.ResourceManager),
-                AzureSession.ClientFactory.CreateClient<SubscriptionClient>(context, AzureEnvironment.Endpoint.ResourceManager))
+                AzureSession.ClientFactory.CreateClient<AuthorizationManagementClient>(context, AzureEnvironment.Endpoint.ResourceManager))
         {
 
         }
@@ -96,13 +93,11 @@ public ResourcesClient(AzureContext context)
         public ResourcesClient(
             IResourceManagementClient resourceManagementClient,
             GalleryTemplatesClient galleryTemplatesClient,
-            IAuthorizationManagementClient authorizationManagementClient,
-            ISubscriptionClient subscriptionClient)
+            IAuthorizationManagementClient authorizationManagementClient)
         {
             GalleryTemplatesClient = galleryTemplatesClient;
             AuthorizationManagementClient = authorizationManagementClient;
             this.ResourceManagementClient = resourceManagementClient;
-            this.SubscriptionClient = subscriptionClient;
         }
 
         /// <summary>
@@ -513,16 +508,6 @@ public virtual List<Provider> ListResourceProviders(string providerName = null,
             }
         }
 
-        public List<Location> ListLocations(string subscriptionId)
-        {
-            var locationList = new List<Location>();
-
-            var tempResult = this.SubscriptionClient.Subscriptions.ListLocations(subscriptionId);
-            locationList.AddRange(tempResult.Locations);
-
-            return locationList;
-        }
-
         private bool ContainsNormalizedLocation(string[] locations, string location)
         {
             return locations.Any(existingLocation => this.NormalizeLetterOrDigitToUpperInvariant(existingLocation).Equals(this.NormalizeLetterOrDigitToUpperInvariant(location)));

src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/ResourcesBaseCmdlet.cs

@@ -15,6 +15,7 @@
 using System.IO;
 using Microsoft.Azure.ServiceManagemenet.Common;
 using Microsoft.Azure.ServiceManagemenet.Common.Models;
+using Microsoft.Azure.Subscriptions;
 
 namespace Microsoft.Azure.Commands.Resources.Models
 {
@@ -42,6 +43,11 @@ public abstract class ResourcesBaseCmdlet : AzureRMCmdlet
         /// </summary>
         private AuthorizationClient policiesClient;
 
+        /// <summary>
+        /// Field that holds the subscripotions client instance
+        /// </summary>
+        private SubscriptionsClient subscriptionsClient;
+
         /// <summary>
         /// Gets or sets the resources client
         /// </summary>
@@ -101,6 +107,23 @@ public AuthorizationClient PoliciesClient
             set { this.policiesClient = value; }
         }
 
+        /// <summary>
+        /// Gets or sets the subscriptions client
+        /// </summary>
+        public SubscriptionsClient SubscriptionsClient
+        {
+            get
+            {
+                if (this.subscriptionsClient == null)
+                {
+                    this.subscriptionsClient = new SubscriptionsClient(DefaultContext);
+                }
+                return this.subscriptionsClient;
+            }
+
+            set { this.subscriptionsClient = value; }
+        }
+
         /// <summary>
         /// Determines the parameter set name.
         /// </summary>

src/ResourceManager/Resources/Commands.Resources/Models.ResourceGroups/SubscriptionsClient.cs

@@ -0,0 +1,56 @@
+// ----------------------------------------------------------------------------------
+//
+// 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 System.Collections.Generic;
+using Microsoft.Azure.Commands.Common.Authentication;
+using Microsoft.Azure.Commands.Common.Authentication.Models;
+using Microsoft.Azure.Subscriptions;
+using Microsoft.Azure.Subscriptions.Models;
+
+namespace Microsoft.Azure.Commands.Resources.Models
+{
+    public class SubscriptionsClient
+    {
+        public ISubscriptionClient SubscriptionClient { get; set; }
+
+        /// <summary>
+        /// Creates new SubscriptionsClient
+        /// </summary>
+        /// <param name="context">Profile containing resources to manipulate</param>
+        public SubscriptionsClient(AzureContext context)
+            : this(AzureSession.ClientFactory.CreateClient<SubscriptionClient>(context, AzureEnvironment.Endpoint.ResourceManager))
+        {
+
+        }
+
+        /// <summary>
+        /// Creates new SubscriptionsClient instance
+        /// </summary>
+        /// <param name="subscriptionClient">The subscription client instance</param>
+        public SubscriptionsClient(ISubscriptionClient subscriptionClient)
+        {
+            this.SubscriptionClient = subscriptionClient;
+        }
+
+        public List<Location> ListLocations(string subscriptionId)
+        {
+            var locationList = new List<Location>();
+
+            var tempResult = this.SubscriptionClient.Subscriptions.ListLocations(subscriptionId);
+            locationList.AddRange(tempResult.Locations);
+
+            return locationList;
+        }
+    }
+}

src/ResourceManager/Resources/Commands.Resources/Providers/GetAzureLocationCmdlet.cs

@@ -37,7 +37,7 @@ public override void ExecuteCmdlet()
         {
             WriteWarning("The output object type of this cmdlet will be modified in a future release.");
 
-            var allLocations = this.ResourcesClient.ListLocations(DefaultContext.Subscription.Id.ToString());
+            var allLocations = this.SubscriptionsClient.ListLocations(DefaultContext.Subscription.Id.ToString());
             var providers = this.ResourcesClient.ListResourceProviders(providerName: null, listAvailable: true);
             var providerLocations = ConstructResourceProviderLocations(allLocations, providers);