cleaned SetupManagementClients and added 'Hyak.Common' reference

REDMOND\v-ajnava · REDMOND\v-ajnava · commit 46cfcce862e7 · 2016-11-14T19:27:36.000-08:00
diff --git a/src/ResourceManager/EventHub/Commands.EventHub.Test/Commands.EventHubs.Test.csproj b/src/ResourceManager/EventHub/Commands.EventHub.Test/Commands.EventHubs.Test.csproj
@@ -41,6 +41,10 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Hyak.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\Hyak.Common.1.0.3\lib\net45\Hyak.Common.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Azure.Common">
       <HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
     </Reference>
diff --git a/src/ResourceManager/EventHub/Commands.EventHub.Test/ScenarioTests/ConsumerGroupsTests.ps1 b/src/ResourceManager/EventHub/Commands.EventHub.Test/ScenarioTests/ConsumerGroupsTests.ps1
@@ -18,8 +18,7 @@ Get valid resource group name
 #>
 function Get-ResourceGroupName
 {
-    return "RGName-" + (getAssetName)	
-	
+    return "RGName-" + (getAssetName)		
 }
 
 <#
diff --git a/src/ResourceManager/EventHub/Commands.EventHub.Test/ScenarioTests/EventHubsController.cs b/src/ResourceManager/EventHub/Commands.EventHub.Test/ScenarioTests/EventHubsController.cs
@@ -42,14 +42,8 @@ public class EventHubsController
 
         public ResourceManagementClient ResourceManagementClient { get; private set; }
 
-        public SubscriptionClient SubscriptionClient { get; private set; }
-
         public EventHubManagementClient EventHubsManagementClient { get; private set; }
 
-        public AuthorizationManagementClient AuthorizationManagementClient { get; private set; }
-
-        //public GalleryClient GalleryClient { get; private set; }
-
         public string UserDomain { get; private set; }
 
         public static EventHubsController NewInstance
@@ -144,26 +138,8 @@ public void RunPsTestWorkflow(
         private void SetupManagementClients(MockContext context)
         {
             ResourceManagementClient = GetResourceManagementClient();
-            SubscriptionClient = GetSubscriptionClient();
-            EventHubsManagementClient = GetEventHubsManagementClient(context);
-            AuthorizationManagementClient = GetAuthorizationManagementClient();
-            //GalleryClient = GetGalleryClient();
-
-            //var armStorageManagementClient = GetArmStorageManagementClient();
-            //helper.SetupManagementClients(ResourceManagementClient,
-            //    SubscriptionClient,
-            //    EventHubsManagementClient,
-            //    AuthorizationManagementClient,
-            //    GalleryClient,
-            //    armStorageManagementClient
-            //    );
-            var armStorageManagementClient = GetArmStorageManagementClient();
-            helper.SetupManagementClients(ResourceManagementClient,
-                SubscriptionClient,
-                EventHubsManagementClient,
-                AuthorizationManagementClient,                
-                armStorageManagementClient
-                );
+            EventHubsManagementClient = GetEventHubsManagementClient(context);            
+            helper.SetupManagementClients(ResourceManagementClient,EventHubsManagementClient);
         }
 
         protected StorageManagementClient GetArmStorageManagementClient()
@@ -189,11 +165,6 @@ private SubscriptionClient GetSubscriptionClient()
         {
             return LegacyTest.TestBase.GetServiceClient<SubscriptionClient>(this.csmTestFactory);
         }
-
-        //private GalleryClient GetGalleryClient()
-        //{
-        //    return LegacyTest.TestBase.GetServiceClient<GalleryClient>(this.csmTestFactory);
-        //}
-
+        
     }
 }
diff --git a/src/ResourceManager/EventHub/Commands.EventHub.Test/ScenarioTests/NamespaceTests.ps1 b/src/ResourceManager/EventHub/Commands.EventHub.Test/ScenarioTests/NamespaceTests.ps1
@@ -18,7 +18,7 @@ Get ResourceGroup name
 #>
 function Get-ResourceGroupName
 {
-    return "RGName-" + (getAssetName)
+  return "RGName-" + (getAssetName)
 }
 
 <#
@@ -295,6 +295,5 @@ function NamespaceAuthTests
     Remove-AzureRmEventHubNamespace -ResourceGroup $resourceGroupName -NamespaceName $namespaceName
 
 	Write-Debug " Delete resourcegroup"
-	Remove-AzureRmResourceGroup -Name $resourceGroupName -Force
-	   
+	Remove-AzureRmResourceGroup -Name $resourceGroupName -Force	   
 }
diff --git a/src/ResourceManager/EventHub/Commands.EventHub/Commands.EventHub.csproj b/src/ResourceManager/EventHub/Commands.EventHub/Commands.EventHub.csproj
@@ -48,6 +48,10 @@
     <Prefer32Bit>false</Prefer32Bit>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="Hyak.Common, Version=1.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\..\packages\Hyak.Common.1.0.3\lib\net45\Hyak.Common.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.Azure.Common">
       <HintPath>..\..\..\packages\Microsoft.Azure.Common.2.1.0\lib\net45\Microsoft.Azure.Common.dll</HintPath>
     </Reference>

Original file line number	Diff line number	Diff line change
`@@ -18,8 +18,7 @@ Get valid resource group name`
`18`	`18`	`#>`
`19`	`19`	`function Get-ResourceGroupName`
`20`	`20`	`{`
`21`		`- return "RGName-" + (getAssetName)`
`22`		`-`
	`21`	`+ return "RGName-" + (getAssetName)`
`23`	`22`	`}`
`24`	`23`
`25`	`24`	`<#`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ Get ResourceGroup name`
`18`	`18`	`#>`
`19`	`19`	`function Get-ResourceGroupName`
`20`	`20`	`{`
`21`		`- return "RGName-" + (getAssetName)`
	`21`	`+ return "RGName-" + (getAssetName)`
`22`	`22`	`}`
`23`	`23`
`24`	`24`	`<#`
`@@ -295,6 +295,5 @@ function NamespaceAuthTests`
`295`	`295`	`Remove-AzureRmEventHubNamespace -ResourceGroup $resourceGroupName -NamespaceName $namespaceName`
`296`	`296`
`297`	`297`	`Write-Debug " Delete resourcegroup"`
`298`		`- Remove-AzureRmResourceGroup -Name $resourceGroupName -Force`
`299`		`-`
	`298`	`+ Remove-AzureRmResourceGroup -Name $resourceGroupName -Force`
`300`	`299`	`}`