Merge pull request #7 from Azure/build

huangpf · huangpf · commit 3db30d8a556a · 2015-04-17T15:14:28.000-07:00
update
diff --git a/README.md b/README.md
@@ -122,7 +122,6 @@ For detail descriptions and examples of the cmdlets, type
 * ```help azure``` to get all the cmdlets.
 * ```help node-dev``` to get all Node.js development related cmdlets.
 * ```help php-dev``` to get all PHP development related cmdlets.
-* ```help python-dev``` to get all Python development related cmdlets.
 * ```help <cmdlet name>``` to get the details of a specific cmdlet.
 
 ## Supported Environments
diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/Commands.TrafficManager2.Test.csproj b/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/Commands.TrafficManager2.Test.csproj
@@ -107,6 +107,9 @@
     <None Include="SessionRecords\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.ProfileTests\TestCreateDeleteUsingProfile.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
+    <None Include="SessionRecords\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.ProfileTests\TestCrudWithEndpoint.json">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </None>
     <None Include="SessionRecords\Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.ProfileTests\TestProfileCrud.json">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </None>
diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/ScenarioTests/Common.ps1 b/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/ScenarioTests/Common.ps1
@@ -75,7 +75,7 @@ Creates a resource group to use in tests
 #>
 function TestSetup-AddEndpoint($endpointName, $profile)
 {
-	$profile = Add-AzureTrafficManagerEndpointConfig -EndpointName $endpointName -TrafficManagerProfile $profile -Type "ExternalEndpoint" -Target "www.contoso.com" -EndpointStatus "Enabled" -EndpointLocation "North Europe"
+	$profile = Add-AzureTrafficManagerEndpointConfig -EndpointName $endpointName -TrafficManagerProfile $profile -Type "ExternalEndpoints" -Target "www.contoso.com" -EndpointStatus "Enabled" -EndpointLocation "North Europe"
 
 	return $profile
 }
diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/ScenarioTests/ProfileTests.cs b/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/ScenarioTests/ProfileTests.cs
@@ -40,6 +40,13 @@ public void TestCreateDeleteUsingProfile()
             WatmV2TestsBase.NewInstance.RunPowerShellTest("Test-CreateDeleteUsingProfile");
         }
 
+        [Fact]
+        [Trait(Category.AcceptanceType, Category.CheckIn)]
+        public void TestCrudWithEndpoint()
+        {
+            WatmV2TestsBase.NewInstance.RunPowerShellTest("Test-CrudWithEndpoint");
+        }
+
         [Fact]
         [Trait(Category.AcceptanceType, Category.CheckIn)]
         public void TestProfileNewAlreadyExists()
diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/ScenarioTests/ProfileTests.ps1 b/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/ScenarioTests/ProfileTests.ps1
@@ -19,7 +19,7 @@ Full Profile CRUD cycle
 function Test-ProfileCrud
 {
 	$profileName = getAssetName
-    $resourceGroup = TestSetup-CreateResourceGroup
+	$resourceGroup = TestSetup-CreateResourceGroup
 	$relativeName = getAssetName
 	$createdProfile = New-AzureTrafficManagerProfile -Name $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -RelativeDnsName $relativeName -Ttl 50 -TrafficRoutingMethod "Performance" -MonitorProtocol "HTTP" -MonitorPort 80 -MonitorPath "/testpath.asp" 
 
@@ -91,6 +91,24 @@ function Test-CreateDeleteUsingProfile
 	Assert-Throws { Get-AzureTrafficManagerProfile -Name $profileName -ResourceGroupName $resourceGroup.ResourceGroupName } "ResourceNotFound: Resource not found."
 }
 
+<#
+.SYNOPSIS
+Full cycle to create an Endpoint in a Profile
+#>
+function Test-CrudWithEndpoint
+{
+	$profileName = getAssetName
+	$resourceGroup = TestSetup-CreateResourceGroup
+	$relativeName = getAssetName
+	$createdProfile = New-AzureTrafficManagerProfile -Name $profileName -ResourceGroupName $resourceGroup.ResourceGroupName -RelativeDnsName $relativeName -Ttl 50 -TrafficRoutingMethod "Performance" -MonitorProtocol "HTTP" -MonitorPort 80 -MonitorPath "/testpath.asp" 
+
+	$profileWithEndpoint = Add-AzureTrafficManagerEndpointConfig -EndpointName "MyExternalEndpoint" -TrafficManagerProfile $createdProfile -Type "ExternalEndpoints" -Target "www.contoso.com" -EndpointStatus "Enabled" -EndpointLocation "North Europe"
+
+	$updatedProfile = Set-AzureTrafficManagerProfile -TrafficManagerProfile $profileWithEndpoint
+
+	Assert-AreEqual 1 $updatedProfile.Endpoints.Count
+}
+
 <#
 .SYNOPSIS
 Create a Profile that already exists
diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/SessionRecords/Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.ProfileTests/TestCrudWithEndpoint.json b/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/SessionRecords/Microsoft.Azure.Commands.TrafficManager.Test.ScenarioTests.ProfileTests/TestCrudWithEndpoint.json
diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/packages.config b/src/ResourceManager/TrafficManager/Commands.TrafficManager2.Test/packages.config
@@ -5,6 +5,7 @@
   <package id="Microsoft.Azure.Common.Authentication" version="1.0.17-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Common.Dependencies" version="1.0.0" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Authorization" version="0.17.0-preview" targetFramework="net45" />
+  <package id="Microsoft.Azure.Gallery" version="2.6.2-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Management.Resources" version="2.14.1-preview" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.Framework" version="1.0.5513.27084-prerelease" targetFramework="net45" />
   <package id="Microsoft.Azure.Test.HttpRecorder" version="1.0.5513.27084-prerelease" targetFramework="net45" />
diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Models/Endpoint.cs b/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Models/Endpoint.cs
@@ -14,6 +14,7 @@
 
 namespace Microsoft.Azure.Commands.TrafficManager.Models
 {
+    using System;
     using Microsoft.Azure.Commands.TrafficManager.Utilities;
 
     public class Endpoint
@@ -28,7 +29,7 @@ public string Type
 
             set
             {
-                if (!value.StartsWith(Constants.ProfileType))
+                if (!value.StartsWith(Constants.ProfileType, StringComparison.OrdinalIgnoreCase))
                 {
                     this.type = string.Format("{0}/{1}", Constants.ProfileType, value);
                 }
diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Models/TrafficManagerProfile.cs b/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Models/TrafficManagerProfile.cs
@@ -40,9 +40,10 @@ public class TrafficManagerProfile
 
         public Profile ToSDKProfile()
         {
-            return new Profile
+            var profile = new Profile
             {
                 Name = this.Name,
+                Type = Constants.ProfileType,
                 Location = TrafficManagerClient.ProfileResourceLocation,
                 Properties = new ProfileProperties
                 {
@@ -60,6 +61,30 @@ public Profile ToSDKProfile()
                     }
                 }
             };
+
+            if (this.Endpoints.Count > 0)
+            {
+                profile.Properties.Endpoints = new List<Management.TrafficManager.Models.Endpoint>();
+
+                foreach (Endpoint endpoint in this.Endpoints)
+                {
+                    profile.Properties.Endpoints.Add(new Management.TrafficManager.Models.Endpoint
+                    {
+                        Name = endpoint.Name,
+                        Type = endpoint.Type,
+                        Properties = new EndpointProperties
+                        {
+                            Target = endpoint.Target,
+                            EndpointStatus = endpoint.EndpointStatus,
+                            Weight = endpoint.Weight,
+                            Priority = endpoint.Priority,
+                            EndpointLocation = endpoint.Location
+                        }
+                    });
+                }    
+            }
+
+            return profile;
         }
     }
 }
diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Utilities/Constants.cs b/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Utilities/Constants.cs
@@ -16,9 +16,9 @@ namespace Microsoft.Azure.Commands.TrafficManager.Utilities
 {
     public class Constants
     {
-        public const string AzureEndpoint = "AzureEndpoint";
-        public const string ExternalEndpoint = "ExternalEndpoint";
-        public const string NestedEndpoint = "NestedEndpoint";
+        public const string AzureEndpoint = "AzureEndpoints";
+        public const string ExternalEndpoint = "ExternalEndpoints";
+        public const string NestedEndpoint = "NestedEndpoints";
 
         public const string StatusEnabled = "Enabled";
         public const string StatusDisabled = "Disabled";
@@ -30,6 +30,6 @@ public class Constants
         public const string HTTP = "HTTP";
         public const string HTTPS = "HTTPS";
 
-        public const string ProfileType = "Microsoft.Network/TrafficManagerProfiles";
+        public const string ProfileType = "Microsoft.Network/trafficManagerProfiles";
     }
 }
diff --git a/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Utilities/TrafficManagerClient.cs b/src/ResourceManager/TrafficManager/Commands.TrafficManager2/Utilities/TrafficManagerClient.cs
@@ -14,6 +14,7 @@
 
 namespace Microsoft.Azure.Commands.TrafficManager.Utilities
 {
+    using System.Collections.Generic;
     using System.Net;
     using Microsoft.Azure.Commands.TrafficManager.Models;
     using Microsoft.Azure.Common.Authentication;
@@ -79,13 +80,16 @@ public TrafficManagerProfile GetTrafficManagerProfile(string resourceGroupName,
 
         public TrafficManagerProfile SetTrafficManagerProfile(TrafficManagerProfile profile)
         {
+            var parameteres = new ProfileCreateOrUpdateParameters
+            {
+                Profile = profile.ToSDKProfile()
+            };
+
             ProfileCreateOrUpdateResponse response = this.TrafficManagerManagementClient.Profiles.CreateOrUpdate(
                 profile.ResourceGroupName,
                 profile.Name, 
-                new ProfileCreateOrUpdateParameters
-                {
-                    Profile = profile.ToSDKProfile()
-                });
+                parameteres
+                );
 
             return TrafficManagerClient.GetPowershellTrafficManagerProfile(profile.ResourceGroupName, profile.Name, response.Profile.Properties);
         }
@@ -99,7 +103,7 @@ public bool DeleteTrafficManagerProfile(TrafficManagerProfile profile)
 
         private static TrafficManagerProfile GetPowershellTrafficManagerProfile(string resourceGroupName, string profileName, ProfileProperties mamlProfileProperties)
         {
-            return new TrafficManagerProfile
+            var profile = new TrafficManagerProfile
             {
                 Name = profileName,
                 ResourceGroupName = resourceGroupName,
@@ -110,6 +114,27 @@ private static TrafficManagerProfile GetPowershellTrafficManagerProfile(string r
                 MonitorPort = mamlProfileProperties.MonitorConfig.Port,
                 MonitorPath = mamlProfileProperties.MonitorConfig.Path
             };
+
+            if (mamlProfileProperties.Endpoints != null)
+            {
+                profile.Endpoints = new List<Models.Endpoint>();
+
+                foreach (Endpoint endpoint in mamlProfileProperties.Endpoints)
+                {
+                    profile.Endpoints.Add(new Models.Endpoint
+                    {
+                        Name = endpoint.Name,
+                        Type = endpoint.Type,
+                        Target = endpoint.Properties.Target,
+                        EndpointStatus = endpoint.Properties.EndpointStatus,
+                        Location = endpoint.Properties.EndpointLocation,
+                        Priority = endpoint.Properties.Priority,
+                        Weight = endpoint.Properties.Weight
+                    });
+                }
+            }
+
+            return profile;
         }
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,7 @@ Creates a resource group to use in tests`
`75`	`75`	`#>`
`76`	`76`	`function TestSetup-AddEndpoint($endpointName, $profile)`
`77`	`77`	`{`
`78`		`- $profile = Add-AzureTrafficManagerEndpointConfig -EndpointName $endpointName -TrafficManagerProfile $profile -Type "ExternalEndpoint" -Target "www.contoso.com" -EndpointStatus "Enabled" -EndpointLocation "North Europe"`
	`78`	`+ $profile = Add-AzureTrafficManagerEndpointConfig -EndpointName $endpointName -TrafficManagerProfile $profile -Type "ExternalEndpoints" -Target "www.contoso.com" -EndpointStatus "Enabled" -EndpointLocation "North Europe"`
`79`	`79`
`80`	`80`	`return $profile`
`81`	`81`	`}`
Original file line number	Diff line number	Diff line change
`@@ -14,6 +14,7 @@`
`14`	`14`
`15`	`15`	`namespace Microsoft.Azure.Commands.TrafficManager.Models`
`16`	`16`	`{`
	`17`	`+ using System;`
`17`	`18`	`using Microsoft.Azure.Commands.TrafficManager.Utilities;`
`18`	`19`
`19`	`20`	`public class Endpoint`
`@@ -28,7 +29,7 @@ public string Type`
`28`	`29`
`29`	`30`	`set`
`30`	`31`	`{`
`31`		`- if (!value.StartsWith(Constants.ProfileType))`
	`32`	`+ if (!value.StartsWith(Constants.ProfileType, StringComparison.OrdinalIgnoreCase))`
`32`	`33`	`{`
`33`	`34`	`this.type = string.Format("{0}/{1}", Constants.ProfileType, value);`
`34`	`35`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,9 +40,10 @@ public class TrafficManagerProfile`
`40`	`40`
`41`	`41`	`public Profile ToSDKProfile()`
`42`	`42`	`{`
`43`		`- return new Profile`
	`43`	`+ var profile = new Profile`
`44`	`44`	`{`
`45`	`45`	`Name = this.Name,`
	`46`	`+ Type = Constants.ProfileType,`
`46`	`47`	`Location = TrafficManagerClient.ProfileResourceLocation,`
`47`	`48`	`Properties = new ProfileProperties`
`48`	`49`	`{`
`@@ -60,6 +61,30 @@ public Profile ToSDKProfile()`
`60`	`61`	`}`
`61`	`62`	`}`
`62`	`63`	`};`
	`64`	`+`
	`65`	`+ if (this.Endpoints.Count > 0)`
	`66`	`+ {`
	`67`	`+ profile.Properties.Endpoints = new List<Management.TrafficManager.Models.Endpoint>();`
	`68`	`+`
	`69`	`+ foreach (Endpoint endpoint in this.Endpoints)`
	`70`	`+ {`
	`71`	`+ profile.Properties.Endpoints.Add(new Management.TrafficManager.Models.Endpoint`
	`72`	`+ {`
	`73`	`+ Name = endpoint.Name,`
	`74`	`+ Type = endpoint.Type,`
	`75`	`+ Properties = new EndpointProperties`
	`76`	`+ {`
	`77`	`+ Target = endpoint.Target,`
	`78`	`+ EndpointStatus = endpoint.EndpointStatus,`
	`79`	`+ Weight = endpoint.Weight,`
	`80`	`+ Priority = endpoint.Priority,`
	`81`	`+ EndpointLocation = endpoint.Location`
	`82`	`+ }`
	`83`	`+ });`
	`84`	`+ }`
	`85`	`+ }`
	`86`	`+`
	`87`	`+ return profile;`
`63`	`88`	`}`
`64`	`89`	`}`
`65`	`90`	`}`
Original file line number	Diff line number	Diff line change
`@@ -16,9 +16,9 @@ namespace Microsoft.Azure.Commands.TrafficManager.Utilities`
`16`	`16`	`{`
`17`	`17`	`public class Constants`
`18`	`18`	`{`
`19`		`- public const string AzureEndpoint = "AzureEndpoint";`
`20`		`- public const string ExternalEndpoint = "ExternalEndpoint";`
`21`		`- public const string NestedEndpoint = "NestedEndpoint";`
	`19`	`+ public const string AzureEndpoint = "AzureEndpoints";`
	`20`	`+ public const string ExternalEndpoint = "ExternalEndpoints";`
	`21`	`+ public const string NestedEndpoint = "NestedEndpoints";`
`22`	`22`
`23`	`23`	`public const string StatusEnabled = "Enabled";`
`24`	`24`	`public const string StatusDisabled = "Disabled";`
`@@ -30,6 +30,6 @@ public class Constants`
`30`	`30`	`public const string HTTP = "HTTP";`
`31`	`31`	`public const string HTTPS = "HTTPS";`
`32`	`32`
`33`		`- public const string ProfileType = "Microsoft.Network/TrafficManagerProfiles";`
	`33`	`+ public const string ProfileType = "Microsoft.Network/trafficManagerProfiles";`
`34`	`34`	`}`
`35`	`35`	`}`