Skip to content

Commit

Permalink
[Network] az network vhub connection: Fix cross-tenant connection c…
Browse files Browse the repository at this point in the history
…annot be created (#6567)
  • Loading branch information
necusjz authored Jul 27, 2023
1 parent 2fb2c29 commit d07c3b8
Show file tree
Hide file tree
Showing 19 changed files with 3,066 additions and 794 deletions.
8 changes: 6 additions & 2 deletions src/virtual-wan/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,14 @@
Release History
===============

0.3.0
++++++
* `az network vhub connection`: Fix cross-tenant connection cannot be created.

0.2.17
++++++
* `az network vhub connection create`: Add new parameter `allow-b2b-traffic` and `auto-scale-config`.
* `az network vhub connection update`: Add new parameter `allow-b2b-traffic` and `auto-scale-config`.
* `az network vhub create`: Add new parameter `allow-b2b-traffic` and `auto-scale-config`.
* `az network vhub update`: Add new parameter `allow-b2b-traffic` and `auto-scale-config`.

0.2.16
++++++
Expand Down
4 changes: 0 additions & 4 deletions src/virtual-wan/azext_vwan/_client_factory.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,6 @@ def cf_virtual_hubs(cli_ctx, _):
return network_client_factory(cli_ctx).virtual_hubs


def cf_virtual_hub_connection(cli_ctx, _):
return network_client_factory(cli_ctx).hub_virtual_network_connections


def cf_virtual_hub_bgpconnection(cli_ctx, _):
return network_client_factory(cli_ctx).virtual_hub_bgp_connection

Expand Down
58 changes: 0 additions & 58 deletions src/virtual-wan/azext_vwan/_help.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,64 +18,6 @@
az network vhub get-effective-routes --resource-type P2SConnection --resource-id /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/p2sVpnGateways/MyGateway/p2sConnectionConfigurations/MyConnection -g MyRG -n MyHub
"""

helps['network vhub connection'] = """
type: group
short-summary: Manage virtual hub VNet connections.
"""

helps['network vhub connection create'] = """
type: command
short-summary: Create a virtual hub VNet connection.
examples:
- name: Create a virtual hub VNet connection without routing configuration.
text: |
az network vhub connection create -n MyConnection --vhub-name MyHub -g MyRG --remote-vnet MyVNet
- name: Create a virtual hub VNet connection with routing configuration.
text: |
az network vhub connection create -n MyConnection --vhub-name MyHub -g MyRG --remote-vnet MyVNet --associated-route-table /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/RouteTable1 --propagated-route-tables /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/RouteTable1 /subscriptions/MySub/resourceGroups/MyRG/providers/Microsoft.Network/virtualHubs/MyHub/hubRouteTables/RouteTable2 --labels label1 label2 --route-name route1 --next-hop 70.0.0.2 --address-prefixes 10.80.0.0/16 10.90.0.0/16
"""

helps['network vhub connection list'] = """
type: command
short-summary: List virtual hub VNet connections.
examples:
- name: List VNet connections in a given virtual hub.
text: |
az network vhub connection list --vhub-name MyHub -g MyRG
"""

helps['network vhub connection show'] = """
type: command
short-summary: Get the details of a virtual hub VNet connection.
examples:
- name: Get the details of a virtual hub VNet connection.
text: |
az network vhub connection show -n MyConnection --vhub-name MyHub -g MyRG
"""

helps['network vhub connection delete'] = """
type: command
short-summary: Delete a virtual hub VNet connection.
examples:
- name: Delete a virtual hub VNet connection.
text: |
az network vhub connection delete -n MyConnection --vhub-name MyHub -g MyRG
"""

helps['network vhub connection update'] = """
type: command
short-summary: Update settings of a virtual hub connection.
examples:
- name: Add labels for propagated route tables under routing configuration.
text: |
az network vhub connection update -n MyConnection --vhub-name MyHub -g MyRG --labels Newlabel1 Newlabel2
"""

helps['network vhub connection wait'] = """
type: command
short-summary: Place the CLI in a waiting state until a condition of virtual hub VNet connection is met.
"""

helps['network vhub bgpconnection'] = """
type: group
short-summary: Manage virtual hub bgpconnections.
Expand Down
5 changes: 0 additions & 5 deletions src/virtual-wan/azext_vwan/_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -66,11 +66,6 @@ def load_arguments(self, _):
c.argument('allow_remote_vnet_to_use_hub_vnet_gateways', arg_type=get_three_state_flag(), options_list='--use-hub-vnet-gateways', deprecate_info=c.deprecate(target='--use-hub-vnet-gateways'), help='Allow remote VNet to use hub\'s VNet gateways.')
c.argument('enable_internet_security', arg_type=get_three_state_flag(), options_list='--internet-security', help='Enable internet security and default is enabled.', default=True)

for item in ['network vhub connection create', 'network vhub connection update']:
with self.argument_context(item) as c:
c.argument('associated_inbound_routemap', help='Resource uri of inbound routemap for this connection’s routing configuration')
c.argument('associated_outbound_routemap', help='Resource uri of outbound routemap for this connection’s routing configuration')

with self.argument_context('network vhub connection list') as c:
c.argument('virtual_hub_name', vhub_name_type, id_part=None)

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
# --------------------------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
#
# Code generated by aaz-dev-tools
# --------------------------------------------------------------------------------------------

# pylint: skip-file
# flake8: noqa

from azure.cli.core.aaz import *


@register_command_group(
"network vhub connection",
)
class __CMDGroup(AAZCommandGroup):
"""Manage virtual hub VNet connections.
"""
pass


__all__ = ["__CMDGroup"]
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# --------------------------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for license information.
#
# Code generated by aaz-dev-tools
# --------------------------------------------------------------------------------------------

# pylint: skip-file
# flake8: noqa

from .__cmd_group import *
from ._create import *
from ._delete import *
from ._list import *
from ._show import *
from ._update import *
from ._wait import *
Loading

0 comments on commit d07c3b8

Please sign in to comment.