Skip to content

[Network] Convert Load Balancer and App Gateway Create to Dynamic Templates #2668

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Travis Prescott (tjprescott) merged 10 commits into from
Mar 30, 2017
Merged

[Network] Convert Load Balancer and App Gateway Create to Dynamic Templates #2668

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d2001e1
Group params.
tjprescott Mar 20, 2017
be84acb
Import VMSS implementation of template builder.
tjprescott Mar 24, 2017
4a4895b
Update template builders.
tjprescott Mar 27, 2017
bc509b2
Add custom command logic.
tjprescott Mar 27, 2017
74f31c8
Update LB params.
tjprescott Mar 27, 2017
0bda368
Update load balancer create.
tjprescott Mar 28, 2017
ecae68f
AppGateway progress
tjprescott Mar 28, 2017
632eb81
App gateway progress.
tjprescott Mar 29, 2017
1e770a8
Re-record tests.
tjprescott Mar 29, 2017
590fe57
Code review feedback.
tjprescott Mar 30, 2017
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
55 changes: 0 additions & 55 deletions azure-cli.pyproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -278,24 +278,6 @@
<Compile Include="command_modules\azure-cli-batch\setup.py" />
<Compile Include="command_modules\azure-cli-keyvault\tests\test_keyvault_commands.py" />
<Compile Include="command_modules\azure-cli-keyvault\tests\__init__.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\app_gateway_creation_client.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\credentials.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\exceptions.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\app_gateway_creation_client_enums.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\basic_dependency.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\dependency.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\deployment_app_gateway.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\deployment_extended.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\deployment_properties_extended.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\parameters_link.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\provider.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\provider_resource_type.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\template_link.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\__init__.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\operations\app_gateway_operations.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\operations\__init__.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\version.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\__init__.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\zone_file\configs.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\zone_file\exceptions.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\zone_file\make_zone_file.py" />
Expand Down Expand Up @@ -383,24 +365,6 @@
<Compile Include="command_modules\azure-cli-component\azure\cli\command_modules\component\_params.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\custom.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\commands.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\credentials.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\exceptions.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\lb_creation_client.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\basic_dependency.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\dependency.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\deployment_extended.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\deployment_lb.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\deployment_properties_extended.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\lb_creation_client_enums.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\parameters_link.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\provider.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\provider_resource_type.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\template_link.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\__init__.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\operations\lb_operations.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\operations\__init__.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\version.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\__init__.py" />
<Compile Include="command_modules\azure-cli-network\azure\cli\command_modules\network\_params.py">
<SubType>Code</SubType>
</Compile>
Expand Down Expand Up @@ -592,12 +556,6 @@
<Folder Include="command_modules\azure-cli-batch\azure\cli\command_modules\" />
<Folder Include="command_modules\azure-cli-batch\azure\cli\command_modules\batch\" />
<Folder Include="command_modules\azure-cli-keyvault\tests\" />
<Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\" />
<Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\" />
<Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\models\" />
<Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\lib\operations\" />
<Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\" />
<Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\tests\zone_files\" />
<Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\zone_file\" />
<Folder Include="command_modules\azure-cli-network\tests\" />
<Folder Include="command_modules\azure-cli-network\tests\zone_files\" />
Expand All @@ -623,10 +581,6 @@
<Folder Include="command_modules\azure-cli-network\azure\cli\" />
<Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\" />
<Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\" />
<Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\" />
<Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\" />
<Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\models\" />
<Folder Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\lib\operations\" />
<Folder Include="command_modules\azure-cli-profile\" />
<Folder Include="command_modules\azure-cli-profile\azure\" />
<Folder Include="command_modules\azure-cli-profile\azure\cli\" />
Expand Down Expand Up @@ -707,15 +661,6 @@
<Content Include="command_modules\azure-cli-keyvault\tests\policy_import_pfx.json" />
<Content Include="command_modules\azure-cli-keyvault\tests\policy_pending.json" />
<Content Include="command_modules\azure-cli-keyvault\tests\test_secret.txt" />
<Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\azuredeploy.json" />
<Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\azuredeploy_tests.md">
<SubType>Code</SubType>
</Content>
<Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_app_gateway\swagger_create_app_gateway.json" />
<Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\azuredeploy_empty.json" />
<Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\azuredeploy_test.md" />
<Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\swagger_create_lb.json" />
<Content Include="command_modules\azure-cli-network\azure\cli\command_modules\network\mgmt_lb\azuredeploy.json" />
<Content Include="command_modules\azure-cli-network\tests\zone_files\fail1.txt" />
<Content Include="command_modules\azure-cli-network\tests\zone_files\fail2.txt" />
<Content Include="command_modules\azure-cli-network\tests\zone_files\fail3.txt" />
Expand Down
12 changes: 0 additions & 12 deletions src/command_modules/azure-cli-network/azure/cli/command_modules/network/_client_factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,6 @@ def cf_application_gateways(_):
return _network_client_factory().application_gateways


def cf_application_gateway_create(_):
from azure.cli.command_modules.network.mgmt_app_gateway.lib import AppGatewayCreationClient
from azure.cli.core.commands.client_factory import get_mgmt_service_client
return get_mgmt_service_client(AppGatewayCreationClient).app_gateway


def cf_express_route_circuit_authorizations(_):
return _network_client_factory().express_route_circuit_authorizations

Expand All @@ -47,12 +41,6 @@ def cf_load_balancers(_):
return _network_client_factory().load_balancers


def cf_load_balancer_create(_):
from azure.cli.command_modules.network.mgmt_lb.lib import LbCreationClient
from azure.cli.core.commands.client_factory import get_mgmt_service_client
return get_mgmt_service_client(LbCreationClient).lb


def cf_local_network_gateways(_):
return _network_client_factory().local_network_gateways

Expand Down
Loading