Skip to content

Commit

Permalink
[Network] Bump to azure-mgmt-network 8.0.0 (#12021)
Browse files Browse the repository at this point in the history
[Network] Bump to azure-mgmt-network 8.0.0
[Network] az network private-link-service update/create: support --enable-proxy-protocol
  • Loading branch information
mmyyrroonn authored Feb 6, 2020
1 parent b875d0f commit c0e345c
Show file tree
Hide file tree
Showing 13 changed files with 1,437 additions and 1,518 deletions.
3 changes: 2 additions & 1 deletion src/azure-cli/azure/cli/command_modules/network/_params.py
Original file line number Diff line number Diff line change
Expand Up @@ -742,7 +742,7 @@ def load_arguments(self, _):
c.argument('subnet', validator=get_subnet_validator(), help='Name or ID of an existing subnet. If name is specified, also specify --vnet-name.', id_part=None)
c.argument('virtual_network_name', help='The virtual network (VNet) associated with the subnet (Omit if supplying a subnet id).', metavar='', id_part=None)
c.argument('private_connection_resource_id', help='The resource id of which private enpoint connect to')
c.argument('group_ids', nargs='+', help='The ID(s) of the group(s) obtained from the remote resource that this private endpoint should connect to. You can use "az network private-resource show to obtain the list of group ids."')
c.argument('group_ids', nargs='+', help='The ID(s) of the group(s) obtained from the remote resource that this private endpoint should connect to. You can use "az keyvault(storage/etc) private-endpoint show" to obtain the list of group ids.')
c.argument('request_message', help='A message passed to the owner of the remote resource with this connection request. Restricted to 140 chars.')
c.argument('manual_request', help='Use manual request to establish the connection', arg_type=get_three_state_flag())
c.argument('connection_name', help='Name of the private link service connection.')
Expand All @@ -760,6 +760,7 @@ def load_arguments(self, _):
c.argument('private_endpoint_connections', nargs='+', help='Space-separated list of private endpoint connections.')
c.argument('fqdns', nargs='+', help='Space-separated list of FQDNs.')
c.argument('location', get_location_type(self.cli_ctx), validator=get_default_location_from_resource_group)
c.argument('enable_proxy_protocol', help='Enable proxy protocol for private link service.', arg_type=get_three_state_flag(), min_api='2019-09-01')

with self.argument_context('network private-link-service', arg_group='IP Configuration') as c:
c.argument('private_ip_address', private_ip_address_type)
Expand Down
11 changes: 7 additions & 4 deletions src/azure-cli/azure/cli/command_modules/network/custom.py
Original file line number Diff line number Diff line change
Expand Up @@ -2454,7 +2454,8 @@ def create_private_link_service(cmd, resource_group_name, service_name, subnet,
private_ip_address_version=None,
virtual_network_name=None, public_ip_address=None,
location=None, tags=None, load_balancer_name=None,
visibility=None, auto_approval=None, fqdns=None):
visibility=None, auto_approval=None, fqdns=None,
enable_proxy_protocol=None):
client = network_client_factory(cmd.cli_ctx).private_link_services
FrontendIPConfiguration, PrivateLinkService, PrivateLinkServiceIpConfiguration, PublicIPAddress, Subnet = \
cmd.get_models('FrontendIPConfiguration', 'PrivateLinkService', 'PrivateLinkServiceIpConfiguration',
Expand All @@ -2476,13 +2477,14 @@ def create_private_link_service(cmd, resource_group_name, service_name, subnet,
visbility=visibility,
auto_approval=auto_approval,
fqdns=fqdns,
tags=tags
tags=tags,
enable_proxy_protocol=enable_proxy_protocol
)
return client.create_or_update(resource_group_name, service_name, link_service)


def update_private_link_service(instance, cmd, tags=None, frontend_ip_configurations=None, load_balancer_name=None,
visibility=None, auto_approval=None, fqdns=None):
visibility=None, auto_approval=None, fqdns=None, enable_proxy_protocol=None):
FrontendIPConfiguration = cmd.get_models('FrontendIPConfiguration')
with cmd.update_context(instance) as c:
c.set_param('tags', tags)
Expand All @@ -2492,6 +2494,7 @@ def update_private_link_service(instance, cmd, tags=None, frontend_ip_configurat
c.set_param('visibility', visibility)
c.set_param('auto_approval', auto_approval)
c.set_param('fqdns', fqdns)
c.set_param('enable_proxy_protocol', enable_proxy_protocol)
return instance


Expand All @@ -2510,7 +2513,7 @@ def update_private_endpoint_connection(cmd, resource_group_name, service_name, p
connection_state = PrivateLinkServiceConnectionState(
status=connection_status,
description=description,
action_required=action_required
actions_required=action_required
)
pe_connection = PrivateEndpointConnection(
private_link_service_connection_state=connection_state
Expand Down
Loading

0 comments on commit c0e345c

Please sign in to comment.