Skip to content

Commit e7ca8cc

Browse files
authored
Remove nfv routing parameters (#23531)
* remove nfv routing parameters * add nfv files to fix breaking change * Revert "add nfv files to fix breaking change" This reverts commit 3450584.
1 parent 2a0ae72 commit e7ca8cc

File tree

6 files changed

+9
-118
lines changed

6 files changed

+9
-118
lines changed

src/Network/Network/Common/NetworkResourceManagerProfile.cs

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -229,8 +229,6 @@ private static void Initialize()
229229
cfg.AddProfile<NetworkResourceManagerProfile>();
230230
cfg.CreateMap<CNM.PSResourceId, MNM.SubResource>();
231231
cfg.CreateMap<MNM.SubResource, CNM.PSResourceId>();
232-
cfg.CreateMap<CNM.PSResourceIdNfv, MNM.RoutingConfigurationNfvSubResource>();
233-
cfg.CreateMap<MNM.RoutingConfigurationNfvSubResource, CNM.PSResourceIdNfv>();
234232

235233
// Map request error exceptions between SDK and PowerShell
236234
cfg.CreateMap<MNM.Error, Rest.Azure.CloudError>();
@@ -1269,8 +1267,6 @@ private static void Initialize()
12691267
cfg.CreateMap<CNM.PSVnetRoute, MNM.VnetRoute>();
12701268
cfg.CreateMap<CNM.PSStaticRoute, MNM.StaticRoute>();
12711269
cfg.CreateMap<CNM.PSStaticRoutesConfig, MNM.StaticRoutesConfig>();
1272-
cfg.CreateMap<CNM.PSRoutingConfigurationNfv, MNM.RoutingConfigurationNfv>();
1273-
cfg.CreateMap<CNM.PSPropagatedRouteTableNfv, MNM.PropagatedRouteTableNfv>();
12741270

12751271
// MNM to CNM
12761272
cfg.CreateMap<MNM.HubRouteTable, CNM.PSVHubRouteTable>();
@@ -1279,8 +1275,6 @@ private static void Initialize()
12791275
cfg.CreateMap<MNM.PropagatedRouteTable, CNM.PSPropagatedRouteTable>();
12801276
cfg.CreateMap<MNM.StaticRoute, CNM.PSStaticRoute>();
12811277
cfg.CreateMap<MNM.StaticRoutesConfig, CNM.PSStaticRoutesConfig>();
1282-
cfg.CreateMap<MNM.RoutingConfigurationNfv, CNM.PSRoutingConfigurationNfv>();
1283-
cfg.CreateMap<MNM.PropagatedRouteTableNfv, CNM.PSPropagatedRouteTableNfv>();
12841278

12851279
//// Virtual Hub Routing Intent
12861280
// CNM to MNM

src/Network/Network/Models/Cortex/PSRoutingConfigurationNfv.cs

Lines changed: 0 additions & 51 deletions
This file was deleted.

src/Network/Network/Models/PSNetworkVirtualApplianceConnection.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public class PSNetworkVirtualApplianceConnection : PSChildResource
3232
public bool PropagateStaticRoutes { get; set; }
3333
public bool EnableInternetSecurity { get; set; }
3434

35-
public PSRoutingConfigurationNfv RoutingConfiguration { get; set; }
35+
public PSRoutingConfiguration RoutingConfiguration { get; set; }
3636

3737
[JsonIgnore]
3838
public string RoutingConfigurationText

src/Network/Network/Models/PSResourceIdNfv.cs

Lines changed: 0 additions & 21 deletions
This file was deleted.

src/Network/Network/Network.format.ps1xml

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -5967,29 +5967,6 @@
59675967
</ListControl>
59685968
</View>
59695969
<View>
5970-
<Name>Microsoft.Azure.Commands.Network.Models.PSRoutingConfigurationNfv</Name>
5971-
<ViewSelectedBy>
5972-
<TypeName>Microsoft.Azure.Commands.Network.Models.PSRoutingConfigurationNfv</TypeName>
5973-
</ViewSelectedBy>
5974-
<ListControl>
5975-
<ListEntries>
5976-
<ListEntry>
5977-
<ListItems>
5978-
<ListItem>
5979-
<Label>AssociatedRouteTable</Label>
5980-
<PropertyName>AssociatedRouteTable</PropertyName>
5981-
</ListItem>
5982-
<ListItem>
5983-
<Label>PropagatedRouteTables</Label>
5984-
<PropertyName>PropagatedRouteTablesText</PropertyName>
5985-
</ListItem>
5986-
</ListItems>
5987-
</ListEntry>
5988-
</ListEntries>
5989-
</ListControl>
5990-
</View>
5991-
5992-
<View>
59935970
<Name>Microsoft.Azure.Commands.Network.Models.PSVHubRouteTable</Name>
59945971
<ViewSelectedBy>
59955972
<TypeName>Microsoft.Azure.Commands.Network.Models.PSVHubRouteTable</TypeName>

src/Network/Network/help/Get-AzNetworkVirtualApplianceConnection.md

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -48,22 +48,18 @@ Asn : 65222
4848
TunnelIdentifier : 0
4949
RoutingConfiguration : {
5050
"AssociatedRouteTable": {
51-
"ResourceUri":"/subscriptions/{subid}/resourceGroups/{resource-group-name}/providers/Microsoft.Network/virtualHubs/{hub-name}//hubRouteTables/defaultRouteTable"
51+
"Id":"/subscriptions/{subid}/resourceGroups/{resource-group-name}/providers/Microsoft.Network/virtualHubs/{hub-name}//hubRouteTables/defaultRouteTable"
5252
},
5353
"PropagatedRouteTables": {
5454
"Labels": [],
5555
"Ids": [
5656
{
57-
"ResourceUri": "/subscriptions/{subid}/resourceGroups/{resource-group-name}/providers/Microsoft.Network/virtualHubs/{hub-name}//hubRouteTables/defaultRouteTable"
57+
"Id": "/subscriptions/{subid}/resourceGroups/{resource-group-name}/providers/Microsoft.Network/virtualHubs/{hub-name}//hubRouteTables/defaultRouteTable"
5858
}
5959
]
6060
},
61-
"InboundRouteMap": {
62-
"ResourceUri": ""
63-
},
64-
"OutboundRouteMap": {
65-
"ResourceUri": ""
66-
}
61+
"InboundRouteMap": {},
62+
"OutboundRouteMap": {}
6763
}
6864
```
6965

@@ -87,22 +83,18 @@ Asn : 65222
8783
TunnelIdentifier : 0
8884
RoutingConfiguration : {
8985
"AssociatedRouteTable": {
90-
"ResourceUri":"/subscriptions/{subid}/resourceGroups/{resource-group-name}/providers/Microsoft.Network/virtualHubs/{hub-name}//hubRouteTables/defaultRouteTable"
86+
"Id":"/subscriptions/{subid}/resourceGroups/{resource-group-name}/providers/Microsoft.Network/virtualHubs/{hub-name}//hubRouteTables/defaultRouteTable"
9187
},
9288
"PropagatedRouteTables": {
9389
"Labels": [],
9490
"Ids": [
9591
{
96-
"ResourceUri": "/subscriptions/{subid}/resourceGroups/{resource-group-name}/providers/Microsoft.Network/virtualHubs/{hub-name}//hubRouteTables/defaultRouteTable"
92+
"Id": "/subscriptions/{subid}/resourceGroups/{resource-group-name}/providers/Microsoft.Network/virtualHubs/{hub-name}//hubRouteTables/defaultRouteTable"
9793
}
9894
]
9995
},
100-
"InboundRouteMap": {
101-
"ResourceUri": ""
102-
},
103-
"OutboundRouteMap": {
104-
"ResourceUri": ""
105-
}
96+
"InboundRouteMap": {},
97+
"OutboundRouteMap": {}
10698
}
10799
```
108100

0 commit comments

Comments
 (0)