Merge pull request #616 from vladca/rel095_tm

TrafficManager Endpoint management cmdlets
huangpf · Jul 16, 2015 · 179166f · 179166f
2 parents 5ead947 + 39ed970
commit 179166f
Show file tree

Hide file tree

Showing 59 changed files with 11,535 additions and 703 deletions.
diff --git a/ChangeLog.txt b/ChangeLog.txt
@@ -89,6 +89,19 @@
 * Azure Resource Manager cmdlets
     * Fixed formatting of output for Get-UsageAggregates
     * Fixed executing Get-UsageAggregates when first cmdlet being called.
+* Added TrafficManager cmdlets
+    * Enable-AzureTrafficManagerProfile
+    * Disable-AzureTrafficManagerProfile
+    * New-AzureTrafficManagerEndpoint
+    * Get-AzureTrafficManagerEndpoint
+    * Set-AzureTrafficManagerEndpoint
+    * Remove-AzureTrafficManagerEndpoint
+    * Enable-AzureTrafficManagerEndpoint
+    * Disable-AzureTrafficManagerEndpoint
+* Upgraded TrafficManager cmdlets
+    * Get-AzureTrafficManagerProfile
+        * Name is now optional (it will list all profiles in resource group)
+        * Resource group is now optional (it will list all profiles in subscription)
 
 * Azure Data Factory cmdlets
     * Upgraded management library to 1.0.0 with breaking JSON format change.

diff --git a/src/ResourceManager.sln b/src/ResourceManager.sln
@@ -49,7 +49,7 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.StreamAnalytics.Te
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Insights", "ResourceManager\Insights\Commands.Insights\Commands.Insights.csproj", "{DEA446A1-84E2-46CC-B780-EB4AFDE2460E}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManagement.Automation.Test", "ResourceManager\Automation\Commands.Automation.Test\Commands.ResourceManagement.Automation.Test.csproj", "{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.ResourceManagement.Automation.Test", "ResourceManager\Automation\Commands.Automation.Test\Commands.ResourceManagement.Automation.Test.csproj", "{59D1B5DC-9175-43EC-90C6-CBA601B3565F}"
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Websites", "ResourceManager\Websites\Commands.Websites\Commands.Websites.csproj", "{80A92297-7C92-456B-8EE7-9FB6CE30149D}"
 EndProject
@@ -63,6 +63,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Dns", "ResourceMan
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.Dns.Test", "ResourceManager\Dns\Commands.Dns.Test\Commands.Dns.Test.csproj", "{133561EC-99AF-4ADC-AF41-39C4D3AD323B}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.TrafficManager2.Test", "ResourceManager\TrafficManager\Commands.TrafficManager2.Test\Commands.TrafficManager2.Test.csproj", "{5764A3A4-586C-4536-8481-13007CAC111B}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Commands.TrafficManager2", "ResourceManager\TrafficManager\Commands.TrafficManager2\Commands.TrafficManager2.csproj", "{270CBB5F-BB8A-4E33-B35B-95698E607D97}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -173,6 +177,14 @@ Global
 		{133561EC-99AF-4ADC-AF41-39C4D3AD323B}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{133561EC-99AF-4ADC-AF41-39C4D3AD323B}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{133561EC-99AF-4ADC-AF41-39C4D3AD323B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5764A3A4-586C-4536-8481-13007CAC111B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5764A3A4-586C-4536-8481-13007CAC111B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5764A3A4-586C-4536-8481-13007CAC111B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5764A3A4-586C-4536-8481-13007CAC111B}.Release|Any CPU.Build.0 = Release|Any CPU
+		{270CBB5F-BB8A-4E33-B35B-95698E607D97}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{270CBB5F-BB8A-4E33-B35B-95698E607D97}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{270CBB5F-BB8A-4E33-B35B-95698E607D97}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{270CBB5F-BB8A-4E33-B35B-95698E607D97}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -188,9 +200,8 @@ Global
 		{7E6683BE-ECFF-4709-89EB-1325E9E70512} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{13E031E4-8A43-4B87-9D72-D70180C31C11} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
-		{F4ABAD68-64A5-4B23-B09C-42559A7524DE} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{469F20E0-9D40-41AD-94C3-B47AD15A4C00} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 		{133561EC-99AF-4ADC-AF41-39C4D3AD323B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
-		{13E031E4-8A43-4B87-9D72-D70180C31C11} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
+		{5764A3A4-586C-4536-8481-13007CAC111B} = {95C16AED-FD57-42A0-86C3-2CF4300A4817}
 	EndGlobalSection
 EndGlobal
diff --git a/...er/Automation/Commands.Automation.Test/Commands.ResourceManagement.Automation.Test.csproj b/...er/Automation/Commands.Automation.Test/Commands.ResourceManagement.Automation.Test.csproj
@@ -6,7 +6,7 @@
     <ProductVersion>
     </ProductVersion>
     <SchemaVersion>2.0</SchemaVersion>
-    <ProjectGuid>{59D1B5DC-9175-43EC-90C6-CBA601B3565F}</ProjectGuid>
+    <ProjectGuid>{127D0D51-FDEA-4E1A-8CD8-34DEB5C2F7F6}</ProjectGuid>
     <OutputType>Library</OutputType>
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>Microsoft.Azure.Commands.ResourceManager.Automation.Test</RootNamespace>

diff --git a/...Manager/TrafficManager/Commands.TrafficManager2.Test/Commands.TrafficManager2.Test.csproj b/...Manager/TrafficManager/Commands.TrafficManager2.Test/Commands.TrafficManager2.Test.csproj
@@ -97,7 +97,7 @@
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="ScenarioTests\ProfileTests.cs" />
     <Compile Include="ScenarioTests\EndpointTests.cs" />
-    <Compile Include="ScenarioTests\WatmV2TestsBase.cs" />
+    <Compile Include="ScenarioTests\TestController.cs" />
     <Compile Include="UnitTests\AddAzureTrafficManagerEndpointConfigTests.cs" />
     <Compile Include="UnitTests\RemoveAzureTrafficManagerEndpointConfigTests.cs" />
   </ItemGroup>
@@ -113,29 +113,8 @@
     <None Include="ScenarioTests\ProfileTests.ps1">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
-    <None Include="SessionRecords\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.EndpointTests\TestAddEndpoint.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="SessionRecords\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.EndpointTests\TestDeleteEndpoint.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="SessionRecords\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.ProfileTests\TestCreateDeleteUsingProfile.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="SessionRecords\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.ProfileTests\TestCrudWithEndpoint.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="SessionRecords\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.ProfileTests\TestProfileCrud.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="SessionRecords\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.ProfileTests\TestProfileCrudWithPiping.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="SessionRecords\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.ProfileTests\TestProfileNewAlreadyExists.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </None>
-    <None Include="SessionRecords\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.ProfileTests\TestProfileRemoveNonExisting.json">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    <None Include="SessionRecords\**\*.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
   </ItemGroup>
   <ItemGroup>

diff --git a/...sourceManager/TrafficManager/Commands.TrafficManager2.Test/ScenarioTests/EndpointTests.cs b/...sourceManager/TrafficManager/Commands.TrafficManager2.Test/ScenarioTests/EndpointTests.cs
@@ -17,20 +17,111 @@ namespace Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests
     using Microsoft.WindowsAzure.Commands.ScenarioTest;
     using Xunit;
 
-    public class EndpointTests : WatmV2TestsBase
+    public class EndpointTests
     {
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestAddEndpoint()
         {
-            this.RunPowerShellTest("Test-AddEndpoint");
+            TestController.NewInstance.RunPowerShellTest("Test-AddEndpoint");
         }
 
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestDeleteEndpoint()
         {
-            this.RunPowerShellTest("Test-DeleteEndpoint");
+            TestController.NewInstance.RunPowerShellTest("Test-DeleteEndpoint");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestEndpointCrud()
+        {
+            TestController.NewInstance.RunPowerShellTest("Test-EndpointCrud");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestEndpointCrudPiping()
+        {
+            TestController.NewInstance.RunPowerShellTest("Test-EndpointCrudPiping");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestCreateExistingEndpoint()
+        {
+            TestController.NewInstance.RunPowerShellTest("Test-CreateExistingEndpoint");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestCreateExistingEndpointFromNonExistingProfile()
+        {
+            TestController.NewInstance.RunPowerShellTest("Test-CreateExistingEndpointFromNonExistingProfile");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestRemoveExistingEndpointFromNonExistingProfile()
+        {
+            TestController.NewInstance.RunPowerShellTest("Test-RemoveExistingEndpointFromNonExistingProfile");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestGetExistingEndpointFromNonExistingProfile()
+        {
+            TestController.NewInstance.RunPowerShellTest("Test-GetExistingEndpointFromNonExistingProfile");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestRemoveNonExistingEndpointFromProfile()
+        {
+            TestController.NewInstance.RunPowerShellTest("Test-RemoveNonExistingEndpointFromProfile");
+        }
+
+        [Fact(Skip = "Bug")]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestEnableEndpoint()
+        {
+            TestController.NewInstance.RunPowerShellTest("Test-EnableEndpoint");
+        }
+
+        [Fact(Skip = "Bug")]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestDisableEndpoint()
+        {
+            TestController.NewInstance.RunPowerShellTest("Test-DisableEndpoint");
+        }
+
+        [Fact(Skip = "Bug")]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestEnableEndpointUsingPiping()
+        {
+            TestController.NewInstance.RunPowerShellTest("Test-EnableEndpointUsingPiping");
+        }
+
+        [Fact(Skip = "Bug")]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestDisableEndpointUsingPiping()
+        {
+            TestController.NewInstance.RunPowerShellTest("Test-DisableEndpointUsingPiping");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestEnableNonExistingEndpoint()
+        {
+            TestController.NewInstance.RunPowerShellTest("Test-EnableNonExistingEndpoint");
+        }
+
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestDisableNonExistingEndpoint()
+        {
+            TestController.NewInstance.RunPowerShellTest("Test-DisableNonExistingEndpoint");
         }
     }
 }