Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
review
  • Loading branch information
msyyc committed Mar 17, 2021
commit 638b3bb0f50438b08a647e776fd4496fcdbb5147
18 changes: 14 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 @@ -3539,6 +3539,8 @@ def create_lb_backend_address_pool(cmd, resource_group_name, load_balancer_name,
ip_address=addr['ip_address'])
else:
raise KeyError
else:
raise KeyError

new_addresses.append(address)
else:
Expand Down Expand Up @@ -3829,10 +3831,18 @@ def add_lb_backend_address_pool_address(cmd, resource_group_name, load_balancer_
'Subnet',
'VirtualNetwork')
if cmd.supported_api_version(min_api='2020-11-01'):
new_address = LoadBalancerBackendAddress(name=address_name,
subnet=Subnet(id=_process_subnet_name_and_id(subnet, vnet, cmd, resource_group_name)) if subnet else None,
virtual_network=VirtualNetwork(id=vnet) if vnet else None,
ip_address=ip_address if ip_address else None)
if vnet:
new_address = LoadBalancerBackendAddress(name=address_name,
subnet=Subnet(id=_process_subnet_name_and_id(subnet, vnet, cmd, resource_group_name)) if subnet else None,
virtual_network=VirtualNetwork(id=vnet),
ip_address=ip_address if ip_address else None)
elif is_valid_resource_id(subnet):
new_address = LoadBalancerBackendAddress(name=address_name,
subnet=Subnet(id=subnet),
ip_address=ip_address if ip_address else None)
else:
raise UnrecognizedArgumentError('Each backend address must have name, ip-address, (vnet name and subnet name | subnet id) information.')

else:
new_address = LoadBalancerBackendAddress(name=address_name,
virtual_network=VirtualNetwork(id=vnet) if vnet else None,
Expand Down
Loading