Various fixes for unit tests

Ed Munoz · Ed Munoz · commit eff66e9d1af9 · 2015-04-14T11:20:12.000-07:00
diff --git a/src/ServiceManagement/Network/Commands.Network.Test/Commands.Network.Test.csproj b/src/ServiceManagement/Network/Commands.Network.Test/Commands.Network.Test.csproj
@@ -95,6 +95,9 @@
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.4.0.1\lib\net40\Microsoft.WindowsAzure.Management.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.WindowsAzure.Management.Compute">
+      <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.9.3.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.WindowsAzure.Management.Network">
       <SpecificVersion>False</SpecificVersion>
       <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Network.7.0.0\lib\net40\Microsoft.WindowsAzure.Management.Network.dll</HintPath>
@@ -174,6 +177,14 @@
       <Project>{46c06ed8-43d9-41fd-b73b-41547d9c04e1}</Project>
       <Name>Commands.Network</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\..\Common\Commands.Common.Test\Commands.Common.Test.csproj">
+      <Project>{3b48a77b-5956-4a62-9081-92ba04b02b27}</Project>
+      <Name>Commands.Common.Test</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\..\Compute\Commands.ServiceManagement\Commands.ServiceManagement.csproj">
+      <Project>{E1CA72BA-8374-45F6-904D-FD34ECDF5B6F}</Project>
+      <Name>Commands.ServiceManagement</Name>
+    </ProjectReference>
   </ItemGroup>
   <ItemGroup>
     <Folder Include="SessionRecords\Microsoft.Azure.Commands.Network.Test.ScenarioTests.NetworkTests\" />
diff --git a/src/ServiceManagement/Network/Commands.Network.Test/packages.config b/src/ServiceManagement/Network/Commands.Network.Test/packages.config
@@ -16,6 +16,7 @@
   <package id="Microsoft.IdentityModel.Clients.ActiveDirectory" version="2.12.111071459" targetFramework="net45" />
   <package id="Microsoft.Net.Http" version="2.2.28" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Management" version="4.0.1" targetFramework="net45" />
+  <package id="Microsoft.WindowsAzure.Management.Compute" version="9.3.0" targetFramework="net45" />
   <package id="Microsoft.WindowsAzure.Management.Network" version="7.0.0" targetFramework="net45" />
   <package id="Moq" version="4.2.1402.2112" targetFramework="net45" />
   <package id="Newtonsoft.Json" version="6.0.4" targetFramework="net45" />
diff --git a/src/ServiceManagement/Network/Commands.Network/Commands.Network.csproj b/src/ServiceManagement/Network/Commands.Network/Commands.Network.csproj
@@ -82,7 +82,7 @@
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Management.Compute, Version=9.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.9.2.1\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
+      <HintPath>..\..\..\packages\Microsoft.WindowsAzure.Management.Compute.9.3.0\lib\net40\Microsoft.WindowsAzure.Management.Compute.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.WindowsAzure.Management.Network, Version=7.0.0.0, Culture=neutral, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
diff --git a/src/ServiceManagement/Network/Commands.Network/NetworkClient.cs b/src/ServiceManagement/Network/Commands.Network/NetworkClient.cs
@@ -38,9 +38,9 @@ namespace Microsoft.Azure.Commands.Network
 
     public class NetworkClient
     {
-        private readonly NetworkManagementClient client;
-        private readonly ComputeManagementClient computeClient;
-        private readonly ManagementClient managementClient;
+        private readonly INetworkManagementClient client;
+        private readonly IComputeManagementClient computeClient;
+        private readonly IManagementClient managementClient;
         private readonly ICommandRuntime commandRuntime;
 
         public NetworkClient(AzureProfile profile, AzureSubscription subscription, ICommandRuntime commandRuntime)
@@ -50,7 +50,7 @@ public NetworkClient(AzureProfile profile, AzureSubscription subscription, IComm
                    commandRuntime)
         {   
         }
-        public NetworkClient(NetworkManagementClient client, ComputeManagementClient computeClient, ManagementClient managementClient, ICommandRuntime commandRuntime)
+        public NetworkClient(INetworkManagementClient client, IComputeManagementClient computeClient, IManagementClient managementClient, ICommandRuntime commandRuntime)
         {
             this.client = client;
             this.computeClient = computeClient;
@@ -819,7 +819,7 @@ public void RemoveNetworkSecurityRule(string securityGroupName, string securityR
             client.NetworkSecurityGroups.DeleteRule(securityGroupName, securityRuleName);
         }
 
-        public NetworkSecurityGroupGetForSubnetResponse GetNetworkSecurityGroupForSubnet(string virtualNetworkName, string subnetName)
+        public NetworkSecurityGroupGetAssociationResponse GetNetworkSecurityGroupForSubnet(string virtualNetworkName, string subnetName)
         {
             return client.NetworkSecurityGroups.GetForSubnet(virtualNetworkName, subnetName);
         }
@@ -831,7 +831,7 @@ public void RemoveNetworkSecurityGroupFromSubnet(string networkSecurityGroupName
 
         public void SetNetworkSecurityGroupForSubnet(string networkSecurityGroupName, string subnetName, string virtualNetworkName)
         {
-            var parameters = new NetworkSecurityGroupAddToSubnetParameters()
+            var parameters = new NetworkSecurityGroupAddAssociationParameters()
             {
                 Name = networkSecurityGroupName
             };
diff --git a/src/ServiceManagement/Network/Commands.Network/NetworkCmdletBase.cs b/src/ServiceManagement/Network/Commands.Network/NetworkCmdletBase.cs
@@ -32,7 +32,7 @@ protected AzureSubscription CurrentSubscription
             get { return Profile.Context.Subscription; }
         }
 
-        protected NetworkClient Client
+        public NetworkClient Client
         {
             get
             {
@@ -42,6 +42,8 @@ protected NetworkClient Client
                 }
                 return client;
             }
+
+            set { this.client = value; }
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -38,9 +38,9 @@ namespace Microsoft.Azure.Commands.Network`
`38`	`38`
`39`	`39`	`public class NetworkClient`
`40`	`40`	`{`
`41`		`- private readonly NetworkManagementClient client;`
`42`		`- private readonly ComputeManagementClient computeClient;`
`43`		`- private readonly ManagementClient managementClient;`
	`41`	`+ private readonly INetworkManagementClient client;`
	`42`	`+ private readonly IComputeManagementClient computeClient;`
	`43`	`+ private readonly IManagementClient managementClient;`
`44`	`44`	`private readonly ICommandRuntime commandRuntime;`
`45`	`45`
`46`	`46`	`public NetworkClient(AzureProfile profile, AzureSubscription subscription, ICommandRuntime commandRuntime)`
`@@ -50,7 +50,7 @@ public NetworkClient(AzureProfile profile, AzureSubscription subscription, IComm`
`50`	`50`	`commandRuntime)`
`51`	`51`	`{`
`52`	`52`	`}`
`53`		`- public NetworkClient(NetworkManagementClient client, ComputeManagementClient computeClient, ManagementClient managementClient, ICommandRuntime commandRuntime)`
	`53`	`+ public NetworkClient(INetworkManagementClient client, IComputeManagementClient computeClient, IManagementClient managementClient, ICommandRuntime commandRuntime)`
`54`	`54`	`{`
`55`	`55`	`this.client = client;`
`56`	`56`	`this.computeClient = computeClient;`
`@@ -819,7 +819,7 @@ public void RemoveNetworkSecurityRule(string securityGroupName, string securityR`
`819`	`819`	`client.NetworkSecurityGroups.DeleteRule(securityGroupName, securityRuleName);`
`820`	`820`	`}`
`821`	`821`
`822`		`- public NetworkSecurityGroupGetForSubnetResponse GetNetworkSecurityGroupForSubnet(string virtualNetworkName, string subnetName)`
	`822`	`+ public NetworkSecurityGroupGetAssociationResponse GetNetworkSecurityGroupForSubnet(string virtualNetworkName, string subnetName)`
`823`	`823`	`{`
`824`	`824`	`return client.NetworkSecurityGroups.GetForSubnet(virtualNetworkName, subnetName);`
`825`	`825`	`}`
`@@ -831,7 +831,7 @@ public void RemoveNetworkSecurityGroupFromSubnet(string networkSecurityGroupName`
`831`	`831`
`832`	`832`	`public void SetNetworkSecurityGroupForSubnet(string networkSecurityGroupName, string subnetName, string virtualNetworkName)`
`833`	`833`	`{`
`834`		`- var parameters = new NetworkSecurityGroupAddToSubnetParameters()`
	`834`	`+ var parameters = new NetworkSecurityGroupAddAssociationParameters()`
`835`	`835`	`{`
`836`	`836`	`Name = networkSecurityGroupName`
`837`	`837`	`};`
Original file line number	Diff line number	Diff line change
`@@ -32,7 +32,7 @@ protected AzureSubscription CurrentSubscription`
`32`	`32`	`get { return Profile.Context.Subscription; }`
`33`	`33`	`}`
`34`	`34`
`35`		`- protected NetworkClient Client`
	`35`	`+ public NetworkClient Client`
`36`	`36`	`{`
`37`	`37`	`get`
`38`	`38`	`{`
`@@ -42,6 +42,8 @@ protected NetworkClient Client`
`42`	`42`	`}`
`43`	`43`	`return client;`
`44`	`44`	`}`
	`45`	`+`
	`46`	`+ set { this.client = value; }`
`45`	`47`	`}`
`46`	`48`	`}`
`47`	`49`	`}`