Merge pull request Azure#1599 from dihan0604/dev

Bug fix for several APIs

Author: stankovski

src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/BgpPeerings/RemoveAzureBGPPeering.cs

@@ -27,7 +27,7 @@ public class RemoveAzureBGPPeeringCommand : ExpressRouteBaseCmdlet
             HelpMessage = "Service Key associated with the Azure BGP Peering to be removed")]
         public Guid ServiceKey { get; set; }
 
-        [Parameter(Mandatory = false, ValueFromPipelineByPropertyName = true, HelpMessage = "Bgp Peering Access Type: Public or Private")]
+        [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true, HelpMessage = "Bgp Peering Access Type: Public or Private")]
         [DefaultValue("Private")]
         public BgpPeeringAccessType AccessType { get; set; }
 

src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/DedicatedCircuitStats/GetAzureDedicatedCircuitPeeringArpInfo.cs

@@ -20,6 +20,40 @@
 
 namespace Microsoft.WindowsAzure.Commands.ExpressRoute
 {
+    using System.IO;
+    using System.Net;
+    using System.Text;
+    using System.Xml;
+    public class CommonParser
+    {
+        public static string parseResult(string url, StringBuilder sb)
+        {
+            var contents = new System.Net.WebClient().DownloadString(url);
+            XmlDocument xmlDoc = new XmlDocument();
+            xmlDoc.LoadXml(contents);
+            bool firstLine = true;
+            StringBuilder header = new StringBuilder();
+            StringBuilder body = new StringBuilder();
+            foreach (XmlNode node in xmlDoc.DocumentElement.ChildNodes)
+            {
+                foreach (XmlNode nodeChild in node.ChildNodes)
+                {
+                    if (firstLine)
+                    {
+                        header.Append(string.Format("{0,20}", nodeChild.Name));
+                    }
+                    body.Append(string.Format("{0,20}", nodeChild.InnerText));
+                }
+                firstLine = false;
+                body.AppendLine();
+            }
+            sb.AppendLine();
+            sb.AppendLine(header.ToString());
+            sb.AppendLine(body.ToString());
+            return sb.ToString();
+        }
+    }
+
     [Cmdlet(VerbsCommon.Get, "AzureDedicatedCircuitPeeringArpInfo"), OutputType(typeof(string), typeof(IEnumerable<string>))]
     public class GetAzureDedicatedCircuitPeeringArpInfoCommand : ExpressRouteBaseCmdlet
     {
@@ -33,13 +67,18 @@ public class GetAzureDedicatedCircuitPeeringArpInfoCommand : ExpressRouteBaseCmd
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true,
             HelpMessage = "Device Path: Primary or Secondary")]
-        public DevicePath BgpPeeringDevicePath { get; set; }
+        public DevicePath Path { get; set; }
 
         public override void ExecuteCmdlet()
         {
-           var arpInfo = ExpressRouteClient.GetAzureDedicatedCircuitPeeringArpInfo(ServiceKey, AccessType, BgpPeeringDevicePath);
-            Console.WriteLine(arpInfo);
-            WriteObject(arpInfo);
+            var arpInfo = ExpressRouteClient.GetAzureDedicatedCircuitPeeringArpInfo(ServiceKey, AccessType, Path);
+            // parse output to a more user-friendly output
+           StringBuilder sb = new StringBuilder();
+           sb.AppendLine("");
+           sb.AppendLine("ARP Info:");
+           WriteObject(CommonParser.parseResult(arpInfo, sb));
         }
+
+        
     }
 }

src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/DedicatedCircuitStats/GetAzureDedicatedCircuitPeeringRouteTableInfo.cs

@@ -20,6 +20,8 @@
 
 namespace Microsoft.WindowsAzure.Commands.ExpressRoute
 {
+    using System.Text;
+
     [Cmdlet(VerbsCommon.Get, "AzureDedicatedCircuitPeeringRouteTableInfo"), OutputType(typeof(AzureDedicatedCircuitPeeringRouteTableInfo), typeof(IEnumerable<AzureDedicatedCircuitPeeringRouteTableInfo>))]
     public class GetAzureDedicatedCircuitPeeringRouteTableInfoCommand : ExpressRouteBaseCmdlet
     {
@@ -33,12 +35,15 @@ public class GetAzureDedicatedCircuitPeeringRouteTableInfoCommand : ExpressRoute
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true,
             HelpMessage = "Device Path: Primary or Secondary")]
-        public DevicePath BgpPeeringDevicePath { get; set; }
+        public DevicePath Path { get; set; }
 
         public override void ExecuteCmdlet()
         {
-            var arpInfo = ExpressRouteClient.GetAzureDedicatedCircuitPeeringRouteTableInfo(ServiceKey, AccessType, BgpPeeringDevicePath);
-            WriteObject(arpInfo);
+            var routeTable = ExpressRouteClient.GetAzureDedicatedCircuitPeeringRouteTableInfo(ServiceKey, AccessType, Path);
+            StringBuilder sb = new StringBuilder();
+            sb.AppendLine("");
+            sb.AppendLine("Route Table Info:");
+            WriteObject(CommonParser.parseResult(routeTable, sb));
         }
     }
 

src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/DedicatedCircuitStats/GetAzureDedicatedCircuitPeeringRouteTableSummary.cs

@@ -20,6 +20,8 @@
 
 namespace Microsoft.WindowsAzure.Commands.ExpressRoute
 {
+    using System.Text;
+
     [Cmdlet(VerbsCommon.Get, "AzureDedicatedCircuitPeeringRouteTableSummary"), OutputType(typeof(AzureDedicatedCircuitPeeringRouteTableSummary), typeof(IEnumerable<AzureDedicatedCircuitPeeringRouteTableSummary>))]
     public class GetAzureDedicatedCircuitPeeringRouteTableSummaryCommand : ExpressRouteBaseCmdlet
     {
@@ -33,12 +35,15 @@ public class GetAzureDedicatedCircuitPeeringRouteTableSummaryCommand : ExpressRo
 
         [Parameter(Mandatory = true, ValueFromPipelineByPropertyName = true,
             HelpMessage = "Device Path: Primary or Secondary")]
-        public DevicePath BgpPeeringDevicePath { get; set; }
+        public DevicePath Path { get; set; }
 
         public override void ExecuteCmdlet()
         {
-            var arpInfo = ExpressRouteClient.GetAzureDedicatedCircuitPeeringRouteTableSummary(ServiceKey, AccessType, BgpPeeringDevicePath);
-            WriteObject(arpInfo);
+            var routeSummary = ExpressRouteClient.GetAzureDedicatedCircuitPeeringRouteTableSummary(ServiceKey, AccessType, Path);
+            StringBuilder sb = new StringBuilder();
+            sb.AppendLine("");
+            sb.AppendLine("Route Table Summary:");
+            WriteObject(CommonParser.parseResult(routeSummary, sb));
         }
     }
 }