Minor fixes to new crossconnection commandlets and AzureBgpPeering commandlets

brooklyngw · brooklyngw · commit 6ebdab837b0c · 2015-05-19T16:35:44.000-07:00
diff --git a/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/BgpPeerings/SetAzureBGPPeering.cs b/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/BgpPeerings/SetAzureBGPPeering.cs
@@ -20,7 +20,6 @@
 
 namespace Microsoft.WindowsAzure.Commands.ExpressRoute
 {
-    using ServiceManagement.Model;
 
     [Cmdlet(VerbsCommon.Set, "AzureBGPPeering"), OutputType(typeof(AzureBgpPeering))]
     public class SetAzureBGPPeeringCommand : ExpressRouteBaseCmdlet
diff --git a/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Commands.ExpressRoute.csproj b/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/Commands.ExpressRoute.csproj
@@ -122,6 +122,9 @@
     <Compile Include="BgpPeerings\NewAzureBGPPeering.cs" />
     <Compile Include="BgpPeerings\RemoveAzureBGPPeering.cs" />
     <Compile Include="BgpPeerings\SetAzureBGPPeering.cs" />
+    <Compile Include="CrossConnections\GetAzureCrossConnection.cs" />
+    <Compile Include="CrossConnections\NewAzureCrossConnections.cs" />
+    <Compile Include="CrossConnections\SetAzureCrossConnection.cs" />
     <Compile Include="DedicatedCircuitLinkAuthorizationMicrosoftIds\NewAzureDedicatedCircuitLinkAuthorizationMicrosoftIds.cs" />
     <Compile Include="DedicatedCircuitLinkAuthorizationMicrosoftIds\RemoveAzureDedicatedCircuitLinkAuthorizationMicrosoftIds.cs" />
     <Compile Include="DedicatedCircuitLinkAuthorizations\GetAzureDedicatedCircuitLinkAuthorization.cs" />
diff --git a/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/CrossConnections/SetAzureCrossConnection.cs b/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/CrossConnections/SetAzureCrossConnection.cs
@@ -20,7 +20,6 @@
 
 namespace Microsoft.WindowsAzure.Commands.ExpressRoute
 {
-    using ServiceManagement.Model;
 
     [Cmdlet(VerbsCommon.Set, "AzureCrossConnection"), OutputType(typeof(AzureCrossConnection))]
     public class SetAzureCrossConnectionCommand : ExpressRouteBaseCmdlet
diff --git a/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/ExpressRouteClient.cs b/src/ServiceManagement/ExpressRoute/Commands.ExpressRoute/ExpressRouteClient.cs
@@ -59,13 +59,16 @@ public AzureBgpPeering GetAzureBGPPeering(string serviceKey, BgpPeeringAccessTyp
             return Client.BorderGatewayProtocolPeerings.Get(serviceKey, accessType).BgpPeering;
         }
 
-        public AzureBgpPeering NewAzureBGPPeering(string serviceKey, UInt32 peerAsn, string primaryPeerSubnet,
-            string secondaryPeerSubnet, UInt32 vlanId, BgpPeeringAccessType accessType, string sharedKey = null)
+        public AzureBgpPeering NewAzureBGPPeering(string serviceKey, string advertisedPublicPrefixes, UInt32 customerAsn, UInt32 peerAsn, string primaryPeerSubnet,
+            string routingRegistryName, string secondaryPeerSubnet, UInt32 vlanId, BgpPeeringAccessType accessType, string sharedKey = null)
         {
              var result = Client.BorderGatewayProtocolPeerings.New(serviceKey, accessType, new BorderGatewayProtocolPeeringNewParameters()
             {
+                AdvertisedPublicPrefixes = advertisedPublicPrefixes,
+                CustomerAutonomousSystemNumber = customerAsn,
                 PeerAutonomousSystemNumber = peerAsn,
                 PrimaryPeerSubnet = primaryPeerSubnet,
+                RoutingRegistryName = routingRegistryName,
                 SecondaryPeerSubnet = secondaryPeerSubnet,
                 SharedKey = sharedKey,
                 VirtualLanId = vlanId
@@ -88,13 +91,15 @@ public bool RemoveAzureBGPPeering(string serviceKey, BgpPeeringAccessType access
         }
 
         public AzureBgpPeering UpdateAzureBGPPeering(string serviceKey, 
-            BgpPeeringAccessType accessType, UInt32 peerAsn, string primaryPeerSubnet,
-            string secondaryPeerSubnet, UInt32 vlanId, string sharedKey)
+            BgpPeeringAccessType accessType, UInt32 customerAsn, UInt32 peerAsn, string primaryPeerSubnet,
+            string routingRegistryName, string secondaryPeerSubnet, UInt32 vlanId, string sharedKey)
         {
             var result = Client.BorderGatewayProtocolPeerings.Update(serviceKey, accessType, new BorderGatewayProtocolPeeringUpdateParameters()
                 {
+                    CustomerAutonomousSystemNumber = customerAsn,
                     PeerAutonomousSystemNumber = peerAsn,
                     PrimaryPeerSubnet = primaryPeerSubnet,
+                    RoutingRegistryName = routingRegistryName,
                     SecondaryPeerSubnet = secondaryPeerSubnet,
                     SharedKey = sharedKey,
                     VirtualLanId = vlanId,

Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@`
`20`	`20`
`21`	`21`	`namespace Microsoft.WindowsAzure.Commands.ExpressRoute`
`22`	`22`	`{`
`23`		`- using ServiceManagement.Model;`
`24`	`23`
`25`	`24`	`[Cmdlet(VerbsCommon.Set, "AzureBGPPeering"), OutputType(typeof(AzureBgpPeering))]`
`26`	`25`	`public class SetAzureBGPPeeringCommand : ExpressRouteBaseCmdlet`
Original file line number	Diff line number	Diff line change
`@@ -59,13 +59,16 @@ public AzureBgpPeering GetAzureBGPPeering(string serviceKey, BgpPeeringAccessTyp`
`59`	`59`	`return Client.BorderGatewayProtocolPeerings.Get(serviceKey, accessType).BgpPeering;`
`60`	`60`	`}`
`61`	`61`
`62`		`- public AzureBgpPeering NewAzureBGPPeering(string serviceKey, UInt32 peerAsn, string primaryPeerSubnet,`
`63`		`- string secondaryPeerSubnet, UInt32 vlanId, BgpPeeringAccessType accessType, string sharedKey = null)`
	`62`	`+ public AzureBgpPeering NewAzureBGPPeering(string serviceKey, string advertisedPublicPrefixes, UInt32 customerAsn, UInt32 peerAsn, string primaryPeerSubnet,`
	`63`	`+ string routingRegistryName, string secondaryPeerSubnet, UInt32 vlanId, BgpPeeringAccessType accessType, string sharedKey = null)`
`64`	`64`	`{`
`65`	`65`	`var result = Client.BorderGatewayProtocolPeerings.New(serviceKey, accessType, new BorderGatewayProtocolPeeringNewParameters()`
`66`	`66`	`{`
	`67`	`+ AdvertisedPublicPrefixes = advertisedPublicPrefixes,`
	`68`	`+ CustomerAutonomousSystemNumber = customerAsn,`
`67`	`69`	`PeerAutonomousSystemNumber = peerAsn,`
`68`	`70`	`PrimaryPeerSubnet = primaryPeerSubnet,`
	`71`	`+ RoutingRegistryName = routingRegistryName,`
`69`	`72`	`SecondaryPeerSubnet = secondaryPeerSubnet,`
`70`	`73`	`SharedKey = sharedKey,`
`71`	`74`	`VirtualLanId = vlanId`
`@@ -88,13 +91,15 @@ public bool RemoveAzureBGPPeering(string serviceKey, BgpPeeringAccessType access`
`88`	`91`	`}`
`89`	`92`
`90`	`93`	`public AzureBgpPeering UpdateAzureBGPPeering(string serviceKey,`
`91`		`- BgpPeeringAccessType accessType, UInt32 peerAsn, string primaryPeerSubnet,`
`92`		`- string secondaryPeerSubnet, UInt32 vlanId, string sharedKey)`
	`94`	`+ BgpPeeringAccessType accessType, UInt32 customerAsn, UInt32 peerAsn, string primaryPeerSubnet,`
	`95`	`+ string routingRegistryName, string secondaryPeerSubnet, UInt32 vlanId, string sharedKey)`
`93`	`96`	`{`
`94`	`97`	`var result = Client.BorderGatewayProtocolPeerings.Update(serviceKey, accessType, new BorderGatewayProtocolPeeringUpdateParameters()`
`95`	`98`	`{`
	`99`	`+ CustomerAutonomousSystemNumber = customerAsn,`
`96`	`100`	`PeerAutonomousSystemNumber = peerAsn,`
`97`	`101`	`PrimaryPeerSubnet = primaryPeerSubnet,`
	`102`	`+ RoutingRegistryName = routingRegistryName,`
`98`	`103`	`SecondaryPeerSubnet = secondaryPeerSubnet,`
`99`	`104`	`SharedKey = sharedKey,`
`100`	`105`	`VirtualLanId = vlanId,`