Skip to content

Change underline behavior of adding IP configuration to route server #15194

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 8, 2021
Merged

Change underline behavior of adding IP configuration to route server #15194

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1f6285e
fix day 1 behavior for route server
litchiyangMSFT Jun 7, 2021
02dda68
Merge branch 'network-february' of https://github.com/Azure/azure-pow…
litchiyangMSFT Jun 7, 2021
8a18771
record and log
litchiyangMSFT Jun 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1,404 changes: 761 additions & 643 deletions ...sionRecords/Commands.Network.Test.ScenarioTests.RouteServerTests/TestRouteServerCRUD.json
View file
Open in desktop

Large diffs are not rendered by default.

1,916 changes: 1,049 additions & 867 deletions ...Records/Commands.Network.Test.ScenarioTests.RouteServerTests/TestRouteServerPeerCRUD.json
View file
Open in desktop

Large diffs are not rendered by default.

1,888 changes: 938 additions & 950 deletions ...cords/Commands.Network.Test.ScenarioTests.RouteServerTests/TestRouteServerPeerRoutes.json
View file
Open in desktop

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions src/Network/Network/ChangeLog.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
--->

## Upcoming Release
* Updated cmdlets for route server for a more stable way to add IP configuration.
* Added support for getting a single private link resource.
* Added more detailed description about GroupId in `New-AzPrivateLinkServiceConnection`
* Updated cmdlets to enable setting of PrivateRange on AzureFirewallPolicy.
Expand Down
5 changes: 2 additions & 3 deletions src/Network/Network/RouteServer/GetAzureRMRouteServerCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,15 +55,14 @@ public override void Execute()
RouteServerName = resourceInfo.ResourceName;
}

string ipConfigName = "ipconfig1";
if (ShouldGetByName(ResourceGroupName, RouteServerName))
{
var virtualHub = this.NetworkClient.NetworkManagementClient.VirtualHubs.Get(ResourceGroupName, RouteServerName);
var virtualHubModel = NetworkResourceManagerProfile.Mapper.Map<CNM.PSVirtualHub>(virtualHub);
virtualHubModel.ResourceGroupName = this.ResourceGroupName;
virtualHubModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
AddBgpConnectionsToPSVirtualHub(virtualHubModel, ResourceGroupName, RouteServerName);
AddIpConfigurtaionToPSVirtualHub(virtualHubModel, this.ResourceGroupName, RouteServerName, ipConfigName);
AddIpConfigurtaionToPSVirtualHub(virtualHubModel, this.ResourceGroupName, RouteServerName);

var routeServerModel = new PSRouteServer(virtualHubModel);
routeServerModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
Expand Down Expand Up @@ -91,7 +90,7 @@ public override void Execute()
virtualHubModel.ResourceGroupName = NetworkBaseCmdlet.GetResourceGroup(virtualHub.Id);
virtualHubModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
AddBgpConnectionsToPSVirtualHub(virtualHubModel, ResourceGroupName, RouteServerName);
AddIpConfigurtaionToPSVirtualHub(virtualHubModel, this.ResourceGroupName, RouteServerName, ipConfigName);
AddIpConfigurtaionToPSVirtualHub(virtualHubModel, this.ResourceGroupName, RouteServerName);

var routeServerModel = new PSRouteServer(virtualHubModel);
routeServerModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
Expand Down
3 changes: 2 additions & 1 deletion src/Network/Network/RouteServer/NewAzureRMRouteServerCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,6 +106,7 @@ public override void Execute()
() =>
{
WriteVerbose(String.Format(Properties.Resources.CreatingLongRunningOperationMessage, this.ResourceGroupName, this.RouteServerName));

PSVirtualHub virtualHub = new PSVirtualHub
{
ResourceGroupName = this.ResourceGroupName,
Expand All @@ -130,7 +131,7 @@ public override void Execute()

virtualHub = NetworkResourceManagerProfile.Mapper.Map<PSVirtualHub>(virtualHubModel);
virtualHub.ResourceGroupName = this.ResourceGroupName;
AddIpConfigurtaionToPSVirtualHub(virtualHub, this.ResourceGroupName, this.RouteServerName, ipConfigName);
AddIpConfigurtaionToPSVirtualHub(virtualHub, this.ResourceGroupName, this.RouteServerName);

var routeServerModel = new PSRouteServer(virtualHub);
routeServerModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHubModel.Tags);
Expand Down
4 changes: 1 addition & 3 deletions src/Network/Network/RouteServer/UpdateAzureRMRouteServerCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,8 +78,6 @@ public override void Execute()
this.RouteServerName = resourceInfo.ResourceName;
}

string ipConfigName = "ipconfig1";

var virtualHub = this.NetworkClient.NetworkManagementClient.VirtualHubs.Get(ResourceGroupName, RouteServerName);
virtualHub.AllowBranchToBranchTraffic = this.AllowBranchToBranchTraffic.IsPresent;
this.NetworkClient.NetworkManagementClient.VirtualHubs.CreateOrUpdate(this.ResourceGroupName, this.RouteServerName, virtualHub);
Expand All @@ -88,7 +86,7 @@ public override void Execute()
psVirtualHub.ResourceGroupName = this.ResourceGroupName;
psVirtualHub.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
AddBgpConnectionsToPSVirtualHub(psVirtualHub, ResourceGroupName, RouteServerName);
AddIpConfigurtaionToPSVirtualHub(psVirtualHub, this.ResourceGroupName, RouteServerName, ipConfigName);
AddIpConfigurtaionToPSVirtualHub(psVirtualHub, this.ResourceGroupName, RouteServerName);

var routeServerModel = new PSRouteServer(psVirtualHub);
routeServerModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
Expand Down
3 changes: 1 addition & 2 deletions src/Network/Network/RouteServerPeer/AddAzureRMRouteServerPeerCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,6 @@ public override void Execute()
PeerIp = this.PeerIp,
Name = this.PeerName
};
string ipConfigName = "ipconfig1";

var bgpConnectionModel = NetworkResourceManagerProfile.Mapper.Map<MNM.BgpConnection>(peer);

Expand All @@ -121,7 +120,7 @@ public override void Execute()
virtualHubModel.ResourceGroupName = this.ResourceGroupName;
virtualHubModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
AddBgpConnectionsToPSVirtualHub(virtualHubModel, ResourceGroupName, this.RouteServerName);
AddIpConfigurtaionToPSVirtualHub(virtualHubModel, this.ResourceGroupName, this.RouteServerName, ipConfigName);
AddIpConfigurtaionToPSVirtualHub(virtualHubModel, this.ResourceGroupName, this.RouteServerName);

var routeServerModel = new PSRouteServer(virtualHubModel);
routeServerModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
Expand Down
4 changes: 1 addition & 3 deletions src/Network/Network/RouteServerPeer/RemoveAzureRMRouteServerPeerCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,15 +104,13 @@ public override void Execute()
PeerName,
() =>
{
string ipConfigName = "ipconfig1";

this.NetworkClient.NetworkManagementClient.VirtualHubBgpConnection.Delete(ResourceGroupName, RouteServerName, PeerName);
var virtualHub = this.NetworkClient.NetworkManagementClient.VirtualHubs.Get(ResourceGroupName, RouteServerName);
var virtualHubModel = NetworkResourceManagerProfile.Mapper.Map<CNM.PSVirtualHub>(virtualHub);
virtualHubModel.ResourceGroupName = this.ResourceGroupName;
virtualHubModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
AddBgpConnectionsToPSVirtualHub(virtualHubModel, ResourceGroupName, this.RouteServerName);
AddIpConfigurtaionToPSVirtualHub(virtualHubModel, this.ResourceGroupName, this.RouteServerName, ipConfigName);
AddIpConfigurtaionToPSVirtualHub(virtualHubModel, this.ResourceGroupName, this.RouteServerName);

var routeServerModel = new PSRouteServer(virtualHubModel);
routeServerModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
Expand Down
4 changes: 1 addition & 3 deletions src/Network/Network/RouteServerPeer/UpdateAzureRMRouteServerPeerCommand.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,8 +154,6 @@ public override void Execute()
PeerAsn = this.PeerAsn,
PeerIp = this.PeerIp
};
string ipConfigName = "ipconfig1";


var bgpConnectionModel = NetworkResourceManagerProfile.Mapper.Map<MNM.BgpConnection>(peer);

Expand All @@ -165,7 +163,7 @@ public override void Execute()
virtualHubModel.ResourceGroupName = this.ResourceGroupName;
virtualHubModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
AddBgpConnectionsToPSVirtualHub(virtualHubModel, ResourceGroupName, this.RouteServerName);
AddIpConfigurtaionToPSVirtualHub(virtualHubModel, this.ResourceGroupName, this.RouteServerName, ipConfigName);
AddIpConfigurtaionToPSVirtualHub(virtualHubModel, this.ResourceGroupName, this.RouteServerName);

var routeServerModel = new PSRouteServer(virtualHubModel);
routeServerModel.Tag = TagsConversionHelper.CreateTagHashtable(virtualHub.Tags);
Expand Down
11 changes: 8 additions & 3 deletions src/Network/Network/VirtualRouter/RouteServerBaseCmdlet.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,15 @@ public void AddBgpConnectionsToPSVirtualHub(CNM.PSVirtualHub virtualHubModel,

public void AddIpConfigurtaionToPSVirtualHub(CNM.PSVirtualHub virtualHubModel,
string resourceGroupName,
string routerName,
string ipConfigName)
string routerName)
{
var ipConfigModel = this.NetworkClient.NetworkManagementClient.VirtualHubIpConfiguration.Get(resourceGroupName, routerName, ipConfigName);
var ipConfigModels = this.NetworkClient.NetworkManagementClient.VirtualHubIpConfiguration.List(resourceGroupName, routerName);
var ipConfigList = ListNextLink<HubIpConfiguration>.GetAllResourcesByPollingNextLink(ipConfigModels, this.NetworkClient.NetworkManagementClient.VirtualHubIpConfiguration.ListNext);
HubIpConfiguration ipConfigModel = null;
if (ipConfigList.Count > 0)
{
ipConfigModel = ipConfigList[0];
}
var ipconfig = NetworkResourceManagerProfile.Mapper.Map<CNM.PSHubIpConfiguration>(ipConfigModel);
virtualHubModel.IpConfigurations = new List<CNM.PSHubIpConfiguration>();
virtualHubModel.IpConfigurations.Add(ipconfig);
Expand Down