Skip to content

Commit bed1a2d

Browse files
cxznmhdcxzcxznmhdcxz
authored
Revert "{Network} Support vpn gateway bandwidth (#31088)"
This reverts commit 42cfd44.
1 parent bb438c3 commit bed1a2d

34 files changed

+4713
-3043
lines changed

‎src/azure-cli/azure/cli/command_modules/network/aaz/latest/network/vnet_gateway/_create.py‎

Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,9 @@ class Create(AAZCommand):
3131
"""
3232

3333
_aaz_info = {
34-
"version": "2024-07-01",
34+
"version": "2024-03-01",
3535
"resources": [
36-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/virtualnetworkgateways/{}", "2024-07-01"],
36+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/virtualnetworkgateways/{}", "2024-03-01"],
3737
]
3838
}
3939

@@ -88,10 +88,6 @@ def _build_arguments_schema(cls, *args, **kwargs):
8888
options=["--min-scale-unit"],
8989
help="Minimum scale units for auto-scale configuration.",
9090
)
91-
_args_schema.enable_high_bandwidth_vpn_gateway = AAZBoolArg(
92-
options=["--enable-high-bandwidth", "--enable-high-bandwidth-vpn-gateway"],
93-
help="To enable Advanced Connectivity feature for VPN gateway",
94-
)
9591
_args_schema.enable_private_ip = AAZBoolArg(
9692
options=["--enable-private-ip"],
9793
help="Whether private IP needs to be enabled on this gateway for connections or not.",
@@ -516,7 +512,7 @@ def url_parameters(self):
516512
def query_parameters(self):
517513
parameters = {
518514
**self.serialize_query_param(
519-
"api-version", "2024-07-01",
515+
"api-version", "2024-03-01",
520516
required=True,
521517
),
522518
}
@@ -570,7 +566,6 @@ def content(self):
570566
properties.set_prop("bgpSettings", AAZObjectType)
571567
properties.set_prop("customRoutes", AAZObjectType)
572568
properties.set_prop("enableBgp", AAZBoolType, ".enable_bgp")
573-
properties.set_prop("enableHighBandwidthVpnGateway", AAZBoolType, ".enable_high_bandwidth_vpn_gateway")
574569
properties.set_prop("enablePrivateIpAddress", AAZBoolType, ".enable_private_ip")
575570
properties.set_prop("gatewayDefaultSite", AAZObjectType)
576571
properties.set_prop("gatewayType", AAZStrType, ".gateway_type")
@@ -823,9 +818,6 @@ def _build_schema_on_200_201(cls):
823818
properties.enable_dns_forwarding = AAZBoolType(
824819
serialized_name="enableDnsForwarding",
825820
)
826-
properties.enable_high_bandwidth_vpn_gateway = AAZBoolType(
827-
serialized_name="enableHighBandwidthVpnGateway",
828-
)
829821
properties.enable_private_ip_address = AAZBoolType(
830822
serialized_name="enablePrivateIpAddress",
831823
)
@@ -861,9 +853,6 @@ def _build_schema_on_200_201(cls):
861853
properties.v_net_extended_location_resource_id = AAZStrType(
862854
serialized_name="vNetExtendedLocationResourceId",
863855
)
864-
properties.virtual_network_gateway_migration_status = AAZObjectType(
865-
serialized_name="virtualNetworkGatewayMigrationStatus",
866-
)
867856
properties.virtual_network_gateway_policy_groups = AAZListType(
868857
serialized_name="virtualNetworkGatewayPolicyGroups",
869858
)
@@ -1004,13 +993,6 @@ def _build_schema_on_200_201(cls):
1004993
sku.name = AAZStrType()
1005994
sku.tier = AAZStrType()
1006995

1007-
virtual_network_gateway_migration_status = cls._schema_on_200_201.properties.virtual_network_gateway_migration_status
1008-
virtual_network_gateway_migration_status.error_message = AAZStrType(
1009-
serialized_name="errorMessage",
1010-
)
1011-
virtual_network_gateway_migration_status.phase = AAZStrType()
1012-
virtual_network_gateway_migration_status.state = AAZStrType()
1013-
1014996
virtual_network_gateway_policy_groups = cls._schema_on_200_201.properties.virtual_network_gateway_policy_groups
1015997
virtual_network_gateway_policy_groups.Element = AAZObjectType()
1016998

‎src/azure-cli/azure/cli/command_modules/network/aaz/latest/network/vnet_gateway/_delete.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,9 @@ class Delete(AAZCommand):
2424
"""
2525

2626
_aaz_info = {
27-
"version": "2024-07-01",
27+
"version": "2024-03-01",
2828
"resources": [
29-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/virtualnetworkgateways/{}", "2024-07-01"],
29+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/virtualnetworkgateways/{}", "2024-03-01"],
3030
]
3131
}
3232

@@ -144,7 +144,7 @@ def url_parameters(self):
144144
def query_parameters(self):
145145
parameters = {
146146
**self.serialize_query_param(
147-
"api-version", "2024-07-01",
147+
"api-version", "2024-03-01",
148148
required=True,
149149
),
150150
}

‎src/azure-cli/azure/cli/command_modules/network/aaz/latest/network/vnet_gateway/_list.py‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ class List(AAZCommand):
2222
"""
2323

2424
_aaz_info = {
25-
"version": "2024-07-01",
25+
"version": "2024-03-01",
2626
"resources": [
27-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/virtualnetworkgateways", "2024-07-01"],
27+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/virtualnetworkgateways", "2024-03-01"],
2828
]
2929
}
3030

@@ -112,7 +112,7 @@ def url_parameters(self):
112112
def query_parameters(self):
113113
parameters = {
114114
**self.serialize_query_param(
115-
"api-version", "2024-07-01",
115+
"api-version", "2024-03-01",
116116
required=True,
117117
),
118118
}
@@ -241,9 +241,6 @@ def _build_schema_on_200(cls):
241241
properties.enable_dns_forwarding = AAZBoolType(
242242
serialized_name="enableDnsForwarding",
243243
)
244-
properties.enable_high_bandwidth_vpn_gateway = AAZBoolType(
245-
serialized_name="enableHighBandwidthVpnGateway",
246-
)
247244
properties.enable_private_ip_address = AAZBoolType(
248245
serialized_name="enablePrivateIpAddress",
249246
)
@@ -279,9 +276,6 @@ def _build_schema_on_200(cls):
279276
properties.v_net_extended_location_resource_id = AAZStrType(
280277
serialized_name="vNetExtendedLocationResourceId",
281278
)
282-
properties.virtual_network_gateway_migration_status = AAZObjectType(
283-
serialized_name="virtualNetworkGatewayMigrationStatus",
284-
)
285279
properties.virtual_network_gateway_policy_groups = AAZListType(
286280
serialized_name="virtualNetworkGatewayPolicyGroups",
287281
)
@@ -422,13 +416,6 @@ def _build_schema_on_200(cls):
422416
sku.name = AAZStrType()
423417
sku.tier = AAZStrType()
424418

425-
virtual_network_gateway_migration_status = cls._schema_on_200.value.Element.properties.virtual_network_gateway_migration_status
426-
virtual_network_gateway_migration_status.error_message = AAZStrType(
427-
serialized_name="errorMessage",
428-
)
429-
virtual_network_gateway_migration_status.phase = AAZStrType()
430-
virtual_network_gateway_migration_status.state = AAZStrType()
431-
432419
virtual_network_gateway_policy_groups = cls._schema_on_200.value.Element.properties.virtual_network_gateway_policy_groups
433420
virtual_network_gateway_policy_groups.Element = AAZObjectType()
434421

‎src/azure-cli/azure/cli/command_modules/network/aaz/latest/network/vnet_gateway/_show.py‎

Lines changed: 3 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ class Show(AAZCommand):
2222
"""
2323

2424
_aaz_info = {
25-
"version": "2024-07-01",
25+
"version": "2024-03-01",
2626
"resources": [
27-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/virtualnetworkgateways/{}", "2024-07-01"],
27+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/virtualnetworkgateways/{}", "2024-03-01"],
2828
]
2929
}
3030

@@ -120,7 +120,7 @@ def url_parameters(self):
120120
def query_parameters(self):
121121
parameters = {
122122
**self.serialize_query_param(
123-
"api-version", "2024-07-01",
123+
"api-version", "2024-03-01",
124124
required=True,
125125
),
126126
}
@@ -239,9 +239,6 @@ def _build_schema_on_200(cls):
239239
properties.enable_dns_forwarding = AAZBoolType(
240240
serialized_name="enableDnsForwarding",
241241
)
242-
properties.enable_high_bandwidth_vpn_gateway = AAZBoolType(
243-
serialized_name="enableHighBandwidthVpnGateway",
244-
)
245242
properties.enable_private_ip_address = AAZBoolType(
246243
serialized_name="enablePrivateIpAddress",
247244
)
@@ -277,9 +274,6 @@ def _build_schema_on_200(cls):
277274
properties.v_net_extended_location_resource_id = AAZStrType(
278275
serialized_name="vNetExtendedLocationResourceId",
279276
)
280-
properties.virtual_network_gateway_migration_status = AAZObjectType(
281-
serialized_name="virtualNetworkGatewayMigrationStatus",
282-
)
283277
properties.virtual_network_gateway_policy_groups = AAZListType(
284278
serialized_name="virtualNetworkGatewayPolicyGroups",
285279
)
@@ -420,13 +414,6 @@ def _build_schema_on_200(cls):
420414
sku.name = AAZStrType()
421415
sku.tier = AAZStrType()
422416

423-
virtual_network_gateway_migration_status = cls._schema_on_200.properties.virtual_network_gateway_migration_status
424-
virtual_network_gateway_migration_status.error_message = AAZStrType(
425-
serialized_name="errorMessage",
426-
)
427-
virtual_network_gateway_migration_status.phase = AAZStrType()
428-
virtual_network_gateway_migration_status.state = AAZStrType()
429-
430417
virtual_network_gateway_policy_groups = cls._schema_on_200.properties.virtual_network_gateway_policy_groups
431418
virtual_network_gateway_policy_groups.Element = AAZObjectType()
432419

‎src/azure-cli/azure/cli/command_modules/network/aaz/latest/network/vnet_gateway/_update.py‎

Lines changed: 4 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,9 @@ class Update(AAZCommand):
2525
"""
2626

2727
_aaz_info = {
28-
"version": "2024-07-01",
28+
"version": "2024-03-01",
2929
"resources": [
30-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/virtualnetworkgateways/{}", "2024-07-01"],
30+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/virtualnetworkgateways/{}", "2024-03-01"],
3131
]
3232
}
3333

@@ -524,7 +524,7 @@ def url_parameters(self):
524524
def query_parameters(self):
525525
parameters = {
526526
**self.serialize_query_param(
527-
"api-version", "2024-07-01",
527+
"api-version", "2024-03-01",
528528
required=True,
529529
),
530530
}
@@ -623,7 +623,7 @@ def url_parameters(self):
623623
def query_parameters(self):
624624
parameters = {
625625
**self.serialize_query_param(
626-
"api-version", "2024-07-01",
626+
"api-version", "2024-03-01",
627627
required=True,
628628
),
629629
}
@@ -992,9 +992,6 @@ def _build_schema_virtual_network_gateway_read(cls, _schema):
992992
properties.enable_dns_forwarding = AAZBoolType(
993993
serialized_name="enableDnsForwarding",
994994
)
995-
properties.enable_high_bandwidth_vpn_gateway = AAZBoolType(
996-
serialized_name="enableHighBandwidthVpnGateway",
997-
)
998995
properties.enable_private_ip_address = AAZBoolType(
999996
serialized_name="enablePrivateIpAddress",
1000997
)
@@ -1030,9 +1027,6 @@ def _build_schema_virtual_network_gateway_read(cls, _schema):
10301027
properties.v_net_extended_location_resource_id = AAZStrType(
10311028
serialized_name="vNetExtendedLocationResourceId",
10321029
)
1033-
properties.virtual_network_gateway_migration_status = AAZObjectType(
1034-
serialized_name="virtualNetworkGatewayMigrationStatus",
1035-
)
10361030
properties.virtual_network_gateway_policy_groups = AAZListType(
10371031
serialized_name="virtualNetworkGatewayPolicyGroups",
10381032
)
@@ -1173,13 +1167,6 @@ def _build_schema_virtual_network_gateway_read(cls, _schema):
11731167
sku.name = AAZStrType()
11741168
sku.tier = AAZStrType()
11751169

1176-
virtual_network_gateway_migration_status = _schema_virtual_network_gateway_read.properties.virtual_network_gateway_migration_status
1177-
virtual_network_gateway_migration_status.error_message = AAZStrType(
1178-
serialized_name="errorMessage",
1179-
)
1180-
virtual_network_gateway_migration_status.phase = AAZStrType()
1181-
virtual_network_gateway_migration_status.state = AAZStrType()
1182-
11831170
virtual_network_gateway_policy_groups = _schema_virtual_network_gateway_read.properties.virtual_network_gateway_policy_groups
11841171
virtual_network_gateway_policy_groups.Element = AAZObjectType()
11851172

‎src/azure-cli/azure/cli/command_modules/network/aaz/latest/network/vnet_gateway/_wait.py‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ class Wait(AAZWaitCommand):
2020

2121
_aaz_info = {
2222
"resources": [
23-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/virtualnetworkgateways/{}", "2024-07-01"],
23+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/virtualnetworkgateways/{}", "2024-03-01"],
2424
]
2525
}
2626

@@ -116,7 +116,7 @@ def url_parameters(self):
116116
def query_parameters(self):
117117
parameters = {
118118
**self.serialize_query_param(
119-
"api-version", "2024-07-01",
119+
"api-version", "2024-03-01",
120120
required=True,
121121
),
122122
}
@@ -235,9 +235,6 @@ def _build_schema_on_200(cls):
235235
properties.enable_dns_forwarding = AAZBoolType(
236236
serialized_name="enableDnsForwarding",
237237
)
238-
properties.enable_high_bandwidth_vpn_gateway = AAZBoolType(
239-
serialized_name="enableHighBandwidthVpnGateway",
240-
)
241238
properties.enable_private_ip_address = AAZBoolType(
242239
serialized_name="enablePrivateIpAddress",
243240
)
@@ -273,9 +270,6 @@ def _build_schema_on_200(cls):
273270
properties.v_net_extended_location_resource_id = AAZStrType(
274271
serialized_name="vNetExtendedLocationResourceId",
275272
)
276-
properties.virtual_network_gateway_migration_status = AAZObjectType(
277-
serialized_name="virtualNetworkGatewayMigrationStatus",
278-
)
279273
properties.virtual_network_gateway_policy_groups = AAZListType(
280274
serialized_name="virtualNetworkGatewayPolicyGroups",
281275
)
@@ -416,13 +410,6 @@ def _build_schema_on_200(cls):
416410
sku.name = AAZStrType()
417411
sku.tier = AAZStrType()
418412

419-
virtual_network_gateway_migration_status = cls._schema_on_200.properties.virtual_network_gateway_migration_status
420-
virtual_network_gateway_migration_status.error_message = AAZStrType(
421-
serialized_name="errorMessage",
422-
)
423-
virtual_network_gateway_migration_status.phase = AAZStrType()
424-
virtual_network_gateway_migration_status.state = AAZStrType()
425-
426413
virtual_network_gateway_policy_groups = cls._schema_on_200.properties.virtual_network_gateway_policy_groups
427414
virtual_network_gateway_policy_groups.Element = AAZObjectType()
428415

‎src/azure-cli/azure/cli/command_modules/network/aaz/latest/network/vpn_connection/_delete.py‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,9 @@ class Delete(AAZCommand):
2222
"""
2323

2424
_aaz_info = {
25-
"version": "2024-07-01",
25+
"version": "2022-01-01",
2626
"resources": [
27-
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/connections/{}", "2024-07-01"],
27+
["mgmt-plane", "/subscriptions/{}/resourcegroups/{}/providers/microsoft.network/connections/{}", "2022-01-01"],
2828
]
2929
}
3030

@@ -142,7 +142,7 @@ def url_parameters(self):
142142
def query_parameters(self):
143143
parameters = {
144144
**self.serialize_query_param(
145-
"api-version", "2024-07-01",
145+
"api-version", "2022-01-01",
146146
required=True,
147147
),
148148
}

0 commit comments

Comments
 (0)