Merge pull request #5732 from maddieclayton/Kub

Update Kubernetes module

Author: cormacpayne

Azure.PowerShell.Netcore.sln

@@ -45,9 +45,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Network.Netcore", "s
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.KeyVault.Netcore", "src\ResourceManager\KeyVault\Commands.KeyVault\Commands.KeyVault.Netcore.csproj", "{814E7BBB-3D69-410A-81CF-374C29CC5C6B}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Kubernetes.Netcore", "src\ResourceManager\Kubernetes\Commands.Kubernetes\Commands.Kubernetes.Netcore.csproj", "{80657644-11E5-435B-A3DB-DFBB7115089F}"
-EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Kubernetes.Test.Netcore", "src\ResourceManager\Kubernetes\Commands.Kubernetes.Test\Commands.Kubernetes.Test.Netcore.csproj", "{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Commands.Aks.Netcore", "src\ResourceManager\Aks\Commands.Aks\Commands.Aks.Netcore.csproj", "{80657644-11E5-435B-A3DB-DFBB7115089F}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Common.Strategies.Netcore", "src\ResourceManager\Common\Commands.Common.Strategies\Common.Strategies.Netcore.csproj", "{77492655-0086-49E8-B941-7C3E9D5448E9}"
 EndProject
@@ -315,18 +313,6 @@ Global
 		{80657644-11E5-435B-A3DB-DFBB7115089F}.Release|x64.Build.0 = Release|Any CPU
 		{80657644-11E5-435B-A3DB-DFBB7115089F}.Release|x86.ActiveCfg = Release|Any CPU
 		{80657644-11E5-435B-A3DB-DFBB7115089F}.Release|x86.Build.0 = Release|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Debug|x64.ActiveCfg = Debug|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Debug|x64.Build.0 = Debug|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Debug|x86.ActiveCfg = Debug|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Debug|x86.Build.0 = Debug|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Release|Any CPU.Build.0 = Release|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Release|x64.ActiveCfg = Release|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Release|x64.Build.0 = Release|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Release|x86.ActiveCfg = Release|Any CPU
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A}.Release|x86.Build.0 = Release|Any CPU
 		{77492655-0086-49E8-B941-7C3E9D5448E9}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{77492655-0086-49E8-B941-7C3E9D5448E9}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{77492655-0086-49E8-B941-7C3E9D5448E9}.Debug|x64.ActiveCfg = Debug|Any CPU
@@ -358,7 +344,6 @@ Global
 	GlobalSection(NestedProjects) = preSolution
 		{87246108-B555-4F5F-B916-A9C6FABB1971} = {4B187BE1-F8C4-4658-AD17-98AA087482AA}
 		{624FE5CE-0F46-4A0A-9A1B-54D5724B7F96} = {4B187BE1-F8C4-4658-AD17-98AA087482AA}
-		{E52DCBCD-CCEF-46E1-880B-CAE04A06804A} = {4B187BE1-F8C4-4658-AD17-98AA087482AA}
 		{B0EF35E9-2D7A-4AAE-8A1A-728B6CC8524B} = {4B187BE1-F8C4-4658-AD17-98AA087482AA}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution

TestMappings.json

@@ -11,6 +11,9 @@
   "src/Common/Commands.Common.Authentication.Test/": [
     ".\\src\\Common\\Commands.Common.Authentication.Test\\bin\\Debug\\Microsoft.Azure.Commands.Common.Authentication.Test.dll"
   ],
+  "src/ResourceManager/Aks/": [
+    ".\\src\\ResourceManager\\Aks\\Commands.Aks.Test\\bin\\Debug\\Microsoft.Azure.Commands.Aks.Test.dll"
+  ],
   "src/ResourceManager/AnalysisServices/": [
     ".\\src\\ResourceManager\\AnalysisServices\\Commands.AnalysisServices.Test\\bin\\Debug\\Microsoft.Azure.Commands.AnalysisServices.Test.dll"
   ],

src/ResourceManager/Kubernetes/Kubernetes.sln renamed to src/ResourceManager/Aks/Aks.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 14
 VisualStudioVersion = 14.0.25420.1
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Kubernetes", "Commands.Kubernetes\Commands.Kubernetes.csproj", "{8058D403-06E3-4BED-8924-D166CE303961}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Aks", "Commands.Aks\Commands.Aks.csproj", "{8058D403-06E3-4BED-8924-D166CE303961}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common", "..\..\Common\Commands.Common\Commands.Common.csproj", "{5EE72C53-1720-4309-B54B-5FB79703195F}"
 EndProject
@@ -17,7 +17,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Common.Authorizati
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Tests", "Tests", "{2FCD151C-4DC7-41A1-AF45-EF66C47EC6B3}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Kubernetes.Test", "Commands.Kubernetes.Test\Commands.Kubernetes.Test.csproj", "{D61726C4-A130-4CA1-A119-40BAC87ED761}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Aks.Test", "Commands.Aks.Test\Commands.Aks.Test.csproj", "{D61726C4-A130-4CA1-A119-40BAC87ED761}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ScenarioTests.ResourceManager.Common", "..\Common\Commands.ScenarioTests.ResourceManager.Common\Commands.ScenarioTests.ResourceManager.Common.csproj", "{3436A126-EDC9-4060-8952-9A1BE34CDD95}"
 EndProject

src/ResourceManager/Kubernetes/AzureRM.Kubernetes.Netcore.psd1 renamed to src/ResourceManager/Aks/AzureRM.Aks.Netcore.psd1

@@ -1,5 +1,5 @@
 #
-# Module manifest for module 'PSGet_AzureRM.Resources'
+# Module manifest for module 'PSGet_AzureRM.Aks'
 #
 # Generated by: Microsoft Corporation
 #
@@ -68,13 +68,13 @@ TypesToProcess = @()
 FormatsToProcess = @()
 
 # Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
-NestedModules = @('.\Microsoft.Azure.Commands.Kubernetes.dll')
+NestedModules = @('.\Microsoft.Azure.Commands.Aks.dll')
 
 # Functions 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 functions to export.
 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-AzureRmKubernetes', 'New-AzureRmKubernetes', 'Remove-AzureRmKubernetes', 'Import-AzureRmKubernetesCredential', 'Start-AzureRmKubernetesDashboard', 'Stop-AzureRmKubernetesDashboard', 'Set-AzureRmKubernetes')
+CmdletsToExport = @('Get-AzureRmAks', 'New-AzureRmAks', 'Remove-AzureRmAks', 'Import-AzureRmAksCredential', 'Start-AzureRmAksDashboard', 'Stop-AzureRmAksDashboard', 'Set-AzureRmAks')
 
 # Variables to export from this module
 # VariablesToExport = @()

src/ResourceManager/Kubernetes/AzureRM.Kubernetes.psd1 renamed to src/ResourceManager/Aks/AzureRM.Aks.psd1

@@ -1,5 +1,5 @@
 #
-# Module manifest for module 'PSGet_AzureRM.Kubernetes'
+# Module manifest for module 'PSGet_AzureRM.Aks'
 #
 # Generated by: Microsoft Corporation
 #
@@ -66,16 +66,16 @@ RequiredAssemblies = '.\YamlDotNet.dll',
 # TypesToProcess = @()
 
 # Format files (.ps1xml) to be loaded when importing this module
-# FormatsToProcess = '.\Microsoft.Azure.Commands.Kubernetes.Format.ps1xml'
+# FormatsToProcess = '.\Microsoft.Azure.Commands.Aks.Format.ps1xml'
 
 # Modules to import as nested modules of the module specified in RootModule/ModuleToProcess
-NestedModules = @('.\Microsoft.Azure.Commands.Kubernetes.dll')
+NestedModules = @('.\Microsoft.Azure.Commands.Aks.dll')
 
 # Functions 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 functions to export.
 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-AzureRmKubernetes', 'New-AzureRmKubernetes', 'Remove-AzureRmKubernetes', 'Import-AzureRmKubernetesCredential', 'Start-AzureRmKubernetesDashboard', 'Stop-AzureRmKubernetesDashboard', 'Set-AzureRmKubernetes')
+CmdletsToExport = @('Get-AzureRmAks', 'New-AzureRmAks', 'Remove-AzureRmAks', 'Import-AzureRmAksCredential', 'Start-AzureRmAksDashboard', 'Stop-AzureRmAksDashboard', 'Set-AzureRmAks')
 
 # Variables to export from this module
 # VariablesToExport = @()

src/ResourceManager/Kubernetes/ChangeLog.md renamed to src/ResourceManager/Aks/ChangeLog.md

@@ -9,8 +9,8 @@
     <ProjectGuid>{D61726C4-A130-4CA1-A119-40BAC87ED761}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
-    <RootNamespace>Microsoft.Azure.Commands.Kubernetes.Test</RootNamespace>
-    <AssemblyName>Microsoft.Azure.Commands.Kubernetes.Test</AssemblyName>
+    <RootNamespace>Microsoft.Azure.Commands.Aks.Test</RootNamespace>
+    <AssemblyName>Microsoft.Azure.Commands.Aks.Test</AssemblyName>
     <TargetFrameworkVersion>v4.5.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
   </PropertyGroup>
@@ -136,7 +136,7 @@
     <None Include="ScenarioTests\KubernetesTests.ps1">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
-    <None Include="SessionRecords\**\*.json">
+    <None Include="SessionRecords\Commands.Aks.Test.ScenarioTests.KubernetesTests\TestAzureKubernetes.json">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </None>
   </ItemGroup>
@@ -162,6 +162,10 @@
       <Project>{5ee72c53-1720-4309-b54b-5fb79703195f}</Project>
       <Name>Commands.Common</Name>
     </ProjectReference>
+    <ProjectReference Include="..\..\Common\Commands.Common.Authentication.ResourceManager\Commands.Common.Authentication.ResourceManager.csproj">
+      <Project>{69C2EB6B-CD63-480A-89A0-C489706E9299}</Project>
+      <Name>Commands.Common.Authentication.ResourceManager</Name>
+    </ProjectReference>
     <ProjectReference Include="..\..\Common\Commands.ResourceManager.Common\Commands.ResourceManager.Common.csproj">
       <Project>{3819d8a7-c62c-4c47-8ddd-0332d9ce1252}</Project>
       <Name>Commands.ResourceManager.Common</Name>
@@ -170,12 +174,11 @@
       <Project>{3436a126-edc9-4060-8952-9a1be34cdd95}</Project>
       <Name>Commands.ScenarioTests.ResourceManager.Common</Name>
     </ProjectReference>
-    <ProjectReference Include="..\Commands.Kubernetes\Commands.Kubernetes.csproj">
-      <Project>{5243702C-E17A-4934-817F-2C91245C8509}</Project>
-      <Name>Commands.Kubernetes</Name>
+    <ProjectReference Include="..\Commands.Aks\Commands.Aks.csproj">
+      <Project>{8058D403-06E3-4BED-8924-D166CE303961}</Project>
+      <Name>Commands.Aks</Name>
     </ProjectReference>
   </ItemGroup>
-  <ItemGroup />
   <ItemGroup>
     <Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
   </ItemGroup>

src/ResourceManager/Kubernetes/Commands.Kubernetes.Test/Commands.Kubernetes.Test.csproj renamed to src/ResourceManager/Aks/Commands.Aks.Test/Commands.Aks.Test.csproj

@@ -1,21 +1,23 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using Microsoft.Azure.Commands.Kubernetes;
+using Microsoft.Azure.Commands.Aks;
 using Xunit;
 using YamlDotNet.RepresentationModel;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using System;
+using System.Reflection;
 
-namespace Commands.Kubernetes.Test
+namespace Commands.Aks.Test
 {
     public class ConfigFixture
     {
         private readonly YamlNode _rootNode;
 
         public ConfigFixture()
         {
-            var merged = ImportAzureRmKubernetesCredential.MergeKubeConfig(File.ReadAllText("./Fixtures/config.yaml"), File.ReadAllText("./Fixtures/additional_kube_config.yaml"));
+            var dir = Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).AbsolutePath);
+            var merged = ImportAzureRmAksCredential.MergeKubeConfig(File.ReadAllText(dir + "/Fixtures/config.yaml"), File.ReadAllText(dir + "/Fixtures/additional_kube_config.yaml"));
             _rootNode = RootNodeFromString(merged);
         }
 

src/ResourceManager/Kubernetes/Commands.Kubernetes.Test/Fixtures/additional_kube_config.yaml renamed to src/ResourceManager/Aks/Commands.Aks.Test/Fixtures/additional_kube_config.yaml

@@ -0,0 +1,25 @@
+using Microsoft.Azure.Commands.ScenarioTest;
+using Microsoft.Azure.ServiceManagemenet.Common.Models;
+using Microsoft.WindowsAzure.Commands.ScenarioTest;
+using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Commands.Aks.Test.ScenarioTests
+{
+    public class KubernetesTests : RMTestBase
+    {
+        public KubernetesTests(ITestOutputHelper output)
+        {
+            XunitTracingInterceptor.AddToContext(new XunitTracingInterceptor(output));
+            TestExecutionHelpers.SetUpSessionAndProfile();
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestAzureKubernetes()
+        {
+            TestController.NewInstance.RunPowerShellTest("Test-AzureRmKubernetes");
+        }
+    }
+}

src/ResourceManager/Kubernetes/Commands.Kubernetes.Test/Fixtures/config.yaml renamed to src/ResourceManager/Aks/Commands.Aks.Test/Fixtures/config.yaml

@@ -15,20 +15,20 @@ function Test-AzureRmKubernetes
 
 		if (isLive) {
 			$cred = $(createTestCredential "Unicorns" "Puppies")
-			New-AzureRmKubernetes -ResourceGroupName $resourceGroupName -Name $kubeClusterName -ClientIdAndSecret $cred
+			New-AzureRmAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName -ClientIdAndSecret $cred
 		} else {
-			New-AzureRmKubernetes -ResourceGroupName $resourceGroupName -Name $kubeClusterName
+			New-AzureRmAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName
 		}
-		$cluster = Get-AzureRmKubernetes -ResourceGroupName $resourceGroupName -Name $kubeClusterName
+		$cluster = Get-AzureRmAks -ResourceGroupName $resourceGroupName -Name $kubeClusterName
 		Assert-NotNull $cluster.Fqdn
 		Assert-NotNull $cluster.DnsPrefix
 		Assert-AreEqual 1 $cluster.AgentPoolProfiles.Length
 		Assert-AreEqual "1.8.1" $cluster.KubernetesVersion
 		Assert-AreEqual 3 $cluster.AgentPoolProfiles[0].Count;
-		$cluster = $cluster | Set-AzureRmKubernetes -NodeCount 2
+		$cluster = $cluster | Set-AzureRmAks -NodeCount 2
 		Assert-AreEqual 2 $cluster.AgentPoolProfiles[0].Count;
-		$cluster | Import-AzureRmKubernetesCredential -Force
-		$cluster | Remove-AzureRmKubernetes -Force
+		$cluster | Import-AzureRmAksCredential -Force
+		$cluster | Remove-AzureRmAks -Force
     }
     finally
     {

src/ResourceManager/Kubernetes/Commands.Kubernetes.Test/Fixtures/id_rsa.pub renamed to src/ResourceManager/Aks/Commands.Aks.Test/Fixtures/id_rsa.pub

@@ -2,15 +2,18 @@
 using System.Diagnostics;
 using System.Linq;
 using Microsoft.Azure.Commands.Common.Authentication;
-using Microsoft.Azure.Commands.Kubernetes.Generated;
+using Microsoft.Azure.Commands.Aks.Generated;
 using Microsoft.WindowsAzure.Commands.ScenarioTest;
 using Microsoft.WindowsAzure.Commands.Test.Utilities.Common;
 using Microsoft.Rest.ClientRuntime.Azure.TestFramework;
 using Microsoft.Azure.Graph.RBAC.Version1_6;
 using System.Collections.Generic;
 using Microsoft.Azure.Test.HttpRecorder;
+using Microsoft.Azure.Commands.Common.Authentication.Models;
+using System.Reflection;
+using System.IO;
 
-namespace Commands.Kubernetes.Test.ScenarioTests
+namespace Commands.Aks.Test.ScenarioTests
 {
     public class TestController : RMTestBase
     {
@@ -33,11 +36,18 @@ public TestController()
 
         public void RunPowerShellTest(params string[] scripts)
         {
-            var st = new StackTrace();
-            var sf = st.GetFrame(1);
+            var callingClassType = TestUtilities.GetCallingClass(2);
+            var mockName = TestUtilities.GetCurrentMethodName(2);
 
-            var callingClassType = sf.GetMethod().ReflectedType.ToString();
-            var mockName = st.GetFrame(2).GetMethod().Name;
+            Dictionary<string, string> d = new Dictionary<string, string>();
+            d.Add("Microsoft.Features", null);
+            d.Add("Microsoft.Authorization", null);
+            var providersToIgnore = new Dictionary<string, string>
+                {
+                    {"Microsoft.Azure.Management.Resources.ResourceManagementClient", "2017-05-10"}
+                };
+            HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(false, d, providersToIgnore);
+            HttpMockServer.RecordsDirectory = Path.Combine(AppDomain.CurrentDomain.BaseDirectory, "SessionRecords");
 
             using (var context = MockContext.Start(callingClassType, mockName))
             {
@@ -46,23 +56,25 @@ public void RunPowerShellTest(params string[] scripts)
                                         .Split(new[] { "." }, StringSplitOptions.RemoveEmptyEntries)
                                         .Last();
 
-                Dictionary<string, string> d = new Dictionary<string, string>();
-                d.Add("Microsoft.Features", null);
-                d.Add("Microsoft.Authorization", null);
-                var providersToIgnore = new Dictionary<string, string>
-                {
-                    {"Microsoft.Azure.Management.Resources.ResourceManagementClient", "2017-05-10"}
-                };
-                HttpMockServer.Matcher = new PermissiveRecordMatcherWithApiExclusion(false, d, providersToIgnore);
-
                 helper.SetupEnvironment(AzureModule.AzureResourceManager);
                 helper.SetupModules(AzureModule.AzureResourceManager,
                     helper.RMProfileModule,
                     helper.RMResourceModule,
-                    helper.GetRMModulePath(@"AzureRM.Kubernetes.psd1"),
+                    helper.GetRMModulePath(@"AzureRM.Aks.psd1"),
                     "ScenarioTests\\Common.ps1",
                     "ScenarioTests\\" + callingClassName + ".ps1");
 
+                if (HttpMockServer.GetCurrentMode() == HttpRecorderMode.Playback)
+                {
+                    AzureSession.Instance.DataStore = new MemoryDataStore();
+                    var home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile);
+                    var dir = Path.GetDirectoryName(new Uri(Assembly.GetExecutingAssembly().CodeBase).AbsolutePath);
+                    var subscription = HttpMockServer.Variables["SubscriptionId"];
+                    AzureSession.Instance.DataStore.WriteFile(Path.Combine(home, ".ssh", "id_rsa.pub"), File.ReadAllText(dir + "/Fixtures/id_rsa.pub"));
+                    string jsonOutput = @"{""" + subscription + @""":{ ""service_principal"":""foo"",""client_secret"":""bar""}}";
+                    AzureSession.Instance.DataStore.WriteFile(Path.Combine(home, ".azure", "acsServicePrincipal.json"), jsonOutput);
+                }
+
                 helper.RunPowerShellTest(scripts);
             }
         }

src/ResourceManager/Kubernetes/Commands.Kubernetes.Test/MSSharedLibKey.snk renamed to src/ResourceManager/Aks/Commands.Aks.Test/MSSharedLibKey.snk

@@ -2,26 +2,26 @@
   <Import Project="..\..\..\..\tools\Common.Netcore.Dependencies.targets" />
   <PropertyGroup>
     <TargetFramework>netcoreapp2.0</TargetFramework>
-    <AssemblyName>Microsoft.Azure.Commands.Kubernetes</AssemblyName>
-    <RootNamespace>Microsoft.Azure.Commands.Kubernetes</RootNamespace>
+    <AssemblyName>Microsoft.Azure.Commands.Aks</AssemblyName>
+    <RootNamespace>Microsoft.Azure.Commands.Aks</RootNamespace>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <CopyLocalLockFileAssemblies>true</CopyLocalLockFileAssemblies>
     <AppendTargetFrameworkToOutputPath>false</AppendTargetFrameworkToOutputPath>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
-    <OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Kubernetes.Netcore\</OutputPath>
+    <OutputPath>..\..\..\Package\Release\ResourceManager\AzureResourceManager\AzureRM.Aks.Netcore\</OutputPath>
     <SignAssembly>True</SignAssembly>
     <DelaySign>True</DelaySign>
     <AssemblyOriginatorKeyFile>MSSharedLibKey.snk</AssemblyOriginatorKeyFile>
     <DefineConstants>TRACE;RELEASE;NETSTANDARD;SIGN</DefineConstants>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <OutputPath>..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Kubernetes.Netcore\</OutputPath>
+    <OutputPath>..\..\..\Package\Debug\ResourceManager\AzureResourceManager\AzureRM.Aks.Netcore\</OutputPath>
     <DefineConstants>TRACE;DEBUG;NETSTANDARD</DefineConstants>
     <DelaySign>false</DelaySign>
   </PropertyGroup>
   <ItemGroup>
-    <None Include="..\AzureRM.Kubernetes.Netcore.psd1" Link="AzureRM.Kubernetes.Netcore.psd1">
+    <None Include="..\AzureRM.Aks.Netcore.psd1" Link="AzureRM.Aks.Netcore.psd1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
@@ -54,10 +54,10 @@
     </EmbeddedResource>
   </ItemGroup>
   <ItemGroup>
-    <None Update="Microsoft.Azure.Commands.Kubernetes.Cmdlets.format.ps1xml">
+    <None Update="Microsoft.Azure.Commands.Aks.Cmdlets.format.ps1xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Update="Microsoft.Azure.Commands.Kubernetes.Cmdlets.Types.ps1xml">
+    <None Update="Microsoft.Azure.Commands.Aks.Cmdlets.Types.ps1xml">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>