Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -182,8 +182,8 @@
cli_command('network express-route circuit delete', ExpressRouteCircuitsOperations.delete, factory)
cli_command('network express-route circuit show', ExpressRouteCircuitsOperations.get, factory)
cli_command('network express-route circuit get-stats', ExpressRouteCircuitsOperations.get_stats, factory)
cli_command('network express-route circuit list-arp', ExpressRouteCircuitsOperations.list_arp_table, factory)
cli_command('network express-route circuit list-routes', ExpressRouteCircuitsOperations.list_routes_table, factory)
cli_command('network express-route circuit list-arp-tables', ExpressRouteCircuitsOperations.list_arp_table, factory)
cli_command('network express-route circuit list-route-tables', ExpressRouteCircuitsOperations.list_routes_table, factory)
cli_command('network express-route circuit list', list_express_route_circuits)
cli_generic_update_command('network express-route circuit update', ExpressRouteCircuitsOperations.get, ExpressRouteCircuitsOperations.create_or_update, factory)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -229,9 +229,9 @@ def body(self):
rg, ern, pv), allowed_exceptions=allowed_exceptions)
self.cmd('network express-route circuit-peering show --resource-group {0} --circuit-name {1} --name {2}'.format(
rg, ern, pv), allowed_exceptions=allowed_exceptions)
self.cmd('network express-route circuit list-arp --resource-group {0} --name {1} --peering-name {2} --device-path {2}'.format(
self.cmd('network express-route circuit list-arp-tables --resource-group {0} --name {1} --peering-name {2} --device-path {2}'.format(
rg, ern, pv), allowed_exceptions=allowed_exceptions)
self.cmd('network express-route circuit list-routes --resource-group {0} --name {1} --peering-name {2} --device-path {2}'.format(
self.cmd('network express-route circuit list-route-tables --resource-group {0} --name {1} --peering-name {2} --device-path {2}'.format(
rg, ern, pv), allowed_exceptions=allowed_exceptions)

class NetworkLoadBalancerScenarioTest(ResourceGroupVCRTestBase):
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ def logout(username=None):
username = profile.get_current_account_user()
profile.logout(username)

def list_location():
def list_locations():
from azure.cli.commands.parameters import get_subscription_locations
return get_subscription_locations()

Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@

from .custom import (login,
logout,
list_location,
list_locations,
list_subscriptions,
set_active_subscription,
account_clear)
Expand All @@ -20,5 +20,5 @@
cli_command('account list', list_subscriptions)
cli_command('account set', set_active_subscription)
cli_command('account clear', account_clear)
cli_command('account list-location', list_location)
cli_command('account list-locations', list_locations)