Merge pull request Azure#1496 from DeepakRajendranMsft/FixRDPCmdlet

Fix RDP cmdlet

Author: markcowl

src/ResourceManager/Compute/Commands.Compute/RemoteDesktop/GetAzureRemoteDesktopFileCommand.cs

@@ -69,6 +69,10 @@ public SwitchParameter Launch
             set;
         }
 
+        const string PublicIPAddressResource = "publicIPAddresses";
+        const string NetworkInterfaceResouce = "networkInterfaces";
+        const string LoadBalancerResouce = "loadBalancers";
+
         public override void ExecuteCmdlet()
         {
             base.ExecuteCmdlet();
@@ -85,21 +89,19 @@ public override void ExecuteCmdlet()
                 // Get Azure VM
                 var vmResponse = this.VirtualMachineClient.Get(this.ResourceGroupName, this.Name);
 
+                var nicId = vmResponse.VirtualMachine.NetworkProfile.NetworkInterfaces.First().ReferenceUri;
+
                 // Get the NIC
-                var nicResourceGroupName =
-                    this.GetResourceGroupName(vmResponse.VirtualMachine.NetworkProfile.NetworkInterfaces.First().ReferenceUri);
+                var nicResourceGroupName = this.GetResourceGroupName(nicId);
 
-                var nicName =
-                    this.GetResourceName(
-                        vmResponse.VirtualMachine.NetworkProfile.NetworkInterfaces.First().ReferenceUri, "networkInterfaces");
+                var nicName = this.GetResourceName(nicId, NetworkInterfaceResouce);
 
-                var nic =
-                    this.NetworkClient.NetworkManagementClient.NetworkInterfaces.Get(nicResourceGroupName, nicName);
+                var nic = this.NetworkClient.NetworkManagementClient.NetworkInterfaces.Get(nicResourceGroupName, nicName);
 
-                if (nic.IpConfigurations.First().PublicIPAddress != null && !string.IsNullOrEmpty(nic.IpConfigurations.First().Id))
+                if (nic.IpConfigurations.First().PublicIPAddress != null && !string.IsNullOrEmpty(nic.IpConfigurations.First().PublicIPAddress.Id))
                 {
                     // Get PublicIPAddress resource if present
-                    address = this.GetAddressFromPublicIPResource(nic.IpConfigurations.First().Id);
+                    address = this.GetAddressFromPublicIPResource(nic.IpConfigurations.First().PublicIPAddress.Id);
                 }
                 else if (nic.IpConfigurations.First().LoadBalancerInboundNatRules.Any())
                 {
@@ -108,7 +110,7 @@ public override void ExecuteCmdlet()
                     // Get ipaddress and port from loadbalancer
                     foreach (var nicRuleRef in nic.IpConfigurations.First().LoadBalancerInboundNatRules)
                     {
-                        var lbName = this.GetResourceName(nicRuleRef.Id, "loadBalancers");
+                        var lbName = this.GetResourceName(nicRuleRef.Id, LoadBalancerResouce);
                         var lbResourceGroupName = this.GetResourceGroupName(nicRuleRef.Id);
 
                         var loadbalancer =
@@ -200,10 +202,10 @@ public override void ExecuteCmdlet()
         private string GetAddressFromPublicIPResource(string resourceId)
         {
             string address = string.Empty;
-
+            
             // Get IpAddress from public IPAddress resource
             var publicIPResourceGroupName = this.GetResourceGroupName(resourceId);
-            var publicIPName = this.GetResourceName(resourceId, "publicIPAddresses");
+            var publicIPName = this.GetResourceName(resourceId, PublicIPAddressResource);
 
             var publicIp =
                 this.NetworkClient.NetworkManagementClient.PublicIPAddresses.Get(
@@ -230,7 +232,16 @@ private string GetResourceGroupName(string resourceId)
 
         private string GetResourceName(string resourceId, string resource)
         {
-            return resourceId.Split('/')[8];
+            int resourceTypeLocation = resourceId.IndexOf(resource, StringComparison.OrdinalIgnoreCase);
+
+            var resourceName = resourceId.Substring(resourceTypeLocation + resource.Length + 1);
+            if (resourceName.Contains("/"))
+            {
+                int resourceNameEnd = resourceName.IndexOf("/");
+                resourceName = resourceName.Substring(0, resourceNameEnd);
+            }
+
+            return resourceName;
         }
     }
 }