Merge pull request #975 from t-alguer/dev

Fixing issue with AzureEndpoints.

Author: markcowl

src/ResourceManager/TrafficManager/Commands.TrafficManager2/Models/TrafficManagerEndpoint.cs

@@ -20,6 +20,8 @@ namespace Microsoft.Azure.Commands.TrafficManager.Models
 
     public class TrafficManagerEndpoint
     {
+        public string Id { get; set; }
+
         public string Name { get; set; }
 
         public string ProfileName { get; set; }
@@ -46,16 +48,17 @@ public Endpoint ToSDKEndpoint()
         {
             return new Endpoint
             {
+                Id = this.Id,
                 Name = this.Name,
                 Type = TrafficManagerEndpoint.ToSDKEndpointType(this.Type),
-                Id = this.TargetResourceId,
                 Properties = new EndpointProperties
                 {
                     Target = this.Target,
                     EndpointStatus = this.EndpointStatus,
                     Weight = this.Weight,
                     Priority = this.Priority,
-                    EndpointLocation = this.Location
+                    EndpointLocation = this.Location,
+                    TargetResourceId = this.TargetResourceId
                 }
             };
         }

src/ResourceManager/TrafficManager/Commands.TrafficManager2/Utilities/TrafficManagerClient.cs

@@ -105,7 +105,7 @@ public TrafficManagerEndpoint CreateTrafficManagerEndpoint(string resourceGroupN
                     }
                 });
 
-            return TrafficManagerClient.GetPowershellTrafficManagerEndpoint(resourceGroupName, profileName, endpointType, endpointName, response.Endpoint.Properties);
+            return TrafficManagerClient.GetPowershellTrafficManagerEndpoint(response.Endpoint.Id, resourceGroupName, profileName, endpointType, endpointName, response.Endpoint.Properties);
         }
 
         public TrafficManagerProfile GetTrafficManagerProfile(string resourceGroupName, string profileName)
@@ -120,6 +120,7 @@ public TrafficManagerEndpoint GetTrafficManagerEndpoint(string resourceGroupName
             EndpointGetResponse response = this.TrafficManagerManagementClient.Endpoints.Get(resourceGroupName, profileName, endpointType, endpointName);
 
             return TrafficManagerClient.GetPowershellTrafficManagerEndpoint(
+                response.Endpoint.Id,
                 resourceGroupName, 
                 profileName, 
                 endpointType, 
@@ -171,6 +172,7 @@ public TrafficManagerEndpoint SetTrafficManagerEndpoint(TrafficManagerEndpoint e
                 parameters);
 
             return TrafficManagerClient.GetPowershellTrafficManagerEndpoint(
+                endpoint.Id,
                 endpoint.ResourceGroupName, 
                 endpoint.ProfileName,
                 endpoint.Type, 
@@ -285,10 +287,11 @@ private static string ExtractResourceGroupFromId(string id)
             return id.Split('/')[4];
         }
 
-        private static TrafficManagerEndpoint GetPowershellTrafficManagerEndpoint(string resourceGroupName, string profileName, string endpointType, string endpointName, EndpointProperties mamlEndpointProperties)
+        private static TrafficManagerEndpoint GetPowershellTrafficManagerEndpoint(string id, string resourceGroupName, string profileName, string endpointType, string endpointName, EndpointProperties mamlEndpointProperties)
         {
             return new TrafficManagerEndpoint
             {
+                Id = id,
                 ResourceGroupName = resourceGroupName,
                 ProfileName = profileName,
                 Name = endpointName,