Skip to content

Fix a output of HostedSubnet under virtual router #13102

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
isra-fel merged 2 commits into from
Oct 9, 2020
Merged

Fix a output of HostedSubnet under virtual router #13102

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cd18543
Change output of virtual router
litchiyangMSFT Sep 14, 2020
73312d2
fix output of hostedsubnet
litchiyangMSFT Sep 29, 2020
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
2 changes: 1 addition & 1 deletion src/Network/Network/Generated/Models/PSHubIpConfiguration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ namespace Microsoft.Azure.Commands.Network.Models
public partial class PSHubIpConfiguration : PSChildResource
{
[Ps1Xml(Target = ViewControl.Table)]
public string HostedSubnet { get; set; }
public PSSubnet Subnet { get; set; }
[Ps1Xml(Target = ViewControl.Table)]
public string ProvisioningState { get; set; }
}
Expand Down
17 changes: 2 additions & 15 deletions src/Network/Network/Generated/Models/PSVirtualRouter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,15 +35,8 @@ public PSVirtualRouter(PSVirtualHub virtualHub)
this.Location = virtualHub.Location;
this.ResourceGuid = virtualHub.ResourceGuid;
this.Type = virtualHub.Type;
this.VirtualNetworkConnections = new List<PSHubIpConfiguration>();
var ipconfig = virtualHub.IpConfigurations.FirstOrDefault<PSHubIpConfiguration>();
var virtualNetworkConnection = new PSHubIpConfiguration()
{
Name = ipconfig.Name,
HostedSubnet = ipconfig.Id,
ProvisioningState = ipconfig.ProvisioningState
};
this.VirtualNetworkConnections.Add(virtualNetworkConnection);
this.HostedSubnet = ipconfig.Subnet.Id;
this.VirtualRouterAsn = virtualHub.VirtualRouterAsn;
this.VirtualRouterIps = virtualHub.VirtualRouterIps;
this.ProvisioningState = virtualHub.ProvisioningState;
Expand All @@ -67,19 +60,13 @@ public PSVirtualRouter(PSVirtualHub virtualHub)
public List<string> VirtualRouterIps { get; set; }
[Ps1Xml(Target = ViewControl.Table)]
public string ProvisioningState { get; set; }
public List<PSHubIpConfiguration> VirtualNetworkConnections { get; set; }
public string HostedSubnet { get; set; }
public List<PSVirtualRouterPeer> Peerings { get; set; }

[JsonIgnore]
public string PeeringsText
{
get { return JsonConvert.SerializeObject(Peerings, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
}

[JsonIgnore]
public string VirtualNetworkConnectionsText
{
get { return JsonConvert.SerializeObject(VirtualNetworkConnections, Formatting.Indented, new JsonSerializerSettings() { NullValueHandling = NullValueHandling.Ignore }); }
}
}
}
4 changes: 2 additions & 2 deletions src/Network/Network/Network.format.ps1xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5409,8 +5409,8 @@
<PropertyName>ProvisioningState</PropertyName>
</ListItem>
<ListItem>
<Label>VirtualNetworkConnections</Label>
<PropertyName>VirtualNetworkConnectionsText</PropertyName>
<Label>HostedSubnet</Label>
<PropertyName>HostedSubnet</PropertyName>
</ListItem>
<ListItem>
<Label>VirtualRouterAsn</Label>
Expand Down