From 878d0bf4d9350931ac8bc7e36212d36dea6ef35c Mon Sep 17 00:00:00 2001
From: Qiaoqiao Zhang <55688292+qiaozha@users.noreply.github.com>
Date: Thu, 3 Dec 2020 09:46:02 +0800
Subject: [PATCH] change-default-extension-no-flatten (#667)
---
README.md | 7 +-
.../templates/generated/CliParams.ts | 6 +-
src/plugins/merger.ts | 7 +-
src/plugins/models.ts | 1 +
src/test/scenario-test.ts | 10 +-
.../generated/_client_factory.py | 2 +-
.../azext_attestation/generated/commands.py | 4 +-
.../azext_attestation/generated/custom.py | 16 +-
.../_attestation_management_client.py | 8 +-
.../aio/_attestation_management_client.py | 8 +-
.../attestation/aio/operations/__init__.py | 4 +-
...y => _attestation_providers_operations.py} | 36 +-
.../attestation/models/__init__.py | 6 +
.../attestation/models/_models.py | 63 ++-
.../attestation/models/_models_py3.py | 71 +++-
.../attestation/operations/__init__.py | 4 +-
...y => _attestation_providers_operations.py} | 36 +-
.../datafactory/configuration/readme.az.md | 2 +-
.../generated/_client_factory.py | 6 +-
.../generated/_params.py | 23 +-
.../generated/commands.py | 13 +-
.../generated/custom.py | 139 +++---
.../_dfaz_management_client.py | 24 +-
.../aio/_dfaz_management_client.py | 24 +-
.../aio/operations/__init__.py | 12 +-
...operations.py => _factories_operations.py} | 92 +---
...py => _integration_runtimes_operations.py} | 75 ++--
..._operations.py => _triggers_operations.py} | 49 +--
.../azure_mgmt_datafactory/models/__init__.py | 3 +
.../azure_mgmt_datafactory/models/_models.py | 80 ++--
.../models/_models_py3.py | 86 ++--
.../operations/__init__.py | 12 +-
...operations.py => _factories_operations.py} | 92 +---
...py => _integration_runtimes_operations.py} | 75 ++--
..._operations.py => _triggers_operations.py} | 49 +--
.../src/kusto/HISTORY.rst | 0
.../src/kusto/README.md | 0
.../src/kusto/azext_kusto/__init__.py | 0
.../src/kusto/azext_kusto/action.py | 0
.../src/kusto/azext_kusto/azext_metadata.json | 0
.../src/kusto/azext_kusto/custom.py | 0
.../kusto/azext_kusto/generated/__init__.py | 0
.../azext_kusto/generated/_client_factory.py | 12 +-
.../src/kusto/azext_kusto/generated/_help.py | 0
.../kusto/azext_kusto/generated/_params.py | 0
.../azext_kusto/generated/_validators.py | 0
.../src/kusto/azext_kusto/generated/action.py | 0
.../kusto/azext_kusto/generated/commands.py | 20 +-
.../src/kusto/azext_kusto/generated/custom.py | 257 +++++-------
.../src/kusto/azext_kusto/manual/__init__.py | 0
.../src/kusto/azext_kusto/tests/__init__.py | 0
.../azext_kusto/tests/latest/__init__.py | 0
.../azext_kusto/tests/latest/example_steps.py | 0
.../tests/latest/test_kusto_scenario.py | 0
.../azext_kusto/vendored_sdks/__init__.py | 0
.../vendored_sdks/kusto/__init__.py | 0
.../vendored_sdks/kusto/_configuration.py | 0
.../kusto/_kusto_management_client.py | 56 +--
.../vendored_sdks/kusto/aio/__init__.py | 0
.../vendored_sdks/kusto/aio/_configuration.py | 0
.../kusto/aio/_kusto_management_client.py | 56 +--
.../kusto/aio/operations/__init__.py | 25 ++
...ched_database_configuration_operations.py} | 33 +-
.../aio/operations/_cluster_operations.py} | 279 ++++++++++---
...luster_principal_assignment_operations.py} | 44 +-
.../_data_connection_operations.py} | 32 +-
.../aio/operations/_database_operations.py} | 51 ++-
...tabase_principal_assignment_operations.py} | 43 +-
.../aio/operations/_operation_operations.py} | 4 +-
.../vendored_sdks/kusto/models/__init__.py | 3 -
.../models/_kusto_management_client_enums.py | 0
.../vendored_sdks/kusto/models/_models.py | 96 ++---
.../vendored_sdks/kusto/models/_models_py3.py | 105 +++--
.../kusto/operations/__init__.py | 25 ++
...ched_database_configuration_operations.py} | 33 +-
.../kusto/operations/_cluster_operations.py} | 279 ++++++++++---
...luster_principal_assignment_operations.py} | 44 +-
.../_data_connection_operations.py} | 32 +-
.../kusto/operations/_database_operations.py} | 51 ++-
...tabase_principal_assignment_operations.py} | 43 +-
.../operations/_operation_operations.py} | 4 +-
.../azext_kusto/vendored_sdks/kusto/py.typed | 0
.../src/kusto/report.md | 0
.../src/kusto/setup.cfg | 0
.../src/kusto/setup.py | 0
.../kusto/aio/operations/__init__.py | 25 --
.../kusto/operations/__init__.py | 25 --
.../configuration/readme.az.md | 4 +-
.../output/src/managed-network/README.md | 4 +-
.../generated/_client_factory.py | 8 +-
.../azext_managed_network/generated/_help.py | 20 +-
.../generated/_params.py | 11 +-
.../generated/commands.py | 22 +-
.../azext_managed_network/generated/custom.py | 95 +++--
.../tests/latest/example_steps.py | 20 +-
.../latest/test_ManagedNetworks_scenario.py | 1 -
.../_managed_network_management_client.py | 40 +-
.../aio/_managed_network_management_client.py | 40 +-
.../managednetwork/aio/operations/__init__.py | 20 +-
... => _managed_network_groups_operations.py} | 44 +-
...ed_network_peering_policies_operations.py} | 22 +-
...ons.py => _managed_networks_operations.py} | 37 +-
...operation_operations.py => _operations.py} | 4 +-
...ns.py => _scope_assignments_operations.py} | 16 +-
.../managednetwork/models/_models.py | 42 +-
.../managednetwork/models/_models_py3.py | 47 ++-
.../managednetwork/operations/__init__.py | 20 +-
... => _managed_network_groups_operations.py} | 44 +-
...ed_network_peering_policies_operations.py} | 22 +-
...ons.py => _managed_networks_operations.py} | 37 +-
...operation_operations.py => _operations.py} | 4 +-
...ns.py => _scope_assignments_operations.py} | 16 +-
.../output/src/managed-network/report.md | 23 +-
.../generated/_client_factory.py | 4 +-
.../azext_mixed_reality/generated/commands.py | 8 +-
.../azext_mixed_reality/generated/custom.py | 38 +-
.../mixedreality/_mixed_reality_client.py | 24 +-
.../mixedreality/aio/_mixed_reality_client.py | 24 +-
.../mixedreality/aio/operations/__init__.py | 12 +-
.../_mixed_reality_client_operations.py | 11 +-
...operation_operations.py => _operations.py} | 4 +-
... _remote_rendering_accounts_operations.py} | 52 +--
...> _spatial_anchors_accounts_operations.py} | 46 +-
.../mixedreality/operations/__init__.py | 12 +-
.../_mixed_reality_client_operations.py | 11 +-
...operation_operations.py => _operations.py} | 4 +-
... _remote_rendering_accounts_operations.py} | 52 +--
...> _spatial_anchors_accounts_operations.py} | 46 +-
.../src/synapse/HISTORY.rst | 0
.../src/synapse/README.md | 0
.../src/synapse/azext_synapse/__init__.py | 0
.../src/synapse/azext_synapse/action.py | 0
.../synapse/azext_synapse/azext_metadata.json | 0
.../src/synapse/azext_synapse/custom.py | 0
.../azext_synapse/generated/__init__.py | 0
.../generated/_client_factory.py | 66 +--
.../synapse/azext_synapse/generated/_help.py | 0
.../azext_synapse/generated/_params.py | 40 +-
.../azext_synapse/generated/_validators.py | 0
.../synapse/azext_synapse/generated/action.py | 0
.../azext_synapse/generated/commands.py | 122 +++---
.../synapse/azext_synapse/generated/custom.py | 333 ++++++---------
.../synapse/azext_synapse/manual/__init__.py | 0
.../synapse/azext_synapse/tests/__init__.py | 0
.../azext_synapse/tests/latest/__init__.py | 0
.../tests/latest/example_steps.py | 0
.../tests/latest/test_synapse_scenario.py | 0
.../azext_synapse/vendored_sdks/__init__.py | 0
.../vendored_sdks/synapse/__init__.py | 0
.../vendored_sdks/synapse/_configuration.py | 0
.../synapse/_synapse_management_client.py | 255 ++++++++++++
.../vendored_sdks/synapse/aio/__init__.py | 0
.../synapse/aio/_configuration.py | 0
.../synapse/aio/_synapse_management_client.py | 249 +++++++++++
.../synapse/aio/operations/__init__.py | 87 ++++
.../operations/_big_data_pool_operations.py} | 85 +++-
...ntegration_runtime_auth_key_operations.py} | 15 +-
...ion_runtime_connection_info_operations.py} | 4 +-
...egration_runtime_credentials_operations.py | 0
...tion_runtime_monitoring_data_operations.py | 0
...tion_runtime_node_ip_address_operations.py | 0
.../_integration_runtime_node_operations.py} | 14 +-
...tion_runtime_object_metadata_operations.py | 8 +-
.../_integration_runtime_operations.py} | 29 +-
.../_integration_runtime_status_operations.py | 0
.../_ip_firewall_rule_operations.py} | 34 +-
.../aio/operations/_operation_operations.py} | 25 +-
...private_endpoint_connection_operations.py} | 4 +-
.../_private_link_hub_operations.py} | 23 +-
.../_private_link_resource_operations.py} | 4 +-
...l_pool_blob_auditing_policy_operations.py} | 150 ++++++-
..._sql_pool_connection_policy_operations.py} | 14 +-
...ata_warehouse_user_activity_operations.py} | 4 +-
..._sql_pool_geo_backup_policy_operations.py} | 4 +-
...l_pool_metadata_sync_config_operations.py} | 12 +-
.../_sql_pool_operation_operations.py} | 14 +-
.../_sql_pool_operation_result_operations.py} | 4 +-
.../aio/operations/_sql_pool_operations.py} | 171 ++++++--
.../_sql_pool_replication_link_operations.py} | 4 +-
.../_sql_pool_restore_point_operations.py} | 18 +-
.../_sql_pool_schema_operations.py} | 14 +-
..._pool_security_alert_policy_operations.py} | 61 ++-
..._sql_pool_sensitivity_label_operations.py} | 21 +-
.../_sql_pool_table_column_operations.py} | 14 +-
.../operations/_sql_pool_table_operations.py} | 14 +-
...transparent_data_encryption_operations.py} | 13 +-
.../operations/_sql_pool_usage_operations.py} | 14 +-
...ol_vulnerability_assessment_operations.py} | 61 ++-
...ty_assessment_rule_baseline_operations.py} | 26 +-
...lnerability_assessment_scan_operations.py} | 16 +-
.../_workspace_aad_admin_operations.py} | 61 ++-
...dentity_sql_control_setting_operations.py} | 36 +-
.../aio/operations/_workspace_operations.py} | 94 ++++-
.../vendored_sdks/synapse/models/__init__.py | 179 ++++----
.../vendored_sdks/synapse/models/_models.py | 365 ++++++----------
.../synapse/models/_models_py3.py | 394 ++++++------------
.../_synapse_management_client_enums.py | 4 +-
.../synapse/operations/__init__.py | 87 ++++
.../operations/_big_data_pool_operations.py} | 85 +++-
...ntegration_runtime_auth_key_operations.py} | 15 +-
...ion_runtime_connection_info_operations.py} | 4 +-
...egration_runtime_credentials_operations.py | 0
...tion_runtime_monitoring_data_operations.py | 0
...tion_runtime_node_ip_address_operations.py | 0
.../_integration_runtime_node_operations.py} | 14 +-
...tion_runtime_object_metadata_operations.py | 8 +-
.../_integration_runtime_operations.py} | 29 +-
.../_integration_runtime_status_operations.py | 0
.../_ip_firewall_rule_operations.py} | 34 +-
.../operations/_operation_operations.py} | 25 +-
...private_endpoint_connection_operations.py} | 4 +-
.../_private_link_hub_operations.py} | 23 +-
.../_private_link_resource_operations.py} | 4 +-
...l_pool_blob_auditing_policy_operations.py} | 150 ++++++-
..._sql_pool_connection_policy_operations.py} | 14 +-
...ata_warehouse_user_activity_operations.py} | 4 +-
..._sql_pool_geo_backup_policy_operations.py} | 4 +-
...l_pool_metadata_sync_config_operations.py} | 12 +-
.../_sql_pool_operation_operations.py} | 14 +-
.../_sql_pool_operation_result_operations.py} | 4 +-
.../operations/_sql_pool_operations.py} | 171 ++++++--
.../_sql_pool_replication_link_operations.py} | 4 +-
.../_sql_pool_restore_point_operations.py} | 18 +-
.../_sql_pool_schema_operations.py} | 14 +-
..._pool_security_alert_policy_operations.py} | 61 ++-
..._sql_pool_sensitivity_label_operations.py} | 21 +-
.../_sql_pool_table_column_operations.py} | 14 +-
.../operations/_sql_pool_table_operations.py} | 14 +-
...transparent_data_encryption_operations.py} | 13 +-
.../operations/_sql_pool_usage_operations.py} | 14 +-
...ol_vulnerability_assessment_operations.py} | 61 ++-
...ty_assessment_rule_baseline_operations.py} | 26 +-
...lnerability_assessment_scan_operations.py} | 16 +-
.../_workspace_aad_admin_operations.py} | 61 ++-
...dentity_sql_control_setting_operations.py} | 36 +-
.../operations/_workspace_operations.py} | 94 ++++-
.../vendored_sdks/synapse/py.typed | 0
.../src/synapse/report.md | 8 +-
.../src/synapse/setup.cfg | 0
.../src/synapse/setup.py | 0
.../synapse/_synapse_management_client.py | 255 ------------
.../synapse/aio/_synapse_management_client.py | 249 -----------
.../synapse/aio/operations/__init__.py | 87 ----
.../synapse/operations/__init__.py | 87 ----
244 files changed, 4905 insertions(+), 3965 deletions(-)
rename src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/operations/{_attestation_provider_operations.py => _attestation_providers_operations.py} (92%)
rename src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/operations/{_attestation_provider_operations.py => _attestation_providers_operations.py} (92%)
rename src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/{_factory_operations.py => _factories_operations.py} (87%)
rename src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/{_integration_runtime_operations.py => _integration_runtimes_operations.py} (94%)
rename src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/{_trigger_operations.py => _triggers_operations.py} (95%)
rename src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/{_factory_operations.py => _factories_operations.py} (86%)
rename src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/{_integration_runtime_operations.py => _integration_runtimes_operations.py} (94%)
rename src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/{_trigger_operations.py => _triggers_operations.py} (95%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/HISTORY.rst (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/README.md (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/__init__.py (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/action.py (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/azext_metadata.json (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/custom.py (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/generated/__init__.py (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/generated/_client_factory.py (75%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/generated/_help.py (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/generated/_params.py (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/generated/_validators.py (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/generated/action.py (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/generated/commands.py (94%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/generated/custom.py (82%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/manual/__init__.py (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/tests/__init__.py (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/tests/latest/__init__.py (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/tests/latest/example_steps.py (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/tests/latest/test_kusto_scenario.py (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/vendored_sdks/__init__.py (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/vendored_sdks/kusto/__init__.py (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/vendored_sdks/kusto/_configuration.py (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/vendored_sdks/kusto/_kusto_management_client.py (62%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/vendored_sdks/kusto/aio/__init__.py (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/vendored_sdks/kusto/aio/_configuration.py (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/vendored_sdks/kusto/aio/_kusto_management_client.py (61%)
create mode 100644 src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/__init__.py
rename src/test/scenarios/kusto/output/{extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_attached_database_configurations_operations.py => extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_attached_database_configuration_operations.py} (92%)
rename src/test/scenarios/kusto/output/{extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_clusters_operations.py => extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_cluster_operations.py} (83%)
rename src/test/scenarios/kusto/output/{extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_cluster_principal_assignments_operations.py => extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_cluster_principal_assignment_operations.py} (93%)
rename src/test/scenarios/kusto/output/{extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_data_connections_operations.py => extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_data_connection_operations.py} (97%)
rename src/test/scenarios/kusto/output/{extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_databases_operations.py => extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_database_operations.py} (95%)
rename src/test/scenarios/kusto/output/{extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_database_principal_assignments_operations.py => extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_database_principal_assignment_operations.py} (93%)
rename src/test/scenarios/kusto/output/{extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_operations.py => extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_operation_operations.py} (98%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/vendored_sdks/kusto/models/__init__.py (98%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/vendored_sdks/kusto/models/_kusto_management_client_enums.py (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/vendored_sdks/kusto/models/_models.py (97%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/vendored_sdks/kusto/models/_models_py3.py (97%)
create mode 100644 src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/__init__.py
rename src/test/scenarios/kusto/output/{extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_attached_database_configurations_operations.py => extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_attached_database_configuration_operations.py} (92%)
rename src/test/scenarios/kusto/output/{extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_clusters_operations.py => extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_cluster_operations.py} (82%)
rename src/test/scenarios/kusto/output/{extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_cluster_principal_assignments_operations.py => extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_cluster_principal_assignment_operations.py} (93%)
rename src/test/scenarios/kusto/output/{extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_data_connections_operations.py => extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_data_connection_operations.py} (97%)
rename src/test/scenarios/kusto/output/{extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_databases_operations.py => extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_database_operations.py} (95%)
rename src/test/scenarios/kusto/output/{extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_database_principal_assignments_operations.py => extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_database_principal_assignment_operations.py} (93%)
rename src/test/scenarios/kusto/output/{extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_operations.py => extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_operation_operations.py} (98%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/azext_kusto/vendored_sdks/kusto/py.typed (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/report.md (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/setup.cfg (100%)
rename src/test/scenarios/kusto/output/{extnoflatten => extflatten}/src/kusto/setup.py (100%)
delete mode 100644 src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/__init__.py
delete mode 100644 src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/__init__.py
rename src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/{_managed_network_group_operations.py => _managed_network_groups_operations.py} (91%)
rename src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/{_managed_network_peering_policy_operations.py => _managed_network_peering_policies_operations.py} (96%)
rename src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/{_managed_network_operations.py => _managed_networks_operations.py} (94%)
rename src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/{_operation_operations.py => _operations.py} (98%)
rename src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/{_scope_assignment_operations.py => _scope_assignments_operations.py} (96%)
rename src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/{_managed_network_group_operations.py => _managed_network_groups_operations.py} (90%)
rename src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/{_managed_network_peering_policy_operations.py => _managed_network_peering_policies_operations.py} (96%)
rename src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/{_managed_network_operations.py => _managed_networks_operations.py} (94%)
rename src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/{_operation_operations.py => _operations.py} (98%)
rename src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/{_scope_assignment_operations.py => _scope_assignments_operations.py} (96%)
rename src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/{_operation_operations.py => _operations.py} (98%)
rename src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/{_remote_rendering_account_operations.py => _remote_rendering_accounts_operations.py} (93%)
rename src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/{_spatial_anchor_account_operations.py => _spatial_anchors_accounts_operations.py} (94%)
rename src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/{_operation_operations.py => _operations.py} (98%)
rename src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/{_remote_rendering_account_operations.py => _remote_rendering_accounts_operations.py} (93%)
rename src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/{_spatial_anchor_account_operations.py => _spatial_anchors_accounts_operations.py} (94%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/HISTORY.rst (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/README.md (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/__init__.py (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/action.py (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/azext_metadata.json (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/custom.py (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/generated/__init__.py (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/generated/_client_factory.py (68%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/generated/_help.py (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/generated/_params.py (97%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/generated/_validators.py (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/generated/action.py (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/generated/commands.py (90%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/generated/custom.py (84%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/manual/__init__.py (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/tests/__init__.py (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/tests/latest/__init__.py (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/tests/latest/example_steps.py (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/tests/latest/test_synapse_scenario.py (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/vendored_sdks/__init__.py (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/vendored_sdks/synapse/__init__.py (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/vendored_sdks/synapse/_configuration.py (100%)
create mode 100644 src/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/_synapse_management_client.py
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/vendored_sdks/synapse/aio/__init__.py (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/vendored_sdks/synapse/aio/_configuration.py (100%)
create mode 100644 src/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/_synapse_management_client.py
create mode 100644 src/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/__init__.py
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_big_data_pools_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_big_data_pool_operations.py} (85%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_integration_runtime_auth_keys_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_integration_runtime_auth_key_operations.py} (94%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_integration_runtime_connection_infos_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_integration_runtime_connection_info_operations.py} (97%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_integration_runtime_credentials_operations.py (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_integration_runtime_monitoring_data_operations.py (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_integration_runtime_node_ip_address_operations.py (100%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_integration_runtime_nodes_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_integration_runtime_node_operations.py} (95%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_integration_runtime_object_metadata_operations.py (97%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_integration_runtimes_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_integration_runtime_operations.py} (96%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_integration_runtime_status_operations.py (100%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_ip_firewall_rules_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_ip_firewall_rule_operations.py} (95%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_operation_operations.py} (95%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_private_endpoint_connections_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_private_endpoint_connection_operations.py} (99%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_private_link_hubs_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_private_link_hub_operations.py} (97%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_private_link_resources_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_private_link_resource_operations.py} (98%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_blob_auditing_policies_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_blob_auditing_policy_operations.py} (53%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_connection_policies_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_connection_policy_operations.py} (93%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_data_warehouse_user_activities_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_data_warehouse_user_activity_operations.py} (97%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_geo_backup_policies_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_geo_backup_policy_operations.py} (98%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_metadata_sync_configs_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_metadata_sync_config_operations.py} (96%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_operations_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_operation_operations.py} (91%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_operation_results_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_operation_result_operations.py} (98%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pools_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_operations.py} (85%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_replication_links_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_replication_link_operations.py} (98%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_restore_points_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_restore_point_operations.py} (96%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_schemas_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_schema_operations.py} (94%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_security_alert_policies_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_security_alert_policy_operations.py} (75%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_sensitivity_labels_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_sensitivity_label_operations.py} (97%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_table_columns_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_table_column_operations.py} (94%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_tables_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_table_operations.py} (94%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_transparent_data_encryptions_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_transparent_data_encryption_operations.py} (95%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_usages_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_usage_operations.py} (94%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_vulnerability_assessments_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_vulnerability_assessment_operations.py} (85%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_vulnerability_assessment_rule_baselines_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_vulnerability_assessment_rule_baseline_operations.py} (91%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_vulnerability_assessment_scans_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_sql_pool_vulnerability_assessment_scan_operations.py} (97%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_workspace_aad_admins_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_workspace_aad_admin_operations.py} (89%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_workspace_managed_identity_sql_control_settings_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_workspace_managed_identity_sql_control_setting_operations.py} (86%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_workspaces_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/_workspace_operations.py} (84%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/vendored_sdks/synapse/models/__init__.py (80%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/vendored_sdks/synapse/models/_models.py (95%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/vendored_sdks/synapse/models/_models_py3.py (95%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/vendored_sdks/synapse/models/_synapse_management_client_enums.py (98%)
create mode 100644 src/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/__init__.py
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_big_data_pools_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_big_data_pool_operations.py} (85%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_integration_runtime_auth_keys_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_integration_runtime_auth_key_operations.py} (94%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_integration_runtime_connection_infos_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_integration_runtime_connection_info_operations.py} (97%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_integration_runtime_credentials_operations.py (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_integration_runtime_monitoring_data_operations.py (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_integration_runtime_node_ip_address_operations.py (100%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_integration_runtime_nodes_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_integration_runtime_node_operations.py} (95%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_integration_runtime_object_metadata_operations.py (97%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_integration_runtimes_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_integration_runtime_operations.py} (96%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_integration_runtime_status_operations.py (100%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_ip_firewall_rules_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_ip_firewall_rule_operations.py} (95%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_operation_operations.py} (95%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_private_endpoint_connections_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_private_endpoint_connection_operations.py} (99%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_private_link_hubs_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_private_link_hub_operations.py} (97%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_private_link_resources_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_private_link_resource_operations.py} (98%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_blob_auditing_policies_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_blob_auditing_policy_operations.py} (53%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_connection_policies_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_connection_policy_operations.py} (93%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_data_warehouse_user_activities_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_data_warehouse_user_activity_operations.py} (97%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_geo_backup_policies_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_geo_backup_policy_operations.py} (98%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_metadata_sync_configs_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_metadata_sync_config_operations.py} (96%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_operations_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_operation_operations.py} (91%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_operation_results_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_operation_result_operations.py} (98%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pools_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_operations.py} (85%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_replication_links_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_replication_link_operations.py} (98%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_restore_points_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_restore_point_operations.py} (96%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_schemas_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_schema_operations.py} (94%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_security_alert_policies_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_security_alert_policy_operations.py} (75%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_sensitivity_labels_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_sensitivity_label_operations.py} (97%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_table_columns_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_table_column_operations.py} (94%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_tables_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_table_operations.py} (94%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_transparent_data_encryptions_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_transparent_data_encryption_operations.py} (95%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_usages_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_usage_operations.py} (94%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_vulnerability_assessments_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_vulnerability_assessment_operations.py} (85%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_vulnerability_assessment_rule_baselines_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_vulnerability_assessment_rule_baseline_operations.py} (91%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_vulnerability_assessment_scans_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_sql_pool_vulnerability_assessment_scan_operations.py} (97%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_workspace_aad_admins_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_workspace_aad_admin_operations.py} (89%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_workspace_managed_identity_sql_control_settings_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_workspace_managed_identity_sql_control_setting_operations.py} (86%)
rename src/test/scenarios/synapse/output/{extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_workspaces_operations.py => extflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/_workspace_operations.py} (84%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/azext_synapse/vendored_sdks/synapse/py.typed (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/report.md (98%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/setup.cfg (100%)
rename src/test/scenarios/synapse/output/{extnoflatten => extflatten}/src/synapse/setup.py (100%)
delete mode 100644 src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/_synapse_management_client.py
delete mode 100644 src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/_synapse_management_client.py
delete mode 100644 src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/aio/operations/__init__.py
delete mode 100644 src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/vendored_sdks/synapse/operations/__init__.py
diff --git a/README.md b/README.md
index ade67f520..5cdae9497 100644
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ debug-output-folder: $(az-output-folder)/_az_debug
use-extension:
"@autorest/python": "5.4.0"
- "@autorest/clicommon": "0.5.7"
+ "@autorest/clicommon": "0.5.8"
#"@autorest/python": "latest"
require:
@@ -55,9 +55,10 @@ modelerfour:
group-parameters: true
flatten-models: true
flatten-payloads: true
+ # keep-unused-flattened-models: true
```
-``` yaml $(target-mode) != 'core' && !$(sdk-no-flatten)
+``` yaml $(sdk-flatten) && !$(sdk-no-flatten)
#payload-flattening-threshold: 4
#recursive-payload-flattening: true
@@ -92,7 +93,7 @@ pipeline:
scope: scope-az
```
-``` yaml $(target-mode) == 'core' || $(sdk-no-flatten)
+``` yaml !$(sdk-flatten) || $(sdk-no-flatten)
#payload-flattening-threshold: 4
#recursive-payload-flattening: true
diff --git a/src/plugins/azgenerator/templates/generated/CliParams.ts b/src/plugins/azgenerator/templates/generated/CliParams.ts
index 9752eb979..c55b63313 100644
--- a/src/plugins/azgenerator/templates/generated/CliParams.ts
+++ b/src/plugins/azgenerator/templates/generated/CliParams.ts
@@ -204,10 +204,10 @@ function getCommandBody(model: CodeModelAz, needGeneric: boolean = false, debug:
} else if (parameterName.endsWith('name') && !model.Method['hasName'] && parameterName.replace(/_name$|_/g, '') == model.CommandGroup_DefaultName.toLowerCase()) {
if (isNullOrUndefined(model.MethodParameter.language['az']['alias'])) {
model.MethodParameter.language['az']['alias'] = [];
+ model.MethodParameter.language['az']['alias'].push('name');
+ model.MethodParameter.language['az']['alias'].push('n');
+ model.MethodParameter.language['az']['alias'].push(parameterName);
}
- model.MethodParameter.language['az']['alias'].push('name');
- model.MethodParameter.language['az']['alias'].push('n');
- model.MethodParameter.language['az']['alias'].push(parameterName);
}
if (!isNullOrUndefined(model.MethodParameter.language['az']['alias'])) {
argument = " c.argument('" + parameterName + "'";
diff --git a/src/plugins/merger.ts b/src/plugins/merger.ts
index 60c4474c3..0a8ae82f1 100644
--- a/src/plugins/merger.ts
+++ b/src/plugins/merger.ts
@@ -418,8 +418,11 @@ export async function processRequest(host: Host) {
const debug = await host.GetValue('debug') || false;
let targetMode = await host.GetValue(ArgumentConstants.targetMode) || TargetMode.Extension;
const cliCore = targetMode == TargetMode.Core ? true: false;
- let sdkNoFlatten = cliCore? true: false;
- sdkNoFlatten = await host.GetValue(ArgumentConstants.sdkNoFlatten) || sdkNoFlatten;
+ // change both core and extension mode into no flattened mode.
+ let sdkFlatten = false;
+ sdkFlatten = await host.GetValue(ArgumentConstants.sdkFlatten) != undefined? true: sdkFlatten;
+ sdkFlatten = await host.GetValue(ArgumentConstants.sdkNoFlatten) != undefined? false: sdkFlatten;
+ let sdkNoFlatten = await host.GetValue(ArgumentConstants.sdkNoFlatten) != undefined? true: !sdkFlatten;
if (cliCore && !sdkNoFlatten) {
host.Message({Channel: Channel.Fatal, Text:"You have specified the --target-mode=core and --sdk-no-flatten=false at the same time. which is not a valid configuration"});
throw new Error("Wrong configuration detected, please check!");
diff --git a/src/plugins/models.ts b/src/plugins/models.ts
index 6cb2caa43..a6091f0f9 100644
--- a/src/plugins/models.ts
+++ b/src/plugins/models.ts
@@ -88,6 +88,7 @@ export class ArgumentConstants {
public static readonly targetMode: string = "target-mode";
public static readonly compatibleLevel: string = "compatible-level";
public static readonly sdkNoFlatten = "sdk-no-flatten";
+ public static readonly sdkFlatten = "sdk-flatten";
public static readonly extensionMode = "extension-mode";
public static readonly azureCliFolder = "azure-cli-folder";
public static readonly azureCliExtFolder = "azure-cli-extension-folder";
diff --git a/src/test/scenario-test.ts b/src/test/scenario-test.ts
index 07166b781..db12922cf 100644
--- a/src/test/scenario-test.ts
+++ b/src/test/scenario-test.ts
@@ -13,7 +13,7 @@ enum TestMode {
ExtIncremental = "ext_Incremental",
CoreDefault = "coredefault",
CoreIncremental = "core_Incremental",
- Ext_NoFlatten = "extnoflatten",
+ Ext_Flatten = "extflatten",
Ext_NoSdk = "extnosdk",
Ext_NoSdk_NoFlatten_Track1 = "extnosdknoflattentrack1"
}
@@ -25,8 +25,8 @@ enum TestMode {
["datafactory", [TestMode.ExtDefault]],
["managed-network", [TestMode.ExtDefault]],
["mixed-reality", [TestMode.ExtIncremental]],
- ["kusto", [TestMode.CoreDefault, TestMode.Ext_NoFlatten, TestMode.Ext_NoSdk, TestMode.Ext_NoSdk_NoFlatten_Track1]],
- ["synapse", [TestMode.CoreDefault, TestMode.Ext_NoFlatten, TestMode.Ext_NoSdk, TestMode.Ext_NoSdk_NoFlatten_Track1]],
+ ["kusto", [TestMode.CoreDefault, TestMode.Ext_Flatten, TestMode.Ext_NoSdk, TestMode.Ext_NoSdk_NoFlatten_Track1]],
+ ["synapse", [TestMode.CoreDefault, TestMode.Ext_Flatten, TestMode.Ext_NoSdk, TestMode.Ext_NoSdk_NoFlatten_Track1]],
["compute", [TestMode.CoreIncremental]]
]);
@@ -78,10 +78,10 @@ enum TestMode {
key = ArgumentConstants.azureCliFolder;
extraOption[key] = outputDir;
return extraOption;
- } else if (testMode == TestMode.Ext_NoFlatten) {
+ } else if (testMode == TestMode.Ext_Flatten) {
let key = ArgumentConstants.azureCliExtFolder
extraOption[key] = outputDir;
- key = ArgumentConstants.sdkNoFlatten;
+ key = ArgumentConstants.sdkFlatten;
extraOption[key] = true;
return extraOption;
} else if (testMode == TestMode.Ext_NoSdk) {
diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/generated/_client_factory.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/generated/_client_factory.py
index 7507562ad..5adf533fc 100644
--- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/generated/_client_factory.py
+++ b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/generated/_client_factory.py
@@ -21,4 +21,4 @@ def cf_operation(cli_ctx, *_):
def cf_attestation_provider(cli_ctx, *_):
- return cf_attestation_cl(cli_ctx).attestation_provider
+ return cf_attestation_cl(cli_ctx).attestation_providers
diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/generated/commands.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/generated/commands.py
index fbc535e2a..f2e17508f 100644
--- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/generated/commands.py
+++ b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/generated/commands.py
@@ -27,8 +27,8 @@ def load_command_table(self, _):
from azext_attestation.generated._client_factory import cf_attestation_provider
attestation_attestation_provider = CliCommandType(
- operations_tmpl='azext_attestation.vendored_sdks.attestation.operations._attestation_provider_operations#Attest'
- 'ationProviderOperations.{}',
+ operations_tmpl='azext_attestation.vendored_sdks.attestation.operations._attestation_providers_operations#Attes'
+ 'tationProvidersOperations.{}',
client_factory=cf_attestation_provider)
with self.command_group('attestation attestation-provider', attestation_attestation_provider,
client_factory=cf_attestation_provider) as g:
diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/generated/custom.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/generated/custom.py
index 3a6b4eca4..0d51e4263 100644
--- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/generated/custom.py
+++ b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/generated/custom.py
@@ -17,12 +17,16 @@ def attestation_create_provider(client,
tags=None,
attestation_policy=None,
policy_signing_certificates_keys=None):
+ creation_params = {}
+ creation_params['location'] = location
+ creation_params['tags'] = tags
+ creation_params['properties'] = {}
+ creation_params['properties']['attestation_policy'] = attestation_policy
+ creation_params['properties']['policy_signing_certificates'] = {}
+ creation_params['properties']['policy_signing_certificates']['keys'] = policy_signing_certificates_keys
return client.create(resource_group_name=resource_group_name,
provider_name=provider_name,
- location=location,
- tags=tags,
- attestation_policy=attestation_policy,
- keys=policy_signing_certificates_keys)
+ creation_params=creation_params)
def attestation_list_operation(client):
@@ -47,9 +51,11 @@ def attestation_attestation_provider_update(client,
resource_group_name,
provider_name,
tags=None):
+ update_params = {}
+ update_params['tags'] = tags
return client.update(resource_group_name=resource_group_name,
provider_name=provider_name,
- tags=tags)
+ update_params=update_params)
def attestation_attestation_provider_delete(client,
diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/_attestation_management_client.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/_attestation_management_client.py
index 861a7d6c2..fd7dfc9e9 100644
--- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/_attestation_management_client.py
+++ b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/_attestation_management_client.py
@@ -19,7 +19,7 @@
from ._configuration import AttestationManagementClientConfiguration
from .operations import OperationOperations
-from .operations import AttestationProviderOperations
+from .operations import AttestationProvidersOperations
from . import models
@@ -28,8 +28,8 @@ class AttestationManagementClient(object):
:ivar operation: OperationOperations operations
:vartype operation: attestation_management_client.operations.OperationOperations
- :ivar attestation_provider: AttestationProviderOperations operations
- :vartype attestation_provider: attestation_management_client.operations.AttestationProviderOperations
+ :ivar attestation_providers: AttestationProvidersOperations operations
+ :vartype attestation_providers: attestation_management_client.operations.AttestationProvidersOperations
:param credential: Credential needed for the client to connect to Azure.
:type credential: ~azure.core.credentials.TokenCredential
:param subscription_id: The ID of the target subscription.
@@ -57,7 +57,7 @@ def __init__(
self.operation = OperationOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.attestation_provider = AttestationProviderOperations(
+ self.attestation_providers = AttestationProvidersOperations(
self._client, self._config, self._serialize, self._deserialize)
def close(self):
diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/_attestation_management_client.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/_attestation_management_client.py
index 0e2d9c9dc..1c904c3cd 100644
--- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/_attestation_management_client.py
+++ b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/_attestation_management_client.py
@@ -17,7 +17,7 @@
from ._configuration import AttestationManagementClientConfiguration
from .operations import OperationOperations
-from .operations import AttestationProviderOperations
+from .operations import AttestationProvidersOperations
from .. import models
@@ -26,8 +26,8 @@ class AttestationManagementClient(object):
:ivar operation: OperationOperations operations
:vartype operation: attestation_management_client.aio.operations.OperationOperations
- :ivar attestation_provider: AttestationProviderOperations operations
- :vartype attestation_provider: attestation_management_client.aio.operations.AttestationProviderOperations
+ :ivar attestation_providers: AttestationProvidersOperations operations
+ :vartype attestation_providers: attestation_management_client.aio.operations.AttestationProvidersOperations
:param credential: Credential needed for the client to connect to Azure.
:type credential: ~azure.core.credentials_async.AsyncTokenCredential
:param subscription_id: The ID of the target subscription.
@@ -54,7 +54,7 @@ def __init__(
self.operation = OperationOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.attestation_provider = AttestationProviderOperations(
+ self.attestation_providers = AttestationProvidersOperations(
self._client, self._config, self._serialize, self._deserialize)
async def close(self) -> None:
diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/operations/__init__.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/operations/__init__.py
index a56bb00ec..c1006e087 100644
--- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/operations/__init__.py
+++ b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/operations/__init__.py
@@ -7,9 +7,9 @@
# --------------------------------------------------------------------------
from ._operation_operations import OperationOperations
-from ._attestation_provider_operations import AttestationProviderOperations
+from ._attestation_providers_operations import AttestationProvidersOperations
__all__ = [
'OperationOperations',
- 'AttestationProviderOperations',
+ 'AttestationProvidersOperations',
]
diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/operations/_attestation_provider_operations.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/operations/_attestation_providers_operations.py
similarity index 92%
rename from src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/operations/_attestation_provider_operations.py
rename to src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/operations/_attestation_providers_operations.py
index f0f0fa74f..5d642d0c6 100644
--- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/operations/_attestation_provider_operations.py
+++ b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/aio/operations/_attestation_providers_operations.py
@@ -5,7 +5,7 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-from typing import Any, Callable, Dict, Generic, List, Optional, TypeVar, Union
+from typing import Any, Callable, Dict, Generic, Optional, TypeVar, Union
import warnings
from azure.core.exceptions import ClientAuthenticationError, HttpResponseError, ResourceExistsError, ResourceNotFoundError, map_error
@@ -18,8 +18,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
-class AttestationProviderOperations:
- """AttestationProviderOperations async operations.
+class AttestationProvidersOperations:
+ """AttestationProvidersOperations async operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -102,10 +102,7 @@ async def create(
self,
resource_group_name: str,
provider_name: str,
- location: str,
- tags: Optional[Dict[str, str]] = None,
- attestation_policy: Optional[str] = None,
- keys: Optional[List["models.JsonWebKey"]] = None,
+ creation_params: "models.AttestationServiceCreationParams",
**kwargs
) -> "models.AttestationProvider":
"""Creates or updates the Attestation Provider.
@@ -114,19 +111,8 @@ async def create(
:type resource_group_name: str
:param provider_name: Name of the attestation service.
:type provider_name: str
- :param location: The supported Azure location where the attestation service instance should be
- created.
- :type location: str
- :param tags: The tags that will be assigned to the attestation service instance.
- :type tags: dict[str, str]
- :param attestation_policy: Name of attestation policy.
- :type attestation_policy: str
- :param keys: The value of the "keys" parameter is an array of JWK values. By
- default, the order of the JWK values within the array does not imply
- an order of preference among them, although applications of JWK Sets
- can choose to assign a meaning to the order for their purposes, if
- desired.
- :type keys: list[~attestation_management_client.models.JsonWebKey]
+ :param creation_params: Client supplied parameters.
+ :type creation_params: ~attestation_management_client.models.AttestationServiceCreationParams
:keyword callable cls: A custom type or function that will be passed the direct response
:return: AttestationProvider, or the result of cls(response)
:rtype: ~attestation_management_client.models.AttestationProvider
@@ -137,8 +123,6 @@ async def create(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- creation_params = models.AttestationServiceCreationParams(location=location, tags=tags, attestation_policy=attestation_policy, keys=keys)
api_version = "2018-09-01-preview"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -188,7 +172,7 @@ async def update(
self,
resource_group_name: str,
provider_name: str,
- tags: Optional[Dict[str, str]] = None,
+ update_params: "models.AttestationServicePatchParams",
**kwargs
) -> "models.AttestationProvider":
"""Updates the Attestation Provider.
@@ -197,8 +181,8 @@ async def update(
:type resource_group_name: str
:param provider_name: Name of the attestation service.
:type provider_name: str
- :param tags: The tags that will be assigned to the attestation service instance.
- :type tags: dict[str, str]
+ :param update_params: Client supplied parameters.
+ :type update_params: ~attestation_management_client.models.AttestationServicePatchParams
:keyword callable cls: A custom type or function that will be passed the direct response
:return: AttestationProvider, or the result of cls(response)
:rtype: ~attestation_management_client.models.AttestationProvider
@@ -209,8 +193,6 @@ async def update(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- update_params = models.AttestationServicePatchParams(tags=tags)
api_version = "2018-09-01-preview"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/models/__init__.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/models/__init__.py
index 44ab2a7ca..d8e402c29 100644
--- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/models/__init__.py
+++ b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/models/__init__.py
@@ -10,9 +10,11 @@
from ._models_py3 import AttestationProvider
from ._models_py3 import AttestationProviderListResult
from ._models_py3 import AttestationServiceCreationParams
+ from ._models_py3 import AttestationServiceCreationSpecificParams
from ._models_py3 import AttestationServicePatchParams
from ._models_py3 import CloudErrorBody
from ._models_py3 import JsonWebKey
+ from ._models_py3 import JsonWebKeySet
from ._models_py3 import OperationList
from ._models_py3 import OperationsDefinition
from ._models_py3 import OperationsDisplayDefinition
@@ -22,9 +24,11 @@
from ._models import AttestationProvider # type: ignore
from ._models import AttestationProviderListResult # type: ignore
from ._models import AttestationServiceCreationParams # type: ignore
+ from ._models import AttestationServiceCreationSpecificParams # type: ignore
from ._models import AttestationServicePatchParams # type: ignore
from ._models import CloudErrorBody # type: ignore
from ._models import JsonWebKey # type: ignore
+ from ._models import JsonWebKeySet # type: ignore
from ._models import OperationList # type: ignore
from ._models import OperationsDefinition # type: ignore
from ._models import OperationsDisplayDefinition # type: ignore
@@ -39,9 +43,11 @@
'AttestationProvider',
'AttestationProviderListResult',
'AttestationServiceCreationParams',
+ 'AttestationServiceCreationSpecificParams',
'AttestationServicePatchParams',
'CloudErrorBody',
'JsonWebKey',
+ 'JsonWebKeySet',
'OperationList',
'OperationsDefinition',
'OperationsDisplayDefinition',
diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/models/_models.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/models/_models.py
index 67f429cca..29926e434 100644
--- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/models/_models.py
+++ b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/models/_models.py
@@ -177,25 +177,20 @@ class AttestationServiceCreationParams(msrest.serialization.Model):
:type location: str
:param tags: A set of tags. The tags that will be assigned to the attestation service instance.
:type tags: dict[str, str]
- :param attestation_policy: Name of attestation policy.
- :type attestation_policy: str
- :param keys: The value of the "keys" parameter is an array of JWK values. By
- default, the order of the JWK values within the array does not imply
- an order of preference among them, although applications of JWK Sets
- can choose to assign a meaning to the order for their purposes, if
- desired.
- :type keys: list[~attestation_management_client.models.JsonWebKey]
+ :param properties: Required. Properties of the attestation service instance.
+ :type properties:
+ ~attestation_management_client.models.AttestationServiceCreationSpecificParams
"""
_validation = {
'location': {'required': True},
+ 'properties': {'required': True},
}
_attribute_map = {
'location': {'key': 'location', 'type': 'str'},
'tags': {'key': 'tags', 'type': '{str}'},
- 'attestation_policy': {'key': 'properties.attestationPolicy', 'type': 'str'},
- 'keys': {'key': 'properties.policySigningCertificates.keys', 'type': '[JsonWebKey]'},
+ 'properties': {'key': 'properties', 'type': 'AttestationServiceCreationSpecificParams'},
}
def __init__(
@@ -205,8 +200,31 @@ def __init__(
super(AttestationServiceCreationParams, self).__init__(**kwargs)
self.location = kwargs['location']
self.tags = kwargs.get('tags', None)
+ self.properties = kwargs['properties']
+
+
+class AttestationServiceCreationSpecificParams(msrest.serialization.Model):
+ """Client supplied parameters used to create a new attestation service instance.
+
+ :param attestation_policy: Name of attestation policy.
+ :type attestation_policy: str
+ :param policy_signing_certificates: JSON Web Key Set defining a set of X.509 Certificates that
+ will represent the parent certificate for the signing certificate used for policy operations.
+ :type policy_signing_certificates: ~attestation_management_client.models.JsonWebKeySet
+ """
+
+ _attribute_map = {
+ 'attestation_policy': {'key': 'attestationPolicy', 'type': 'str'},
+ 'policy_signing_certificates': {'key': 'policySigningCertificates', 'type': 'JsonWebKeySet'},
+ }
+
+ def __init__(
+ self,
+ **kwargs
+ ):
+ super(AttestationServiceCreationSpecificParams, self).__init__(**kwargs)
self.attestation_policy = kwargs.get('attestation_policy', None)
- self.keys = kwargs.get('keys', None)
+ self.policy_signing_certificates = kwargs.get('policy_signing_certificates', None)
class AttestationServicePatchParams(msrest.serialization.Model):
@@ -370,6 +388,29 @@ def __init__(
self.y = kwargs.get('y', None)
+class JsonWebKeySet(msrest.serialization.Model):
+ """JsonWebKeySet.
+
+ :param keys: The value of the "keys" parameter is an array of JWK values. By
+ default, the order of the JWK values within the array does not imply
+ an order of preference among them, although applications of JWK Sets
+ can choose to assign a meaning to the order for their purposes, if
+ desired.
+ :type keys: list[~attestation_management_client.models.JsonWebKey]
+ """
+
+ _attribute_map = {
+ 'keys': {'key': 'keys', 'type': '[JsonWebKey]'},
+ }
+
+ def __init__(
+ self,
+ **kwargs
+ ):
+ super(JsonWebKeySet, self).__init__(**kwargs)
+ self.keys = kwargs.get('keys', None)
+
+
class OperationList(msrest.serialization.Model):
"""List of supported operations.
diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/models/_models_py3.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/models/_models_py3.py
index 41ceb554a..3978e862c 100644
--- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/models/_models_py3.py
+++ b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/models/_models_py3.py
@@ -192,41 +192,61 @@ class AttestationServiceCreationParams(msrest.serialization.Model):
:type location: str
:param tags: A set of tags. The tags that will be assigned to the attestation service instance.
:type tags: dict[str, str]
- :param attestation_policy: Name of attestation policy.
- :type attestation_policy: str
- :param keys: The value of the "keys" parameter is an array of JWK values. By
- default, the order of the JWK values within the array does not imply
- an order of preference among them, although applications of JWK Sets
- can choose to assign a meaning to the order for their purposes, if
- desired.
- :type keys: list[~attestation_management_client.models.JsonWebKey]
+ :param properties: Required. Properties of the attestation service instance.
+ :type properties:
+ ~attestation_management_client.models.AttestationServiceCreationSpecificParams
"""
_validation = {
'location': {'required': True},
+ 'properties': {'required': True},
}
_attribute_map = {
'location': {'key': 'location', 'type': 'str'},
'tags': {'key': 'tags', 'type': '{str}'},
- 'attestation_policy': {'key': 'properties.attestationPolicy', 'type': 'str'},
- 'keys': {'key': 'properties.policySigningCertificates.keys', 'type': '[JsonWebKey]'},
+ 'properties': {'key': 'properties', 'type': 'AttestationServiceCreationSpecificParams'},
}
def __init__(
self,
*,
location: str,
+ properties: "AttestationServiceCreationSpecificParams",
tags: Optional[Dict[str, str]] = None,
- attestation_policy: Optional[str] = None,
- keys: Optional[List["JsonWebKey"]] = None,
**kwargs
):
super(AttestationServiceCreationParams, self).__init__(**kwargs)
self.location = location
self.tags = tags
+ self.properties = properties
+
+
+class AttestationServiceCreationSpecificParams(msrest.serialization.Model):
+ """Client supplied parameters used to create a new attestation service instance.
+
+ :param attestation_policy: Name of attestation policy.
+ :type attestation_policy: str
+ :param policy_signing_certificates: JSON Web Key Set defining a set of X.509 Certificates that
+ will represent the parent certificate for the signing certificate used for policy operations.
+ :type policy_signing_certificates: ~attestation_management_client.models.JsonWebKeySet
+ """
+
+ _attribute_map = {
+ 'attestation_policy': {'key': 'attestationPolicy', 'type': 'str'},
+ 'policy_signing_certificates': {'key': 'policySigningCertificates', 'type': 'JsonWebKeySet'},
+ }
+
+ def __init__(
+ self,
+ *,
+ attestation_policy: Optional[str] = None,
+ policy_signing_certificates: Optional["JsonWebKeySet"] = None,
+ **kwargs
+ ):
+ super(AttestationServiceCreationSpecificParams, self).__init__(**kwargs)
self.attestation_policy = attestation_policy
- self.keys = keys
+ self.policy_signing_certificates = policy_signing_certificates
class AttestationServicePatchParams(msrest.serialization.Model):
@@ -413,6 +433,31 @@ def __init__(
self.y = y
+class JsonWebKeySet(msrest.serialization.Model):
+ """JsonWebKeySet.
+
+ :param keys: The value of the "keys" parameter is an array of JWK values. By
+ default, the order of the JWK values within the array does not imply
+ an order of preference among them, although applications of JWK Sets
+ can choose to assign a meaning to the order for their purposes, if
+ desired.
+ :type keys: list[~attestation_management_client.models.JsonWebKey]
+ """
+
+ _attribute_map = {
+ 'keys': {'key': 'keys', 'type': '[JsonWebKey]'},
+ }
+
+ def __init__(
+ self,
+ *,
+ keys: Optional[List["JsonWebKey"]] = None,
+ **kwargs
+ ):
+ super(JsonWebKeySet, self).__init__(**kwargs)
+ self.keys = keys
+
+
class OperationList(msrest.serialization.Model):
"""List of supported operations.
diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/operations/__init__.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/operations/__init__.py
index a56bb00ec..c1006e087 100644
--- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/operations/__init__.py
+++ b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/operations/__init__.py
@@ -7,9 +7,9 @@
# --------------------------------------------------------------------------
from ._operation_operations import OperationOperations
-from ._attestation_provider_operations import AttestationProviderOperations
+from ._attestation_providers_operations import AttestationProvidersOperations
__all__ = [
'OperationOperations',
- 'AttestationProviderOperations',
+ 'AttestationProvidersOperations',
]
diff --git a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/operations/_attestation_provider_operations.py b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/operations/_attestation_providers_operations.py
similarity index 92%
rename from src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/operations/_attestation_provider_operations.py
rename to src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/operations/_attestation_providers_operations.py
index 189322659..31939385f 100644
--- a/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/operations/_attestation_provider_operations.py
+++ b/src/test/scenarios/attestation/output/src/attestation/azext_attestation/vendored_sdks/attestation/operations/_attestation_providers_operations.py
@@ -17,13 +17,13 @@
if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
- from typing import Any, Callable, Dict, Generic, List, Optional, TypeVar, Union
+ from typing import Any, Callable, Dict, Generic, Optional, TypeVar, Union
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
-class AttestationProviderOperations(object):
- """AttestationProviderOperations operations.
+class AttestationProvidersOperations(object):
+ """AttestationProvidersOperations operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -107,10 +107,7 @@ def create(
self,
resource_group_name, # type: str
provider_name, # type: str
- location, # type: str
- tags=None, # type: Optional[Dict[str, str]]
- attestation_policy=None, # type: Optional[str]
- keys=None, # type: Optional[List["models.JsonWebKey"]]
+ creation_params, # type: "models.AttestationServiceCreationParams"
**kwargs # type: Any
):
# type: (...) -> "models.AttestationProvider"
@@ -120,19 +117,8 @@ def create(
:type resource_group_name: str
:param provider_name: Name of the attestation service.
:type provider_name: str
- :param location: The supported Azure location where the attestation service instance should be
- created.
- :type location: str
- :param tags: The tags that will be assigned to the attestation service instance.
- :type tags: dict[str, str]
- :param attestation_policy: Name of attestation policy.
- :type attestation_policy: str
- :param keys: The value of the "keys" parameter is an array of JWK values. By
- default, the order of the JWK values within the array does not imply
- an order of preference among them, although applications of JWK Sets
- can choose to assign a meaning to the order for their purposes, if
- desired.
- :type keys: list[~attestation_management_client.models.JsonWebKey]
+ :param creation_params: Client supplied parameters.
+ :type creation_params: ~attestation_management_client.models.AttestationServiceCreationParams
:keyword callable cls: A custom type or function that will be passed the direct response
:return: AttestationProvider, or the result of cls(response)
:rtype: ~attestation_management_client.models.AttestationProvider
@@ -143,8 +129,6 @@ def create(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- creation_params = models.AttestationServiceCreationParams(location=location, tags=tags, attestation_policy=attestation_policy, keys=keys)
api_version = "2018-09-01-preview"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -194,7 +178,7 @@ def update(
self,
resource_group_name, # type: str
provider_name, # type: str
- tags=None, # type: Optional[Dict[str, str]]
+ update_params, # type: "models.AttestationServicePatchParams"
**kwargs # type: Any
):
# type: (...) -> "models.AttestationProvider"
@@ -204,8 +188,8 @@ def update(
:type resource_group_name: str
:param provider_name: Name of the attestation service.
:type provider_name: str
- :param tags: The tags that will be assigned to the attestation service instance.
- :type tags: dict[str, str]
+ :param update_params: Client supplied parameters.
+ :type update_params: ~attestation_management_client.models.AttestationServicePatchParams
:keyword callable cls: A custom type or function that will be passed the direct response
:return: AttestationProvider, or the result of cls(response)
:rtype: ~attestation_management_client.models.AttestationProvider
@@ -216,8 +200,6 @@ def update(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- update_params = models.AttestationServicePatchParams(tags=tags)
api_version = "2018-09-01-preview"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
diff --git a/src/test/scenarios/datafactory/configuration/readme.az.md b/src/test/scenarios/datafactory/configuration/readme.az.md
index 8461595fa..1968e9f4d 100644
--- a/src/test/scenarios/datafactory/configuration/readme.az.md
+++ b/src/test/scenarios/datafactory/configuration/readme.az.md
@@ -26,7 +26,7 @@ cli:
cli-directive:
# directive on operationGroup
- where:
- group: datafactory
+ group: Factories
parameter: factoryName
alias:
- name
diff --git a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/generated/_client_factory.py b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/generated/_client_factory.py
index 09a81421d..288df4d6f 100644
--- a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/generated/_client_factory.py
+++ b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/generated/_client_factory.py
@@ -17,12 +17,12 @@ def cf_datafactory_cl(cli_ctx, *_):
def cf_factory(cli_ctx, *_):
- return cf_datafactory_cl(cli_ctx).factory
+ return cf_datafactory_cl(cli_ctx).factories
def cf_trigger(cli_ctx, *_):
- return cf_datafactory_cl(cli_ctx).trigger
+ return cf_datafactory_cl(cli_ctx).triggers
def cf_integration_runtime(cli_ctx, *_):
- return cf_datafactory_cl(cli_ctx).integration_runtime
+ return cf_datafactory_cl(cli_ctx).integration_runtimes
diff --git a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/generated/_params.py b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/generated/_params.py
index 3878b4a0e..b73599531 100644
--- a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/generated/_params.py
+++ b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/generated/_params.py
@@ -35,14 +35,14 @@ def load_arguments(self, _):
with self.argument_context('datafactory show') as c:
c.argument('resource_group_name', resource_group_name_type)
- c.argument('factory_name', options_list=['--name', '-n', '--factory-name'], type=str, help='The factory name.',
- id_part='name', configured_default='factory')
+ c.argument('factory_name', options_list=['--name', '-n'], type=str, help='The factory name.', id_part='name',
+ configured_default='factory')
c.argument('if_none_match', type=str, help='ETag of the factory entity. Should only be specified for get. If '
'the ETag matches the existing entity tag, or if * was provided, then no content will be returned.')
with self.argument_context('datafactory create') as c:
c.argument('resource_group_name', resource_group_name_type)
- c.argument('factory_name', options_list=['--name', '-n', '--factory-name'], type=str, help='The factory name.',
+ c.argument('factory_name', options_list=['--name', '-n'], type=str, help='The factory name.',
configured_default='factory')
c.argument('if_match', type=str, help='ETag of the factory entity. Should only be specified for update, for '
'which it should match existing entity or can be * for unconditional update.')
@@ -60,14 +60,14 @@ def load_arguments(self, _):
with self.argument_context('datafactory update') as c:
c.argument('resource_group_name', resource_group_name_type)
- c.argument('factory_name', options_list=['--name', '-n', '--factory-name'], type=str, help='The factory name.',
- id_part='name', configured_default='factory')
+ c.argument('factory_name', options_list=['--name', '-n'], type=str, help='The factory name.', id_part='name',
+ configured_default='factory')
c.argument('tags', tags_type)
with self.argument_context('datafactory delete') as c:
c.argument('resource_group_name', resource_group_name_type)
- c.argument('factory_name', options_list=['--name', '-n', '--factory-name'], type=str, help='The factory name.',
- id_part='name', configured_default='factory')
+ c.argument('factory_name', options_list=['--name', '-n'], type=str, help='The factory name.', id_part='name',
+ configured_default='factory')
with self.argument_context('datafactory configure-factory-repo') as c:
c.argument('location_id', type=str, help='The location identifier.', id_part='name')
@@ -79,8 +79,8 @@ def load_arguments(self, _):
with self.argument_context('datafactory get-data-plane-access') as c:
c.argument('resource_group_name', resource_group_name_type)
- c.argument('factory_name', options_list=['--name', '-n', '--factory-name'], type=str, help='The factory name.',
- id_part='name', configured_default='factory')
+ c.argument('factory_name', options_list=['--name', '-n'], type=str, help='The factory name.', id_part='name',
+ configured_default='factory')
c.argument('permissions', type=str, help='The string with permissions for Data Plane access. Currently only '
'\'r\' is supported which grants read only access.')
c.argument('access_resource_path', type=str, help='The resource path to get access relative to factory. '
@@ -94,8 +94,8 @@ def load_arguments(self, _):
with self.argument_context('datafactory get-git-hub-access-token') as c:
c.argument('resource_group_name', resource_group_name_type)
- c.argument('factory_name', options_list=['--name', '-n', '--factory-name'], type=str, help='The factory name.',
- id_part='name', configured_default='factory')
+ c.argument('factory_name', options_list=['--name', '-n'], type=str, help='The factory name.', id_part='name',
+ configured_default='factory')
c.argument('git_hub_access_code', type=str, help='GitHub access code.')
c.argument('git_hub_client_id', type=str, help='GitHub application client ID.')
c.argument('git_hub_access_token_base_url', type=str, help='GitHub access token base URL.')
@@ -132,7 +132,6 @@ def load_arguments(self, _):
c.argument('description', type=str, help='Trigger description.')
c.argument('annotations', type=validate_file_or_dict, help='List of tags that can be used for describing the '
'trigger. Expected value: json-string/@json-file.')
- c.ignore('properties')
with self.argument_context('datafactory trigger delete') as c:
c.argument('resource_group_name', resource_group_name_type)
diff --git a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/generated/commands.py b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/generated/commands.py
index 612cb64c3..4bc569a73 100644
--- a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/generated/commands.py
+++ b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/generated/commands.py
@@ -17,8 +17,8 @@ def load_command_table(self, _):
from azext_datafactory_preview.generated._client_factory import cf_factory
datafactory_factory = CliCommandType(
- operations_tmpl='azext_datafactory_preview.vendored_sdks.azure_mgmt_datafactory.operations._factory_operations#'
- 'FactoryOperations.{}',
+ operations_tmpl='azext_datafactory_preview.vendored_sdks.azure_mgmt_datafactory.operations._factories_operation'
+ 's#FactoriesOperations.{}',
client_factory=cf_factory)
with self.command_group('datafactory', datafactory_factory, client_factory=cf_factory, is_experimental=True) as g:
g.custom_command('list', 'datafactory_list')
@@ -32,15 +32,14 @@ def load_command_table(self, _):
from azext_datafactory_preview.generated._client_factory import cf_trigger
datafactory_trigger = CliCommandType(
- operations_tmpl='azext_datafactory_preview.vendored_sdks.azure_mgmt_datafactory.operations._trigger_operations#'
- 'TriggerOperations.{}',
+ operations_tmpl='azext_datafactory_preview.vendored_sdks.azure_mgmt_datafactory.operations._triggers_operations'
+ '#TriggersOperations.{}',
client_factory=cf_trigger)
with self.command_group('datafactory trigger', datafactory_trigger, client_factory=cf_trigger) as g:
g.custom_command('list', 'datafactory_trigger_list')
g.custom_show_command('show', 'datafactory_trigger_show')
g.custom_command('create', 'datafactory_trigger_create')
- g.generic_update_command('update', setter_arg_name='properties',
- custom_func_name='datafactory_trigger_update')
+ g.generic_update_command('update', custom_func_name='datafactory_trigger_update')
g.custom_command('delete', 'datafactory_trigger_delete', confirmation=True)
g.custom_command('get-event-subscription-status', 'datafactory_trigger_get_event_subscription_status')
g.custom_command('query-by-factory', 'datafactory_trigger_query_by_factory')
@@ -54,7 +53,7 @@ def load_command_table(self, _):
from azext_datafactory_preview.generated._client_factory import cf_integration_runtime
datafactory_integration_runtime = CliCommandType(
operations_tmpl='azext_datafactory_preview.vendored_sdks.azure_mgmt_datafactory.operations._integration_runtime'
- '_operations#IntegrationRuntimeOperations.{}',
+ 's_operations#IntegrationRuntimesOperations.{}',
client_factory=cf_integration_runtime)
with self.command_group('datafactory integration-runtime', datafactory_integration_runtime,
client_factory=cf_integration_runtime) as g:
diff --git a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/generated/custom.py b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/generated/custom.py
index 1f2b2f772..8489c0a7e 100644
--- a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/generated/custom.py
+++ b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/generated/custom.py
@@ -7,6 +7,7 @@
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------
+# pylint: disable=line-too-long
# pylint: disable=too-many-lines
# pylint: disable=unused-argument
@@ -51,26 +52,32 @@ def datafactory_create(client,
raise CLIError('at most one of factory_vsts_configuration, factory_git_hub_configuration is needed for '
'repo_configuration!')
repo_configuration = all_repo_configuration[0] if len(all_repo_configuration) == 1 else None
+ factory = {}
+ factory['location'] = location
+ factory['tags'] = tags
+ factory['test_inherit'] = test_inherit
+ factory['repo_configuration'] = repo_configuration
+ factory['fake_identity'] = fake_identity
+ factory['zones'] = zones
+ factory['identity'] = {}
+ factory['identity']['type'] = "SystemAssigned"
return client.create_or_update(resource_group_name=resource_group_name,
factory_name=factory_name,
if_match=if_match,
- location=location,
- tags=tags,
- test_inherit=test_inherit,
- repo_configuration=repo_configuration,
- fake_identity=fake_identity,
- zones=zones,
- type="SystemAssigned")
+ factory=factory)
def datafactory_update(client,
resource_group_name,
factory_name,
tags=None):
+ factory_update_parameters = {}
+ factory_update_parameters['tags'] = tags
+ factory_update_parameters['identity'] = {}
+ factory_update_parameters['identity']['type'] = "SystemAssigned"
return client.update(resource_group_name=resource_group_name,
factory_name=factory_name,
- tags=tags,
- type="SystemAssigned")
+ factory_update_parameters=factory_update_parameters)
def datafactory_delete(client,
@@ -94,9 +101,13 @@ def datafactory_configure_factory_repo(client,
raise CLIError('at most one of factory_vsts_configuration, factory_git_hub_configuration is needed for '
'repo_configuration!')
repo_configuration = all_repo_configuration[0] if len(all_repo_configuration) == 1 else None
+ factory_repo_update = {}
+ factory_repo_update['factory_resource_id'] = factory_resource_id
+ factory_repo_update['repo_configuration'] = repo_configuration
return client.configure_factory_repo(location_id=location_id,
- factory_resource_id=factory_resource_id,
- repo_configuration=repo_configuration)
+ factory_repo_update=factory_repo_update,
+ FactoryVstsConfiguration=factory_vsts_configuration,
+ FactoryGitHubConfiguration=factory_git_hub_configuration)
def datafactory_get_data_plane_access(client,
@@ -107,13 +118,15 @@ def datafactory_get_data_plane_access(client,
profile_name=None,
start_time=None,
expire_time=None):
+ policy = {}
+ policy['permissions'] = permissions
+ policy['access_resource_path'] = access_resource_path
+ policy['profile_name'] = profile_name
+ policy['start_time'] = start_time
+ policy['expire_time'] = expire_time
return client.get_data_plane_access(resource_group_name=resource_group_name,
factory_name=factory_name,
- permissions=permissions,
- access_resource_path=access_resource_path,
- profile_name=profile_name,
- start_time=start_time,
- expire_time=expire_time)
+ policy=policy)
def datafactory_get_git_hub_access_token(client,
@@ -122,11 +135,13 @@ def datafactory_get_git_hub_access_token(client,
git_hub_access_code,
git_hub_access_token_base_url,
git_hub_client_id=None):
+ git_hub_access_token_request = {}
+ git_hub_access_token_request['git_hub_access_code'] = git_hub_access_code
+ git_hub_access_token_request['git_hub_client_id'] = git_hub_client_id
+ git_hub_access_token_request['git_hub_access_token_base_url'] = git_hub_access_token_base_url
return client.get_git_hub_access_token(resource_group_name=resource_group_name,
factory_name=factory_name,
- git_hub_access_code=git_hub_access_code,
- git_hub_client_id=git_hub_client_id,
- git_hub_access_token_base_url=git_hub_access_token_base_url)
+ git_hub_access_token_request=git_hub_access_token_request)
def datafactory_trigger_list(client,
@@ -153,11 +168,13 @@ def datafactory_trigger_create(client,
trigger_name,
properties,
if_match=None):
+ trigger = {}
+ trigger['properties'] = properties
return client.create_or_update(resource_group_name=resource_group_name,
factory_name=factory_name,
trigger_name=trigger_name,
if_match=if_match,
- properties=properties)
+ trigger=trigger)
def datafactory_trigger_update(instance,
@@ -168,10 +185,10 @@ def datafactory_trigger_update(instance,
description=None,
annotations=None):
if description is not None:
- instance.properties.description = description
+ instance.description = description
if annotations is not None:
- instance.properties.annotations = annotations
- return instance.properties
+ instance.annotations = annotations
+ return instance.undefined
def datafactory_trigger_delete(client,
@@ -197,10 +214,12 @@ def datafactory_trigger_query_by_factory(client,
factory_name,
continuation_token=None,
parent_trigger_name=None):
+ filter_parameters = {}
+ filter_parameters['continuation_token'] = continuation_token
+ filter_parameters['parent_trigger_name'] = parent_trigger_name
return client.query_by_factory(resource_group_name=resource_group_name,
factory_name=factory_name,
- continuation_token_parameter=continuation_token,
- parent_trigger_name=parent_trigger_name)
+ filter_parameters=filter_parameters)
def datafactory_trigger_start(client,
@@ -233,7 +252,7 @@ def datafactory_trigger_subscribe_to_event(client,
trigger_name,
no_wait=False):
return sdk_no_wait(no_wait,
- client.begin_subscribe_to_event,
+ client.begin_subscribe_to_events,
resource_group_name=resource_group_name,
factory_name=factory_name,
trigger_name=trigger_name)
@@ -245,7 +264,7 @@ def datafactory_trigger_unsubscribe_from_event(client,
trigger_name,
no_wait=False):
return sdk_no_wait(no_wait,
- client.begin_unsubscribe_from_event,
+ client.begin_unsubscribe_from_events,
resource_group_name=resource_group_name,
factory_name=factory_name,
trigger_name=trigger_name)
@@ -277,13 +296,15 @@ def datafactory_integration_runtime_linked_integration_runtime_create(client,
subscription_id=None,
data_factory_name=None,
data_factory_location=None):
+ create_linked_integration_runtime_request = {}
+ create_linked_integration_runtime_request['name'] = name
+ create_linked_integration_runtime_request['subscription_id'] = subscription_id
+ create_linked_integration_runtime_request['data_factory_name'] = data_factory_name
+ create_linked_integration_runtime_request['data_factory_location'] = data_factory_location
return client.create_linked_integration_runtime(resource_group_name=resource_group_name,
factory_name=factory_name,
integration_runtime_name=integration_runtime_name,
- name=name,
- subscription_id=subscription_id,
- data_factory_name=data_factory_name,
- data_factory_location=data_factory_location)
+ create_linked_integration_runtime_request=create_linked_integration_runtime_request)
def datafactory_integration_runtime_managed_create(client,
@@ -307,19 +328,20 @@ def datafactory_integration_runtime_managed_create(client,
raise CLIError('at most one of factory_vsts_configuration, factory_git_hub_configuration is needed for '
'repo_configuration!')
repo_configuration = all_repo_configuration[0] if len(all_repo_configuration) == 1 else None
- properties = {}
- properties['type'] = 'Managed'
- properties['description'] = description
- properties['repo_configuration'] = repo_configuration
- properties['fake_identity'] = fake_identity
- properties['zones'] = zones
- properties['compute_properties'] = type_properties_compute_properties
- properties['ssis_properties'] = type_properties_ssis_properties
+ integration_runtime = {}
+ integration_runtime['properties'] = {}
+ integration_runtime['properties']['type'] = 'Managed'
+ integration_runtime['properties']['description'] = description
+ integration_runtime['properties']['repo_configuration'] = repo_configuration
+ integration_runtime['properties']['fake_identity'] = fake_identity
+ integration_runtime['properties']['zones'] = zones
+ integration_runtime['properties']['compute_properties'] = type_properties_compute_properties
+ integration_runtime['properties']['ssis_properties'] = type_properties_ssis_properties
return client.create_or_update(resource_group_name=resource_group_name,
factory_name=factory_name,
integration_runtime_name=integration_runtime_name,
if_match=if_match,
- properties=properties)
+ integration_runtime=integration_runtime)
def datafactory_integration_runtime_self_hosted_create(client,
@@ -329,15 +351,16 @@ def datafactory_integration_runtime_self_hosted_create(client,
if_match=None,
description=None,
type_properties_linked_info=None):
- properties = {}
- properties['type'] = 'SelfHosted'
- properties['description'] = description
- properties['linked_info'] = type_properties_linked_info
+ integration_runtime = {}
+ integration_runtime['properties'] = {}
+ integration_runtime['properties']['type'] = 'SelfHosted'
+ integration_runtime['properties']['description'] = description
+ integration_runtime['properties']['linked_info'] = type_properties_linked_info
return client.create_or_update(resource_group_name=resource_group_name,
factory_name=factory_name,
integration_runtime_name=integration_runtime_name,
if_match=if_match,
- properties=properties)
+ integration_runtime=integration_runtime)
def datafactory_integration_runtime_update(client,
@@ -346,11 +369,13 @@ def datafactory_integration_runtime_update(client,
integration_runtime_name,
auto_update=None,
update_delay_offset=None):
+ update_integration_runtime_request = {}
+ update_integration_runtime_request['auto_update'] = auto_update
+ update_integration_runtime_request['update_delay_offset'] = update_delay_offset
return client.update(resource_group_name=resource_group_name,
factory_name=factory_name,
integration_runtime_name=integration_runtime_name,
- auto_update=auto_update,
- update_delay_offset=update_delay_offset)
+ update_integration_runtime_request=update_integration_runtime_request)
def datafactory_integration_runtime_delete(client,
@@ -393,9 +418,9 @@ def datafactory_integration_runtime_list_auth_key(client,
resource_group_name,
factory_name,
integration_runtime_name):
- return client.list_auth_key(resource_group_name=resource_group_name,
- factory_name=factory_name,
- integration_runtime_name=integration_runtime_name)
+ return client.list_auth_keys(resource_group_name=resource_group_name,
+ factory_name=factory_name,
+ integration_runtime_name=integration_runtime_name)
def datafactory_integration_runtime_regenerate_auth_key(client,
@@ -403,10 +428,12 @@ def datafactory_integration_runtime_regenerate_auth_key(client,
factory_name,
integration_runtime_name,
key_name=None):
+ regenerate_key_parameters = {}
+ regenerate_key_parameters['key_name'] = key_name
return client.regenerate_auth_key(resource_group_name=resource_group_name,
factory_name=factory_name,
integration_runtime_name=integration_runtime_name,
- key_name=key_name)
+ regenerate_key_parameters=regenerate_key_parameters)
def datafactory_integration_runtime_remove_link(client,
@@ -414,10 +441,12 @@ def datafactory_integration_runtime_remove_link(client,
factory_name,
integration_runtime_name,
linked_factory_name):
- return client.remove_link(resource_group_name=resource_group_name,
- factory_name=factory_name,
- integration_runtime_name=integration_runtime_name,
- linked_factory_name=linked_factory_name)
+ linked_integration_runtime_request = {}
+ linked_integration_runtime_request['linked_factory_name'] = linked_factory_name
+ return client.remove_links(resource_group_name=resource_group_name,
+ factory_name=factory_name,
+ integration_runtime_name=integration_runtime_name,
+ linked_integration_runtime_request=linked_integration_runtime_request)
def datafactory_integration_runtime_start(client,
diff --git a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/_dfaz_management_client.py b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/_dfaz_management_client.py
index d8418688e..ef3b4de81 100644
--- a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/_dfaz_management_client.py
+++ b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/_dfaz_management_client.py
@@ -18,21 +18,21 @@
from azure.core.credentials import TokenCredential
from ._configuration import DFAZManagementClientConfiguration
-from .operations import FactoryOperations
-from .operations import TriggerOperations
-from .operations import IntegrationRuntimeOperations
+from .operations import FactoriesOperations
+from .operations import TriggersOperations
+from .operations import IntegrationRuntimesOperations
from . import models
class DFAZManagementClient(object):
"""The DFAZ Client.
- :ivar factory: FactoryOperations operations
- :vartype factory: dfaz_management_client.operations.FactoryOperations
- :ivar trigger: TriggerOperations operations
- :vartype trigger: dfaz_management_client.operations.TriggerOperations
- :ivar integration_runtime: IntegrationRuntimeOperations operations
- :vartype integration_runtime: dfaz_management_client.operations.IntegrationRuntimeOperations
+ :ivar factories: FactoriesOperations operations
+ :vartype factories: dfaz_management_client.operations.FactoriesOperations
+ :ivar triggers: TriggersOperations operations
+ :vartype triggers: dfaz_management_client.operations.TriggersOperations
+ :ivar integration_runtimes: IntegrationRuntimesOperations operations
+ :vartype integration_runtimes: dfaz_management_client.operations.IntegrationRuntimesOperations
:param credential: Credential needed for the client to connect to Azure.
:type credential: ~azure.core.credentials.TokenCredential
:param subscription_id: The subscription identifier.
@@ -59,11 +59,11 @@ def __init__(
self._serialize.client_side_validation = False
self._deserialize = Deserializer(client_models)
- self.factory = FactoryOperations(
+ self.factories = FactoriesOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.trigger = TriggerOperations(
+ self.triggers = TriggersOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.integration_runtime = IntegrationRuntimeOperations(
+ self.integration_runtimes = IntegrationRuntimesOperations(
self._client, self._config, self._serialize, self._deserialize)
def close(self):
diff --git a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/_dfaz_management_client.py b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/_dfaz_management_client.py
index 8eb93692d..779fc9570 100644
--- a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/_dfaz_management_client.py
+++ b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/_dfaz_management_client.py
@@ -16,21 +16,21 @@
from azure.core.credentials_async import AsyncTokenCredential
from ._configuration import DFAZManagementClientConfiguration
-from .operations import FactoryOperations
-from .operations import TriggerOperations
-from .operations import IntegrationRuntimeOperations
+from .operations import FactoriesOperations
+from .operations import TriggersOperations
+from .operations import IntegrationRuntimesOperations
from .. import models
class DFAZManagementClient(object):
"""The DFAZ Client.
- :ivar factory: FactoryOperations operations
- :vartype factory: dfaz_management_client.aio.operations.FactoryOperations
- :ivar trigger: TriggerOperations operations
- :vartype trigger: dfaz_management_client.aio.operations.TriggerOperations
- :ivar integration_runtime: IntegrationRuntimeOperations operations
- :vartype integration_runtime: dfaz_management_client.aio.operations.IntegrationRuntimeOperations
+ :ivar factories: FactoriesOperations operations
+ :vartype factories: dfaz_management_client.aio.operations.FactoriesOperations
+ :ivar triggers: TriggersOperations operations
+ :vartype triggers: dfaz_management_client.aio.operations.TriggersOperations
+ :ivar integration_runtimes: IntegrationRuntimesOperations operations
+ :vartype integration_runtimes: dfaz_management_client.aio.operations.IntegrationRuntimesOperations
:param credential: Credential needed for the client to connect to Azure.
:type credential: ~azure.core.credentials_async.AsyncTokenCredential
:param subscription_id: The subscription identifier.
@@ -56,11 +56,11 @@ def __init__(
self._serialize.client_side_validation = False
self._deserialize = Deserializer(client_models)
- self.factory = FactoryOperations(
+ self.factories = FactoriesOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.trigger = TriggerOperations(
+ self.triggers = TriggersOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.integration_runtime = IntegrationRuntimeOperations(
+ self.integration_runtimes = IntegrationRuntimesOperations(
self._client, self._config, self._serialize, self._deserialize)
async def close(self) -> None:
diff --git a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/__init__.py b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/__init__.py
index c59809b9a..b1459e933 100644
--- a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/__init__.py
+++ b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/__init__.py
@@ -6,12 +6,12 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-from ._factory_operations import FactoryOperations
-from ._trigger_operations import TriggerOperations
-from ._integration_runtime_operations import IntegrationRuntimeOperations
+from ._factories_operations import FactoriesOperations
+from ._triggers_operations import TriggersOperations
+from ._integration_runtimes_operations import IntegrationRuntimesOperations
__all__ = [
- 'FactoryOperations',
- 'TriggerOperations',
- 'IntegrationRuntimeOperations',
+ 'FactoriesOperations',
+ 'TriggersOperations',
+ 'IntegrationRuntimesOperations',
]
diff --git a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/_factory_operations.py b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/_factories_operations.py
similarity index 87%
rename from src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/_factory_operations.py
rename to src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/_factories_operations.py
index 675d86a65..f6bb10dea 100644
--- a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/_factory_operations.py
+++ b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/_factories_operations.py
@@ -5,7 +5,7 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-from typing import Any, AsyncIterable, Callable, Dict, Generic, List, Optional, TypeVar, Union
+from typing import Any, AsyncIterable, Callable, Dict, Generic, Optional, TypeVar
import warnings
from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -19,8 +19,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
-class FactoryOperations:
- """FactoryOperations async operations.
+class FactoriesOperations:
+ """FactoriesOperations async operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -115,18 +115,15 @@ async def get_next(next_link=None):
async def configure_factory_repo(
self,
location_id: str,
- factory_resource_id: Optional[str] = None,
- repo_configuration: Optional["models.FactoryRepoConfiguration"] = None,
+ factory_repo_update: "models.FactoryRepoUpdate",
**kwargs
) -> "models.Factory":
"""Updates a factory's repo information.
:param location_id: The location identifier.
:type location_id: str
- :param factory_resource_id: The factory resource id.
- :type factory_resource_id: str
- :param repo_configuration: Git repo information of the factory.
- :type repo_configuration: ~dfaz_management_client.models.FactoryRepoConfiguration
+ :param factory_repo_update: Update factory repo request definition.
+ :type factory_repo_update: ~dfaz_management_client.models.FactoryRepoUpdate
:keyword callable cls: A custom type or function that will be passed the direct response
:return: Factory, or the result of cls(response)
:rtype: ~dfaz_management_client.models.Factory
@@ -137,8 +134,6 @@ async def configure_factory_repo(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- factory_repo_update = models.FactoryRepoUpdate(factory_resource_id=factory_resource_id, repo_configuration=repo_configuration)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -253,14 +248,8 @@ async def create_or_update(
self,
resource_group_name: str,
factory_name: str,
+ factory: "models.Factory",
if_match: Optional[str] = None,
- location: Optional[str] = None,
- tags: Optional[Dict[str, str]] = None,
- test_inherit: Optional["models.JobBase"] = None,
- repo_configuration: Optional["models.FactoryRepoConfiguration"] = None,
- fake_identity: Optional["models.FakeFactoryIdentity"] = None,
- zones: Optional[List[str]] = None,
- type: Optional[Union[str, "models.FactoryIdentityType"]] = None,
**kwargs
) -> "models.Factory":
"""Creates or updates a factory.
@@ -269,23 +258,11 @@ async def create_or_update(
:type resource_group_name: str
:param factory_name: The factory name.
:type factory_name: str
+ :param factory: Factory resource definition.
+ :type factory: ~dfaz_management_client.models.Factory
:param if_match: ETag of the factory entity. Should only be specified for update, for which it
should match existing entity or can be * for unconditional update.
:type if_match: str
- :param location: The resource location.
- :type location: str
- :param tags: The resource tags.
- :type tags: dict[str, str]
- :param test_inherit: Test Job Base.
- :type test_inherit: ~dfaz_management_client.models.JobBase
- :param repo_configuration: Git repo information of the factory.
- :type repo_configuration: ~dfaz_management_client.models.FactoryRepoConfiguration
- :param fake_identity: This is only for az test.
- :type fake_identity: ~dfaz_management_client.models.FakeFactoryIdentity
- :param zones: This is only for az test.
- :type zones: list[str]
- :param type: The identity type. Currently the only supported type is 'SystemAssigned'.
- :type type: str or ~dfaz_management_client.models.FactoryIdentityType
:keyword callable cls: A custom type or function that will be passed the direct response
:return: Factory, or the result of cls(response)
:rtype: ~dfaz_management_client.models.Factory
@@ -296,8 +273,6 @@ async def create_or_update(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- factory = models.Factory(location=location, tags=tags, test_inherit=test_inherit, repo_configuration=repo_configuration, fake_identity=fake_identity, zones=zones, type_identity_type=type)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -345,8 +320,7 @@ async def update(
self,
resource_group_name: str,
factory_name: str,
- type: Union[str, "models.FactoryIdentityType"],
- tags: Optional[Dict[str, str]] = None,
+ factory_update_parameters: "models.FactoryUpdateParameters",
**kwargs
) -> "models.Factory":
"""Updates a factory.
@@ -355,10 +329,8 @@ async def update(
:type resource_group_name: str
:param factory_name: The factory name.
:type factory_name: str
- :param type: The identity type. Currently the only supported type is 'SystemAssigned'.
- :type type: str or ~dfaz_management_client.models.FactoryIdentityType
- :param tags: The resource tags.
- :type tags: dict[str, str]
+ :param factory_update_parameters: The parameters for updating a factory.
+ :type factory_update_parameters: ~dfaz_management_client.models.FactoryUpdateParameters
:keyword callable cls: A custom type or function that will be passed the direct response
:return: Factory, or the result of cls(response)
:rtype: ~dfaz_management_client.models.Factory
@@ -369,8 +341,6 @@ async def update(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- factory_update_parameters = models.FactoryUpdateParameters(tags=tags, type=type)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -537,9 +507,7 @@ async def get_git_hub_access_token(
self,
resource_group_name: str,
factory_name: str,
- git_hub_access_code: str,
- git_hub_access_token_base_url: str,
- git_hub_client_id: Optional[str] = None,
+ git_hub_access_token_request: "models.GitHubAccessTokenRequest",
**kwargs
) -> "models.GitHubAccessTokenResponse":
"""Get GitHub Access Token.
@@ -548,12 +516,8 @@ async def get_git_hub_access_token(
:type resource_group_name: str
:param factory_name: The factory name.
:type factory_name: str
- :param git_hub_access_code: GitHub access code.
- :type git_hub_access_code: str
- :param git_hub_access_token_base_url: GitHub access token base URL.
- :type git_hub_access_token_base_url: str
- :param git_hub_client_id: GitHub application client ID.
- :type git_hub_client_id: str
+ :param git_hub_access_token_request: Get GitHub access token request definition.
+ :type git_hub_access_token_request: ~dfaz_management_client.models.GitHubAccessTokenRequest
:keyword callable cls: A custom type or function that will be passed the direct response
:return: GitHubAccessTokenResponse, or the result of cls(response)
:rtype: ~dfaz_management_client.models.GitHubAccessTokenResponse
@@ -564,8 +528,6 @@ async def get_git_hub_access_token(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- git_hub_access_token_request = models.GitHubAccessTokenRequest(git_hub_access_code=git_hub_access_code, git_hub_client_id=git_hub_client_id, git_hub_access_token_base_url=git_hub_access_token_base_url)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -611,11 +573,7 @@ async def get_data_plane_access(
self,
resource_group_name: str,
factory_name: str,
- permissions: Optional[str] = None,
- access_resource_path: Optional[str] = None,
- profile_name: Optional[str] = None,
- start_time: Optional[str] = None,
- expire_time: Optional[str] = None,
+ policy: "models.UserAccessPolicy",
**kwargs
) -> "models.AccessPolicyResponse":
"""Get Data Plane access.
@@ -624,20 +582,8 @@ async def get_data_plane_access(
:type resource_group_name: str
:param factory_name: The factory name.
:type factory_name: str
- :param permissions: The string with permissions for Data Plane access. Currently only 'r' is
- supported which grants read only access.
- :type permissions: str
- :param access_resource_path: The resource path to get access relative to factory. Currently
- only empty string is supported which corresponds to the factory resource.
- :type access_resource_path: str
- :param profile_name: The name of the profile. Currently only the default is supported. The
- default value is DefaultProfile.
- :type profile_name: str
- :param start_time: Start time for the token. If not specified the current time will be used.
- :type start_time: str
- :param expire_time: Expiration time for the token. Maximum duration for the token is eight
- hours and by default the token will expire in eight hours.
- :type expire_time: str
+ :param policy: Data Plane user access policy definition.
+ :type policy: ~dfaz_management_client.models.UserAccessPolicy
:keyword callable cls: A custom type or function that will be passed the direct response
:return: AccessPolicyResponse, or the result of cls(response)
:rtype: ~dfaz_management_client.models.AccessPolicyResponse
@@ -648,8 +594,6 @@ async def get_data_plane_access(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- policy = models.UserAccessPolicy(permissions=permissions, access_resource_path=access_resource_path, profile_name=profile_name, start_time=start_time, expire_time=expire_time)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
diff --git a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/_integration_runtime_operations.py b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/_integration_runtimes_operations.py
similarity index 94%
rename from src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/_integration_runtime_operations.py
rename to src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/_integration_runtimes_operations.py
index 184d5a737..d32fbd85c 100644
--- a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/_integration_runtime_operations.py
+++ b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/_integration_runtimes_operations.py
@@ -21,8 +21,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
-class IntegrationRuntimeOperations:
- """IntegrationRuntimeOperations async operations.
+class IntegrationRuntimesOperations:
+ """IntegrationRuntimesOperations async operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -122,7 +122,7 @@ async def create_or_update(
resource_group_name: str,
factory_name: str,
integration_runtime_name: str,
- properties: "models.IntegrationRuntime",
+ integration_runtime: "models.IntegrationRuntimeResource",
if_match: Optional[str] = None,
**kwargs
) -> "models.IntegrationRuntimeResource":
@@ -134,8 +134,8 @@ async def create_or_update(
:type factory_name: str
:param integration_runtime_name: The integration runtime name.
:type integration_runtime_name: str
- :param properties: Integration runtime properties.
- :type properties: ~dfaz_management_client.models.IntegrationRuntime
+ :param integration_runtime: Integration runtime resource definition.
+ :type integration_runtime: ~dfaz_management_client.models.IntegrationRuntimeResource
:param if_match: ETag of the integration runtime entity. Should only be specified for update,
for which it should match existing entity or can be * for unconditional update.
:type if_match: str
@@ -149,8 +149,6 @@ async def create_or_update(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- integration_runtime = models.IntegrationRuntimeResource(properties=properties)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -271,8 +269,7 @@ async def update(
resource_group_name: str,
factory_name: str,
integration_runtime_name: str,
- auto_update: Optional[Union[str, "models.IntegrationRuntimeAutoUpdate"]] = None,
- update_delay_offset: Optional[str] = None,
+ update_integration_runtime_request: "models.UpdateIntegrationRuntimeRequest",
**kwargs
) -> "models.IntegrationRuntimeResource":
"""Updates an integration runtime.
@@ -283,12 +280,8 @@ async def update(
:type factory_name: str
:param integration_runtime_name: The integration runtime name.
:type integration_runtime_name: str
- :param auto_update: Enables or disables the auto-update feature of the self-hosted integration
- runtime. See https://go.microsoft.com/fwlink/?linkid=854189.
- :type auto_update: str or ~dfaz_management_client.models.IntegrationRuntimeAutoUpdate
- :param update_delay_offset: The time offset (in hours) in the day, e.g., PT03H is 3 hours. The
- integration runtime auto update will happen on that time.
- :type update_delay_offset: str
+ :param update_integration_runtime_request: The parameters for updating an integration runtime.
+ :type update_integration_runtime_request: ~dfaz_management_client.models.UpdateIntegrationRuntimeRequest
:keyword callable cls: A custom type or function that will be passed the direct response
:return: IntegrationRuntimeResource, or the result of cls(response)
:rtype: ~dfaz_management_client.models.IntegrationRuntimeResource
@@ -299,8 +292,6 @@ async def update(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- update_integration_runtime_request = models.UpdateIntegrationRuntimeRequest(auto_update=auto_update, update_delay_offset=update_delay_offset)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -532,7 +523,7 @@ async def regenerate_auth_key(
resource_group_name: str,
factory_name: str,
integration_runtime_name: str,
- key_name: Optional[Union[str, "models.IntegrationRuntimeAuthKeyName"]] = None,
+ regenerate_key_parameters: "models.IntegrationRuntimeRegenerateKeyParameters",
**kwargs
) -> "models.IntegrationRuntimeAuthKeys":
"""Regenerates the authentication key for an integration runtime.
@@ -543,8 +534,9 @@ async def regenerate_auth_key(
:type factory_name: str
:param integration_runtime_name: The integration runtime name.
:type integration_runtime_name: str
- :param key_name: The name of the authentication key to regenerate.
- :type key_name: str or ~dfaz_management_client.models.IntegrationRuntimeAuthKeyName
+ :param regenerate_key_parameters: The parameters for regenerating integration runtime
+ authentication key.
+ :type regenerate_key_parameters: ~dfaz_management_client.models.IntegrationRuntimeRegenerateKeyParameters
:keyword callable cls: A custom type or function that will be passed the direct response
:return: IntegrationRuntimeAuthKeys, or the result of cls(response)
:rtype: ~dfaz_management_client.models.IntegrationRuntimeAuthKeys
@@ -555,8 +547,6 @@ async def regenerate_auth_key(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- regenerate_key_parameters = models.IntegrationRuntimeRegenerateKeyParameters(key_name=key_name)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -599,7 +589,7 @@ async def regenerate_auth_key(
return deserialized
regenerate_auth_key.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/regenerateAuthKey'} # type: ignore
- async def list_auth_key(
+ async def list_auth_keys(
self,
resource_group_name: str,
factory_name: str,
@@ -628,7 +618,7 @@ async def list_auth_key(
accept = "application/json"
# Construct URL
- url = self.list_auth_key.metadata['url'] # type: ignore
+ url = self.list_auth_keys.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
@@ -659,7 +649,7 @@ async def list_auth_key(
return cls(pipeline_response, deserialized, {})
return deserialized
- list_auth_key.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/listAuthKeys'} # type: ignore
+ list_auth_keys.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/listAuthKeys'} # type: ignore
async def _start_initial(
self,
@@ -1083,12 +1073,12 @@ async def upgrade(
upgrade.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/upgrade'} # type: ignore
- async def remove_link(
+ async def remove_links(
self,
resource_group_name: str,
factory_name: str,
integration_runtime_name: str,
- linked_factory_name: str,
+ linked_integration_runtime_request: "models.LinkedIntegrationRuntimeRequest",
**kwargs
) -> None:
"""Remove all linked integration runtimes under specific data factory in a self-hosted integration
@@ -1100,8 +1090,9 @@ async def remove_link(
:type factory_name: str
:param integration_runtime_name: The integration runtime name.
:type integration_runtime_name: str
- :param linked_factory_name: The data factory name for linked integration runtime.
- :type linked_factory_name: str
+ :param linked_integration_runtime_request: The data factory name for the linked integration
+ runtime.
+ :type linked_integration_runtime_request: ~dfaz_management_client.models.LinkedIntegrationRuntimeRequest
:keyword callable cls: A custom type or function that will be passed the direct response
:return: None, or the result of cls(response)
:rtype: None
@@ -1112,14 +1103,12 @@ async def remove_link(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- linked_integration_runtime_request = models.LinkedIntegrationRuntimeRequest(linked_factory_name=linked_factory_name)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
# Construct URL
- url = self.remove_link.metadata['url'] # type: ignore
+ url = self.remove_links.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
@@ -1151,17 +1140,14 @@ async def remove_link(
if cls:
return cls(pipeline_response, None, {})
- remove_link.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/removeLinks'} # type: ignore
+ remove_links.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/removeLinks'} # type: ignore
async def create_linked_integration_runtime(
self,
resource_group_name: str,
factory_name: str,
integration_runtime_name: str,
- name: Optional[str] = None,
- subscription_id: Optional[str] = None,
- data_factory_name: Optional[str] = None,
- data_factory_location: Optional[str] = None,
+ create_linked_integration_runtime_request: "models.CreateLinkedIntegrationRuntimeRequest",
**kwargs
) -> "models.IntegrationRuntimeStatusResponse":
"""Create a linked integration runtime entry in a shared integration runtime.
@@ -1172,17 +1158,8 @@ async def create_linked_integration_runtime(
:type factory_name: str
:param integration_runtime_name: The integration runtime name.
:type integration_runtime_name: str
- :param name: The name of the linked integration runtime.
- :type name: str
- :param subscription_id: The ID of the subscription that the linked integration runtime belongs
- to.
- :type subscription_id: str
- :param data_factory_name: The name of the data factory that the linked integration runtime
- belongs to.
- :type data_factory_name: str
- :param data_factory_location: The location of the data factory that the linked integration
- runtime belongs to.
- :type data_factory_location: str
+ :param create_linked_integration_runtime_request: The linked integration runtime properties.
+ :type create_linked_integration_runtime_request: ~dfaz_management_client.models.CreateLinkedIntegrationRuntimeRequest
:keyword callable cls: A custom type or function that will be passed the direct response
:return: IntegrationRuntimeStatusResponse, or the result of cls(response)
:rtype: ~dfaz_management_client.models.IntegrationRuntimeStatusResponse
@@ -1193,8 +1170,6 @@ async def create_linked_integration_runtime(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- create_linked_integration_runtime_request = models.CreateLinkedIntegrationRuntimeRequest(name=name, subscription_id=subscription_id, data_factory_name=data_factory_name, data_factory_location=data_factory_location)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
diff --git a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/_trigger_operations.py b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/_triggers_operations.py
similarity index 95%
rename from src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/_trigger_operations.py
rename to src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/_triggers_operations.py
index c918ff125..6686bddbf 100644
--- a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/_trigger_operations.py
+++ b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/aio/operations/_triggers_operations.py
@@ -21,8 +21,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
-class TriggerOperations:
- """TriggerOperations async operations.
+class TriggersOperations:
+ """TriggersOperations async operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -121,8 +121,7 @@ async def query_by_factory(
self,
resource_group_name: str,
factory_name: str,
- continuation_token_parameter: Optional[str] = None,
- parent_trigger_name: Optional[str] = None,
+ filter_parameters: "models.TriggerFilterParameters",
**kwargs
) -> "models.TriggerQueryResponse":
"""Query triggers.
@@ -131,12 +130,8 @@ async def query_by_factory(
:type resource_group_name: str
:param factory_name: The factory name.
:type factory_name: str
- :param continuation_token_parameter: The continuation token for getting the next page of
- results. Null for first page.
- :type continuation_token_parameter: str
- :param parent_trigger_name: The name of the parent TumblingWindowTrigger to get the child rerun
- triggers.
- :type parent_trigger_name: str
+ :param filter_parameters: Parameters to filter the triggers.
+ :type filter_parameters: ~dfaz_management_client.models.TriggerFilterParameters
:keyword callable cls: A custom type or function that will be passed the direct response
:return: TriggerQueryResponse, or the result of cls(response)
:rtype: ~dfaz_management_client.models.TriggerQueryResponse
@@ -147,8 +142,6 @@ async def query_by_factory(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- filter_parameters = models.TriggerFilterParameters(continuation_token=continuation_token_parameter, parent_trigger_name=parent_trigger_name)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -195,7 +188,7 @@ async def create_or_update(
resource_group_name: str,
factory_name: str,
trigger_name: str,
- properties: "models.Trigger",
+ trigger: "models.TriggerResource",
if_match: Optional[str] = None,
**kwargs
) -> "models.TriggerResource":
@@ -207,8 +200,8 @@ async def create_or_update(
:type factory_name: str
:param trigger_name: The trigger name.
:type trigger_name: str
- :param properties: Properties of the trigger.
- :type properties: ~dfaz_management_client.models.Trigger
+ :param trigger: Trigger resource definition.
+ :type trigger: ~dfaz_management_client.models.TriggerResource
:param if_match: ETag of the trigger entity. Should only be specified for update, for which it
should match existing entity or can be * for unconditional update.
:type if_match: str
@@ -222,8 +215,6 @@ async def create_or_update(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- trigger = models.TriggerResource(properties=properties)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -397,7 +388,7 @@ async def delete(
delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}'} # type: ignore
- async def _subscribe_to_event_initial(
+ async def _subscribe_to_events_initial(
self,
resource_group_name: str,
factory_name: str,
@@ -413,7 +404,7 @@ async def _subscribe_to_event_initial(
accept = "application/json"
# Construct URL
- url = self._subscribe_to_event_initial.metadata['url'] # type: ignore
+ url = self._subscribe_to_events_initial.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
@@ -446,9 +437,9 @@ async def _subscribe_to_event_initial(
return cls(pipeline_response, deserialized, {})
return deserialized
- _subscribe_to_event_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/subscribeToEvents'} # type: ignore
+ _subscribe_to_events_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/subscribeToEvents'} # type: ignore
- async def begin_subscribe_to_event(
+ async def begin_subscribe_to_events(
self,
resource_group_name: str,
factory_name: str,
@@ -481,7 +472,7 @@ async def begin_subscribe_to_event(
)
cont_token = kwargs.pop('continuation_token', None) # type: Optional[str]
if cont_token is None:
- raw_result = await self._subscribe_to_event_initial(
+ raw_result = await self._subscribe_to_events_initial(
resource_group_name=resource_group_name,
factory_name=factory_name,
trigger_name=trigger_name,
@@ -518,7 +509,7 @@ def get_long_running_output(pipeline_response):
)
else:
return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method)
- begin_subscribe_to_event.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/subscribeToEvents'} # type: ignore
+ begin_subscribe_to_events.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/subscribeToEvents'} # type: ignore
async def get_event_subscription_status(
self,
@@ -582,7 +573,7 @@ async def get_event_subscription_status(
return deserialized
get_event_subscription_status.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/getEventSubscriptionStatus'} # type: ignore
- async def _unsubscribe_from_event_initial(
+ async def _unsubscribe_from_events_initial(
self,
resource_group_name: str,
factory_name: str,
@@ -598,7 +589,7 @@ async def _unsubscribe_from_event_initial(
accept = "application/json"
# Construct URL
- url = self._unsubscribe_from_event_initial.metadata['url'] # type: ignore
+ url = self._unsubscribe_from_events_initial.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
@@ -631,9 +622,9 @@ async def _unsubscribe_from_event_initial(
return cls(pipeline_response, deserialized, {})
return deserialized
- _unsubscribe_from_event_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/unsubscribeFromEvents'} # type: ignore
+ _unsubscribe_from_events_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/unsubscribeFromEvents'} # type: ignore
- async def begin_unsubscribe_from_event(
+ async def begin_unsubscribe_from_events(
self,
resource_group_name: str,
factory_name: str,
@@ -666,7 +657,7 @@ async def begin_unsubscribe_from_event(
)
cont_token = kwargs.pop('continuation_token', None) # type: Optional[str]
if cont_token is None:
- raw_result = await self._unsubscribe_from_event_initial(
+ raw_result = await self._unsubscribe_from_events_initial(
resource_group_name=resource_group_name,
factory_name=factory_name,
trigger_name=trigger_name,
@@ -703,7 +694,7 @@ def get_long_running_output(pipeline_response):
)
else:
return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method)
- begin_unsubscribe_from_event.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/unsubscribeFromEvents'} # type: ignore
+ begin_unsubscribe_from_events.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/unsubscribeFromEvents'} # type: ignore
async def _start_initial(
self,
diff --git a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/models/__init__.py b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/models/__init__.py
index c423b4e03..238374b94 100644
--- a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/models/__init__.py
+++ b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/models/__init__.py
@@ -24,6 +24,7 @@
from ._models_py3 import EnvironmentVariableSetup
from ._models_py3 import Factory
from ._models_py3 import FactoryGitHubConfiguration
+ from ._models_py3 import FactoryIdentity
from ._models_py3 import FactoryListResponse
from ._models_py3 import FactoryRepoConfiguration
from ._models_py3 import FactoryRepoUpdate
@@ -123,6 +124,7 @@
from ._models import EnvironmentVariableSetup # type: ignore
from ._models import Factory # type: ignore
from ._models import FactoryGitHubConfiguration # type: ignore
+ from ._models import FactoryIdentity # type: ignore
from ._models import FactoryListResponse # type: ignore
from ._models import FactoryRepoConfiguration # type: ignore
from ._models import FactoryRepoUpdate # type: ignore
@@ -253,6 +255,7 @@
'EnvironmentVariableSetup',
'Factory',
'FactoryGitHubConfiguration',
+ 'FactoryIdentity',
'FactoryListResponse',
'FactoryRepoConfiguration',
'FactoryRepoUpdate',
diff --git a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/models/_models.py b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/models/_models.py
index 805c1a4c9..9d0882305 100644
--- a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/models/_models.py
+++ b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/models/_models.py
@@ -1007,6 +1007,8 @@ class Factory(Resource):
:param additional_properties: Unmatched properties from the message are deserialized to this
collection.
:type additional_properties: dict[str, object]
+ :param identity: Managed service identity of the factory.
+ :type identity: ~dfaz_management_client.models.FactoryIdentity
:param test_inherit: Test Job Base.
:type test_inherit: ~dfaz_management_client.models.JobBase
:ivar provisioning_state: Factory provisioning state, example Succeeded.
@@ -1021,13 +1023,6 @@ class Factory(Resource):
:type fake_identity: ~dfaz_management_client.models.FakeFactoryIdentity
:param zones: This is only for az test.
:type zones: list[str]
- :param type_identity_type: The identity type. Currently the only supported type is
- 'SystemAssigned'. Possible values include: "SystemAssigned".
- :type type_identity_type: str or ~dfaz_management_client.models.FactoryIdentityType
- :ivar principal_id: The principal id of the identity.
- :vartype principal_id: str
- :ivar tenant_id: The client tenant id of the identity.
- :vartype tenant_id: str
"""
_validation = {
@@ -1038,8 +1033,6 @@ class Factory(Resource):
'provisioning_state': {'readonly': True},
'create_time': {'readonly': True},
'version': {'readonly': True},
- 'principal_id': {'readonly': True},
- 'tenant_id': {'readonly': True},
}
_attribute_map = {
@@ -1050,6 +1043,7 @@ class Factory(Resource):
'tags': {'key': 'tags', 'type': '{str}'},
'e_tag': {'key': 'eTag', 'type': 'str'},
'additional_properties': {'key': '', 'type': '{object}'},
+ 'identity': {'key': 'identity', 'type': 'FactoryIdentity'},
'test_inherit': {'key': 'testInherit', 'type': 'JobBase'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'create_time': {'key': 'properties.createTime', 'type': 'iso-8601'},
@@ -1057,9 +1051,6 @@ class Factory(Resource):
'repo_configuration': {'key': 'properties.repoConfiguration', 'type': 'FactoryRepoConfiguration'},
'fake_identity': {'key': 'properties.fakeIdentity', 'type': 'FakeFactoryIdentity'},
'zones': {'key': 'properties.zones', 'type': '[str]'},
- 'type_identity_type': {'key': 'identity.type', 'type': 'str'},
- 'principal_id': {'key': 'identity.principalId', 'type': 'str'},
- 'tenant_id': {'key': 'identity.tenantId', 'type': 'str'},
}
def __init__(
@@ -1068,6 +1059,7 @@ def __init__(
):
super(Factory, self).__init__(**kwargs)
self.additional_properties = kwargs.get('additional_properties', None)
+ self.identity = kwargs.get('identity', None)
self.test_inherit = kwargs.get('test_inherit', None)
self.provisioning_state = None
self.create_time = None
@@ -1075,9 +1067,6 @@ def __init__(
self.repo_configuration = kwargs.get('repo_configuration', None)
self.fake_identity = kwargs.get('fake_identity', None)
self.zones = kwargs.get('zones', None)
- self.type_identity_type = kwargs.get('type_identity_type', None)
- self.principal_id = None
- self.tenant_id = None
class FactoryRepoConfiguration(msrest.serialization.Model):
@@ -1184,6 +1173,44 @@ def __init__(
self.host_name = kwargs.get('host_name', None)
+class FactoryIdentity(msrest.serialization.Model):
+ """Identity properties of the factory resource.
+
+ Variables are only populated by the server, and will be ignored when sending a request.
+
+ All required parameters must be populated in order to send to Azure.
+
+ :param type: Required. The identity type. Currently the only supported type is
+ 'SystemAssigned'. Possible values include: "SystemAssigned".
+ :type type: str or ~dfaz_management_client.models.FactoryIdentityType
+ :ivar principal_id: The principal id of the identity.
+ :vartype principal_id: str
+ :ivar tenant_id: The client tenant id of the identity.
+ :vartype tenant_id: str
+ """
+
+ _validation = {
+ 'type': {'required': True},
+ 'principal_id': {'readonly': True},
+ 'tenant_id': {'readonly': True},
+ }
+
+ _attribute_map = {
+ 'type': {'key': 'type', 'type': 'str'},
+ 'principal_id': {'key': 'principalId', 'type': 'str'},
+ 'tenant_id': {'key': 'tenantId', 'type': 'str'},
+ }
+
+ def __init__(
+ self,
+ **kwargs
+ ):
+ super(FactoryIdentity, self).__init__(**kwargs)
+ self.type = kwargs['type']
+ self.principal_id = None
+ self.tenant_id = None
+
+
class FactoryListResponse(msrest.serialization.Model):
"""A list of factory resources.
@@ -1239,32 +1266,21 @@ def __init__(
class FactoryUpdateParameters(msrest.serialization.Model):
"""Parameters for updating a factory resource.
- Variables are only populated by the server, and will be ignored when sending a request.
-
All required parameters must be populated in order to send to Azure.
:param tags: A set of tags. The resource tags.
:type tags: dict[str, str]
- :param type: Required. The identity type. Currently the only supported type is
- 'SystemAssigned'. Possible values include: "SystemAssigned".
- :type type: str or ~dfaz_management_client.models.FactoryIdentityType
- :ivar principal_id: The principal id of the identity.
- :vartype principal_id: str
- :ivar tenant_id: The client tenant id of the identity.
- :vartype tenant_id: str
+ :param identity: Required. Managed service identity of the factory.
+ :type identity: ~dfaz_management_client.models.FactoryIdentity
"""
_validation = {
- 'type': {'required': True},
- 'principal_id': {'readonly': True},
- 'tenant_id': {'readonly': True},
+ 'identity': {'required': True},
}
_attribute_map = {
'tags': {'key': 'tags', 'type': '{str}'},
- 'type': {'key': 'identity.type', 'type': 'str'},
- 'principal_id': {'key': 'identity.principalId', 'type': 'str'},
- 'tenant_id': {'key': 'identity.tenantId', 'type': 'str'},
+ 'identity': {'key': 'identity', 'type': 'FactoryIdentity'},
}
def __init__(
@@ -1273,9 +1289,7 @@ def __init__(
):
super(FactoryUpdateParameters, self).__init__(**kwargs)
self.tags = kwargs.get('tags', None)
- self.type = kwargs['type']
- self.principal_id = None
- self.tenant_id = None
+ self.identity = kwargs['identity']
class FactoryVstsConfiguration(FactoryRepoConfiguration):
diff --git a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/models/_models_py3.py b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/models/_models_py3.py
index 5188f80cb..2f37bb85b 100644
--- a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/models/_models_py3.py
+++ b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/models/_models_py3.py
@@ -1122,6 +1122,8 @@ class Factory(Resource):
:param additional_properties: Unmatched properties from the message are deserialized to this
collection.
:type additional_properties: dict[str, object]
+ :param identity: Managed service identity of the factory.
+ :type identity: ~dfaz_management_client.models.FactoryIdentity
:param test_inherit: Test Job Base.
:type test_inherit: ~dfaz_management_client.models.JobBase
:ivar provisioning_state: Factory provisioning state, example Succeeded.
@@ -1136,13 +1138,6 @@ class Factory(Resource):
:type fake_identity: ~dfaz_management_client.models.FakeFactoryIdentity
:param zones: This is only for az test.
:type zones: list[str]
- :param type_identity_type: The identity type. Currently the only supported type is
- 'SystemAssigned'. Possible values include: "SystemAssigned".
- :type type_identity_type: str or ~dfaz_management_client.models.FactoryIdentityType
- :ivar principal_id: The principal id of the identity.
- :vartype principal_id: str
- :ivar tenant_id: The client tenant id of the identity.
- :vartype tenant_id: str
"""
_validation = {
@@ -1153,8 +1148,6 @@ class Factory(Resource):
'provisioning_state': {'readonly': True},
'create_time': {'readonly': True},
'version': {'readonly': True},
- 'principal_id': {'readonly': True},
- 'tenant_id': {'readonly': True},
}
_attribute_map = {
@@ -1165,6 +1158,7 @@ class Factory(Resource):
'tags': {'key': 'tags', 'type': '{str}'},
'e_tag': {'key': 'eTag', 'type': 'str'},
'additional_properties': {'key': '', 'type': '{object}'},
+ 'identity': {'key': 'identity', 'type': 'FactoryIdentity'},
'test_inherit': {'key': 'testInherit', 'type': 'JobBase'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'create_time': {'key': 'properties.createTime', 'type': 'iso-8601'},
@@ -1172,9 +1166,6 @@ class Factory(Resource):
'repo_configuration': {'key': 'properties.repoConfiguration', 'type': 'FactoryRepoConfiguration'},
'fake_identity': {'key': 'properties.fakeIdentity', 'type': 'FakeFactoryIdentity'},
'zones': {'key': 'properties.zones', 'type': '[str]'},
- 'type_identity_type': {'key': 'identity.type', 'type': 'str'},
- 'principal_id': {'key': 'identity.principalId', 'type': 'str'},
- 'tenant_id': {'key': 'identity.tenantId', 'type': 'str'},
}
def __init__(
@@ -1183,15 +1174,16 @@ def __init__(
location: Optional[str] = None,
tags: Optional[Dict[str, str]] = None,
additional_properties: Optional[Dict[str, object]] = None,
+ identity: Optional["FactoryIdentity"] = None,
test_inherit: Optional["JobBase"] = None,
repo_configuration: Optional["FactoryRepoConfiguration"] = None,
fake_identity: Optional["FakeFactoryIdentity"] = None,
zones: Optional[List[str]] = None,
- type_identity_type: Optional[Union[str, "FactoryIdentityType"]] = None,
**kwargs
):
super(Factory, self).__init__(location=location, tags=tags, **kwargs)
self.additional_properties = additional_properties
+ self.identity = identity
self.test_inherit = test_inherit
self.provisioning_state = None
self.create_time = None
@@ -1199,9 +1191,6 @@ def __init__(
self.repo_configuration = repo_configuration
self.fake_identity = fake_identity
self.zones = zones
- self.type_identity_type = type_identity_type
- self.principal_id = None
- self.tenant_id = None
class FactoryRepoConfiguration(msrest.serialization.Model):
@@ -1321,6 +1310,46 @@ def __init__(
self.host_name = host_name
+class FactoryIdentity(msrest.serialization.Model):
+ """Identity properties of the factory resource.
+
+ Variables are only populated by the server, and will be ignored when sending a request.
+
+ All required parameters must be populated in order to send to Azure.
+
+ :param type: Required. The identity type. Currently the only supported type is
+ 'SystemAssigned'. Possible values include: "SystemAssigned".
+ :type type: str or ~dfaz_management_client.models.FactoryIdentityType
+ :ivar principal_id: The principal id of the identity.
+ :vartype principal_id: str
+ :ivar tenant_id: The client tenant id of the identity.
+ :vartype tenant_id: str
+ """
+
+ _validation = {
+ 'type': {'required': True},
+ 'principal_id': {'readonly': True},
+ 'tenant_id': {'readonly': True},
+ }
+
+ _attribute_map = {
+ 'type': {'key': 'type', 'type': 'str'},
+ 'principal_id': {'key': 'principalId', 'type': 'str'},
+ 'tenant_id': {'key': 'tenantId', 'type': 'str'},
+ }
+
+ def __init__(
+ self,
+ *,
+ type: Union[str, "FactoryIdentityType"],
+ **kwargs
+ ):
+ super(FactoryIdentity, self).__init__(**kwargs)
+ self.type = type
+ self.principal_id = None
+ self.tenant_id = None
+
+
class FactoryListResponse(msrest.serialization.Model):
"""A list of factory resources.
@@ -1382,46 +1411,33 @@ def __init__(
class FactoryUpdateParameters(msrest.serialization.Model):
"""Parameters for updating a factory resource.
- Variables are only populated by the server, and will be ignored when sending a request.
-
All required parameters must be populated in order to send to Azure.
:param tags: A set of tags. The resource tags.
:type tags: dict[str, str]
- :param type: Required. The identity type. Currently the only supported type is
- 'SystemAssigned'. Possible values include: "SystemAssigned".
- :type type: str or ~dfaz_management_client.models.FactoryIdentityType
- :ivar principal_id: The principal id of the identity.
- :vartype principal_id: str
- :ivar tenant_id: The client tenant id of the identity.
- :vartype tenant_id: str
+ :param identity: Required. Managed service identity of the factory.
+ :type identity: ~dfaz_management_client.models.FactoryIdentity
"""
_validation = {
- 'type': {'required': True},
- 'principal_id': {'readonly': True},
- 'tenant_id': {'readonly': True},
+ 'identity': {'required': True},
}
_attribute_map = {
'tags': {'key': 'tags', 'type': '{str}'},
- 'type': {'key': 'identity.type', 'type': 'str'},
- 'principal_id': {'key': 'identity.principalId', 'type': 'str'},
- 'tenant_id': {'key': 'identity.tenantId', 'type': 'str'},
+ 'identity': {'key': 'identity', 'type': 'FactoryIdentity'},
}
def __init__(
self,
*,
- type: Union[str, "FactoryIdentityType"],
+ identity: "FactoryIdentity",
tags: Optional[Dict[str, str]] = None,
**kwargs
):
super(FactoryUpdateParameters, self).__init__(**kwargs)
self.tags = tags
- self.type = type
- self.principal_id = None
- self.tenant_id = None
+ self.identity = identity
class FactoryVstsConfiguration(FactoryRepoConfiguration):
diff --git a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/__init__.py b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/__init__.py
index c59809b9a..b1459e933 100644
--- a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/__init__.py
+++ b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/__init__.py
@@ -6,12 +6,12 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-from ._factory_operations import FactoryOperations
-from ._trigger_operations import TriggerOperations
-from ._integration_runtime_operations import IntegrationRuntimeOperations
+from ._factories_operations import FactoriesOperations
+from ._triggers_operations import TriggersOperations
+from ._integration_runtimes_operations import IntegrationRuntimesOperations
__all__ = [
- 'FactoryOperations',
- 'TriggerOperations',
- 'IntegrationRuntimeOperations',
+ 'FactoriesOperations',
+ 'TriggersOperations',
+ 'IntegrationRuntimesOperations',
]
diff --git a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/_factory_operations.py b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/_factories_operations.py
similarity index 86%
rename from src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/_factory_operations.py
rename to src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/_factories_operations.py
index f6b42e0b6..3337bbfab 100644
--- a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/_factory_operations.py
+++ b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/_factories_operations.py
@@ -18,13 +18,13 @@
if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
- from typing import Any, Callable, Dict, Generic, Iterable, List, Optional, TypeVar, Union
+ from typing import Any, Callable, Dict, Generic, Iterable, Optional, TypeVar
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
-class FactoryOperations(object):
- """FactoryOperations operations.
+class FactoriesOperations(object):
+ """FactoriesOperations operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -120,8 +120,7 @@ def get_next(next_link=None):
def configure_factory_repo(
self,
location_id, # type: str
- factory_resource_id=None, # type: Optional[str]
- repo_configuration=None, # type: Optional["models.FactoryRepoConfiguration"]
+ factory_repo_update, # type: "models.FactoryRepoUpdate"
**kwargs # type: Any
):
# type: (...) -> "models.Factory"
@@ -129,10 +128,8 @@ def configure_factory_repo(
:param location_id: The location identifier.
:type location_id: str
- :param factory_resource_id: The factory resource id.
- :type factory_resource_id: str
- :param repo_configuration: Git repo information of the factory.
- :type repo_configuration: ~dfaz_management_client.models.FactoryRepoConfiguration
+ :param factory_repo_update: Update factory repo request definition.
+ :type factory_repo_update: ~dfaz_management_client.models.FactoryRepoUpdate
:keyword callable cls: A custom type or function that will be passed the direct response
:return: Factory, or the result of cls(response)
:rtype: ~dfaz_management_client.models.Factory
@@ -143,8 +140,6 @@ def configure_factory_repo(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- factory_repo_update = models.FactoryRepoUpdate(factory_resource_id=factory_resource_id, repo_configuration=repo_configuration)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -260,14 +255,8 @@ def create_or_update(
self,
resource_group_name, # type: str
factory_name, # type: str
+ factory, # type: "models.Factory"
if_match=None, # type: Optional[str]
- location=None, # type: Optional[str]
- tags=None, # type: Optional[Dict[str, str]]
- test_inherit=None, # type: Optional["models.JobBase"]
- repo_configuration=None, # type: Optional["models.FactoryRepoConfiguration"]
- fake_identity=None, # type: Optional["models.FakeFactoryIdentity"]
- zones=None, # type: Optional[List[str]]
- type=None, # type: Optional[Union[str, "models.FactoryIdentityType"]]
**kwargs # type: Any
):
# type: (...) -> "models.Factory"
@@ -277,23 +266,11 @@ def create_or_update(
:type resource_group_name: str
:param factory_name: The factory name.
:type factory_name: str
+ :param factory: Factory resource definition.
+ :type factory: ~dfaz_management_client.models.Factory
:param if_match: ETag of the factory entity. Should only be specified for update, for which it
should match existing entity or can be * for unconditional update.
:type if_match: str
- :param location: The resource location.
- :type location: str
- :param tags: The resource tags.
- :type tags: dict[str, str]
- :param test_inherit: Test Job Base.
- :type test_inherit: ~dfaz_management_client.models.JobBase
- :param repo_configuration: Git repo information of the factory.
- :type repo_configuration: ~dfaz_management_client.models.FactoryRepoConfiguration
- :param fake_identity: This is only for az test.
- :type fake_identity: ~dfaz_management_client.models.FakeFactoryIdentity
- :param zones: This is only for az test.
- :type zones: list[str]
- :param type: The identity type. Currently the only supported type is 'SystemAssigned'.
- :type type: str or ~dfaz_management_client.models.FactoryIdentityType
:keyword callable cls: A custom type or function that will be passed the direct response
:return: Factory, or the result of cls(response)
:rtype: ~dfaz_management_client.models.Factory
@@ -304,8 +281,6 @@ def create_or_update(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- factory = models.Factory(location=location, tags=tags, test_inherit=test_inherit, repo_configuration=repo_configuration, fake_identity=fake_identity, zones=zones, type_identity_type=type)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -353,8 +328,7 @@ def update(
self,
resource_group_name, # type: str
factory_name, # type: str
- type, # type: Union[str, "models.FactoryIdentityType"]
- tags=None, # type: Optional[Dict[str, str]]
+ factory_update_parameters, # type: "models.FactoryUpdateParameters"
**kwargs # type: Any
):
# type: (...) -> "models.Factory"
@@ -364,10 +338,8 @@ def update(
:type resource_group_name: str
:param factory_name: The factory name.
:type factory_name: str
- :param type: The identity type. Currently the only supported type is 'SystemAssigned'.
- :type type: str or ~dfaz_management_client.models.FactoryIdentityType
- :param tags: The resource tags.
- :type tags: dict[str, str]
+ :param factory_update_parameters: The parameters for updating a factory.
+ :type factory_update_parameters: ~dfaz_management_client.models.FactoryUpdateParameters
:keyword callable cls: A custom type or function that will be passed the direct response
:return: Factory, or the result of cls(response)
:rtype: ~dfaz_management_client.models.Factory
@@ -378,8 +350,6 @@ def update(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- factory_update_parameters = models.FactoryUpdateParameters(tags=tags, type=type)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -548,9 +518,7 @@ def get_git_hub_access_token(
self,
resource_group_name, # type: str
factory_name, # type: str
- git_hub_access_code, # type: str
- git_hub_access_token_base_url, # type: str
- git_hub_client_id=None, # type: Optional[str]
+ git_hub_access_token_request, # type: "models.GitHubAccessTokenRequest"
**kwargs # type: Any
):
# type: (...) -> "models.GitHubAccessTokenResponse"
@@ -560,12 +528,8 @@ def get_git_hub_access_token(
:type resource_group_name: str
:param factory_name: The factory name.
:type factory_name: str
- :param git_hub_access_code: GitHub access code.
- :type git_hub_access_code: str
- :param git_hub_access_token_base_url: GitHub access token base URL.
- :type git_hub_access_token_base_url: str
- :param git_hub_client_id: GitHub application client ID.
- :type git_hub_client_id: str
+ :param git_hub_access_token_request: Get GitHub access token request definition.
+ :type git_hub_access_token_request: ~dfaz_management_client.models.GitHubAccessTokenRequest
:keyword callable cls: A custom type or function that will be passed the direct response
:return: GitHubAccessTokenResponse, or the result of cls(response)
:rtype: ~dfaz_management_client.models.GitHubAccessTokenResponse
@@ -576,8 +540,6 @@ def get_git_hub_access_token(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- git_hub_access_token_request = models.GitHubAccessTokenRequest(git_hub_access_code=git_hub_access_code, git_hub_client_id=git_hub_client_id, git_hub_access_token_base_url=git_hub_access_token_base_url)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -623,11 +585,7 @@ def get_data_plane_access(
self,
resource_group_name, # type: str
factory_name, # type: str
- permissions=None, # type: Optional[str]
- access_resource_path=None, # type: Optional[str]
- profile_name=None, # type: Optional[str]
- start_time=None, # type: Optional[str]
- expire_time=None, # type: Optional[str]
+ policy, # type: "models.UserAccessPolicy"
**kwargs # type: Any
):
# type: (...) -> "models.AccessPolicyResponse"
@@ -637,20 +595,8 @@ def get_data_plane_access(
:type resource_group_name: str
:param factory_name: The factory name.
:type factory_name: str
- :param permissions: The string with permissions for Data Plane access. Currently only 'r' is
- supported which grants read only access.
- :type permissions: str
- :param access_resource_path: The resource path to get access relative to factory. Currently
- only empty string is supported which corresponds to the factory resource.
- :type access_resource_path: str
- :param profile_name: The name of the profile. Currently only the default is supported. The
- default value is DefaultProfile.
- :type profile_name: str
- :param start_time: Start time for the token. If not specified the current time will be used.
- :type start_time: str
- :param expire_time: Expiration time for the token. Maximum duration for the token is eight
- hours and by default the token will expire in eight hours.
- :type expire_time: str
+ :param policy: Data Plane user access policy definition.
+ :type policy: ~dfaz_management_client.models.UserAccessPolicy
:keyword callable cls: A custom type or function that will be passed the direct response
:return: AccessPolicyResponse, or the result of cls(response)
:rtype: ~dfaz_management_client.models.AccessPolicyResponse
@@ -661,8 +607,6 @@ def get_data_plane_access(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- policy = models.UserAccessPolicy(permissions=permissions, access_resource_path=access_resource_path, profile_name=profile_name, start_time=start_time, expire_time=expire_time)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
diff --git a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/_integration_runtime_operations.py b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/_integration_runtimes_operations.py
similarity index 94%
rename from src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/_integration_runtime_operations.py
rename to src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/_integration_runtimes_operations.py
index bc3fe3a32..fc2362942 100644
--- a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/_integration_runtime_operations.py
+++ b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/_integration_runtimes_operations.py
@@ -25,8 +25,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
-class IntegrationRuntimeOperations(object):
- """IntegrationRuntimeOperations operations.
+class IntegrationRuntimesOperations(object):
+ """IntegrationRuntimesOperations operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -127,7 +127,7 @@ def create_or_update(
resource_group_name, # type: str
factory_name, # type: str
integration_runtime_name, # type: str
- properties, # type: "models.IntegrationRuntime"
+ integration_runtime, # type: "models.IntegrationRuntimeResource"
if_match=None, # type: Optional[str]
**kwargs # type: Any
):
@@ -140,8 +140,8 @@ def create_or_update(
:type factory_name: str
:param integration_runtime_name: The integration runtime name.
:type integration_runtime_name: str
- :param properties: Integration runtime properties.
- :type properties: ~dfaz_management_client.models.IntegrationRuntime
+ :param integration_runtime: Integration runtime resource definition.
+ :type integration_runtime: ~dfaz_management_client.models.IntegrationRuntimeResource
:param if_match: ETag of the integration runtime entity. Should only be specified for update,
for which it should match existing entity or can be * for unconditional update.
:type if_match: str
@@ -155,8 +155,6 @@ def create_or_update(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- integration_runtime = models.IntegrationRuntimeResource(properties=properties)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -278,8 +276,7 @@ def update(
resource_group_name, # type: str
factory_name, # type: str
integration_runtime_name, # type: str
- auto_update=None, # type: Optional[Union[str, "models.IntegrationRuntimeAutoUpdate"]]
- update_delay_offset=None, # type: Optional[str]
+ update_integration_runtime_request, # type: "models.UpdateIntegrationRuntimeRequest"
**kwargs # type: Any
):
# type: (...) -> "models.IntegrationRuntimeResource"
@@ -291,12 +288,8 @@ def update(
:type factory_name: str
:param integration_runtime_name: The integration runtime name.
:type integration_runtime_name: str
- :param auto_update: Enables or disables the auto-update feature of the self-hosted integration
- runtime. See https://go.microsoft.com/fwlink/?linkid=854189.
- :type auto_update: str or ~dfaz_management_client.models.IntegrationRuntimeAutoUpdate
- :param update_delay_offset: The time offset (in hours) in the day, e.g., PT03H is 3 hours. The
- integration runtime auto update will happen on that time.
- :type update_delay_offset: str
+ :param update_integration_runtime_request: The parameters for updating an integration runtime.
+ :type update_integration_runtime_request: ~dfaz_management_client.models.UpdateIntegrationRuntimeRequest
:keyword callable cls: A custom type or function that will be passed the direct response
:return: IntegrationRuntimeResource, or the result of cls(response)
:rtype: ~dfaz_management_client.models.IntegrationRuntimeResource
@@ -307,8 +300,6 @@ def update(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- update_integration_runtime_request = models.UpdateIntegrationRuntimeRequest(auto_update=auto_update, update_delay_offset=update_delay_offset)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -543,7 +534,7 @@ def regenerate_auth_key(
resource_group_name, # type: str
factory_name, # type: str
integration_runtime_name, # type: str
- key_name=None, # type: Optional[Union[str, "models.IntegrationRuntimeAuthKeyName"]]
+ regenerate_key_parameters, # type: "models.IntegrationRuntimeRegenerateKeyParameters"
**kwargs # type: Any
):
# type: (...) -> "models.IntegrationRuntimeAuthKeys"
@@ -555,8 +546,9 @@ def regenerate_auth_key(
:type factory_name: str
:param integration_runtime_name: The integration runtime name.
:type integration_runtime_name: str
- :param key_name: The name of the authentication key to regenerate.
- :type key_name: str or ~dfaz_management_client.models.IntegrationRuntimeAuthKeyName
+ :param regenerate_key_parameters: The parameters for regenerating integration runtime
+ authentication key.
+ :type regenerate_key_parameters: ~dfaz_management_client.models.IntegrationRuntimeRegenerateKeyParameters
:keyword callable cls: A custom type or function that will be passed the direct response
:return: IntegrationRuntimeAuthKeys, or the result of cls(response)
:rtype: ~dfaz_management_client.models.IntegrationRuntimeAuthKeys
@@ -567,8 +559,6 @@ def regenerate_auth_key(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- regenerate_key_parameters = models.IntegrationRuntimeRegenerateKeyParameters(key_name=key_name)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -611,7 +601,7 @@ def regenerate_auth_key(
return deserialized
regenerate_auth_key.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/regenerateAuthKey'} # type: ignore
- def list_auth_key(
+ def list_auth_keys(
self,
resource_group_name, # type: str
factory_name, # type: str
@@ -641,7 +631,7 @@ def list_auth_key(
accept = "application/json"
# Construct URL
- url = self.list_auth_key.metadata['url'] # type: ignore
+ url = self.list_auth_keys.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
@@ -672,7 +662,7 @@ def list_auth_key(
return cls(pipeline_response, deserialized, {})
return deserialized
- list_auth_key.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/listAuthKeys'} # type: ignore
+ list_auth_keys.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/listAuthKeys'} # type: ignore
def _start_initial(
self,
@@ -1103,12 +1093,12 @@ def upgrade(
upgrade.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/upgrade'} # type: ignore
- def remove_link(
+ def remove_links(
self,
resource_group_name, # type: str
factory_name, # type: str
integration_runtime_name, # type: str
- linked_factory_name, # type: str
+ linked_integration_runtime_request, # type: "models.LinkedIntegrationRuntimeRequest"
**kwargs # type: Any
):
# type: (...) -> None
@@ -1121,8 +1111,9 @@ def remove_link(
:type factory_name: str
:param integration_runtime_name: The integration runtime name.
:type integration_runtime_name: str
- :param linked_factory_name: The data factory name for linked integration runtime.
- :type linked_factory_name: str
+ :param linked_integration_runtime_request: The data factory name for the linked integration
+ runtime.
+ :type linked_integration_runtime_request: ~dfaz_management_client.models.LinkedIntegrationRuntimeRequest
:keyword callable cls: A custom type or function that will be passed the direct response
:return: None, or the result of cls(response)
:rtype: None
@@ -1133,14 +1124,12 @@ def remove_link(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- linked_integration_runtime_request = models.LinkedIntegrationRuntimeRequest(linked_factory_name=linked_factory_name)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
# Construct URL
- url = self.remove_link.metadata['url'] # type: ignore
+ url = self.remove_links.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
@@ -1172,17 +1161,14 @@ def remove_link(
if cls:
return cls(pipeline_response, None, {})
- remove_link.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/removeLinks'} # type: ignore
+ remove_links.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/integrationRuntimes/{integrationRuntimeName}/removeLinks'} # type: ignore
def create_linked_integration_runtime(
self,
resource_group_name, # type: str
factory_name, # type: str
integration_runtime_name, # type: str
- name=None, # type: Optional[str]
- subscription_id=None, # type: Optional[str]
- data_factory_name=None, # type: Optional[str]
- data_factory_location=None, # type: Optional[str]
+ create_linked_integration_runtime_request, # type: "models.CreateLinkedIntegrationRuntimeRequest"
**kwargs # type: Any
):
# type: (...) -> "models.IntegrationRuntimeStatusResponse"
@@ -1194,17 +1180,8 @@ def create_linked_integration_runtime(
:type factory_name: str
:param integration_runtime_name: The integration runtime name.
:type integration_runtime_name: str
- :param name: The name of the linked integration runtime.
- :type name: str
- :param subscription_id: The ID of the subscription that the linked integration runtime belongs
- to.
- :type subscription_id: str
- :param data_factory_name: The name of the data factory that the linked integration runtime
- belongs to.
- :type data_factory_name: str
- :param data_factory_location: The location of the data factory that the linked integration
- runtime belongs to.
- :type data_factory_location: str
+ :param create_linked_integration_runtime_request: The linked integration runtime properties.
+ :type create_linked_integration_runtime_request: ~dfaz_management_client.models.CreateLinkedIntegrationRuntimeRequest
:keyword callable cls: A custom type or function that will be passed the direct response
:return: IntegrationRuntimeStatusResponse, or the result of cls(response)
:rtype: ~dfaz_management_client.models.IntegrationRuntimeStatusResponse
@@ -1215,8 +1192,6 @@ def create_linked_integration_runtime(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- create_linked_integration_runtime_request = models.CreateLinkedIntegrationRuntimeRequest(name=name, subscription_id=subscription_id, data_factory_name=data_factory_name, data_factory_location=data_factory_location)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
diff --git a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/_trigger_operations.py b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/_triggers_operations.py
similarity index 95%
rename from src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/_trigger_operations.py
rename to src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/_triggers_operations.py
index a1d7b4b45..a08d64bce 100644
--- a/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/_trigger_operations.py
+++ b/src/test/scenarios/datafactory/output/src/datafactory-preview/azext_datafactory_preview/vendored_sdks/azure_mgmt_datafactory/operations/_triggers_operations.py
@@ -25,8 +25,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
-class TriggerOperations(object):
- """TriggerOperations operations.
+class TriggersOperations(object):
+ """TriggersOperations operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -126,8 +126,7 @@ def query_by_factory(
self,
resource_group_name, # type: str
factory_name, # type: str
- continuation_token_parameter=None, # type: Optional[str]
- parent_trigger_name=None, # type: Optional[str]
+ filter_parameters, # type: "models.TriggerFilterParameters"
**kwargs # type: Any
):
# type: (...) -> "models.TriggerQueryResponse"
@@ -137,12 +136,8 @@ def query_by_factory(
:type resource_group_name: str
:param factory_name: The factory name.
:type factory_name: str
- :param continuation_token_parameter: The continuation token for getting the next page of
- results. Null for first page.
- :type continuation_token_parameter: str
- :param parent_trigger_name: The name of the parent TumblingWindowTrigger to get the child rerun
- triggers.
- :type parent_trigger_name: str
+ :param filter_parameters: Parameters to filter the triggers.
+ :type filter_parameters: ~dfaz_management_client.models.TriggerFilterParameters
:keyword callable cls: A custom type or function that will be passed the direct response
:return: TriggerQueryResponse, or the result of cls(response)
:rtype: ~dfaz_management_client.models.TriggerQueryResponse
@@ -153,8 +148,6 @@ def query_by_factory(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- filter_parameters = models.TriggerFilterParameters(continuation_token=continuation_token_parameter, parent_trigger_name=parent_trigger_name)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -201,7 +194,7 @@ def create_or_update(
resource_group_name, # type: str
factory_name, # type: str
trigger_name, # type: str
- properties, # type: "models.Trigger"
+ trigger, # type: "models.TriggerResource"
if_match=None, # type: Optional[str]
**kwargs # type: Any
):
@@ -214,8 +207,8 @@ def create_or_update(
:type factory_name: str
:param trigger_name: The trigger name.
:type trigger_name: str
- :param properties: Properties of the trigger.
- :type properties: ~dfaz_management_client.models.Trigger
+ :param trigger: Trigger resource definition.
+ :type trigger: ~dfaz_management_client.models.TriggerResource
:param if_match: ETag of the trigger entity. Should only be specified for update, for which it
should match existing entity or can be * for unconditional update.
:type if_match: str
@@ -229,8 +222,6 @@ def create_or_update(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- trigger = models.TriggerResource(properties=properties)
api_version = "2018-06-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -406,7 +397,7 @@ def delete(
delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}'} # type: ignore
- def _subscribe_to_event_initial(
+ def _subscribe_to_events_initial(
self,
resource_group_name, # type: str
factory_name, # type: str
@@ -423,7 +414,7 @@ def _subscribe_to_event_initial(
accept = "application/json"
# Construct URL
- url = self._subscribe_to_event_initial.metadata['url'] # type: ignore
+ url = self._subscribe_to_events_initial.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
@@ -456,9 +447,9 @@ def _subscribe_to_event_initial(
return cls(pipeline_response, deserialized, {})
return deserialized
- _subscribe_to_event_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/subscribeToEvents'} # type: ignore
+ _subscribe_to_events_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/subscribeToEvents'} # type: ignore
- def begin_subscribe_to_event(
+ def begin_subscribe_to_events(
self,
resource_group_name, # type: str
factory_name, # type: str
@@ -492,7 +483,7 @@ def begin_subscribe_to_event(
)
cont_token = kwargs.pop('continuation_token', None) # type: Optional[str]
if cont_token is None:
- raw_result = self._subscribe_to_event_initial(
+ raw_result = self._subscribe_to_events_initial(
resource_group_name=resource_group_name,
factory_name=factory_name,
trigger_name=trigger_name,
@@ -529,7 +520,7 @@ def get_long_running_output(pipeline_response):
)
else:
return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
- begin_subscribe_to_event.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/subscribeToEvents'} # type: ignore
+ begin_subscribe_to_events.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/subscribeToEvents'} # type: ignore
def get_event_subscription_status(
self,
@@ -594,7 +585,7 @@ def get_event_subscription_status(
return deserialized
get_event_subscription_status.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/getEventSubscriptionStatus'} # type: ignore
- def _unsubscribe_from_event_initial(
+ def _unsubscribe_from_events_initial(
self,
resource_group_name, # type: str
factory_name, # type: str
@@ -611,7 +602,7 @@ def _unsubscribe_from_event_initial(
accept = "application/json"
# Construct URL
- url = self._unsubscribe_from_event_initial.metadata['url'] # type: ignore
+ url = self._unsubscribe_from_events_initial.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
@@ -644,9 +635,9 @@ def _unsubscribe_from_event_initial(
return cls(pipeline_response, deserialized, {})
return deserialized
- _unsubscribe_from_event_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/unsubscribeFromEvents'} # type: ignore
+ _unsubscribe_from_events_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/unsubscribeFromEvents'} # type: ignore
- def begin_unsubscribe_from_event(
+ def begin_unsubscribe_from_events(
self,
resource_group_name, # type: str
factory_name, # type: str
@@ -680,7 +671,7 @@ def begin_unsubscribe_from_event(
)
cont_token = kwargs.pop('continuation_token', None) # type: Optional[str]
if cont_token is None:
- raw_result = self._unsubscribe_from_event_initial(
+ raw_result = self._unsubscribe_from_events_initial(
resource_group_name=resource_group_name,
factory_name=factory_name,
trigger_name=trigger_name,
@@ -717,7 +708,7 @@ def get_long_running_output(pipeline_response):
)
else:
return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
- begin_unsubscribe_from_event.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/unsubscribeFromEvents'} # type: ignore
+ begin_unsubscribe_from_events.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataFactory/factories/{factoryName}/triggers/{triggerName}/unsubscribeFromEvents'} # type: ignore
def _start_initial(
self,
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/HISTORY.rst b/src/test/scenarios/kusto/output/extflatten/src/kusto/HISTORY.rst
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/HISTORY.rst
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/HISTORY.rst
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/README.md b/src/test/scenarios/kusto/output/extflatten/src/kusto/README.md
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/README.md
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/README.md
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/__init__.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/__init__.py
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/__init__.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/__init__.py
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/action.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/action.py
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/action.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/action.py
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/azext_metadata.json b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/azext_metadata.json
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/azext_metadata.json
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/azext_metadata.json
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/custom.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/custom.py
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/custom.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/custom.py
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/generated/__init__.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/generated/__init__.py
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/generated/__init__.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/generated/__init__.py
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/generated/_client_factory.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/generated/_client_factory.py
similarity index 75%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/generated/_client_factory.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/generated/_client_factory.py
index 8f733109d..0180c5303 100644
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/generated/_client_factory.py
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/generated/_client_factory.py
@@ -17,24 +17,24 @@ def cf_kusto_cl(cli_ctx, *_):
def cf_cluster(cli_ctx, *_):
- return cf_kusto_cl(cli_ctx).clusters
+ return cf_kusto_cl(cli_ctx).cluster
def cf_cluster_principal_assignment(cli_ctx, *_):
- return cf_kusto_cl(cli_ctx).cluster_principal_assignments
+ return cf_kusto_cl(cli_ctx).cluster_principal_assignment
def cf_database(cli_ctx, *_):
- return cf_kusto_cl(cli_ctx).databases
+ return cf_kusto_cl(cli_ctx).database
def cf_database_principal_assignment(cli_ctx, *_):
- return cf_kusto_cl(cli_ctx).database_principal_assignments
+ return cf_kusto_cl(cli_ctx).database_principal_assignment
def cf_attached_database_configuration(cli_ctx, *_):
- return cf_kusto_cl(cli_ctx).attached_database_configurations
+ return cf_kusto_cl(cli_ctx).attached_database_configuration
def cf_data_connection(cli_ctx, *_):
- return cf_kusto_cl(cli_ctx).data_connections
+ return cf_kusto_cl(cli_ctx).data_connection
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/generated/_help.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/generated/_help.py
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/generated/_help.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/generated/_help.py
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/generated/_params.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/generated/_params.py
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/generated/_params.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/generated/_params.py
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/generated/_validators.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/generated/_validators.py
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/generated/_validators.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/generated/_validators.py
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/generated/action.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/generated/action.py
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/generated/action.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/generated/action.py
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/generated/commands.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/generated/commands.py
similarity index 94%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/generated/commands.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/generated/commands.py
index 8cb4184e4..36d6656e1 100644
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/generated/commands.py
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/generated/commands.py
@@ -17,7 +17,7 @@ def load_command_table(self, _):
from azext_kusto.generated._client_factory import cf_cluster
kusto_cluster = CliCommandType(
- operations_tmpl='azext_kusto.vendored_sdks.kusto.operations._clusters_operations#ClustersOperations.{}',
+ operations_tmpl='azext_kusto.vendored_sdks.kusto.operations._cluster_operations#ClusterOperations.{}',
client_factory=cf_cluster)
with self.command_group('kusto cluster', kusto_cluster, client_factory=cf_cluster, is_experimental=True) as g:
g.custom_command('list', 'kusto_cluster_list')
@@ -40,8 +40,8 @@ def load_command_table(self, _):
from azext_kusto.generated._client_factory import cf_cluster_principal_assignment
kusto_cluster_principal_assignment = CliCommandType(
- operations_tmpl='azext_kusto.vendored_sdks.kusto.operations._cluster_principal_assignments_operations#ClusterPr'
- 'incipalAssignmentsOperations.{}',
+ operations_tmpl='azext_kusto.vendored_sdks.kusto.operations._cluster_principal_assignment_operations#ClusterPri'
+ 'ncipalAssignmentOperations.{}',
client_factory=cf_cluster_principal_assignment)
with self.command_group('kusto cluster-principal-assignment', kusto_cluster_principal_assignment,
client_factory=cf_cluster_principal_assignment) as g:
@@ -55,7 +55,7 @@ def load_command_table(self, _):
from azext_kusto.generated._client_factory import cf_database
kusto_database = CliCommandType(
- operations_tmpl='azext_kusto.vendored_sdks.kusto.operations._databases_operations#DatabasesOperations.{}',
+ operations_tmpl='azext_kusto.vendored_sdks.kusto.operations._database_operations#DatabaseOperations.{}',
client_factory=cf_database)
with self.command_group('kusto database', kusto_database, client_factory=cf_database) as g:
g.custom_command('list', 'kusto_database_list')
@@ -70,8 +70,8 @@ def load_command_table(self, _):
from azext_kusto.generated._client_factory import cf_database_principal_assignment
kusto_database_principal_assignment = CliCommandType(
- operations_tmpl='azext_kusto.vendored_sdks.kusto.operations._database_principal_assignments_operations#Database'
- 'PrincipalAssignmentsOperations.{}',
+ operations_tmpl='azext_kusto.vendored_sdks.kusto.operations._database_principal_assignment_operations#DatabaseP'
+ 'rincipalAssignmentOperations.{}',
client_factory=cf_database_principal_assignment)
with self.command_group('kusto database-principal-assignment', kusto_database_principal_assignment,
client_factory=cf_database_principal_assignment) as g:
@@ -85,8 +85,8 @@ def load_command_table(self, _):
from azext_kusto.generated._client_factory import cf_attached_database_configuration
kusto_attached_database_configuration = CliCommandType(
- operations_tmpl='azext_kusto.vendored_sdks.kusto.operations._attached_database_configurations_operations#Attach'
- 'edDatabaseConfigurationsOperations.{}',
+ operations_tmpl='azext_kusto.vendored_sdks.kusto.operations._attached_database_configuration_operations#Attache'
+ 'dDatabaseConfigurationOperations.{}',
client_factory=cf_attached_database_configuration)
with self.command_group('kusto attached-database-configuration', kusto_attached_database_configuration,
client_factory=cf_attached_database_configuration) as g:
@@ -100,8 +100,8 @@ def load_command_table(self, _):
from azext_kusto.generated._client_factory import cf_data_connection
kusto_data_connection = CliCommandType(
- operations_tmpl='azext_kusto.vendored_sdks.kusto.operations._data_connections_operations#DataConnectionsOperati'
- 'ons.{}',
+ operations_tmpl='azext_kusto.vendored_sdks.kusto.operations._data_connection_operations#DataConnectionOperation'
+ 's.{}',
client_factory=cf_data_connection)
with self.command_group('kusto data-connection', kusto_data_connection, client_factory=cf_data_connection) as g:
g.custom_command('list', 'kusto_data_connection_list')
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/generated/custom.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/generated/custom.py
similarity index 82%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/generated/custom.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/generated/custom.py
index 77da48a99..73d2aa01c 100644
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/generated/custom.py
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/generated/custom.py
@@ -51,27 +51,24 @@ def kusto_cluster_create(client,
enable_purge = False
if enable_double_encryption is None:
enable_double_encryption = False
- parameters = {}
- parameters['tags'] = tags
- parameters['location'] = location
- parameters['sku'] = sku
- parameters['zones'] = zones
- parameters['trusted_external_tenants'] = trusted_external_tenants
- parameters['optimized_autoscale'] = optimized_autoscale
- parameters['enable_disk_encryption'] = enable_disk_encryption
- parameters['enable_streaming_ingest'] = False if enable_streaming_ingest is None else enable_streaming_ingest
- parameters['virtual_network_configuration'] = virtual_network_configuration
- parameters['key_vault_properties'] = key_vault_properties
- parameters['enable_purge'] = False if enable_purge is None else enable_purge
- parameters['enable_double_encryption'] = False if enable_double_encryption is None else enable_double_encryption
- parameters['identity'] = {}
- parameters['identity']['type'] = identity_type
- parameters['identity']['user_assigned_identities'] = identity_user_assigned_identities
return sdk_no_wait(no_wait,
client.begin_create_or_update,
resource_group_name=resource_group_name,
cluster_name=cluster_name,
- parameters=parameters)
+ tags=tags,
+ location=location,
+ sku=sku,
+ zones=zones,
+ trusted_external_tenants=trusted_external_tenants,
+ optimized_autoscale=optimized_autoscale,
+ enable_disk_encryption=enable_disk_encryption,
+ enable_streaming_ingest=enable_streaming_ingest,
+ virtual_network_configuration=virtual_network_configuration,
+ key_vault_properties=key_vault_properties,
+ enable_purge=enable_purge,
+ enable_double_encryption=enable_double_encryption,
+ type=identity_type,
+ user_assigned_identities=identity_user_assigned_identities)
def kusto_cluster_update(client,
@@ -97,26 +94,23 @@ def kusto_cluster_update(client,
enable_purge = False
if enable_double_encryption is None:
enable_double_encryption = False
- parameters = {}
- parameters['tags'] = tags
- parameters['location'] = location
- parameters['sku'] = sku
- parameters['trusted_external_tenants'] = trusted_external_tenants
- parameters['optimized_autoscale'] = optimized_autoscale
- parameters['enable_disk_encryption'] = enable_disk_encryption
- parameters['enable_streaming_ingest'] = False if enable_streaming_ingest is None else enable_streaming_ingest
- parameters['virtual_network_configuration'] = virtual_network_configuration
- parameters['key_vault_properties'] = key_vault_properties
- parameters['enable_purge'] = False if enable_purge is None else enable_purge
- parameters['enable_double_encryption'] = False if enable_double_encryption is None else enable_double_encryption
- parameters['identity'] = {}
- parameters['identity']['type'] = identity_type
- parameters['identity']['user_assigned_identities'] = identity_user_assigned_identities
return sdk_no_wait(no_wait,
client.begin_update,
resource_group_name=resource_group_name,
cluster_name=cluster_name,
- parameters=parameters)
+ tags=tags,
+ location=location,
+ sku=sku,
+ trusted_external_tenants=trusted_external_tenants,
+ optimized_autoscale=optimized_autoscale,
+ enable_disk_encryption=enable_disk_encryption,
+ enable_streaming_ingest=enable_streaming_ingest,
+ virtual_network_configuration=virtual_network_configuration,
+ key_vault_properties=key_vault_properties,
+ enable_purge=enable_purge,
+ enable_double_encryption=enable_double_encryption,
+ type=identity_type,
+ user_assigned_identities=identity_user_assigned_identities)
def kusto_cluster_delete(client,
@@ -134,13 +128,11 @@ def kusto_cluster_add_language_extension(client,
cluster_name,
value=None,
no_wait=False):
- language_extensions_to_add = {}
- language_extensions_to_add['value'] = value
return sdk_no_wait(no_wait,
- client.begin_add_language_extensions,
+ client.begin_add_language_extension,
resource_group_name=resource_group_name,
cluster_name=cluster_name,
- language_extensions_to_add=language_extensions_to_add)
+ value=value)
def kusto_cluster_detach_follower_database(client,
@@ -149,14 +141,12 @@ def kusto_cluster_detach_follower_database(client,
cluster_resource_id,
attached_database_configuration_name,
no_wait=False):
- follower_database_to_remove = {}
- follower_database_to_remove['cluster_resource_id'] = cluster_resource_id
- follower_database_to_remove['attached_database_configuration_name'] = attached_database_configuration_name
return sdk_no_wait(no_wait,
- client.begin_detach_follower_databases,
+ client.begin_detach_follower_database,
resource_group_name=resource_group_name,
cluster_name=cluster_name,
- follower_database_to_remove=follower_database_to_remove)
+ cluster_resource_id=cluster_resource_id,
+ attached_database_configuration_name=attached_database_configuration_name)
def kusto_cluster_diagnose_virtual_network(client,
@@ -172,24 +162,24 @@ def kusto_cluster_diagnose_virtual_network(client,
def kusto_cluster_list_follower_database(client,
resource_group_name,
cluster_name):
- return client.list_follower_databases(resource_group_name=resource_group_name,
- cluster_name=cluster_name)
+ return client.list_follower_database(resource_group_name=resource_group_name,
+ cluster_name=cluster_name)
def kusto_cluster_list_language_extension(client,
resource_group_name,
cluster_name):
- return client.list_language_extensions(resource_group_name=resource_group_name,
- cluster_name=cluster_name)
+ return client.list_language_extension(resource_group_name=resource_group_name,
+ cluster_name=cluster_name)
def kusto_cluster_list_sku(client,
resource_group_name=None,
cluster_name=None):
if resource_group_name and cluster_name is not None:
- return client.list_skus_by_resource(resource_group_name=resource_group_name,
- cluster_name=cluster_name)
- return client.list_skus()
+ return client.list_sku_by_resource(resource_group_name=resource_group_name,
+ cluster_name=cluster_name)
+ return client.list_sku()
def kusto_cluster_remove_language_extension(client,
@@ -197,13 +187,11 @@ def kusto_cluster_remove_language_extension(client,
cluster_name,
value=None,
no_wait=False):
- language_extensions_to_remove = {}
- language_extensions_to_remove['value'] = value
return sdk_no_wait(no_wait,
- client.begin_remove_language_extensions,
+ client.begin_remove_language_extension,
resource_group_name=resource_group_name,
cluster_name=cluster_name,
- language_extensions_to_remove=language_extensions_to_remove)
+ value=value)
def kusto_cluster_start(client,
@@ -251,17 +239,15 @@ def kusto_cluster_principal_assignment_create(client,
tenant_id=None,
principal_type=None,
no_wait=False):
- parameters = {}
- parameters['principal_id'] = principal_id
- parameters['role'] = role
- parameters['tenant_id'] = tenant_id
- parameters['principal_type'] = principal_type
return sdk_no_wait(no_wait,
client.begin_create_or_update,
resource_group_name=resource_group_name,
cluster_name=cluster_name,
principal_assignment_name=principal_assignment_name,
- parameters=parameters)
+ principal_id=principal_id,
+ role=role,
+ tenant_id=tenant_id,
+ principal_type=principal_type)
def kusto_cluster_principal_assignment_update(client,
@@ -273,17 +259,15 @@ def kusto_cluster_principal_assignment_update(client,
tenant_id=None,
principal_type=None,
no_wait=False):
- parameters = {}
- parameters['principal_id'] = principal_id
- parameters['role'] = role
- parameters['tenant_id'] = tenant_id
- parameters['principal_type'] = principal_type
return sdk_no_wait(no_wait,
client.begin_create_or_update,
resource_group_name=resource_group_name,
cluster_name=cluster_name,
principal_assignment_name=principal_assignment_name,
- parameters=parameters)
+ principal_id=principal_id,
+ role=role,
+ tenant_id=tenant_id,
+ principal_type=principal_type)
def kusto_cluster_principal_assignment_delete(client,
@@ -383,21 +367,19 @@ def kusto_database_add_principal(client,
cluster_name,
database_name,
value=None):
- database_principals_to_add = {}
- database_principals_to_add['value'] = value
- return client.add_principals(resource_group_name=resource_group_name,
- cluster_name=cluster_name,
- database_name=database_name,
- database_principals_to_add=database_principals_to_add)
+ return client.add_principal(resource_group_name=resource_group_name,
+ cluster_name=cluster_name,
+ database_name=database_name,
+ value=value)
def kusto_database_list_principal(client,
resource_group_name,
cluster_name,
database_name):
- return client.list_principals(resource_group_name=resource_group_name,
- cluster_name=cluster_name,
- database_name=database_name)
+ return client.list_principal(resource_group_name=resource_group_name,
+ cluster_name=cluster_name,
+ database_name=database_name)
def kusto_database_remove_principal(client,
@@ -405,12 +387,10 @@ def kusto_database_remove_principal(client,
cluster_name,
database_name,
value=None):
- database_principals_to_remove = {}
- database_principals_to_remove['value'] = value
- return client.remove_principals(resource_group_name=resource_group_name,
- cluster_name=cluster_name,
- database_name=database_name,
- database_principals_to_remove=database_principals_to_remove)
+ return client.remove_principal(resource_group_name=resource_group_name,
+ cluster_name=cluster_name,
+ database_name=database_name,
+ value=value)
def kusto_database_principal_assignment_list(client,
@@ -443,18 +423,16 @@ def kusto_database_principal_assignment_create(client,
tenant_id=None,
principal_type=None,
no_wait=False):
- parameters = {}
- parameters['principal_id'] = principal_id
- parameters['role'] = role
- parameters['tenant_id'] = tenant_id
- parameters['principal_type'] = principal_type
return sdk_no_wait(no_wait,
client.begin_create_or_update,
resource_group_name=resource_group_name,
cluster_name=cluster_name,
database_name=database_name,
principal_assignment_name=principal_assignment_name,
- parameters=parameters)
+ principal_id=principal_id,
+ role=role,
+ tenant_id=tenant_id,
+ principal_type=principal_type)
def kusto_database_principal_assignment_update(client,
@@ -467,18 +445,16 @@ def kusto_database_principal_assignment_update(client,
tenant_id=None,
principal_type=None,
no_wait=False):
- parameters = {}
- parameters['principal_id'] = principal_id
- parameters['role'] = role
- parameters['tenant_id'] = tenant_id
- parameters['principal_type'] = principal_type
return sdk_no_wait(no_wait,
client.begin_create_or_update,
resource_group_name=resource_group_name,
cluster_name=cluster_name,
database_name=database_name,
principal_assignment_name=principal_assignment_name,
- parameters=parameters)
+ principal_id=principal_id,
+ role=role,
+ tenant_id=tenant_id,
+ principal_type=principal_type)
def kusto_database_principal_assignment_delete(client,
@@ -520,17 +496,15 @@ def kusto_attached_database_configuration_create(client,
cluster_resource_id=None,
default_principals_modification_kind=None,
no_wait=False):
- parameters = {}
- parameters['location'] = location
- parameters['database_name'] = database_name
- parameters['cluster_resource_id'] = cluster_resource_id
- parameters['default_principals_modification_kind'] = default_principals_modification_kind
return sdk_no_wait(no_wait,
client.begin_create_or_update,
resource_group_name=resource_group_name,
cluster_name=cluster_name,
attached_database_configuration_name=attached_database_configuration_name,
- parameters=parameters)
+ location=location,
+ database_name=database_name,
+ cluster_resource_id=cluster_resource_id,
+ default_principals_modification_kind=default_principals_modification_kind)
def kusto_attached_database_configuration_update(client,
@@ -542,17 +516,15 @@ def kusto_attached_database_configuration_update(client,
cluster_resource_id=None,
default_principals_modification_kind=None,
no_wait=False):
- parameters = {}
- parameters['location'] = location
- parameters['database_name'] = database_name
- parameters['cluster_resource_id'] = cluster_resource_id
- parameters['default_principals_modification_kind'] = default_principals_modification_kind
return sdk_no_wait(no_wait,
client.begin_create_or_update,
resource_group_name=resource_group_name,
cluster_name=cluster_name,
attached_database_configuration_name=attached_database_configuration_name,
- parameters=parameters)
+ location=location,
+ database_name=database_name,
+ cluster_resource_id=cluster_resource_id,
+ default_principals_modification_kind=default_principals_modification_kind)
def kusto_attached_database_configuration_delete(client,
@@ -818,25 +790,24 @@ def kusto_data_connection_event_grid_data_connection_validation(client,
ignore_first_record=None,
blob_storage_event_type=None,
no_wait=False):
- parameters = {}
- parameters['data_connection_name'] = data_connection_name
- parameters['properties'] = {}
- parameters['properties']['location'] = location
- parameters['properties']['kind'] = 'EventGrid'
- parameters['properties']['storage_account_resource_id'] = storage_account_resource_id
- parameters['properties']['event_hub_resource_id'] = event_hub_resource_id
- parameters['properties']['consumer_group'] = consumer_group
- parameters['properties']['table_name'] = table_name
- parameters['properties']['mapping_rule_name'] = mapping_rule_name
- parameters['properties']['data_format'] = data_format
- parameters['properties']['ignore_first_record'] = ignore_first_record
- parameters['properties']['blob_storage_event_type'] = blob_storage_event_type
+ properties = {}
+ properties['location'] = location
+ properties['kind'] = 'EventGrid'
+ properties['storage_account_resource_id'] = storage_account_resource_id
+ properties['event_hub_resource_id'] = event_hub_resource_id
+ properties['consumer_group'] = consumer_group
+ properties['table_name'] = table_name
+ properties['mapping_rule_name'] = mapping_rule_name
+ properties['data_format'] = data_format
+ properties['ignore_first_record'] = ignore_first_record
+ properties['blob_storage_event_type'] = blob_storage_event_type
return sdk_no_wait(no_wait,
client.begin_data_connection_validation,
resource_group_name=resource_group_name,
cluster_name=cluster_name,
database_name=database_name,
- parameters=parameters)
+ data_connection_name=data_connection_name,
+ properties=properties)
def kusto_data_connection_event_hub_data_connection_validation(client,
@@ -853,24 +824,23 @@ def kusto_data_connection_event_hub_data_connection_validation(client,
event_system_properties=None,
compression=None,
no_wait=False):
- parameters = {}
- parameters['data_connection_name'] = data_connection_name
- parameters['properties'] = {}
- parameters['properties']['location'] = location
- parameters['properties']['kind'] = 'EventHub'
- parameters['properties']['event_hub_resource_id'] = event_hub_resource_id
- parameters['properties']['consumer_group'] = consumer_group
- parameters['properties']['table_name'] = table_name
- parameters['properties']['mapping_rule_name'] = mapping_rule_name
- parameters['properties']['data_format'] = data_format
- parameters['properties']['event_system_properties'] = event_system_properties
- parameters['properties']['compression'] = compression
+ properties = {}
+ properties['location'] = location
+ properties['kind'] = 'EventHub'
+ properties['event_hub_resource_id'] = event_hub_resource_id
+ properties['consumer_group'] = consumer_group
+ properties['table_name'] = table_name
+ properties['mapping_rule_name'] = mapping_rule_name
+ properties['data_format'] = data_format
+ properties['event_system_properties'] = event_system_properties
+ properties['compression'] = compression
return sdk_no_wait(no_wait,
client.begin_data_connection_validation,
resource_group_name=resource_group_name,
cluster_name=cluster_name,
database_name=database_name,
- parameters=parameters)
+ data_connection_name=data_connection_name,
+ properties=properties)
def kusto_data_connection_iot_hub_data_connection_validation(client,
@@ -887,21 +857,20 @@ def kusto_data_connection_iot_hub_data_connection_validation(client,
event_system_properties=None,
shared_access_policy_name=None,
no_wait=False):
- parameters = {}
- parameters['data_connection_name'] = data_connection_name
- parameters['properties'] = {}
- parameters['properties']['location'] = location
- parameters['properties']['kind'] = 'IotHub'
- parameters['properties']['iot_hub_resource_id'] = iot_hub_resource_id
- parameters['properties']['consumer_group'] = consumer_group
- parameters['properties']['table_name'] = table_name
- parameters['properties']['mapping_rule_name'] = mapping_rule_name
- parameters['properties']['data_format'] = data_format
- parameters['properties']['event_system_properties'] = event_system_properties
- parameters['properties']['shared_access_policy_name'] = shared_access_policy_name
+ properties = {}
+ properties['location'] = location
+ properties['kind'] = 'IotHub'
+ properties['iot_hub_resource_id'] = iot_hub_resource_id
+ properties['consumer_group'] = consumer_group
+ properties['table_name'] = table_name
+ properties['mapping_rule_name'] = mapping_rule_name
+ properties['data_format'] = data_format
+ properties['event_system_properties'] = event_system_properties
+ properties['shared_access_policy_name'] = shared_access_policy_name
return sdk_no_wait(no_wait,
client.begin_data_connection_validation,
resource_group_name=resource_group_name,
cluster_name=cluster_name,
database_name=database_name,
- parameters=parameters)
+ data_connection_name=data_connection_name,
+ properties=properties)
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/manual/__init__.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/manual/__init__.py
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/manual/__init__.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/manual/__init__.py
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/tests/__init__.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/tests/__init__.py
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/tests/__init__.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/tests/__init__.py
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/tests/latest/__init__.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/tests/latest/__init__.py
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/tests/latest/__init__.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/tests/latest/__init__.py
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/tests/latest/example_steps.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/tests/latest/example_steps.py
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/tests/latest/example_steps.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/tests/latest/example_steps.py
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/tests/latest/test_kusto_scenario.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/tests/latest/test_kusto_scenario.py
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/tests/latest/test_kusto_scenario.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/tests/latest/test_kusto_scenario.py
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/__init__.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/__init__.py
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/__init__.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/__init__.py
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/__init__.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/__init__.py
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/__init__.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/__init__.py
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/_configuration.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/_configuration.py
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/_configuration.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/_configuration.py
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/_kusto_management_client.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/_kusto_management_client.py
similarity index 62%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/_kusto_management_client.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/_kusto_management_client.py
index c53a1e8f3..57952e519 100644
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/_kusto_management_client.py
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/_kusto_management_client.py
@@ -18,33 +18,33 @@
from azure.core.credentials import TokenCredential
from ._configuration import KustoManagementClientConfiguration
-from .operations import ClustersOperations
-from .operations import ClusterPrincipalAssignmentsOperations
-from .operations import DatabasesOperations
-from .operations import DatabasePrincipalAssignmentsOperations
-from .operations import AttachedDatabaseConfigurationsOperations
-from .operations import DataConnectionsOperations
-from .operations import Operations
+from .operations import ClusterOperations
+from .operations import ClusterPrincipalAssignmentOperations
+from .operations import DatabaseOperations
+from .operations import DatabasePrincipalAssignmentOperations
+from .operations import AttachedDatabaseConfigurationOperations
+from .operations import DataConnectionOperations
+from .operations import OperationOperations
from . import models
class KustoManagementClient(object):
"""The Azure Kusto management API provides a RESTful set of web services that interact with Azure Kusto services to manage your clusters and databases. The API enables you to create, update, and delete clusters and databases.
- :ivar clusters: ClustersOperations operations
- :vartype clusters: kusto_management_client.operations.ClustersOperations
- :ivar cluster_principal_assignments: ClusterPrincipalAssignmentsOperations operations
- :vartype cluster_principal_assignments: kusto_management_client.operations.ClusterPrincipalAssignmentsOperations
- :ivar databases: DatabasesOperations operations
- :vartype databases: kusto_management_client.operations.DatabasesOperations
- :ivar database_principal_assignments: DatabasePrincipalAssignmentsOperations operations
- :vartype database_principal_assignments: kusto_management_client.operations.DatabasePrincipalAssignmentsOperations
- :ivar attached_database_configurations: AttachedDatabaseConfigurationsOperations operations
- :vartype attached_database_configurations: kusto_management_client.operations.AttachedDatabaseConfigurationsOperations
- :ivar data_connections: DataConnectionsOperations operations
- :vartype data_connections: kusto_management_client.operations.DataConnectionsOperations
- :ivar operations: Operations operations
- :vartype operations: kusto_management_client.operations.Operations
+ :ivar cluster: ClusterOperations operations
+ :vartype cluster: kusto_management_client.operations.ClusterOperations
+ :ivar cluster_principal_assignment: ClusterPrincipalAssignmentOperations operations
+ :vartype cluster_principal_assignment: kusto_management_client.operations.ClusterPrincipalAssignmentOperations
+ :ivar database: DatabaseOperations operations
+ :vartype database: kusto_management_client.operations.DatabaseOperations
+ :ivar database_principal_assignment: DatabasePrincipalAssignmentOperations operations
+ :vartype database_principal_assignment: kusto_management_client.operations.DatabasePrincipalAssignmentOperations
+ :ivar attached_database_configuration: AttachedDatabaseConfigurationOperations operations
+ :vartype attached_database_configuration: kusto_management_client.operations.AttachedDatabaseConfigurationOperations
+ :ivar data_connection: DataConnectionOperations operations
+ :vartype data_connection: kusto_management_client.operations.DataConnectionOperations
+ :ivar operation: OperationOperations operations
+ :vartype operation: kusto_management_client.operations.OperationOperations
:param credential: Credential needed for the client to connect to Azure.
:type credential: ~azure.core.credentials.TokenCredential
:param subscription_id: Gets subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
@@ -71,19 +71,19 @@ def __init__(
self._serialize.client_side_validation = False
self._deserialize = Deserializer(client_models)
- self.clusters = ClustersOperations(
+ self.cluster = ClusterOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.cluster_principal_assignments = ClusterPrincipalAssignmentsOperations(
+ self.cluster_principal_assignment = ClusterPrincipalAssignmentOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.databases = DatabasesOperations(
+ self.database = DatabaseOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.database_principal_assignments = DatabasePrincipalAssignmentsOperations(
+ self.database_principal_assignment = DatabasePrincipalAssignmentOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.attached_database_configurations = AttachedDatabaseConfigurationsOperations(
+ self.attached_database_configuration = AttachedDatabaseConfigurationOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.data_connections = DataConnectionsOperations(
+ self.data_connection = DataConnectionOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.operations = Operations(
+ self.operation = OperationOperations(
self._client, self._config, self._serialize, self._deserialize)
def close(self):
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/__init__.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/__init__.py
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/__init__.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/__init__.py
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/_configuration.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/_configuration.py
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/_configuration.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/_configuration.py
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/_kusto_management_client.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/_kusto_management_client.py
similarity index 61%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/_kusto_management_client.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/_kusto_management_client.py
index 6d5f42e0a..b6497c9e4 100644
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/_kusto_management_client.py
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/_kusto_management_client.py
@@ -16,33 +16,33 @@
from azure.core.credentials_async import AsyncTokenCredential
from ._configuration import KustoManagementClientConfiguration
-from .operations import ClustersOperations
-from .operations import ClusterPrincipalAssignmentsOperations
-from .operations import DatabasesOperations
-from .operations import DatabasePrincipalAssignmentsOperations
-from .operations import AttachedDatabaseConfigurationsOperations
-from .operations import DataConnectionsOperations
-from .operations import Operations
+from .operations import ClusterOperations
+from .operations import ClusterPrincipalAssignmentOperations
+from .operations import DatabaseOperations
+from .operations import DatabasePrincipalAssignmentOperations
+from .operations import AttachedDatabaseConfigurationOperations
+from .operations import DataConnectionOperations
+from .operations import OperationOperations
from .. import models
class KustoManagementClient(object):
"""The Azure Kusto management API provides a RESTful set of web services that interact with Azure Kusto services to manage your clusters and databases. The API enables you to create, update, and delete clusters and databases.
- :ivar clusters: ClustersOperations operations
- :vartype clusters: kusto_management_client.aio.operations.ClustersOperations
- :ivar cluster_principal_assignments: ClusterPrincipalAssignmentsOperations operations
- :vartype cluster_principal_assignments: kusto_management_client.aio.operations.ClusterPrincipalAssignmentsOperations
- :ivar databases: DatabasesOperations operations
- :vartype databases: kusto_management_client.aio.operations.DatabasesOperations
- :ivar database_principal_assignments: DatabasePrincipalAssignmentsOperations operations
- :vartype database_principal_assignments: kusto_management_client.aio.operations.DatabasePrincipalAssignmentsOperations
- :ivar attached_database_configurations: AttachedDatabaseConfigurationsOperations operations
- :vartype attached_database_configurations: kusto_management_client.aio.operations.AttachedDatabaseConfigurationsOperations
- :ivar data_connections: DataConnectionsOperations operations
- :vartype data_connections: kusto_management_client.aio.operations.DataConnectionsOperations
- :ivar operations: Operations operations
- :vartype operations: kusto_management_client.aio.operations.Operations
+ :ivar cluster: ClusterOperations operations
+ :vartype cluster: kusto_management_client.aio.operations.ClusterOperations
+ :ivar cluster_principal_assignment: ClusterPrincipalAssignmentOperations operations
+ :vartype cluster_principal_assignment: kusto_management_client.aio.operations.ClusterPrincipalAssignmentOperations
+ :ivar database: DatabaseOperations operations
+ :vartype database: kusto_management_client.aio.operations.DatabaseOperations
+ :ivar database_principal_assignment: DatabasePrincipalAssignmentOperations operations
+ :vartype database_principal_assignment: kusto_management_client.aio.operations.DatabasePrincipalAssignmentOperations
+ :ivar attached_database_configuration: AttachedDatabaseConfigurationOperations operations
+ :vartype attached_database_configuration: kusto_management_client.aio.operations.AttachedDatabaseConfigurationOperations
+ :ivar data_connection: DataConnectionOperations operations
+ :vartype data_connection: kusto_management_client.aio.operations.DataConnectionOperations
+ :ivar operation: OperationOperations operations
+ :vartype operation: kusto_management_client.aio.operations.OperationOperations
:param credential: Credential needed for the client to connect to Azure.
:type credential: ~azure.core.credentials_async.AsyncTokenCredential
:param subscription_id: Gets subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
@@ -68,19 +68,19 @@ def __init__(
self._serialize.client_side_validation = False
self._deserialize = Deserializer(client_models)
- self.clusters = ClustersOperations(
+ self.cluster = ClusterOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.cluster_principal_assignments = ClusterPrincipalAssignmentsOperations(
+ self.cluster_principal_assignment = ClusterPrincipalAssignmentOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.databases = DatabasesOperations(
+ self.database = DatabaseOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.database_principal_assignments = DatabasePrincipalAssignmentsOperations(
+ self.database_principal_assignment = DatabasePrincipalAssignmentOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.attached_database_configurations = AttachedDatabaseConfigurationsOperations(
+ self.attached_database_configuration = AttachedDatabaseConfigurationOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.data_connections = DataConnectionsOperations(
+ self.data_connection = DataConnectionOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.operations = Operations(
+ self.operation = OperationOperations(
self._client, self._config, self._serialize, self._deserialize)
async def close(self) -> None:
diff --git a/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/__init__.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/__init__.py
new file mode 100644
index 000000000..5750cdc82
--- /dev/null
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/__init__.py
@@ -0,0 +1,25 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# 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 Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from ._cluster_operations import ClusterOperations
+from ._cluster_principal_assignment_operations import ClusterPrincipalAssignmentOperations
+from ._database_operations import DatabaseOperations
+from ._database_principal_assignment_operations import DatabasePrincipalAssignmentOperations
+from ._attached_database_configuration_operations import AttachedDatabaseConfigurationOperations
+from ._data_connection_operations import DataConnectionOperations
+from ._operation_operations import OperationOperations
+
+__all__ = [
+ 'ClusterOperations',
+ 'ClusterPrincipalAssignmentOperations',
+ 'DatabaseOperations',
+ 'DatabasePrincipalAssignmentOperations',
+ 'AttachedDatabaseConfigurationOperations',
+ 'DataConnectionOperations',
+ 'OperationOperations',
+]
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_attached_database_configurations_operations.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_attached_database_configuration_operations.py
similarity index 92%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_attached_database_configurations_operations.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_attached_database_configuration_operations.py
index 03ccc65bd..8dae1929e 100644
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_attached_database_configurations_operations.py
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_attached_database_configuration_operations.py
@@ -21,8 +21,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
-class AttachedDatabaseConfigurationsOperations:
- """AttachedDatabaseConfigurationsOperations async operations.
+class AttachedDatabaseConfigurationOperations:
+ """AttachedDatabaseConfigurationOperations async operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -184,7 +184,10 @@ async def _create_or_update_initial(
resource_group_name: str,
cluster_name: str,
attached_database_configuration_name: str,
- parameters: "models.AttachedDatabaseConfiguration",
+ location: Optional[str] = None,
+ database_name: Optional[str] = None,
+ cluster_resource_id: Optional[str] = None,
+ default_principals_modification_kind: Optional[Union[str, "models.DefaultPrincipalsModificationKind"]] = None,
**kwargs
) -> "models.AttachedDatabaseConfiguration":
cls = kwargs.pop('cls', None) # type: ClsType["models.AttachedDatabaseConfiguration"]
@@ -192,6 +195,8 @@ async def _create_or_update_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ parameters = models.AttachedDatabaseConfiguration(location=location, database_name=database_name, cluster_resource_id=cluster_resource_id, default_principals_modification_kind=default_principals_modification_kind)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -246,7 +251,10 @@ async def begin_create_or_update(
resource_group_name: str,
cluster_name: str,
attached_database_configuration_name: str,
- parameters: "models.AttachedDatabaseConfiguration",
+ location: Optional[str] = None,
+ database_name: Optional[str] = None,
+ cluster_resource_id: Optional[str] = None,
+ default_principals_modification_kind: Optional[Union[str, "models.DefaultPrincipalsModificationKind"]] = None,
**kwargs
) -> AsyncLROPoller["models.AttachedDatabaseConfiguration"]:
"""Creates or updates an attached database configuration.
@@ -257,8 +265,16 @@ async def begin_create_or_update(
:type cluster_name: str
:param attached_database_configuration_name: The name of the attached database configuration.
:type attached_database_configuration_name: str
- :param parameters: The database parameters supplied to the CreateOrUpdate operation.
- :type parameters: ~kusto_management_client.models.AttachedDatabaseConfiguration
+ :param location: Resource location.
+ :type location: str
+ :param database_name: The name of the database which you would like to attach, use * if you
+ want to follow all current and future databases.
+ :type database_name: str
+ :param cluster_resource_id: The resource id of the cluster where the databases you would like
+ to attach reside.
+ :type cluster_resource_id: str
+ :param default_principals_modification_kind: The default principals modification kind.
+ :type default_principals_modification_kind: str or ~kusto_management_client.models.DefaultPrincipalsModificationKind
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -281,7 +297,10 @@ async def begin_create_or_update(
resource_group_name=resource_group_name,
cluster_name=cluster_name,
attached_database_configuration_name=attached_database_configuration_name,
- parameters=parameters,
+ location=location,
+ database_name=database_name,
+ cluster_resource_id=cluster_resource_id,
+ default_principals_modification_kind=default_principals_modification_kind,
cls=lambda x,y,z: x,
**kwargs
)
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_clusters_operations.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_cluster_operations.py
similarity index 83%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_clusters_operations.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_cluster_operations.py
index c805b73ea..1137adf5d 100644
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_clusters_operations.py
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_cluster_operations.py
@@ -5,7 +5,7 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-from typing import Any, AsyncIterable, Callable, Dict, Generic, Optional, TypeVar, Union
+from typing import Any, AsyncIterable, Callable, Dict, Generic, List, Optional, TypeVar, Union
import warnings
from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -21,8 +21,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
-class ClustersOperations:
- """ClustersOperations async operations.
+class ClusterOperations:
+ """ClusterOperations async operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -105,7 +105,20 @@ async def _create_or_update_initial(
self,
resource_group_name: str,
cluster_name: str,
- parameters: "models.Cluster",
+ location: str,
+ sku: "models.AzureSku",
+ tags: Optional[Dict[str, str]] = None,
+ zones: Optional[List[str]] = None,
+ trusted_external_tenants: Optional[List["models.TrustedExternalTenant"]] = None,
+ optimized_autoscale: Optional["models.OptimizedAutoscale"] = None,
+ enable_disk_encryption: Optional[bool] = None,
+ enable_streaming_ingest: Optional[bool] = False,
+ virtual_network_configuration: Optional["models.VirtualNetworkConfiguration"] = None,
+ key_vault_properties: Optional["models.KeyVaultProperties"] = None,
+ enable_purge: Optional[bool] = False,
+ enable_double_encryption: Optional[bool] = False,
+ type: Optional[Union[str, "models.IdentityType"]] = None,
+ user_assigned_identities: Optional[Dict[str, "models.ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties"]] = None,
**kwargs
) -> "models.Cluster":
cls = kwargs.pop('cls', None) # type: ClsType["models.Cluster"]
@@ -113,6 +126,8 @@ async def _create_or_update_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ parameters = models.Cluster(tags=tags, location=location, sku=sku, zones=zones, trusted_external_tenants=trusted_external_tenants, optimized_autoscale=optimized_autoscale, enable_disk_encryption=enable_disk_encryption, enable_streaming_ingest=enable_streaming_ingest, virtual_network_configuration=virtual_network_configuration, key_vault_properties=key_vault_properties, enable_purge=enable_purge, enable_double_encryption=enable_double_encryption, type_identity_type=type, user_assigned_identities=user_assigned_identities)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -162,7 +177,20 @@ async def begin_create_or_update(
self,
resource_group_name: str,
cluster_name: str,
- parameters: "models.Cluster",
+ location: str,
+ sku: "models.AzureSku",
+ tags: Optional[Dict[str, str]] = None,
+ zones: Optional[List[str]] = None,
+ trusted_external_tenants: Optional[List["models.TrustedExternalTenant"]] = None,
+ optimized_autoscale: Optional["models.OptimizedAutoscale"] = None,
+ enable_disk_encryption: Optional[bool] = None,
+ enable_streaming_ingest: Optional[bool] = False,
+ virtual_network_configuration: Optional["models.VirtualNetworkConfiguration"] = None,
+ key_vault_properties: Optional["models.KeyVaultProperties"] = None,
+ enable_purge: Optional[bool] = False,
+ enable_double_encryption: Optional[bool] = False,
+ type: Optional[Union[str, "models.IdentityType"]] = None,
+ user_assigned_identities: Optional[Dict[str, "models.ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties"]] = None,
**kwargs
) -> AsyncLROPoller["models.Cluster"]:
"""Create or update a Kusto cluster.
@@ -171,8 +199,39 @@ async def begin_create_or_update(
:type resource_group_name: str
:param cluster_name: The name of the Kusto cluster.
:type cluster_name: str
- :param parameters: The Kusto cluster parameters supplied to the CreateOrUpdate operation.
- :type parameters: ~kusto_management_client.models.Cluster
+ :param location: The geo-location where the resource lives.
+ :type location: str
+ :param sku: The SKU of the cluster.
+ :type sku: ~kusto_management_client.models.AzureSku
+ :param tags: Resource tags.
+ :type tags: dict[str, str]
+ :param zones: The availability zones of the cluster.
+ :type zones: list[str]
+ :param trusted_external_tenants: The cluster's external tenants.
+ :type trusted_external_tenants: list[~kusto_management_client.models.TrustedExternalTenant]
+ :param optimized_autoscale: Optimized auto scale definition.
+ :type optimized_autoscale: ~kusto_management_client.models.OptimizedAutoscale
+ :param enable_disk_encryption: A boolean value that indicates if the cluster's disks are
+ encrypted.
+ :type enable_disk_encryption: bool
+ :param enable_streaming_ingest: A boolean value that indicates if the streaming ingest is
+ enabled.
+ :type enable_streaming_ingest: bool
+ :param virtual_network_configuration: Virtual network definition.
+ :type virtual_network_configuration: ~kusto_management_client.models.VirtualNetworkConfiguration
+ :param key_vault_properties: KeyVault properties for the cluster encryption.
+ :type key_vault_properties: ~kusto_management_client.models.KeyVaultProperties
+ :param enable_purge: A boolean value that indicates if the purge operations are enabled.
+ :type enable_purge: bool
+ :param enable_double_encryption: A boolean value that indicates if double encryption is
+ enabled.
+ :type enable_double_encryption: bool
+ :param type: The identity type.
+ :type type: str or ~kusto_management_client.models.IdentityType
+ :param user_assigned_identities: The list of user identities associated with the Kusto cluster.
+ The user identity dictionary key references will be ARM resource ids in the form:
+ '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
+ :type user_assigned_identities: dict[str, ~kusto_management_client.models.ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties]
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -194,7 +253,20 @@ async def begin_create_or_update(
raw_result = await self._create_or_update_initial(
resource_group_name=resource_group_name,
cluster_name=cluster_name,
- parameters=parameters,
+ location=location,
+ sku=sku,
+ tags=tags,
+ zones=zones,
+ trusted_external_tenants=trusted_external_tenants,
+ optimized_autoscale=optimized_autoscale,
+ enable_disk_encryption=enable_disk_encryption,
+ enable_streaming_ingest=enable_streaming_ingest,
+ virtual_network_configuration=virtual_network_configuration,
+ key_vault_properties=key_vault_properties,
+ enable_purge=enable_purge,
+ enable_double_encryption=enable_double_encryption,
+ type=type,
+ user_assigned_identities=user_assigned_identities,
cls=lambda x,y,z: x,
**kwargs
)
@@ -233,7 +305,19 @@ async def _update_initial(
self,
resource_group_name: str,
cluster_name: str,
- parameters: "models.ClusterUpdate",
+ tags: Optional[Dict[str, str]] = None,
+ location: Optional[str] = None,
+ sku: Optional["models.AzureSku"] = None,
+ trusted_external_tenants: Optional[List["models.TrustedExternalTenant"]] = None,
+ optimized_autoscale: Optional["models.OptimizedAutoscale"] = None,
+ enable_disk_encryption: Optional[bool] = None,
+ enable_streaming_ingest: Optional[bool] = False,
+ virtual_network_configuration: Optional["models.VirtualNetworkConfiguration"] = None,
+ key_vault_properties: Optional["models.KeyVaultProperties"] = None,
+ enable_purge: Optional[bool] = False,
+ enable_double_encryption: Optional[bool] = False,
+ type: Optional[Union[str, "models.IdentityType"]] = None,
+ user_assigned_identities: Optional[Dict[str, "models.ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties"]] = None,
**kwargs
) -> "models.Cluster":
cls = kwargs.pop('cls', None) # type: ClsType["models.Cluster"]
@@ -241,6 +325,8 @@ async def _update_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ parameters = models.ClusterUpdate(tags=tags, location=location, sku=sku, trusted_external_tenants=trusted_external_tenants, optimized_autoscale=optimized_autoscale, enable_disk_encryption=enable_disk_encryption, enable_streaming_ingest=enable_streaming_ingest, virtual_network_configuration=virtual_network_configuration, key_vault_properties=key_vault_properties, enable_purge=enable_purge, enable_double_encryption=enable_double_encryption, type_identity_type=type, user_assigned_identities=user_assigned_identities)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -293,7 +379,19 @@ async def begin_update(
self,
resource_group_name: str,
cluster_name: str,
- parameters: "models.ClusterUpdate",
+ tags: Optional[Dict[str, str]] = None,
+ location: Optional[str] = None,
+ sku: Optional["models.AzureSku"] = None,
+ trusted_external_tenants: Optional[List["models.TrustedExternalTenant"]] = None,
+ optimized_autoscale: Optional["models.OptimizedAutoscale"] = None,
+ enable_disk_encryption: Optional[bool] = None,
+ enable_streaming_ingest: Optional[bool] = False,
+ virtual_network_configuration: Optional["models.VirtualNetworkConfiguration"] = None,
+ key_vault_properties: Optional["models.KeyVaultProperties"] = None,
+ enable_purge: Optional[bool] = False,
+ enable_double_encryption: Optional[bool] = False,
+ type: Optional[Union[str, "models.IdentityType"]] = None,
+ user_assigned_identities: Optional[Dict[str, "models.ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties"]] = None,
**kwargs
) -> AsyncLROPoller["models.Cluster"]:
"""Update a Kusto cluster.
@@ -302,8 +400,37 @@ async def begin_update(
:type resource_group_name: str
:param cluster_name: The name of the Kusto cluster.
:type cluster_name: str
- :param parameters: The Kusto cluster parameters supplied to the Update operation.
- :type parameters: ~kusto_management_client.models.ClusterUpdate
+ :param tags: Resource tags.
+ :type tags: dict[str, str]
+ :param location: Resource location.
+ :type location: str
+ :param sku: The SKU of the cluster.
+ :type sku: ~kusto_management_client.models.AzureSku
+ :param trusted_external_tenants: The cluster's external tenants.
+ :type trusted_external_tenants: list[~kusto_management_client.models.TrustedExternalTenant]
+ :param optimized_autoscale: Optimized auto scale definition.
+ :type optimized_autoscale: ~kusto_management_client.models.OptimizedAutoscale
+ :param enable_disk_encryption: A boolean value that indicates if the cluster's disks are
+ encrypted.
+ :type enable_disk_encryption: bool
+ :param enable_streaming_ingest: A boolean value that indicates if the streaming ingest is
+ enabled.
+ :type enable_streaming_ingest: bool
+ :param virtual_network_configuration: Virtual network definition.
+ :type virtual_network_configuration: ~kusto_management_client.models.VirtualNetworkConfiguration
+ :param key_vault_properties: KeyVault properties for the cluster encryption.
+ :type key_vault_properties: ~kusto_management_client.models.KeyVaultProperties
+ :param enable_purge: A boolean value that indicates if the purge operations are enabled.
+ :type enable_purge: bool
+ :param enable_double_encryption: A boolean value that indicates if double encryption is
+ enabled.
+ :type enable_double_encryption: bool
+ :param type: The identity type.
+ :type type: str or ~kusto_management_client.models.IdentityType
+ :param user_assigned_identities: The list of user identities associated with the Kusto cluster.
+ The user identity dictionary key references will be ARM resource ids in the form:
+ '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
+ :type user_assigned_identities: dict[str, ~kusto_management_client.models.ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties]
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -325,7 +452,19 @@ async def begin_update(
raw_result = await self._update_initial(
resource_group_name=resource_group_name,
cluster_name=cluster_name,
- parameters=parameters,
+ tags=tags,
+ location=location,
+ sku=sku,
+ trusted_external_tenants=trusted_external_tenants,
+ optimized_autoscale=optimized_autoscale,
+ enable_disk_encryption=enable_disk_encryption,
+ enable_streaming_ingest=enable_streaming_ingest,
+ virtual_network_configuration=virtual_network_configuration,
+ key_vault_properties=key_vault_properties,
+ enable_purge=enable_purge,
+ enable_double_encryption=enable_double_encryption,
+ type=type,
+ user_assigned_identities=user_assigned_identities,
cls=lambda x,y,z: x,
**kwargs
)
@@ -684,7 +823,7 @@ def get_long_running_output(pipeline_response):
return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method)
begin_start.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/start'} # type: ignore
- def list_follower_databases(
+ def list_follower_database(
self,
resource_group_name: str,
cluster_name: str,
@@ -717,7 +856,7 @@ def prepare_request(next_link=None):
if not next_link:
# Construct URL
- url = self.list_follower_databases.metadata['url'] # type: ignore
+ url = self.list_follower_database.metadata['url'] # type: ignore
path_format_arguments = {
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
'clusterName': self._serialize.url("cluster_name", cluster_name, 'str'),
@@ -757,13 +896,14 @@ async def get_next(next_link=None):
return AsyncItemPaged(
get_next, extract_data
)
- list_follower_databases.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/listFollowerDatabases'} # type: ignore
+ list_follower_database.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/listFollowerDatabases'} # type: ignore
- async def _detach_follower_databases_initial(
+ async def _detach_follower_database_initial(
self,
resource_group_name: str,
cluster_name: str,
- follower_database_to_remove: "models.FollowerDatabaseDefinition",
+ cluster_resource_id: str,
+ attached_database_configuration_name: str,
**kwargs
) -> None:
cls = kwargs.pop('cls', None) # type: ClsType[None]
@@ -771,12 +911,14 @@ async def _detach_follower_databases_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ follower_database_to_remove = models.FollowerDatabaseDefinition(cluster_resource_id=cluster_resource_id, attached_database_configuration_name=attached_database_configuration_name)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
# Construct URL
- url = self._detach_follower_databases_initial.metadata['url'] # type: ignore
+ url = self._detach_follower_database_initial.metadata['url'] # type: ignore
path_format_arguments = {
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
'clusterName': self._serialize.url("cluster_name", cluster_name, 'str'),
@@ -807,13 +949,14 @@ async def _detach_follower_databases_initial(
if cls:
return cls(pipeline_response, None, {})
- _detach_follower_databases_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/detachFollowerDatabases'} # type: ignore
+ _detach_follower_database_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/detachFollowerDatabases'} # type: ignore
- async def begin_detach_follower_databases(
+ async def begin_detach_follower_database(
self,
resource_group_name: str,
cluster_name: str,
- follower_database_to_remove: "models.FollowerDatabaseDefinition",
+ cluster_resource_id: str,
+ attached_database_configuration_name: str,
**kwargs
) -> AsyncLROPoller[None]:
"""Detaches all followers of a database owned by this cluster.
@@ -822,8 +965,12 @@ async def begin_detach_follower_databases(
:type resource_group_name: str
:param cluster_name: The name of the Kusto cluster.
:type cluster_name: str
- :param follower_database_to_remove: The follower databases properties to remove.
- :type follower_database_to_remove: ~kusto_management_client.models.FollowerDatabaseDefinition
+ :param cluster_resource_id: Resource id of the cluster that follows a database owned by this
+ cluster.
+ :type cluster_resource_id: str
+ :param attached_database_configuration_name: Resource name of the attached database
+ configuration in the follower cluster.
+ :type attached_database_configuration_name: str
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -842,10 +989,11 @@ async def begin_detach_follower_databases(
)
cont_token = kwargs.pop('continuation_token', None) # type: Optional[str]
if cont_token is None:
- raw_result = await self._detach_follower_databases_initial(
+ raw_result = await self._detach_follower_database_initial(
resource_group_name=resource_group_name,
cluster_name=cluster_name,
- follower_database_to_remove=follower_database_to_remove,
+ cluster_resource_id=cluster_resource_id,
+ attached_database_configuration_name=attached_database_configuration_name,
cls=lambda x,y,z: x,
**kwargs
)
@@ -875,7 +1023,7 @@ def get_long_running_output(pipeline_response):
)
else:
return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method)
- begin_detach_follower_databases.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/detachFollowerDatabases'} # type: ignore
+ begin_detach_follower_database.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/detachFollowerDatabases'} # type: ignore
async def _diagnose_virtual_network_initial(
self,
@@ -1130,7 +1278,7 @@ async def get_next(next_link=None):
)
list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Kusto/clusters'} # type: ignore
- def list_skus(
+ def list_sku(
self,
**kwargs
) -> AsyncIterable["models.SkuDescriptionList"]:
@@ -1156,7 +1304,7 @@ def prepare_request(next_link=None):
if not next_link:
# Construct URL
- url = self.list_skus.metadata['url'] # type: ignore
+ url = self.list_sku.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
}
@@ -1194,20 +1342,23 @@ async def get_next(next_link=None):
return AsyncItemPaged(
get_next, extract_data
)
- list_skus.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Kusto/skus'} # type: ignore
+ list_sku.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Kusto/skus'} # type: ignore
async def check_name_availability(
self,
location: str,
- cluster_name: "models.ClusterCheckNameRequest",
+ name: str,
+ type: Union[str, "models.Type"],
**kwargs
) -> "models.CheckNameResult":
"""Checks that the cluster name is valid and is not already in use.
:param location: Azure location.
:type location: str
- :param cluster_name: The name of the cluster.
- :type cluster_name: ~kusto_management_client.models.ClusterCheckNameRequest
+ :param name: Cluster name.
+ :type name: str
+ :param type: The type of resource, Microsoft.Kusto/clusters.
+ :type type: str or ~kusto_management_client.models.Type
:keyword callable cls: A custom type or function that will be passed the direct response
:return: CheckNameResult, or the result of cls(response)
:rtype: ~kusto_management_client.models.CheckNameResult
@@ -1218,6 +1369,8 @@ async def check_name_availability(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ cluster_name = models.ClusterCheckNameRequest(name=name, type=type)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -1258,7 +1411,7 @@ async def check_name_availability(
return deserialized
check_name_availability.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Kusto/locations/{location}/checkNameAvailability'} # type: ignore
- def list_skus_by_resource(
+ def list_sku_by_resource(
self,
resource_group_name: str,
cluster_name: str,
@@ -1290,7 +1443,7 @@ def prepare_request(next_link=None):
if not next_link:
# Construct URL
- url = self.list_skus_by_resource.metadata['url'] # type: ignore
+ url = self.list_sku_by_resource.metadata['url'] # type: ignore
path_format_arguments = {
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
'clusterName': self._serialize.url("cluster_name", cluster_name, 'str'),
@@ -1330,9 +1483,9 @@ async def get_next(next_link=None):
return AsyncItemPaged(
get_next, extract_data
)
- list_skus_by_resource.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/skus'} # type: ignore
+ list_sku_by_resource.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/skus'} # type: ignore
- def list_language_extensions(
+ def list_language_extension(
self,
resource_group_name: str,
cluster_name: str,
@@ -1364,7 +1517,7 @@ def prepare_request(next_link=None):
if not next_link:
# Construct URL
- url = self.list_language_extensions.metadata['url'] # type: ignore
+ url = self.list_language_extension.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
@@ -1404,13 +1557,13 @@ async def get_next(next_link=None):
return AsyncItemPaged(
get_next, extract_data
)
- list_language_extensions.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/listLanguageExtensions'} # type: ignore
+ list_language_extension.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/listLanguageExtensions'} # type: ignore
- async def _add_language_extensions_initial(
+ async def _add_language_extension_initial(
self,
resource_group_name: str,
cluster_name: str,
- language_extensions_to_add: "models.LanguageExtensionsList",
+ value: Optional[List["models.LanguageExtension"]] = None,
**kwargs
) -> None:
cls = kwargs.pop('cls', None) # type: ClsType[None]
@@ -1418,12 +1571,14 @@ async def _add_language_extensions_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ language_extensions_to_add = models.LanguageExtensionsList(value=value)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
# Construct URL
- url = self._add_language_extensions_initial.metadata['url'] # type: ignore
+ url = self._add_language_extension_initial.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
@@ -1454,13 +1609,13 @@ async def _add_language_extensions_initial(
if cls:
return cls(pipeline_response, None, {})
- _add_language_extensions_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/addLanguageExtensions'} # type: ignore
+ _add_language_extension_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/addLanguageExtensions'} # type: ignore
- async def begin_add_language_extensions(
+ async def begin_add_language_extension(
self,
resource_group_name: str,
cluster_name: str,
- language_extensions_to_add: "models.LanguageExtensionsList",
+ value: Optional[List["models.LanguageExtension"]] = None,
**kwargs
) -> AsyncLROPoller[None]:
"""Add a list of language extensions that can run within KQL queries.
@@ -1469,8 +1624,8 @@ async def begin_add_language_extensions(
:type resource_group_name: str
:param cluster_name: The name of the Kusto cluster.
:type cluster_name: str
- :param language_extensions_to_add: The language extensions to add.
- :type language_extensions_to_add: ~kusto_management_client.models.LanguageExtensionsList
+ :param value: The list of language extensions.
+ :type value: list[~kusto_management_client.models.LanguageExtension]
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -1489,10 +1644,10 @@ async def begin_add_language_extensions(
)
cont_token = kwargs.pop('continuation_token', None) # type: Optional[str]
if cont_token is None:
- raw_result = await self._add_language_extensions_initial(
+ raw_result = await self._add_language_extension_initial(
resource_group_name=resource_group_name,
cluster_name=cluster_name,
- language_extensions_to_add=language_extensions_to_add,
+ value=value,
cls=lambda x,y,z: x,
**kwargs
)
@@ -1522,13 +1677,13 @@ def get_long_running_output(pipeline_response):
)
else:
return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method)
- begin_add_language_extensions.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/addLanguageExtensions'} # type: ignore
+ begin_add_language_extension.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/addLanguageExtensions'} # type: ignore
- async def _remove_language_extensions_initial(
+ async def _remove_language_extension_initial(
self,
resource_group_name: str,
cluster_name: str,
- language_extensions_to_remove: "models.LanguageExtensionsList",
+ value: Optional[List["models.LanguageExtension"]] = None,
**kwargs
) -> None:
cls = kwargs.pop('cls', None) # type: ClsType[None]
@@ -1536,12 +1691,14 @@ async def _remove_language_extensions_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ language_extensions_to_remove = models.LanguageExtensionsList(value=value)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
# Construct URL
- url = self._remove_language_extensions_initial.metadata['url'] # type: ignore
+ url = self._remove_language_extension_initial.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
@@ -1572,13 +1729,13 @@ async def _remove_language_extensions_initial(
if cls:
return cls(pipeline_response, None, {})
- _remove_language_extensions_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/removeLanguageExtensions'} # type: ignore
+ _remove_language_extension_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/removeLanguageExtensions'} # type: ignore
- async def begin_remove_language_extensions(
+ async def begin_remove_language_extension(
self,
resource_group_name: str,
cluster_name: str,
- language_extensions_to_remove: "models.LanguageExtensionsList",
+ value: Optional[List["models.LanguageExtension"]] = None,
**kwargs
) -> AsyncLROPoller[None]:
"""Remove a list of language extensions that can run within KQL queries.
@@ -1587,8 +1744,8 @@ async def begin_remove_language_extensions(
:type resource_group_name: str
:param cluster_name: The name of the Kusto cluster.
:type cluster_name: str
- :param language_extensions_to_remove: The language extensions to remove.
- :type language_extensions_to_remove: ~kusto_management_client.models.LanguageExtensionsList
+ :param value: The list of language extensions.
+ :type value: list[~kusto_management_client.models.LanguageExtension]
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -1607,10 +1764,10 @@ async def begin_remove_language_extensions(
)
cont_token = kwargs.pop('continuation_token', None) # type: Optional[str]
if cont_token is None:
- raw_result = await self._remove_language_extensions_initial(
+ raw_result = await self._remove_language_extension_initial(
resource_group_name=resource_group_name,
cluster_name=cluster_name,
- language_extensions_to_remove=language_extensions_to_remove,
+ value=value,
cls=lambda x,y,z: x,
**kwargs
)
@@ -1640,4 +1797,4 @@ def get_long_running_output(pipeline_response):
)
else:
return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method)
- begin_remove_language_extensions.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/removeLanguageExtensions'} # type: ignore
+ begin_remove_language_extension.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/removeLanguageExtensions'} # type: ignore
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_cluster_principal_assignments_operations.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_cluster_principal_assignment_operations.py
similarity index 93%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_cluster_principal_assignments_operations.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_cluster_principal_assignment_operations.py
index 315813450..4b0dc447a 100644
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_cluster_principal_assignments_operations.py
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_cluster_principal_assignment_operations.py
@@ -21,8 +21,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
-class ClusterPrincipalAssignmentsOperations:
- """ClusterPrincipalAssignmentsOperations async operations.
+class ClusterPrincipalAssignmentOperations:
+ """ClusterPrincipalAssignmentOperations async operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -47,7 +47,8 @@ async def check_name_availability(
self,
resource_group_name: str,
cluster_name: str,
- principal_assignment_name: "models.ClusterPrincipalAssignmentCheckNameRequest",
+ name: str,
+ type: Union[str, "models.Type"],
**kwargs
) -> "models.CheckNameResult":
"""Checks that the principal assignment name is valid and is not already in use.
@@ -56,8 +57,10 @@ async def check_name_availability(
:type resource_group_name: str
:param cluster_name: The name of the Kusto cluster.
:type cluster_name: str
- :param principal_assignment_name: The name of the principal assignment.
- :type principal_assignment_name: ~kusto_management_client.models.ClusterPrincipalAssignmentCheckNameRequest
+ :param name: Principal Assignment resource name.
+ :type name: str
+ :param type: The type of resource, Microsoft.Kusto/clusters/principalAssignments.
+ :type type: str or ~kusto_management_client.models.Type
:keyword callable cls: A custom type or function that will be passed the direct response
:return: CheckNameResult, or the result of cls(response)
:rtype: ~kusto_management_client.models.CheckNameResult
@@ -68,6 +71,8 @@ async def check_name_availability(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ principal_assignment_name = models.ClusterPrincipalAssignmentCheckNameRequest(name=name, type=type)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -176,7 +181,10 @@ async def _create_or_update_initial(
resource_group_name: str,
cluster_name: str,
principal_assignment_name: str,
- parameters: "models.ClusterPrincipalAssignment",
+ principal_id: Optional[str] = None,
+ role: Optional[Union[str, "models.ClusterPrincipalRole"]] = None,
+ tenant_id: Optional[str] = None,
+ principal_type: Optional[Union[str, "models.PrincipalType"]] = None,
**kwargs
) -> "models.ClusterPrincipalAssignment":
cls = kwargs.pop('cls', None) # type: ClsType["models.ClusterPrincipalAssignment"]
@@ -184,6 +192,8 @@ async def _create_or_update_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ parameters = models.ClusterPrincipalAssignment(principal_id=principal_id, role=role, tenant_id=tenant_id, principal_type=principal_type)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -235,7 +245,10 @@ async def begin_create_or_update(
resource_group_name: str,
cluster_name: str,
principal_assignment_name: str,
- parameters: "models.ClusterPrincipalAssignment",
+ principal_id: Optional[str] = None,
+ role: Optional[Union[str, "models.ClusterPrincipalRole"]] = None,
+ tenant_id: Optional[str] = None,
+ principal_type: Optional[Union[str, "models.PrincipalType"]] = None,
**kwargs
) -> AsyncLROPoller["models.ClusterPrincipalAssignment"]:
"""Create a Kusto cluster principalAssignment.
@@ -246,9 +259,15 @@ async def begin_create_or_update(
:type cluster_name: str
:param principal_assignment_name: The name of the Kusto principalAssignment.
:type principal_assignment_name: str
- :param parameters: The Kusto cluster principalAssignment's parameters supplied for the
- operation.
- :type parameters: ~kusto_management_client.models.ClusterPrincipalAssignment
+ :param principal_id: The principal ID assigned to the cluster principal. It can be a user
+ email, application ID, or security group name.
+ :type principal_id: str
+ :param role: Cluster principal role.
+ :type role: str or ~kusto_management_client.models.ClusterPrincipalRole
+ :param tenant_id: The tenant id of the principal.
+ :type tenant_id: str
+ :param principal_type: Principal type.
+ :type principal_type: str or ~kusto_management_client.models.PrincipalType
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -271,7 +290,10 @@ async def begin_create_or_update(
resource_group_name=resource_group_name,
cluster_name=cluster_name,
principal_assignment_name=principal_assignment_name,
- parameters=parameters,
+ principal_id=principal_id,
+ role=role,
+ tenant_id=tenant_id,
+ principal_type=principal_type,
cls=lambda x,y,z: x,
**kwargs
)
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_data_connections_operations.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_data_connection_operations.py
similarity index 97%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_data_connections_operations.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_data_connection_operations.py
index 3fb6ede3e..459d0d414 100644
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_data_connections_operations.py
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_data_connection_operations.py
@@ -21,8 +21,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
-class DataConnectionsOperations:
- """DataConnectionsOperations async operations.
+class DataConnectionOperations:
+ """DataConnectionOperations async operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -126,7 +126,8 @@ async def _data_connection_validation_initial(
resource_group_name: str,
cluster_name: str,
database_name: str,
- parameters: "models.DataConnectionValidation",
+ data_connection_name: Optional[str] = None,
+ properties: Optional["models.DataConnection"] = None,
**kwargs
) -> Optional["models.DataConnectionValidationListResult"]:
cls = kwargs.pop('cls', None) # type: ClsType[Optional["models.DataConnectionValidationListResult"]]
@@ -134,6 +135,8 @@ async def _data_connection_validation_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ parameters = models.DataConnectionValidation(data_connection_name=data_connection_name, properties=properties)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -183,7 +186,8 @@ async def begin_data_connection_validation(
resource_group_name: str,
cluster_name: str,
database_name: str,
- parameters: "models.DataConnectionValidation",
+ data_connection_name: Optional[str] = None,
+ properties: Optional["models.DataConnection"] = None,
**kwargs
) -> AsyncLROPoller["models.DataConnectionValidationListResult"]:
"""Checks that the data connection parameters are valid.
@@ -194,8 +198,10 @@ async def begin_data_connection_validation(
:type cluster_name: str
:param database_name: The name of the database in the Kusto cluster.
:type database_name: str
- :param parameters: The data connection parameters supplied to the CreateOrUpdate operation.
- :type parameters: ~kusto_management_client.models.DataConnectionValidation
+ :param data_connection_name: The name of the data connection.
+ :type data_connection_name: str
+ :param properties: The data connection properties to validate.
+ :type properties: ~kusto_management_client.models.DataConnection
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -218,7 +224,8 @@ async def begin_data_connection_validation(
resource_group_name=resource_group_name,
cluster_name=cluster_name,
database_name=database_name,
- parameters=parameters,
+ data_connection_name=data_connection_name,
+ properties=properties,
cls=lambda x,y,z: x,
**kwargs
)
@@ -259,7 +266,8 @@ async def check_name_availability(
resource_group_name: str,
cluster_name: str,
database_name: str,
- data_connection_name: "models.DataConnectionCheckNameRequest",
+ name: str,
+ type: Union[str, "models.Type"],
**kwargs
) -> "models.CheckNameResult":
"""Checks that the data connection name is valid and is not already in use.
@@ -270,8 +278,10 @@ async def check_name_availability(
:type cluster_name: str
:param database_name: The name of the database in the Kusto cluster.
:type database_name: str
- :param data_connection_name: The name of the data connection.
- :type data_connection_name: ~kusto_management_client.models.DataConnectionCheckNameRequest
+ :param name: Data Connection name.
+ :type name: str
+ :param type: The type of resource, Microsoft.Kusto/clusters/databases/dataConnections.
+ :type type: str or ~kusto_management_client.models.Type
:keyword callable cls: A custom type or function that will be passed the direct response
:return: CheckNameResult, or the result of cls(response)
:rtype: ~kusto_management_client.models.CheckNameResult
@@ -282,6 +292,8 @@ async def check_name_availability(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ data_connection_name = models.DataConnectionCheckNameRequest(name=name, type=type)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_databases_operations.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_database_operations.py
similarity index 95%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_databases_operations.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_database_operations.py
index f2fb6bf2c..dfe13681d 100644
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_databases_operations.py
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_database_operations.py
@@ -5,7 +5,7 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-from typing import Any, AsyncIterable, Callable, Dict, Generic, Optional, TypeVar, Union
+from typing import Any, AsyncIterable, Callable, Dict, Generic, List, Optional, TypeVar, Union
import warnings
from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -21,8 +21,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
-class DatabasesOperations:
- """DatabasesOperations async operations.
+class DatabaseOperations:
+ """DatabaseOperations async operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -47,7 +47,8 @@ async def check_name_availability(
self,
resource_group_name: str,
cluster_name: str,
- resource_name: "models.CheckNameRequest",
+ name: str,
+ type: Union[str, "models.Type"],
**kwargs
) -> "models.CheckNameResult":
"""Checks that the database name is valid and is not already in use.
@@ -56,8 +57,10 @@ async def check_name_availability(
:type resource_group_name: str
:param cluster_name: The name of the Kusto cluster.
:type cluster_name: str
- :param resource_name: The name of the resource.
- :type resource_name: ~kusto_management_client.models.CheckNameRequest
+ :param name: Resource name.
+ :type name: str
+ :param type: The type of resource, for instance Microsoft.Kusto/clusters/databases.
+ :type type: str or ~kusto_management_client.models.Type
:keyword callable cls: A custom type or function that will be passed the direct response
:return: CheckNameResult, or the result of cls(response)
:rtype: ~kusto_management_client.models.CheckNameResult
@@ -68,6 +71,8 @@ async def check_name_availability(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ resource_name = models.CheckNameRequest(name=name, type=type)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -636,7 +641,7 @@ def get_long_running_output(pipeline_response):
return AsyncLROPoller(self._client, raw_result, get_long_running_output, polling_method)
begin_delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/databases/{databaseName}'} # type: ignore
- def list_principals(
+ def list_principal(
self,
resource_group_name: str,
cluster_name: str,
@@ -671,7 +676,7 @@ def prepare_request(next_link=None):
if not next_link:
# Construct URL
- url = self.list_principals.metadata['url'] # type: ignore
+ url = self.list_principal.metadata['url'] # type: ignore
path_format_arguments = {
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
'clusterName': self._serialize.url("cluster_name", cluster_name, 'str'),
@@ -712,14 +717,14 @@ async def get_next(next_link=None):
return AsyncItemPaged(
get_next, extract_data
)
- list_principals.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/databases/{databaseName}/listPrincipals'} # type: ignore
+ list_principal.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/databases/{databaseName}/listPrincipals'} # type: ignore
- async def add_principals(
+ async def add_principal(
self,
resource_group_name: str,
cluster_name: str,
database_name: str,
- database_principals_to_add: "models.DatabasePrincipalListRequest",
+ value: Optional[List["models.DatabasePrincipal"]] = None,
**kwargs
) -> "models.DatabasePrincipalListResult":
"""Add Database principals permissions.
@@ -730,8 +735,8 @@ async def add_principals(
:type cluster_name: str
:param database_name: The name of the database in the Kusto cluster.
:type database_name: str
- :param database_principals_to_add: List of database principals to add.
- :type database_principals_to_add: ~kusto_management_client.models.DatabasePrincipalListRequest
+ :param value: The list of Kusto database principals.
+ :type value: list[~kusto_management_client.models.DatabasePrincipal]
:keyword callable cls: A custom type or function that will be passed the direct response
:return: DatabasePrincipalListResult, or the result of cls(response)
:rtype: ~kusto_management_client.models.DatabasePrincipalListResult
@@ -742,12 +747,14 @@ async def add_principals(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ database_principals_to_add = models.DatabasePrincipalListRequest(value=value)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
# Construct URL
- url = self.add_principals.metadata['url'] # type: ignore
+ url = self.add_principal.metadata['url'] # type: ignore
path_format_arguments = {
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
'clusterName': self._serialize.url("cluster_name", cluster_name, 'str'),
@@ -782,14 +789,14 @@ async def add_principals(
return cls(pipeline_response, deserialized, {})
return deserialized
- add_principals.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/databases/{databaseName}/addPrincipals'} # type: ignore
+ add_principal.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/databases/{databaseName}/addPrincipals'} # type: ignore
- async def remove_principals(
+ async def remove_principal(
self,
resource_group_name: str,
cluster_name: str,
database_name: str,
- database_principals_to_remove: "models.DatabasePrincipalListRequest",
+ value: Optional[List["models.DatabasePrincipal"]] = None,
**kwargs
) -> "models.DatabasePrincipalListResult":
"""Remove Database principals permissions.
@@ -800,8 +807,8 @@ async def remove_principals(
:type cluster_name: str
:param database_name: The name of the database in the Kusto cluster.
:type database_name: str
- :param database_principals_to_remove: List of database principals to remove.
- :type database_principals_to_remove: ~kusto_management_client.models.DatabasePrincipalListRequest
+ :param value: The list of Kusto database principals.
+ :type value: list[~kusto_management_client.models.DatabasePrincipal]
:keyword callable cls: A custom type or function that will be passed the direct response
:return: DatabasePrincipalListResult, or the result of cls(response)
:rtype: ~kusto_management_client.models.DatabasePrincipalListResult
@@ -812,12 +819,14 @@ async def remove_principals(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ database_principals_to_remove = models.DatabasePrincipalListRequest(value=value)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
# Construct URL
- url = self.remove_principals.metadata['url'] # type: ignore
+ url = self.remove_principal.metadata['url'] # type: ignore
path_format_arguments = {
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
'clusterName': self._serialize.url("cluster_name", cluster_name, 'str'),
@@ -852,4 +861,4 @@ async def remove_principals(
return cls(pipeline_response, deserialized, {})
return deserialized
- remove_principals.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/databases/{databaseName}/removePrincipals'} # type: ignore
+ remove_principal.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/databases/{databaseName}/removePrincipals'} # type: ignore
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_database_principal_assignments_operations.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_database_principal_assignment_operations.py
similarity index 93%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_database_principal_assignments_operations.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_database_principal_assignment_operations.py
index 1816f8fa6..710a8a211 100644
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_database_principal_assignments_operations.py
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_database_principal_assignment_operations.py
@@ -21,8 +21,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
-class DatabasePrincipalAssignmentsOperations:
- """DatabasePrincipalAssignmentsOperations async operations.
+class DatabasePrincipalAssignmentOperations:
+ """DatabasePrincipalAssignmentOperations async operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -48,7 +48,8 @@ async def check_name_availability(
resource_group_name: str,
cluster_name: str,
database_name: str,
- principal_assignment_name: "models.DatabasePrincipalAssignmentCheckNameRequest",
+ name: str,
+ type: Union[str, "models.Type"],
**kwargs
) -> "models.CheckNameResult":
"""Checks that the database principal assignment is valid and is not already in use.
@@ -59,8 +60,10 @@ async def check_name_availability(
:type cluster_name: str
:param database_name: The name of the database in the Kusto cluster.
:type database_name: str
- :param principal_assignment_name: The name of the resource.
- :type principal_assignment_name: ~kusto_management_client.models.DatabasePrincipalAssignmentCheckNameRequest
+ :param name: Principal Assignment resource name.
+ :type name: str
+ :param type: The type of resource, Microsoft.Kusto/clusters/databases/principalAssignments.
+ :type type: str or ~kusto_management_client.models.Type
:keyword callable cls: A custom type or function that will be passed the direct response
:return: CheckNameResult, or the result of cls(response)
:rtype: ~kusto_management_client.models.CheckNameResult
@@ -71,6 +74,8 @@ async def check_name_availability(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ principal_assignment_name = models.DatabasePrincipalAssignmentCheckNameRequest(name=name, type=type)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -185,7 +190,10 @@ async def _create_or_update_initial(
cluster_name: str,
database_name: str,
principal_assignment_name: str,
- parameters: "models.DatabasePrincipalAssignment",
+ principal_id: Optional[str] = None,
+ role: Optional[Union[str, "models.DatabasePrincipalRole"]] = None,
+ tenant_id: Optional[str] = None,
+ principal_type: Optional[Union[str, "models.PrincipalType"]] = None,
**kwargs
) -> "models.DatabasePrincipalAssignment":
cls = kwargs.pop('cls', None) # type: ClsType["models.DatabasePrincipalAssignment"]
@@ -193,6 +201,8 @@ async def _create_or_update_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ parameters = models.DatabasePrincipalAssignment(principal_id=principal_id, role=role, tenant_id=tenant_id, principal_type=principal_type)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -246,7 +256,10 @@ async def begin_create_or_update(
cluster_name: str,
database_name: str,
principal_assignment_name: str,
- parameters: "models.DatabasePrincipalAssignment",
+ principal_id: Optional[str] = None,
+ role: Optional[Union[str, "models.DatabasePrincipalRole"]] = None,
+ tenant_id: Optional[str] = None,
+ principal_type: Optional[Union[str, "models.PrincipalType"]] = None,
**kwargs
) -> AsyncLROPoller["models.DatabasePrincipalAssignment"]:
"""Creates a Kusto cluster database principalAssignment.
@@ -259,8 +272,15 @@ async def begin_create_or_update(
:type database_name: str
:param principal_assignment_name: The name of the Kusto principalAssignment.
:type principal_assignment_name: str
- :param parameters: The Kusto principalAssignments parameters supplied for the operation.
- :type parameters: ~kusto_management_client.models.DatabasePrincipalAssignment
+ :param principal_id: The principal ID assigned to the database principal. It can be a user
+ email, application ID, or security group name.
+ :type principal_id: str
+ :param role: Database principal role.
+ :type role: str or ~kusto_management_client.models.DatabasePrincipalRole
+ :param tenant_id: The tenant id of the principal.
+ :type tenant_id: str
+ :param principal_type: Principal type.
+ :type principal_type: str or ~kusto_management_client.models.PrincipalType
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -284,7 +304,10 @@ async def begin_create_or_update(
cluster_name=cluster_name,
database_name=database_name,
principal_assignment_name=principal_assignment_name,
- parameters=parameters,
+ principal_id=principal_id,
+ role=role,
+ tenant_id=tenant_id,
+ principal_type=principal_type,
cls=lambda x,y,z: x,
**kwargs
)
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_operations.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_operation_operations.py
similarity index 98%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_operations.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_operation_operations.py
index 4087210b0..82a4c845b 100644
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_operations.py
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/_operation_operations.py
@@ -19,8 +19,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
-class Operations:
- """Operations async operations.
+class OperationOperations:
+ """OperationOperations async operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/models/__init__.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/models/__init__.py
similarity index 98%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/models/__init__.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/models/__init__.py
index a85e849f8..3ab71bc36 100644
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/models/__init__.py
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/models/__init__.py
@@ -43,7 +43,6 @@
from ._models_py3 import EventHubDataConnection
from ._models_py3 import FollowerDatabaseDefinition
from ._models_py3 import FollowerDatabaseListResult
- from ._models_py3 import Identity
from ._models_py3 import IotHubDataConnection
from ._models_py3 import KeyVaultProperties
from ._models_py3 import LanguageExtension
@@ -100,7 +99,6 @@
from ._models import EventHubDataConnection # type: ignore
from ._models import FollowerDatabaseDefinition # type: ignore
from ._models import FollowerDatabaseListResult # type: ignore
- from ._models import Identity # type: ignore
from ._models import IotHubDataConnection # type: ignore
from ._models import KeyVaultProperties # type: ignore
from ._models import LanguageExtension # type: ignore
@@ -182,7 +180,6 @@
'EventHubDataConnection',
'FollowerDatabaseDefinition',
'FollowerDatabaseListResult',
- 'Identity',
'IotHubDataConnection',
'KeyVaultProperties',
'LanguageExtension',
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/models/_kusto_management_client_enums.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/models/_kusto_management_client_enums.py
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/models/_kusto_management_client_enums.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/models/_kusto_management_client_enums.py
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/models/_models.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/models/_models.py
similarity index 97%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/models/_models.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/models/_models.py
index fb90dff68..e8b0194f2 100644
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/models/_models.py
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/models/_models.py
@@ -409,8 +409,6 @@ class Cluster(TrackedResource):
:type sku: ~kusto_management_client.models.AzureSku
:param zones: The availability zones of the cluster.
:type zones: list[str]
- :param identity: The identity of the cluster, if configured.
- :type identity: ~kusto_management_client.models.Identity
:ivar state: The state of the resource. Possible values include: "Creating", "Unavailable",
"Running", "Deleting", "Deleted", "Stopping", "Stopped", "Starting", "Updating".
:vartype state: str or ~kusto_management_client.models.State
@@ -445,6 +443,18 @@ class Cluster(TrackedResource):
:param enable_double_encryption: A boolean value that indicates if double encryption is
enabled.
:type enable_double_encryption: bool
+ :ivar principal_id: The principal ID of resource identity.
+ :vartype principal_id: str
+ :ivar tenant_id: The tenant ID of resource.
+ :vartype tenant_id: str
+ :param type_identity_type: The identity type. Possible values include: "None",
+ "SystemAssigned".
+ :type type_identity_type: str or ~kusto_management_client.models.IdentityType
+ :param user_assigned_identities: The list of user identities associated with the Kusto cluster.
+ The user identity dictionary key references will be ARM resource ids in the form:
+ '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
+ :type user_assigned_identities: dict[str,
+ ~kusto_management_client.models.ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties]
"""
_validation = {
@@ -459,6 +469,8 @@ class Cluster(TrackedResource):
'data_ingestion_uri': {'readonly': True},
'state_reason': {'readonly': True},
'language_extensions': {'readonly': True},
+ 'principal_id': {'readonly': True},
+ 'tenant_id': {'readonly': True},
}
_attribute_map = {
@@ -469,7 +481,6 @@ class Cluster(TrackedResource):
'location': {'key': 'location', 'type': 'str'},
'sku': {'key': 'sku', 'type': 'AzureSku'},
'zones': {'key': 'zones', 'type': '[str]'},
- 'identity': {'key': 'identity', 'type': 'Identity'},
'state': {'key': 'properties.state', 'type': 'str'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'uri': {'key': 'properties.uri', 'type': 'str'},
@@ -484,6 +495,10 @@ class Cluster(TrackedResource):
'enable_purge': {'key': 'properties.enablePurge', 'type': 'bool'},
'language_extensions': {'key': 'properties.languageExtensions', 'type': 'LanguageExtensionsList'},
'enable_double_encryption': {'key': 'properties.enableDoubleEncryption', 'type': 'bool'},
+ 'principal_id': {'key': 'identity.principalId', 'type': 'str'},
+ 'tenant_id': {'key': 'identity.tenantId', 'type': 'str'},
+ 'type_identity_type': {'key': 'identity.type', 'type': 'str'},
+ 'user_assigned_identities': {'key': 'identity.userAssignedIdentities', 'type': '{ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties}'},
}
def __init__(
@@ -493,7 +508,6 @@ def __init__(
super(Cluster, self).__init__(**kwargs)
self.sku = kwargs['sku']
self.zones = kwargs.get('zones', None)
- self.identity = kwargs.get('identity', None)
self.state = None
self.provisioning_state = None
self.uri = None
@@ -508,6 +522,10 @@ def __init__(
self.enable_purge = kwargs.get('enable_purge', False)
self.language_extensions = None
self.enable_double_encryption = kwargs.get('enable_double_encryption', False)
+ self.principal_id = None
+ self.tenant_id = None
+ self.type_identity_type = kwargs.get('type_identity_type', None)
+ self.user_assigned_identities = kwargs.get('user_assigned_identities', None)
class ClusterCheckNameRequest(msrest.serialization.Model):
@@ -705,8 +723,6 @@ class ClusterUpdate(Resource):
:type location: str
:param sku: The SKU of the cluster.
:type sku: ~kusto_management_client.models.AzureSku
- :param identity: The identity of the cluster, if configured.
- :type identity: ~kusto_management_client.models.Identity
:ivar state: The state of the resource. Possible values include: "Creating", "Unavailable",
"Running", "Deleting", "Deleted", "Stopping", "Stopped", "Starting", "Updating".
:vartype state: str or ~kusto_management_client.models.State
@@ -741,6 +757,18 @@ class ClusterUpdate(Resource):
:param enable_double_encryption: A boolean value that indicates if double encryption is
enabled.
:type enable_double_encryption: bool
+ :ivar principal_id: The principal ID of resource identity.
+ :vartype principal_id: str
+ :ivar tenant_id: The tenant ID of resource.
+ :vartype tenant_id: str
+ :param type_identity_type: The identity type. Possible values include: "None",
+ "SystemAssigned".
+ :type type_identity_type: str or ~kusto_management_client.models.IdentityType
+ :param user_assigned_identities: The list of user identities associated with the Kusto cluster.
+ The user identity dictionary key references will be ARM resource ids in the form:
+ '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
+ :type user_assigned_identities: dict[str,
+ ~kusto_management_client.models.ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties]
"""
_validation = {
@@ -753,6 +781,8 @@ class ClusterUpdate(Resource):
'data_ingestion_uri': {'readonly': True},
'state_reason': {'readonly': True},
'language_extensions': {'readonly': True},
+ 'principal_id': {'readonly': True},
+ 'tenant_id': {'readonly': True},
}
_attribute_map = {
@@ -762,7 +792,6 @@ class ClusterUpdate(Resource):
'tags': {'key': 'tags', 'type': '{str}'},
'location': {'key': 'location', 'type': 'str'},
'sku': {'key': 'sku', 'type': 'AzureSku'},
- 'identity': {'key': 'identity', 'type': 'Identity'},
'state': {'key': 'properties.state', 'type': 'str'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'uri': {'key': 'properties.uri', 'type': 'str'},
@@ -777,6 +806,10 @@ class ClusterUpdate(Resource):
'enable_purge': {'key': 'properties.enablePurge', 'type': 'bool'},
'language_extensions': {'key': 'properties.languageExtensions', 'type': 'LanguageExtensionsList'},
'enable_double_encryption': {'key': 'properties.enableDoubleEncryption', 'type': 'bool'},
+ 'principal_id': {'key': 'identity.principalId', 'type': 'str'},
+ 'tenant_id': {'key': 'identity.tenantId', 'type': 'str'},
+ 'type_identity_type': {'key': 'identity.type', 'type': 'str'},
+ 'user_assigned_identities': {'key': 'identity.userAssignedIdentities', 'type': '{ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties}'},
}
def __init__(
@@ -787,7 +820,6 @@ def __init__(
self.tags = kwargs.get('tags', None)
self.location = kwargs.get('location', None)
self.sku = kwargs.get('sku', None)
- self.identity = kwargs.get('identity', None)
self.state = None
self.provisioning_state = None
self.uri = None
@@ -802,6 +834,10 @@ def __init__(
self.enable_purge = kwargs.get('enable_purge', False)
self.language_extensions = None
self.enable_double_encryption = kwargs.get('enable_double_encryption', False)
+ self.principal_id = None
+ self.tenant_id = None
+ self.type_identity_type = kwargs.get('type_identity_type', None)
+ self.user_assigned_identities = kwargs.get('user_assigned_identities', None)
class ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties(msrest.serialization.Model):
@@ -1555,50 +1591,6 @@ def __init__(
self.value = kwargs.get('value', None)
-class Identity(msrest.serialization.Model):
- """Identity for the resource.
-
- Variables are only populated by the server, and will be ignored when sending a request.
-
- All required parameters must be populated in order to send to Azure.
-
- :ivar principal_id: The principal ID of resource identity.
- :vartype principal_id: str
- :ivar tenant_id: The tenant ID of resource.
- :vartype tenant_id: str
- :param type: Required. The identity type. Possible values include: "None", "SystemAssigned".
- :type type: str or ~kusto_management_client.models.IdentityType
- :param user_assigned_identities: The list of user identities associated with the Kusto cluster.
- The user identity dictionary key references will be ARM resource ids in the form:
- '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
- :type user_assigned_identities: dict[str,
- ~kusto_management_client.models.ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties]
- """
-
- _validation = {
- 'principal_id': {'readonly': True},
- 'tenant_id': {'readonly': True},
- 'type': {'required': True},
- }
-
- _attribute_map = {
- 'principal_id': {'key': 'principalId', 'type': 'str'},
- 'tenant_id': {'key': 'tenantId', 'type': 'str'},
- 'type': {'key': 'type', 'type': 'str'},
- 'user_assigned_identities': {'key': 'userAssignedIdentities', 'type': '{ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties}'},
- }
-
- def __init__(
- self,
- **kwargs
- ):
- super(Identity, self).__init__(**kwargs)
- self.principal_id = None
- self.tenant_id = None
- self.type = kwargs['type']
- self.user_assigned_identities = kwargs.get('user_assigned_identities', None)
-
-
class IotHubDataConnection(DataConnection):
"""Class representing an iot hub data connection.
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/models/_models_py3.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/models/_models_py3.py
similarity index 97%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/models/_models_py3.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/models/_models_py3.py
index a0b86af0b..2ebd80310 100644
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/models/_models_py3.py
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/models/_models_py3.py
@@ -450,8 +450,6 @@ class Cluster(TrackedResource):
:type sku: ~kusto_management_client.models.AzureSku
:param zones: The availability zones of the cluster.
:type zones: list[str]
- :param identity: The identity of the cluster, if configured.
- :type identity: ~kusto_management_client.models.Identity
:ivar state: The state of the resource. Possible values include: "Creating", "Unavailable",
"Running", "Deleting", "Deleted", "Stopping", "Stopped", "Starting", "Updating".
:vartype state: str or ~kusto_management_client.models.State
@@ -486,6 +484,18 @@ class Cluster(TrackedResource):
:param enable_double_encryption: A boolean value that indicates if double encryption is
enabled.
:type enable_double_encryption: bool
+ :ivar principal_id: The principal ID of resource identity.
+ :vartype principal_id: str
+ :ivar tenant_id: The tenant ID of resource.
+ :vartype tenant_id: str
+ :param type_identity_type: The identity type. Possible values include: "None",
+ "SystemAssigned".
+ :type type_identity_type: str or ~kusto_management_client.models.IdentityType
+ :param user_assigned_identities: The list of user identities associated with the Kusto cluster.
+ The user identity dictionary key references will be ARM resource ids in the form:
+ '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
+ :type user_assigned_identities: dict[str,
+ ~kusto_management_client.models.ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties]
"""
_validation = {
@@ -500,6 +510,8 @@ class Cluster(TrackedResource):
'data_ingestion_uri': {'readonly': True},
'state_reason': {'readonly': True},
'language_extensions': {'readonly': True},
+ 'principal_id': {'readonly': True},
+ 'tenant_id': {'readonly': True},
}
_attribute_map = {
@@ -510,7 +522,6 @@ class Cluster(TrackedResource):
'location': {'key': 'location', 'type': 'str'},
'sku': {'key': 'sku', 'type': 'AzureSku'},
'zones': {'key': 'zones', 'type': '[str]'},
- 'identity': {'key': 'identity', 'type': 'Identity'},
'state': {'key': 'properties.state', 'type': 'str'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'uri': {'key': 'properties.uri', 'type': 'str'},
@@ -525,6 +536,10 @@ class Cluster(TrackedResource):
'enable_purge': {'key': 'properties.enablePurge', 'type': 'bool'},
'language_extensions': {'key': 'properties.languageExtensions', 'type': 'LanguageExtensionsList'},
'enable_double_encryption': {'key': 'properties.enableDoubleEncryption', 'type': 'bool'},
+ 'principal_id': {'key': 'identity.principalId', 'type': 'str'},
+ 'tenant_id': {'key': 'identity.tenantId', 'type': 'str'},
+ 'type_identity_type': {'key': 'identity.type', 'type': 'str'},
+ 'user_assigned_identities': {'key': 'identity.userAssignedIdentities', 'type': '{ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties}'},
}
def __init__(
@@ -534,7 +549,6 @@ def __init__(
sku: "AzureSku",
tags: Optional[Dict[str, str]] = None,
zones: Optional[List[str]] = None,
- identity: Optional["Identity"] = None,
trusted_external_tenants: Optional[List["TrustedExternalTenant"]] = None,
optimized_autoscale: Optional["OptimizedAutoscale"] = None,
enable_disk_encryption: Optional[bool] = None,
@@ -543,12 +557,13 @@ def __init__(
key_vault_properties: Optional["KeyVaultProperties"] = None,
enable_purge: Optional[bool] = False,
enable_double_encryption: Optional[bool] = False,
+ type_identity_type: Optional[Union[str, "IdentityType"]] = None,
+ user_assigned_identities: Optional[Dict[str, "ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties"]] = None,
**kwargs
):
super(Cluster, self).__init__(tags=tags, location=location, **kwargs)
self.sku = sku
self.zones = zones
- self.identity = identity
self.state = None
self.provisioning_state = None
self.uri = None
@@ -563,6 +578,10 @@ def __init__(
self.enable_purge = enable_purge
self.language_extensions = None
self.enable_double_encryption = enable_double_encryption
+ self.principal_id = None
+ self.tenant_id = None
+ self.type_identity_type = type_identity_type
+ self.user_assigned_identities = user_assigned_identities
class ClusterCheckNameRequest(msrest.serialization.Model):
@@ -775,8 +794,6 @@ class ClusterUpdate(Resource):
:type location: str
:param sku: The SKU of the cluster.
:type sku: ~kusto_management_client.models.AzureSku
- :param identity: The identity of the cluster, if configured.
- :type identity: ~kusto_management_client.models.Identity
:ivar state: The state of the resource. Possible values include: "Creating", "Unavailable",
"Running", "Deleting", "Deleted", "Stopping", "Stopped", "Starting", "Updating".
:vartype state: str or ~kusto_management_client.models.State
@@ -811,6 +828,18 @@ class ClusterUpdate(Resource):
:param enable_double_encryption: A boolean value that indicates if double encryption is
enabled.
:type enable_double_encryption: bool
+ :ivar principal_id: The principal ID of resource identity.
+ :vartype principal_id: str
+ :ivar tenant_id: The tenant ID of resource.
+ :vartype tenant_id: str
+ :param type_identity_type: The identity type. Possible values include: "None",
+ "SystemAssigned".
+ :type type_identity_type: str or ~kusto_management_client.models.IdentityType
+ :param user_assigned_identities: The list of user identities associated with the Kusto cluster.
+ The user identity dictionary key references will be ARM resource ids in the form:
+ '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
+ :type user_assigned_identities: dict[str,
+ ~kusto_management_client.models.ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties]
"""
_validation = {
@@ -823,6 +852,8 @@ class ClusterUpdate(Resource):
'data_ingestion_uri': {'readonly': True},
'state_reason': {'readonly': True},
'language_extensions': {'readonly': True},
+ 'principal_id': {'readonly': True},
+ 'tenant_id': {'readonly': True},
}
_attribute_map = {
@@ -832,7 +863,6 @@ class ClusterUpdate(Resource):
'tags': {'key': 'tags', 'type': '{str}'},
'location': {'key': 'location', 'type': 'str'},
'sku': {'key': 'sku', 'type': 'AzureSku'},
- 'identity': {'key': 'identity', 'type': 'Identity'},
'state': {'key': 'properties.state', 'type': 'str'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'uri': {'key': 'properties.uri', 'type': 'str'},
@@ -847,6 +877,10 @@ class ClusterUpdate(Resource):
'enable_purge': {'key': 'properties.enablePurge', 'type': 'bool'},
'language_extensions': {'key': 'properties.languageExtensions', 'type': 'LanguageExtensionsList'},
'enable_double_encryption': {'key': 'properties.enableDoubleEncryption', 'type': 'bool'},
+ 'principal_id': {'key': 'identity.principalId', 'type': 'str'},
+ 'tenant_id': {'key': 'identity.tenantId', 'type': 'str'},
+ 'type_identity_type': {'key': 'identity.type', 'type': 'str'},
+ 'user_assigned_identities': {'key': 'identity.userAssignedIdentities', 'type': '{ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties}'},
}
def __init__(
@@ -855,7 +889,6 @@ def __init__(
tags: Optional[Dict[str, str]] = None,
location: Optional[str] = None,
sku: Optional["AzureSku"] = None,
- identity: Optional["Identity"] = None,
trusted_external_tenants: Optional[List["TrustedExternalTenant"]] = None,
optimized_autoscale: Optional["OptimizedAutoscale"] = None,
enable_disk_encryption: Optional[bool] = None,
@@ -864,13 +897,14 @@ def __init__(
key_vault_properties: Optional["KeyVaultProperties"] = None,
enable_purge: Optional[bool] = False,
enable_double_encryption: Optional[bool] = False,
+ type_identity_type: Optional[Union[str, "IdentityType"]] = None,
+ user_assigned_identities: Optional[Dict[str, "ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties"]] = None,
**kwargs
):
super(ClusterUpdate, self).__init__(**kwargs)
self.tags = tags
self.location = location
self.sku = sku
- self.identity = identity
self.state = None
self.provisioning_state = None
self.uri = None
@@ -885,6 +919,10 @@ def __init__(
self.enable_purge = enable_purge
self.language_extensions = None
self.enable_double_encryption = enable_double_encryption
+ self.principal_id = None
+ self.tenant_id = None
+ self.type_identity_type = type_identity_type
+ self.user_assigned_identities = user_assigned_identities
class ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties(msrest.serialization.Model):
@@ -1705,53 +1743,6 @@ def __init__(
self.value = value
-class Identity(msrest.serialization.Model):
- """Identity for the resource.
-
- Variables are only populated by the server, and will be ignored when sending a request.
-
- All required parameters must be populated in order to send to Azure.
-
- :ivar principal_id: The principal ID of resource identity.
- :vartype principal_id: str
- :ivar tenant_id: The tenant ID of resource.
- :vartype tenant_id: str
- :param type: Required. The identity type. Possible values include: "None", "SystemAssigned".
- :type type: str or ~kusto_management_client.models.IdentityType
- :param user_assigned_identities: The list of user identities associated with the Kusto cluster.
- The user identity dictionary key references will be ARM resource ids in the form:
- '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
- :type user_assigned_identities: dict[str,
- ~kusto_management_client.models.ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties]
- """
-
- _validation = {
- 'principal_id': {'readonly': True},
- 'tenant_id': {'readonly': True},
- 'type': {'required': True},
- }
-
- _attribute_map = {
- 'principal_id': {'key': 'principalId', 'type': 'str'},
- 'tenant_id': {'key': 'tenantId', 'type': 'str'},
- 'type': {'key': 'type', 'type': 'str'},
- 'user_assigned_identities': {'key': 'userAssignedIdentities', 'type': '{ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties}'},
- }
-
- def __init__(
- self,
- *,
- type: Union[str, "IdentityType"],
- user_assigned_identities: Optional[Dict[str, "ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties"]] = None,
- **kwargs
- ):
- super(Identity, self).__init__(**kwargs)
- self.principal_id = None
- self.tenant_id = None
- self.type = type
- self.user_assigned_identities = user_assigned_identities
-
-
class IotHubDataConnection(DataConnection):
"""Class representing an iot hub data connection.
diff --git a/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/__init__.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/__init__.py
new file mode 100644
index 000000000..5750cdc82
--- /dev/null
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/__init__.py
@@ -0,0 +1,25 @@
+# coding=utf-8
+# --------------------------------------------------------------------------
+# 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 Microsoft (R) AutoRest Code Generator.
+# Changes may cause incorrect behavior and will be lost if the code is regenerated.
+# --------------------------------------------------------------------------
+
+from ._cluster_operations import ClusterOperations
+from ._cluster_principal_assignment_operations import ClusterPrincipalAssignmentOperations
+from ._database_operations import DatabaseOperations
+from ._database_principal_assignment_operations import DatabasePrincipalAssignmentOperations
+from ._attached_database_configuration_operations import AttachedDatabaseConfigurationOperations
+from ._data_connection_operations import DataConnectionOperations
+from ._operation_operations import OperationOperations
+
+__all__ = [
+ 'ClusterOperations',
+ 'ClusterPrincipalAssignmentOperations',
+ 'DatabaseOperations',
+ 'DatabasePrincipalAssignmentOperations',
+ 'AttachedDatabaseConfigurationOperations',
+ 'DataConnectionOperations',
+ 'OperationOperations',
+]
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_attached_database_configurations_operations.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_attached_database_configuration_operations.py
similarity index 92%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_attached_database_configurations_operations.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_attached_database_configuration_operations.py
index 32afc67d4..a2cddc5c9 100644
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_attached_database_configurations_operations.py
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_attached_database_configuration_operations.py
@@ -25,8 +25,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
-class AttachedDatabaseConfigurationsOperations(object):
- """AttachedDatabaseConfigurationsOperations operations.
+class AttachedDatabaseConfigurationOperations(object):
+ """AttachedDatabaseConfigurationOperations operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -190,7 +190,10 @@ def _create_or_update_initial(
resource_group_name, # type: str
cluster_name, # type: str
attached_database_configuration_name, # type: str
- parameters, # type: "models.AttachedDatabaseConfiguration"
+ location=None, # type: Optional[str]
+ database_name=None, # type: Optional[str]
+ cluster_resource_id=None, # type: Optional[str]
+ default_principals_modification_kind=None, # type: Optional[Union[str, "models.DefaultPrincipalsModificationKind"]]
**kwargs # type: Any
):
# type: (...) -> "models.AttachedDatabaseConfiguration"
@@ -199,6 +202,8 @@ def _create_or_update_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ parameters = models.AttachedDatabaseConfiguration(location=location, database_name=database_name, cluster_resource_id=cluster_resource_id, default_principals_modification_kind=default_principals_modification_kind)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -253,7 +258,10 @@ def begin_create_or_update(
resource_group_name, # type: str
cluster_name, # type: str
attached_database_configuration_name, # type: str
- parameters, # type: "models.AttachedDatabaseConfiguration"
+ location=None, # type: Optional[str]
+ database_name=None, # type: Optional[str]
+ cluster_resource_id=None, # type: Optional[str]
+ default_principals_modification_kind=None, # type: Optional[Union[str, "models.DefaultPrincipalsModificationKind"]]
**kwargs # type: Any
):
# type: (...) -> LROPoller["models.AttachedDatabaseConfiguration"]
@@ -265,8 +273,16 @@ def begin_create_or_update(
:type cluster_name: str
:param attached_database_configuration_name: The name of the attached database configuration.
:type attached_database_configuration_name: str
- :param parameters: The database parameters supplied to the CreateOrUpdate operation.
- :type parameters: ~kusto_management_client.models.AttachedDatabaseConfiguration
+ :param location: Resource location.
+ :type location: str
+ :param database_name: The name of the database which you would like to attach, use * if you
+ want to follow all current and future databases.
+ :type database_name: str
+ :param cluster_resource_id: The resource id of the cluster where the databases you would like
+ to attach reside.
+ :type cluster_resource_id: str
+ :param default_principals_modification_kind: The default principals modification kind.
+ :type default_principals_modification_kind: str or ~kusto_management_client.models.DefaultPrincipalsModificationKind
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -289,7 +305,10 @@ def begin_create_or_update(
resource_group_name=resource_group_name,
cluster_name=cluster_name,
attached_database_configuration_name=attached_database_configuration_name,
- parameters=parameters,
+ location=location,
+ database_name=database_name,
+ cluster_resource_id=cluster_resource_id,
+ default_principals_modification_kind=default_principals_modification_kind,
cls=lambda x,y,z: x,
**kwargs
)
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_clusters_operations.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_cluster_operations.py
similarity index 82%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_clusters_operations.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_cluster_operations.py
index 93903b4e8..d2a05bda4 100644
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_clusters_operations.py
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_cluster_operations.py
@@ -20,13 +20,13 @@
if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
- from typing import Any, Callable, Dict, Generic, Iterable, Optional, TypeVar, Union
+ from typing import Any, Callable, Dict, Generic, Iterable, List, Optional, TypeVar, Union
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
-class ClustersOperations(object):
- """ClustersOperations operations.
+class ClusterOperations(object):
+ """ClusterOperations operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -110,7 +110,20 @@ def _create_or_update_initial(
self,
resource_group_name, # type: str
cluster_name, # type: str
- parameters, # type: "models.Cluster"
+ location, # type: str
+ sku, # type: "models.AzureSku"
+ tags=None, # type: Optional[Dict[str, str]]
+ zones=None, # type: Optional[List[str]]
+ trusted_external_tenants=None, # type: Optional[List["models.TrustedExternalTenant"]]
+ optimized_autoscale=None, # type: Optional["models.OptimizedAutoscale"]
+ enable_disk_encryption=None, # type: Optional[bool]
+ enable_streaming_ingest=False, # type: Optional[bool]
+ virtual_network_configuration=None, # type: Optional["models.VirtualNetworkConfiguration"]
+ key_vault_properties=None, # type: Optional["models.KeyVaultProperties"]
+ enable_purge=False, # type: Optional[bool]
+ enable_double_encryption=False, # type: Optional[bool]
+ type=None, # type: Optional[Union[str, "models.IdentityType"]]
+ user_assigned_identities=None, # type: Optional[Dict[str, "models.ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties"]]
**kwargs # type: Any
):
# type: (...) -> "models.Cluster"
@@ -119,6 +132,8 @@ def _create_or_update_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ parameters = models.Cluster(tags=tags, location=location, sku=sku, zones=zones, trusted_external_tenants=trusted_external_tenants, optimized_autoscale=optimized_autoscale, enable_disk_encryption=enable_disk_encryption, enable_streaming_ingest=enable_streaming_ingest, virtual_network_configuration=virtual_network_configuration, key_vault_properties=key_vault_properties, enable_purge=enable_purge, enable_double_encryption=enable_double_encryption, type_identity_type=type, user_assigned_identities=user_assigned_identities)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -168,7 +183,20 @@ def begin_create_or_update(
self,
resource_group_name, # type: str
cluster_name, # type: str
- parameters, # type: "models.Cluster"
+ location, # type: str
+ sku, # type: "models.AzureSku"
+ tags=None, # type: Optional[Dict[str, str]]
+ zones=None, # type: Optional[List[str]]
+ trusted_external_tenants=None, # type: Optional[List["models.TrustedExternalTenant"]]
+ optimized_autoscale=None, # type: Optional["models.OptimizedAutoscale"]
+ enable_disk_encryption=None, # type: Optional[bool]
+ enable_streaming_ingest=False, # type: Optional[bool]
+ virtual_network_configuration=None, # type: Optional["models.VirtualNetworkConfiguration"]
+ key_vault_properties=None, # type: Optional["models.KeyVaultProperties"]
+ enable_purge=False, # type: Optional[bool]
+ enable_double_encryption=False, # type: Optional[bool]
+ type=None, # type: Optional[Union[str, "models.IdentityType"]]
+ user_assigned_identities=None, # type: Optional[Dict[str, "models.ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties"]]
**kwargs # type: Any
):
# type: (...) -> LROPoller["models.Cluster"]
@@ -178,8 +206,39 @@ def begin_create_or_update(
:type resource_group_name: str
:param cluster_name: The name of the Kusto cluster.
:type cluster_name: str
- :param parameters: The Kusto cluster parameters supplied to the CreateOrUpdate operation.
- :type parameters: ~kusto_management_client.models.Cluster
+ :param location: The geo-location where the resource lives.
+ :type location: str
+ :param sku: The SKU of the cluster.
+ :type sku: ~kusto_management_client.models.AzureSku
+ :param tags: Resource tags.
+ :type tags: dict[str, str]
+ :param zones: The availability zones of the cluster.
+ :type zones: list[str]
+ :param trusted_external_tenants: The cluster's external tenants.
+ :type trusted_external_tenants: list[~kusto_management_client.models.TrustedExternalTenant]
+ :param optimized_autoscale: Optimized auto scale definition.
+ :type optimized_autoscale: ~kusto_management_client.models.OptimizedAutoscale
+ :param enable_disk_encryption: A boolean value that indicates if the cluster's disks are
+ encrypted.
+ :type enable_disk_encryption: bool
+ :param enable_streaming_ingest: A boolean value that indicates if the streaming ingest is
+ enabled.
+ :type enable_streaming_ingest: bool
+ :param virtual_network_configuration: Virtual network definition.
+ :type virtual_network_configuration: ~kusto_management_client.models.VirtualNetworkConfiguration
+ :param key_vault_properties: KeyVault properties for the cluster encryption.
+ :type key_vault_properties: ~kusto_management_client.models.KeyVaultProperties
+ :param enable_purge: A boolean value that indicates if the purge operations are enabled.
+ :type enable_purge: bool
+ :param enable_double_encryption: A boolean value that indicates if double encryption is
+ enabled.
+ :type enable_double_encryption: bool
+ :param type: The identity type.
+ :type type: str or ~kusto_management_client.models.IdentityType
+ :param user_assigned_identities: The list of user identities associated with the Kusto cluster.
+ The user identity dictionary key references will be ARM resource ids in the form:
+ '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
+ :type user_assigned_identities: dict[str, ~kusto_management_client.models.ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties]
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -201,7 +260,20 @@ def begin_create_or_update(
raw_result = self._create_or_update_initial(
resource_group_name=resource_group_name,
cluster_name=cluster_name,
- parameters=parameters,
+ location=location,
+ sku=sku,
+ tags=tags,
+ zones=zones,
+ trusted_external_tenants=trusted_external_tenants,
+ optimized_autoscale=optimized_autoscale,
+ enable_disk_encryption=enable_disk_encryption,
+ enable_streaming_ingest=enable_streaming_ingest,
+ virtual_network_configuration=virtual_network_configuration,
+ key_vault_properties=key_vault_properties,
+ enable_purge=enable_purge,
+ enable_double_encryption=enable_double_encryption,
+ type=type,
+ user_assigned_identities=user_assigned_identities,
cls=lambda x,y,z: x,
**kwargs
)
@@ -240,7 +312,19 @@ def _update_initial(
self,
resource_group_name, # type: str
cluster_name, # type: str
- parameters, # type: "models.ClusterUpdate"
+ tags=None, # type: Optional[Dict[str, str]]
+ location=None, # type: Optional[str]
+ sku=None, # type: Optional["models.AzureSku"]
+ trusted_external_tenants=None, # type: Optional[List["models.TrustedExternalTenant"]]
+ optimized_autoscale=None, # type: Optional["models.OptimizedAutoscale"]
+ enable_disk_encryption=None, # type: Optional[bool]
+ enable_streaming_ingest=False, # type: Optional[bool]
+ virtual_network_configuration=None, # type: Optional["models.VirtualNetworkConfiguration"]
+ key_vault_properties=None, # type: Optional["models.KeyVaultProperties"]
+ enable_purge=False, # type: Optional[bool]
+ enable_double_encryption=False, # type: Optional[bool]
+ type=None, # type: Optional[Union[str, "models.IdentityType"]]
+ user_assigned_identities=None, # type: Optional[Dict[str, "models.ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties"]]
**kwargs # type: Any
):
# type: (...) -> "models.Cluster"
@@ -249,6 +333,8 @@ def _update_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ parameters = models.ClusterUpdate(tags=tags, location=location, sku=sku, trusted_external_tenants=trusted_external_tenants, optimized_autoscale=optimized_autoscale, enable_disk_encryption=enable_disk_encryption, enable_streaming_ingest=enable_streaming_ingest, virtual_network_configuration=virtual_network_configuration, key_vault_properties=key_vault_properties, enable_purge=enable_purge, enable_double_encryption=enable_double_encryption, type_identity_type=type, user_assigned_identities=user_assigned_identities)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -301,7 +387,19 @@ def begin_update(
self,
resource_group_name, # type: str
cluster_name, # type: str
- parameters, # type: "models.ClusterUpdate"
+ tags=None, # type: Optional[Dict[str, str]]
+ location=None, # type: Optional[str]
+ sku=None, # type: Optional["models.AzureSku"]
+ trusted_external_tenants=None, # type: Optional[List["models.TrustedExternalTenant"]]
+ optimized_autoscale=None, # type: Optional["models.OptimizedAutoscale"]
+ enable_disk_encryption=None, # type: Optional[bool]
+ enable_streaming_ingest=False, # type: Optional[bool]
+ virtual_network_configuration=None, # type: Optional["models.VirtualNetworkConfiguration"]
+ key_vault_properties=None, # type: Optional["models.KeyVaultProperties"]
+ enable_purge=False, # type: Optional[bool]
+ enable_double_encryption=False, # type: Optional[bool]
+ type=None, # type: Optional[Union[str, "models.IdentityType"]]
+ user_assigned_identities=None, # type: Optional[Dict[str, "models.ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties"]]
**kwargs # type: Any
):
# type: (...) -> LROPoller["models.Cluster"]
@@ -311,8 +409,37 @@ def begin_update(
:type resource_group_name: str
:param cluster_name: The name of the Kusto cluster.
:type cluster_name: str
- :param parameters: The Kusto cluster parameters supplied to the Update operation.
- :type parameters: ~kusto_management_client.models.ClusterUpdate
+ :param tags: Resource tags.
+ :type tags: dict[str, str]
+ :param location: Resource location.
+ :type location: str
+ :param sku: The SKU of the cluster.
+ :type sku: ~kusto_management_client.models.AzureSku
+ :param trusted_external_tenants: The cluster's external tenants.
+ :type trusted_external_tenants: list[~kusto_management_client.models.TrustedExternalTenant]
+ :param optimized_autoscale: Optimized auto scale definition.
+ :type optimized_autoscale: ~kusto_management_client.models.OptimizedAutoscale
+ :param enable_disk_encryption: A boolean value that indicates if the cluster's disks are
+ encrypted.
+ :type enable_disk_encryption: bool
+ :param enable_streaming_ingest: A boolean value that indicates if the streaming ingest is
+ enabled.
+ :type enable_streaming_ingest: bool
+ :param virtual_network_configuration: Virtual network definition.
+ :type virtual_network_configuration: ~kusto_management_client.models.VirtualNetworkConfiguration
+ :param key_vault_properties: KeyVault properties for the cluster encryption.
+ :type key_vault_properties: ~kusto_management_client.models.KeyVaultProperties
+ :param enable_purge: A boolean value that indicates if the purge operations are enabled.
+ :type enable_purge: bool
+ :param enable_double_encryption: A boolean value that indicates if double encryption is
+ enabled.
+ :type enable_double_encryption: bool
+ :param type: The identity type.
+ :type type: str or ~kusto_management_client.models.IdentityType
+ :param user_assigned_identities: The list of user identities associated with the Kusto cluster.
+ The user identity dictionary key references will be ARM resource ids in the form:
+ '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ManagedIdentity/userAssignedIdentities/{identityName}'.
+ :type user_assigned_identities: dict[str, ~kusto_management_client.models.ComponentsSgqdofSchemasIdentityPropertiesUserassignedidentitiesAdditionalproperties]
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -334,7 +461,19 @@ def begin_update(
raw_result = self._update_initial(
resource_group_name=resource_group_name,
cluster_name=cluster_name,
- parameters=parameters,
+ tags=tags,
+ location=location,
+ sku=sku,
+ trusted_external_tenants=trusted_external_tenants,
+ optimized_autoscale=optimized_autoscale,
+ enable_disk_encryption=enable_disk_encryption,
+ enable_streaming_ingest=enable_streaming_ingest,
+ virtual_network_configuration=virtual_network_configuration,
+ key_vault_properties=key_vault_properties,
+ enable_purge=enable_purge,
+ enable_double_encryption=enable_double_encryption,
+ type=type,
+ user_assigned_identities=user_assigned_identities,
cls=lambda x,y,z: x,
**kwargs
)
@@ -699,7 +838,7 @@ def get_long_running_output(pipeline_response):
return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
begin_start.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/start'} # type: ignore
- def list_follower_databases(
+ def list_follower_database(
self,
resource_group_name, # type: str
cluster_name, # type: str
@@ -733,7 +872,7 @@ def prepare_request(next_link=None):
if not next_link:
# Construct URL
- url = self.list_follower_databases.metadata['url'] # type: ignore
+ url = self.list_follower_database.metadata['url'] # type: ignore
path_format_arguments = {
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
'clusterName': self._serialize.url("cluster_name", cluster_name, 'str'),
@@ -773,13 +912,14 @@ def get_next(next_link=None):
return ItemPaged(
get_next, extract_data
)
- list_follower_databases.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/listFollowerDatabases'} # type: ignore
+ list_follower_database.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/listFollowerDatabases'} # type: ignore
- def _detach_follower_databases_initial(
+ def _detach_follower_database_initial(
self,
resource_group_name, # type: str
cluster_name, # type: str
- follower_database_to_remove, # type: "models.FollowerDatabaseDefinition"
+ cluster_resource_id, # type: str
+ attached_database_configuration_name, # type: str
**kwargs # type: Any
):
# type: (...) -> None
@@ -788,12 +928,14 @@ def _detach_follower_databases_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ follower_database_to_remove = models.FollowerDatabaseDefinition(cluster_resource_id=cluster_resource_id, attached_database_configuration_name=attached_database_configuration_name)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
# Construct URL
- url = self._detach_follower_databases_initial.metadata['url'] # type: ignore
+ url = self._detach_follower_database_initial.metadata['url'] # type: ignore
path_format_arguments = {
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
'clusterName': self._serialize.url("cluster_name", cluster_name, 'str'),
@@ -824,13 +966,14 @@ def _detach_follower_databases_initial(
if cls:
return cls(pipeline_response, None, {})
- _detach_follower_databases_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/detachFollowerDatabases'} # type: ignore
+ _detach_follower_database_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/detachFollowerDatabases'} # type: ignore
- def begin_detach_follower_databases(
+ def begin_detach_follower_database(
self,
resource_group_name, # type: str
cluster_name, # type: str
- follower_database_to_remove, # type: "models.FollowerDatabaseDefinition"
+ cluster_resource_id, # type: str
+ attached_database_configuration_name, # type: str
**kwargs # type: Any
):
# type: (...) -> LROPoller[None]
@@ -840,8 +983,12 @@ def begin_detach_follower_databases(
:type resource_group_name: str
:param cluster_name: The name of the Kusto cluster.
:type cluster_name: str
- :param follower_database_to_remove: The follower databases properties to remove.
- :type follower_database_to_remove: ~kusto_management_client.models.FollowerDatabaseDefinition
+ :param cluster_resource_id: Resource id of the cluster that follows a database owned by this
+ cluster.
+ :type cluster_resource_id: str
+ :param attached_database_configuration_name: Resource name of the attached database
+ configuration in the follower cluster.
+ :type attached_database_configuration_name: str
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -860,10 +1007,11 @@ def begin_detach_follower_databases(
)
cont_token = kwargs.pop('continuation_token', None) # type: Optional[str]
if cont_token is None:
- raw_result = self._detach_follower_databases_initial(
+ raw_result = self._detach_follower_database_initial(
resource_group_name=resource_group_name,
cluster_name=cluster_name,
- follower_database_to_remove=follower_database_to_remove,
+ cluster_resource_id=cluster_resource_id,
+ attached_database_configuration_name=attached_database_configuration_name,
cls=lambda x,y,z: x,
**kwargs
)
@@ -893,7 +1041,7 @@ def get_long_running_output(pipeline_response):
)
else:
return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
- begin_detach_follower_databases.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/detachFollowerDatabases'} # type: ignore
+ begin_detach_follower_database.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/detachFollowerDatabases'} # type: ignore
def _diagnose_virtual_network_initial(
self,
@@ -1152,7 +1300,7 @@ def get_next(next_link=None):
)
list.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Kusto/clusters'} # type: ignore
- def list_skus(
+ def list_sku(
self,
**kwargs # type: Any
):
@@ -1179,7 +1327,7 @@ def prepare_request(next_link=None):
if not next_link:
# Construct URL
- url = self.list_skus.metadata['url'] # type: ignore
+ url = self.list_sku.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
}
@@ -1217,12 +1365,13 @@ def get_next(next_link=None):
return ItemPaged(
get_next, extract_data
)
- list_skus.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Kusto/skus'} # type: ignore
+ list_sku.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Kusto/skus'} # type: ignore
def check_name_availability(
self,
location, # type: str
- cluster_name, # type: "models.ClusterCheckNameRequest"
+ name, # type: str
+ type, # type: Union[str, "models.Type"]
**kwargs # type: Any
):
# type: (...) -> "models.CheckNameResult"
@@ -1230,8 +1379,10 @@ def check_name_availability(
:param location: Azure location.
:type location: str
- :param cluster_name: The name of the cluster.
- :type cluster_name: ~kusto_management_client.models.ClusterCheckNameRequest
+ :param name: Cluster name.
+ :type name: str
+ :param type: The type of resource, Microsoft.Kusto/clusters.
+ :type type: str or ~kusto_management_client.models.Type
:keyword callable cls: A custom type or function that will be passed the direct response
:return: CheckNameResult, or the result of cls(response)
:rtype: ~kusto_management_client.models.CheckNameResult
@@ -1242,6 +1393,8 @@ def check_name_availability(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ cluster_name = models.ClusterCheckNameRequest(name=name, type=type)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -1282,7 +1435,7 @@ def check_name_availability(
return deserialized
check_name_availability.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.Kusto/locations/{location}/checkNameAvailability'} # type: ignore
- def list_skus_by_resource(
+ def list_sku_by_resource(
self,
resource_group_name, # type: str
cluster_name, # type: str
@@ -1315,7 +1468,7 @@ def prepare_request(next_link=None):
if not next_link:
# Construct URL
- url = self.list_skus_by_resource.metadata['url'] # type: ignore
+ url = self.list_sku_by_resource.metadata['url'] # type: ignore
path_format_arguments = {
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
'clusterName': self._serialize.url("cluster_name", cluster_name, 'str'),
@@ -1355,9 +1508,9 @@ def get_next(next_link=None):
return ItemPaged(
get_next, extract_data
)
- list_skus_by_resource.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/skus'} # type: ignore
+ list_sku_by_resource.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/skus'} # type: ignore
- def list_language_extensions(
+ def list_language_extension(
self,
resource_group_name, # type: str
cluster_name, # type: str
@@ -1390,7 +1543,7 @@ def prepare_request(next_link=None):
if not next_link:
# Construct URL
- url = self.list_language_extensions.metadata['url'] # type: ignore
+ url = self.list_language_extension.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
@@ -1430,13 +1583,13 @@ def get_next(next_link=None):
return ItemPaged(
get_next, extract_data
)
- list_language_extensions.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/listLanguageExtensions'} # type: ignore
+ list_language_extension.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/listLanguageExtensions'} # type: ignore
- def _add_language_extensions_initial(
+ def _add_language_extension_initial(
self,
resource_group_name, # type: str
cluster_name, # type: str
- language_extensions_to_add, # type: "models.LanguageExtensionsList"
+ value=None, # type: Optional[List["models.LanguageExtension"]]
**kwargs # type: Any
):
# type: (...) -> None
@@ -1445,12 +1598,14 @@ def _add_language_extensions_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ language_extensions_to_add = models.LanguageExtensionsList(value=value)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
# Construct URL
- url = self._add_language_extensions_initial.metadata['url'] # type: ignore
+ url = self._add_language_extension_initial.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
@@ -1481,13 +1636,13 @@ def _add_language_extensions_initial(
if cls:
return cls(pipeline_response, None, {})
- _add_language_extensions_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/addLanguageExtensions'} # type: ignore
+ _add_language_extension_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/addLanguageExtensions'} # type: ignore
- def begin_add_language_extensions(
+ def begin_add_language_extension(
self,
resource_group_name, # type: str
cluster_name, # type: str
- language_extensions_to_add, # type: "models.LanguageExtensionsList"
+ value=None, # type: Optional[List["models.LanguageExtension"]]
**kwargs # type: Any
):
# type: (...) -> LROPoller[None]
@@ -1497,8 +1652,8 @@ def begin_add_language_extensions(
:type resource_group_name: str
:param cluster_name: The name of the Kusto cluster.
:type cluster_name: str
- :param language_extensions_to_add: The language extensions to add.
- :type language_extensions_to_add: ~kusto_management_client.models.LanguageExtensionsList
+ :param value: The list of language extensions.
+ :type value: list[~kusto_management_client.models.LanguageExtension]
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -1517,10 +1672,10 @@ def begin_add_language_extensions(
)
cont_token = kwargs.pop('continuation_token', None) # type: Optional[str]
if cont_token is None:
- raw_result = self._add_language_extensions_initial(
+ raw_result = self._add_language_extension_initial(
resource_group_name=resource_group_name,
cluster_name=cluster_name,
- language_extensions_to_add=language_extensions_to_add,
+ value=value,
cls=lambda x,y,z: x,
**kwargs
)
@@ -1550,13 +1705,13 @@ def get_long_running_output(pipeline_response):
)
else:
return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
- begin_add_language_extensions.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/addLanguageExtensions'} # type: ignore
+ begin_add_language_extension.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/addLanguageExtensions'} # type: ignore
- def _remove_language_extensions_initial(
+ def _remove_language_extension_initial(
self,
resource_group_name, # type: str
cluster_name, # type: str
- language_extensions_to_remove, # type: "models.LanguageExtensionsList"
+ value=None, # type: Optional[List["models.LanguageExtension"]]
**kwargs # type: Any
):
# type: (...) -> None
@@ -1565,12 +1720,14 @@ def _remove_language_extensions_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ language_extensions_to_remove = models.LanguageExtensionsList(value=value)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
# Construct URL
- url = self._remove_language_extensions_initial.metadata['url'] # type: ignore
+ url = self._remove_language_extension_initial.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
@@ -1601,13 +1758,13 @@ def _remove_language_extensions_initial(
if cls:
return cls(pipeline_response, None, {})
- _remove_language_extensions_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/removeLanguageExtensions'} # type: ignore
+ _remove_language_extension_initial.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/removeLanguageExtensions'} # type: ignore
- def begin_remove_language_extensions(
+ def begin_remove_language_extension(
self,
resource_group_name, # type: str
cluster_name, # type: str
- language_extensions_to_remove, # type: "models.LanguageExtensionsList"
+ value=None, # type: Optional[List["models.LanguageExtension"]]
**kwargs # type: Any
):
# type: (...) -> LROPoller[None]
@@ -1617,8 +1774,8 @@ def begin_remove_language_extensions(
:type resource_group_name: str
:param cluster_name: The name of the Kusto cluster.
:type cluster_name: str
- :param language_extensions_to_remove: The language extensions to remove.
- :type language_extensions_to_remove: ~kusto_management_client.models.LanguageExtensionsList
+ :param value: The list of language extensions.
+ :type value: list[~kusto_management_client.models.LanguageExtension]
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -1637,10 +1794,10 @@ def begin_remove_language_extensions(
)
cont_token = kwargs.pop('continuation_token', None) # type: Optional[str]
if cont_token is None:
- raw_result = self._remove_language_extensions_initial(
+ raw_result = self._remove_language_extension_initial(
resource_group_name=resource_group_name,
cluster_name=cluster_name,
- language_extensions_to_remove=language_extensions_to_remove,
+ value=value,
cls=lambda x,y,z: x,
**kwargs
)
@@ -1670,4 +1827,4 @@ def get_long_running_output(pipeline_response):
)
else:
return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
- begin_remove_language_extensions.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/removeLanguageExtensions'} # type: ignore
+ begin_remove_language_extension.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/removeLanguageExtensions'} # type: ignore
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_cluster_principal_assignments_operations.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_cluster_principal_assignment_operations.py
similarity index 93%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_cluster_principal_assignments_operations.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_cluster_principal_assignment_operations.py
index c7947814f..06e3a1be6 100644
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_cluster_principal_assignments_operations.py
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_cluster_principal_assignment_operations.py
@@ -25,8 +25,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
-class ClusterPrincipalAssignmentsOperations(object):
- """ClusterPrincipalAssignmentsOperations operations.
+class ClusterPrincipalAssignmentOperations(object):
+ """ClusterPrincipalAssignmentOperations operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -51,7 +51,8 @@ def check_name_availability(
self,
resource_group_name, # type: str
cluster_name, # type: str
- principal_assignment_name, # type: "models.ClusterPrincipalAssignmentCheckNameRequest"
+ name, # type: str
+ type, # type: Union[str, "models.Type"]
**kwargs # type: Any
):
# type: (...) -> "models.CheckNameResult"
@@ -61,8 +62,10 @@ def check_name_availability(
:type resource_group_name: str
:param cluster_name: The name of the Kusto cluster.
:type cluster_name: str
- :param principal_assignment_name: The name of the principal assignment.
- :type principal_assignment_name: ~kusto_management_client.models.ClusterPrincipalAssignmentCheckNameRequest
+ :param name: Principal Assignment resource name.
+ :type name: str
+ :param type: The type of resource, Microsoft.Kusto/clusters/principalAssignments.
+ :type type: str or ~kusto_management_client.models.Type
:keyword callable cls: A custom type or function that will be passed the direct response
:return: CheckNameResult, or the result of cls(response)
:rtype: ~kusto_management_client.models.CheckNameResult
@@ -73,6 +76,8 @@ def check_name_availability(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ principal_assignment_name = models.ClusterPrincipalAssignmentCheckNameRequest(name=name, type=type)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -182,7 +187,10 @@ def _create_or_update_initial(
resource_group_name, # type: str
cluster_name, # type: str
principal_assignment_name, # type: str
- parameters, # type: "models.ClusterPrincipalAssignment"
+ principal_id=None, # type: Optional[str]
+ role=None, # type: Optional[Union[str, "models.ClusterPrincipalRole"]]
+ tenant_id=None, # type: Optional[str]
+ principal_type=None, # type: Optional[Union[str, "models.PrincipalType"]]
**kwargs # type: Any
):
# type: (...) -> "models.ClusterPrincipalAssignment"
@@ -191,6 +199,8 @@ def _create_or_update_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ parameters = models.ClusterPrincipalAssignment(principal_id=principal_id, role=role, tenant_id=tenant_id, principal_type=principal_type)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -242,7 +252,10 @@ def begin_create_or_update(
resource_group_name, # type: str
cluster_name, # type: str
principal_assignment_name, # type: str
- parameters, # type: "models.ClusterPrincipalAssignment"
+ principal_id=None, # type: Optional[str]
+ role=None, # type: Optional[Union[str, "models.ClusterPrincipalRole"]]
+ tenant_id=None, # type: Optional[str]
+ principal_type=None, # type: Optional[Union[str, "models.PrincipalType"]]
**kwargs # type: Any
):
# type: (...) -> LROPoller["models.ClusterPrincipalAssignment"]
@@ -254,9 +267,15 @@ def begin_create_or_update(
:type cluster_name: str
:param principal_assignment_name: The name of the Kusto principalAssignment.
:type principal_assignment_name: str
- :param parameters: The Kusto cluster principalAssignment's parameters supplied for the
- operation.
- :type parameters: ~kusto_management_client.models.ClusterPrincipalAssignment
+ :param principal_id: The principal ID assigned to the cluster principal. It can be a user
+ email, application ID, or security group name.
+ :type principal_id: str
+ :param role: Cluster principal role.
+ :type role: str or ~kusto_management_client.models.ClusterPrincipalRole
+ :param tenant_id: The tenant id of the principal.
+ :type tenant_id: str
+ :param principal_type: Principal type.
+ :type principal_type: str or ~kusto_management_client.models.PrincipalType
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -279,7 +298,10 @@ def begin_create_or_update(
resource_group_name=resource_group_name,
cluster_name=cluster_name,
principal_assignment_name=principal_assignment_name,
- parameters=parameters,
+ principal_id=principal_id,
+ role=role,
+ tenant_id=tenant_id,
+ principal_type=principal_type,
cls=lambda x,y,z: x,
**kwargs
)
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_data_connections_operations.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_data_connection_operations.py
similarity index 97%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_data_connections_operations.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_data_connection_operations.py
index 5bd256333..101ccfcee 100644
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_data_connections_operations.py
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_data_connection_operations.py
@@ -25,8 +25,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
-class DataConnectionsOperations(object):
- """DataConnectionsOperations operations.
+class DataConnectionOperations(object):
+ """DataConnectionOperations operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -131,7 +131,8 @@ def _data_connection_validation_initial(
resource_group_name, # type: str
cluster_name, # type: str
database_name, # type: str
- parameters, # type: "models.DataConnectionValidation"
+ data_connection_name=None, # type: Optional[str]
+ properties=None, # type: Optional["models.DataConnection"]
**kwargs # type: Any
):
# type: (...) -> Optional["models.DataConnectionValidationListResult"]
@@ -140,6 +141,8 @@ def _data_connection_validation_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ parameters = models.DataConnectionValidation(data_connection_name=data_connection_name, properties=properties)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -189,7 +192,8 @@ def begin_data_connection_validation(
resource_group_name, # type: str
cluster_name, # type: str
database_name, # type: str
- parameters, # type: "models.DataConnectionValidation"
+ data_connection_name=None, # type: Optional[str]
+ properties=None, # type: Optional["models.DataConnection"]
**kwargs # type: Any
):
# type: (...) -> LROPoller["models.DataConnectionValidationListResult"]
@@ -201,8 +205,10 @@ def begin_data_connection_validation(
:type cluster_name: str
:param database_name: The name of the database in the Kusto cluster.
:type database_name: str
- :param parameters: The data connection parameters supplied to the CreateOrUpdate operation.
- :type parameters: ~kusto_management_client.models.DataConnectionValidation
+ :param data_connection_name: The name of the data connection.
+ :type data_connection_name: str
+ :param properties: The data connection properties to validate.
+ :type properties: ~kusto_management_client.models.DataConnection
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -225,7 +231,8 @@ def begin_data_connection_validation(
resource_group_name=resource_group_name,
cluster_name=cluster_name,
database_name=database_name,
- parameters=parameters,
+ data_connection_name=data_connection_name,
+ properties=properties,
cls=lambda x,y,z: x,
**kwargs
)
@@ -266,7 +273,8 @@ def check_name_availability(
resource_group_name, # type: str
cluster_name, # type: str
database_name, # type: str
- data_connection_name, # type: "models.DataConnectionCheckNameRequest"
+ name, # type: str
+ type, # type: Union[str, "models.Type"]
**kwargs # type: Any
):
# type: (...) -> "models.CheckNameResult"
@@ -278,8 +286,10 @@ def check_name_availability(
:type cluster_name: str
:param database_name: The name of the database in the Kusto cluster.
:type database_name: str
- :param data_connection_name: The name of the data connection.
- :type data_connection_name: ~kusto_management_client.models.DataConnectionCheckNameRequest
+ :param name: Data Connection name.
+ :type name: str
+ :param type: The type of resource, Microsoft.Kusto/clusters/databases/dataConnections.
+ :type type: str or ~kusto_management_client.models.Type
:keyword callable cls: A custom type or function that will be passed the direct response
:return: CheckNameResult, or the result of cls(response)
:rtype: ~kusto_management_client.models.CheckNameResult
@@ -290,6 +300,8 @@ def check_name_availability(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ data_connection_name = models.DataConnectionCheckNameRequest(name=name, type=type)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_databases_operations.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_database_operations.py
similarity index 95%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_databases_operations.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_database_operations.py
index 859921184..e6ea7cea6 100644
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_databases_operations.py
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_database_operations.py
@@ -20,13 +20,13 @@
if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
- from typing import Any, Callable, Dict, Generic, Iterable, Optional, TypeVar, Union
+ from typing import Any, Callable, Dict, Generic, Iterable, List, Optional, TypeVar, Union
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
-class DatabasesOperations(object):
- """DatabasesOperations operations.
+class DatabaseOperations(object):
+ """DatabaseOperations operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -51,7 +51,8 @@ def check_name_availability(
self,
resource_group_name, # type: str
cluster_name, # type: str
- resource_name, # type: "models.CheckNameRequest"
+ name, # type: str
+ type, # type: Union[str, "models.Type"]
**kwargs # type: Any
):
# type: (...) -> "models.CheckNameResult"
@@ -61,8 +62,10 @@ def check_name_availability(
:type resource_group_name: str
:param cluster_name: The name of the Kusto cluster.
:type cluster_name: str
- :param resource_name: The name of the resource.
- :type resource_name: ~kusto_management_client.models.CheckNameRequest
+ :param name: Resource name.
+ :type name: str
+ :param type: The type of resource, for instance Microsoft.Kusto/clusters/databases.
+ :type type: str or ~kusto_management_client.models.Type
:keyword callable cls: A custom type or function that will be passed the direct response
:return: CheckNameResult, or the result of cls(response)
:rtype: ~kusto_management_client.models.CheckNameResult
@@ -73,6 +76,8 @@ def check_name_availability(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ resource_name = models.CheckNameRequest(name=name, type=type)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -649,7 +654,7 @@ def get_long_running_output(pipeline_response):
return LROPoller(self._client, raw_result, get_long_running_output, polling_method)
begin_delete.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/databases/{databaseName}'} # type: ignore
- def list_principals(
+ def list_principal(
self,
resource_group_name, # type: str
cluster_name, # type: str
@@ -685,7 +690,7 @@ def prepare_request(next_link=None):
if not next_link:
# Construct URL
- url = self.list_principals.metadata['url'] # type: ignore
+ url = self.list_principal.metadata['url'] # type: ignore
path_format_arguments = {
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
'clusterName': self._serialize.url("cluster_name", cluster_name, 'str'),
@@ -726,14 +731,14 @@ def get_next(next_link=None):
return ItemPaged(
get_next, extract_data
)
- list_principals.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/databases/{databaseName}/listPrincipals'} # type: ignore
+ list_principal.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/databases/{databaseName}/listPrincipals'} # type: ignore
- def add_principals(
+ def add_principal(
self,
resource_group_name, # type: str
cluster_name, # type: str
database_name, # type: str
- database_principals_to_add, # type: "models.DatabasePrincipalListRequest"
+ value=None, # type: Optional[List["models.DatabasePrincipal"]]
**kwargs # type: Any
):
# type: (...) -> "models.DatabasePrincipalListResult"
@@ -745,8 +750,8 @@ def add_principals(
:type cluster_name: str
:param database_name: The name of the database in the Kusto cluster.
:type database_name: str
- :param database_principals_to_add: List of database principals to add.
- :type database_principals_to_add: ~kusto_management_client.models.DatabasePrincipalListRequest
+ :param value: The list of Kusto database principals.
+ :type value: list[~kusto_management_client.models.DatabasePrincipal]
:keyword callable cls: A custom type or function that will be passed the direct response
:return: DatabasePrincipalListResult, or the result of cls(response)
:rtype: ~kusto_management_client.models.DatabasePrincipalListResult
@@ -757,12 +762,14 @@ def add_principals(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ database_principals_to_add = models.DatabasePrincipalListRequest(value=value)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
# Construct URL
- url = self.add_principals.metadata['url'] # type: ignore
+ url = self.add_principal.metadata['url'] # type: ignore
path_format_arguments = {
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
'clusterName': self._serialize.url("cluster_name", cluster_name, 'str'),
@@ -797,14 +804,14 @@ def add_principals(
return cls(pipeline_response, deserialized, {})
return deserialized
- add_principals.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/databases/{databaseName}/addPrincipals'} # type: ignore
+ add_principal.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/databases/{databaseName}/addPrincipals'} # type: ignore
- def remove_principals(
+ def remove_principal(
self,
resource_group_name, # type: str
cluster_name, # type: str
database_name, # type: str
- database_principals_to_remove, # type: "models.DatabasePrincipalListRequest"
+ value=None, # type: Optional[List["models.DatabasePrincipal"]]
**kwargs # type: Any
):
# type: (...) -> "models.DatabasePrincipalListResult"
@@ -816,8 +823,8 @@ def remove_principals(
:type cluster_name: str
:param database_name: The name of the database in the Kusto cluster.
:type database_name: str
- :param database_principals_to_remove: List of database principals to remove.
- :type database_principals_to_remove: ~kusto_management_client.models.DatabasePrincipalListRequest
+ :param value: The list of Kusto database principals.
+ :type value: list[~kusto_management_client.models.DatabasePrincipal]
:keyword callable cls: A custom type or function that will be passed the direct response
:return: DatabasePrincipalListResult, or the result of cls(response)
:rtype: ~kusto_management_client.models.DatabasePrincipalListResult
@@ -828,12 +835,14 @@ def remove_principals(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ database_principals_to_remove = models.DatabasePrincipalListRequest(value=value)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
# Construct URL
- url = self.remove_principals.metadata['url'] # type: ignore
+ url = self.remove_principal.metadata['url'] # type: ignore
path_format_arguments = {
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'),
'clusterName': self._serialize.url("cluster_name", cluster_name, 'str'),
@@ -868,4 +877,4 @@ def remove_principals(
return cls(pipeline_response, deserialized, {})
return deserialized
- remove_principals.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/databases/{databaseName}/removePrincipals'} # type: ignore
+ remove_principal.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.Kusto/clusters/{clusterName}/databases/{databaseName}/removePrincipals'} # type: ignore
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_database_principal_assignments_operations.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_database_principal_assignment_operations.py
similarity index 93%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_database_principal_assignments_operations.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_database_principal_assignment_operations.py
index 752ba5924..383c23add 100644
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_database_principal_assignments_operations.py
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_database_principal_assignment_operations.py
@@ -25,8 +25,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
-class DatabasePrincipalAssignmentsOperations(object):
- """DatabasePrincipalAssignmentsOperations operations.
+class DatabasePrincipalAssignmentOperations(object):
+ """DatabasePrincipalAssignmentOperations operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -52,7 +52,8 @@ def check_name_availability(
resource_group_name, # type: str
cluster_name, # type: str
database_name, # type: str
- principal_assignment_name, # type: "models.DatabasePrincipalAssignmentCheckNameRequest"
+ name, # type: str
+ type, # type: Union[str, "models.Type"]
**kwargs # type: Any
):
# type: (...) -> "models.CheckNameResult"
@@ -64,8 +65,10 @@ def check_name_availability(
:type cluster_name: str
:param database_name: The name of the database in the Kusto cluster.
:type database_name: str
- :param principal_assignment_name: The name of the resource.
- :type principal_assignment_name: ~kusto_management_client.models.DatabasePrincipalAssignmentCheckNameRequest
+ :param name: Principal Assignment resource name.
+ :type name: str
+ :param type: The type of resource, Microsoft.Kusto/clusters/databases/principalAssignments.
+ :type type: str or ~kusto_management_client.models.Type
:keyword callable cls: A custom type or function that will be passed the direct response
:return: CheckNameResult, or the result of cls(response)
:rtype: ~kusto_management_client.models.CheckNameResult
@@ -76,6 +79,8 @@ def check_name_availability(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ principal_assignment_name = models.DatabasePrincipalAssignmentCheckNameRequest(name=name, type=type)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -191,7 +196,10 @@ def _create_or_update_initial(
cluster_name, # type: str
database_name, # type: str
principal_assignment_name, # type: str
- parameters, # type: "models.DatabasePrincipalAssignment"
+ principal_id=None, # type: Optional[str]
+ role=None, # type: Optional[Union[str, "models.DatabasePrincipalRole"]]
+ tenant_id=None, # type: Optional[str]
+ principal_type=None, # type: Optional[Union[str, "models.PrincipalType"]]
**kwargs # type: Any
):
# type: (...) -> "models.DatabasePrincipalAssignment"
@@ -200,6 +208,8 @@ def _create_or_update_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
+
+ parameters = models.DatabasePrincipalAssignment(principal_id=principal_id, role=role, tenant_id=tenant_id, principal_type=principal_type)
api_version = "2020-06-14"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -253,7 +263,10 @@ def begin_create_or_update(
cluster_name, # type: str
database_name, # type: str
principal_assignment_name, # type: str
- parameters, # type: "models.DatabasePrincipalAssignment"
+ principal_id=None, # type: Optional[str]
+ role=None, # type: Optional[Union[str, "models.DatabasePrincipalRole"]]
+ tenant_id=None, # type: Optional[str]
+ principal_type=None, # type: Optional[Union[str, "models.PrincipalType"]]
**kwargs # type: Any
):
# type: (...) -> LROPoller["models.DatabasePrincipalAssignment"]
@@ -267,8 +280,15 @@ def begin_create_or_update(
:type database_name: str
:param principal_assignment_name: The name of the Kusto principalAssignment.
:type principal_assignment_name: str
- :param parameters: The Kusto principalAssignments parameters supplied for the operation.
- :type parameters: ~kusto_management_client.models.DatabasePrincipalAssignment
+ :param principal_id: The principal ID assigned to the database principal. It can be a user
+ email, application ID, or security group name.
+ :type principal_id: str
+ :param role: Database principal role.
+ :type role: str or ~kusto_management_client.models.DatabasePrincipalRole
+ :param tenant_id: The tenant id of the principal.
+ :type tenant_id: str
+ :param principal_type: Principal type.
+ :type principal_type: str or ~kusto_management_client.models.PrincipalType
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -292,7 +312,10 @@ def begin_create_or_update(
cluster_name=cluster_name,
database_name=database_name,
principal_assignment_name=principal_assignment_name,
- parameters=parameters,
+ principal_id=principal_id,
+ role=role,
+ tenant_id=tenant_id,
+ principal_type=principal_type,
cls=lambda x,y,z: x,
**kwargs
)
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_operations.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_operation_operations.py
similarity index 98%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_operations.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_operation_operations.py
index dcca09b24..014f977ca 100644
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_operations.py
+++ b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/_operation_operations.py
@@ -23,8 +23,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
-class Operations(object):
- """Operations operations.
+class OperationOperations(object):
+ """OperationOperations operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/py.typed b/src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/py.typed
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/py.typed
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/azext_kusto/vendored_sdks/kusto/py.typed
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/report.md b/src/test/scenarios/kusto/output/extflatten/src/kusto/report.md
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/report.md
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/report.md
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/setup.cfg b/src/test/scenarios/kusto/output/extflatten/src/kusto/setup.cfg
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/setup.cfg
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/setup.cfg
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/setup.py b/src/test/scenarios/kusto/output/extflatten/src/kusto/setup.py
similarity index 100%
rename from src/test/scenarios/kusto/output/extnoflatten/src/kusto/setup.py
rename to src/test/scenarios/kusto/output/extflatten/src/kusto/setup.py
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/__init__.py b/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/__init__.py
deleted file mode 100644
index fb6fa5953..000000000
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/aio/operations/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# coding=utf-8
-# --------------------------------------------------------------------------
-# 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 Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from ._clusters_operations import ClustersOperations
-from ._cluster_principal_assignments_operations import ClusterPrincipalAssignmentsOperations
-from ._databases_operations import DatabasesOperations
-from ._database_principal_assignments_operations import DatabasePrincipalAssignmentsOperations
-from ._attached_database_configurations_operations import AttachedDatabaseConfigurationsOperations
-from ._data_connections_operations import DataConnectionsOperations
-from ._operations import Operations
-
-__all__ = [
- 'ClustersOperations',
- 'ClusterPrincipalAssignmentsOperations',
- 'DatabasesOperations',
- 'DatabasePrincipalAssignmentsOperations',
- 'AttachedDatabaseConfigurationsOperations',
- 'DataConnectionsOperations',
- 'Operations',
-]
diff --git a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/__init__.py b/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/__init__.py
deleted file mode 100644
index fb6fa5953..000000000
--- a/src/test/scenarios/kusto/output/extnoflatten/src/kusto/azext_kusto/vendored_sdks/kusto/operations/__init__.py
+++ /dev/null
@@ -1,25 +0,0 @@
-# coding=utf-8
-# --------------------------------------------------------------------------
-# 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 Microsoft (R) AutoRest Code Generator.
-# Changes may cause incorrect behavior and will be lost if the code is regenerated.
-# --------------------------------------------------------------------------
-
-from ._clusters_operations import ClustersOperations
-from ._cluster_principal_assignments_operations import ClusterPrincipalAssignmentsOperations
-from ._databases_operations import DatabasesOperations
-from ._database_principal_assignments_operations import DatabasePrincipalAssignmentsOperations
-from ._attached_database_configurations_operations import AttachedDatabaseConfigurationsOperations
-from ._data_connections_operations import DataConnectionsOperations
-from ._operations import Operations
-
-__all__ = [
- 'ClustersOperations',
- 'ClusterPrincipalAssignmentsOperations',
- 'DatabasesOperations',
- 'DatabasePrincipalAssignmentsOperations',
- 'AttachedDatabaseConfigurationsOperations',
- 'DataConnectionsOperations',
- 'Operations',
-]
diff --git a/src/test/scenarios/managed-network/configuration/readme.az.md b/src/test/scenarios/managed-network/configuration/readme.az.md
index fe73ba9cf..29a62bb5b 100644
--- a/src/test/scenarios/managed-network/configuration/readme.az.md
+++ b/src/test/scenarios/managed-network/configuration/readme.az.md
@@ -51,8 +51,8 @@ cli:
param: 'managementGroups'
json: true
- where:
- type: 'ManagedNetwork'
- prop: 'properties'
+ group: 'ManagedNetworks'
+ param: 'managedNetwork'
json: true
- where:
group: managedNetworkPeeringPolicies
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/README.md b/src/test/scenarios/managed-network/output/src/managed-network/README.md
index 1eef26c74..c0b08a2d7 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/README.md
+++ b/src/test/scenarios/managed-network/output/src/managed-network/README.md
@@ -11,8 +11,8 @@ az extension add --name managed-network
#### managed-network mn ####
##### Create #####
```
-az managed-network mn create --location "eastus" \
- --properties "{\\"managementGroups\\":[{\\"id\\":\\"/providers/Microsoft.Management/managementGroups/20000000-0001-0000-0000-000000000000\\"},{\\"id\\":\\"/providers/Microsoft.Management/managementGroups/20000000-0002-0000-0000-000000000000\\"}],\\"subscriptions\\":[{\\"id\\":\\"subscriptionA\\"},{\\"id\\":\\"subscriptionB\\"}],\\"virtualNetworks\\":[{\\"id\\":\\"/subscriptions/subscriptionC/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork\\"},{\\"id\\":\\"/subscriptions/subscriptionC/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork2\\"}],\\"subnets\\":[{\\"id\\":\\"/subscriptions/subscriptionC/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork3/subnets/default\\"},{\\"id\\":\\"/subscriptions/subscriptionC/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork3/subnets/default\\"}]}" \
+az managed-network mn create \
+ --managed-network "{\\"location\\":\\"eastus\\",\\"tags\\":{},\\"managementGroups\\":[{\\"id\\":\\"/providers/Microsoft.Management/managementGroups/20000000-0001-0000-0000-000000000000\\"},{\\"id\\":\\"/providers/Microsoft.Management/managementGroups/20000000-0002-0000-0000-000000000000\\"}],\\"subscriptions\\":[{\\"id\\":\\"subscriptionA\\"},{\\"id\\":\\"subscriptionB\\"}],\\"virtualNetworks\\":[{\\"id\\":\\"/subscriptions/subscriptionC/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork\\"},{\\"id\\":\\"/subscriptions/subscriptionC/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork2\\"}],\\"subnets\\":[{\\"id\\":\\"/subscriptions/subscriptionC/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork3/subnets/default\\"},{\\"id\\":\\"/subscriptions/subscriptionC/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork3/subnets/default\\"}]}" \
--name "myManagedNetwork" --resource-group "myResourceGroup"
```
##### List #####
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/_client_factory.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/_client_factory.py
index 083aca9e4..a40b890e6 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/_client_factory.py
+++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/_client_factory.py
@@ -17,16 +17,16 @@ def cf_managed_network_cl(cli_ctx, *_):
def cf_managed_network(cli_ctx, *_):
- return cf_managed_network_cl(cli_ctx).managed_network
+ return cf_managed_network_cl(cli_ctx).managed_networks
def cf_scope_assignment(cli_ctx, *_):
- return cf_managed_network_cl(cli_ctx).scope_assignment
+ return cf_managed_network_cl(cli_ctx).scope_assignments
def cf_managed_network_group(cli_ctx, *_):
- return cf_managed_network_cl(cli_ctx).managed_network_group
+ return cf_managed_network_cl(cli_ctx).managed_network_groups
def cf_managed_network_peering_policy(cli_ctx, *_):
- return cf_managed_network_cl(cli_ctx).managed_network_peering_policy
+ return cf_managed_network_cl(cli_ctx).managed_network_peering_policies
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/_help.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/_help.py
index d04993291..29a4070df 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/_help.py
+++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/_help.py
@@ -38,16 +38,16 @@
examples:
- name: Create/Update Managed Network
text: |-
- az managed-network mn create --location "eastus" --properties "{\\"managementGroups\\":[{\\"id\\":\\"/pr\
-oviders/Microsoft.Management/managementGroups/20000000-0001-0000-0000-000000000000\\"},{\\"id\\":\\"/providers/Microsof\
-t.Management/managementGroups/20000000-0002-0000-0000-000000000000\\"}],\\"subscriptions\\":[{\\"id\\":\\"subscriptionA\
-\\"},{\\"id\\":\\"subscriptionB\\"}],\\"virtualNetworks\\":[{\\"id\\":\\"/subscriptions/subscriptionC/resourceGroups/my\
-ResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork\\"},{\\"id\\":\\"/subscriptions/subscription\
-C/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork2\\"}],\\"subnets\\":[{\\"\
-id\\":\\"/subscriptions/subscriptionC/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirt\
-ualNetwork3/subnets/default\\"},{\\"id\\":\\"/subscriptions/subscriptionC/resourceGroups/myResourceGroup/providers/Micr\
-osoft.Network/virtualNetworks/myVirtualNetwork3/subnets/default\\"}]}" --name "myManagedNetwork" --resource-group \
-"myResourceGroup"
+ az managed-network mn create --managed-network "{\\"location\\":\\"eastus\\",\\"tags\\":{},\\"management\
+Groups\\":[{\\"id\\":\\"/providers/Microsoft.Management/managementGroups/20000000-0001-0000-0000-000000000000\\"},{\\"i\
+d\\":\\"/providers/Microsoft.Management/managementGroups/20000000-0002-0000-0000-000000000000\\"}],\\"subscriptions\\":\
+[{\\"id\\":\\"subscriptionA\\"},{\\"id\\":\\"subscriptionB\\"}],\\"virtualNetworks\\":[{\\"id\\":\\"/subscriptions/subs\
+criptionC/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork\\"},{\\"id\\":\\"\
+/subscriptions/subscriptionC/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwor\
+k2\\"}],\\"subnets\\":[{\\"id\\":\\"/subscriptions/subscriptionC/resourceGroups/myResourceGroup/providers/Microsoft.Net\
+work/virtualNetworks/myVirtualNetwork3/subnets/default\\"},{\\"id\\":\\"/subscriptions/subscriptionC/resourceGroups/myR\
+esourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork3/subnets/default\\"}]}" --name \
+"myManagedNetwork" --resource-group "myResourceGroup"
"""
helps['managed-network mn update'] = """
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/_params.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/_params.py
index 73adf82b2..604a72406 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/_params.py
+++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/_params.py
@@ -43,11 +43,8 @@ def load_arguments(self, _):
c.argument('resource_group_name', resource_group_name_type)
c.argument('managed_network_name', options_list=['--name', '-n', '--managed-network-name'], type=str,
help='The name of the Managed Network.')
- c.argument('location', arg_type=get_location_type(self.cli_ctx), required=False,
- validator=get_default_location_from_resource_group)
- c.argument('tags', tags_type)
- c.argument('properties', type=validate_file_or_dict, help='The MNC properties Expected value: '
- 'json-string/@json-file.')
+ c.argument('managed_network', type=validate_file_or_dict, help='Parameters supplied to the create/update a '
+ 'Managed Network Resource Expected value: json-string/@json-file.')
with self.argument_context('managed-network mn update') as c:
c.argument('resource_group_name', resource_group_name_type)
@@ -199,7 +196,7 @@ def load_arguments(self, _):
c.argument('hub', action=AddHub, nargs='+', help='Gets or sets the hub virtual network ID')
c.argument('spokes', action=AddSpokes, nargs='+', help='Gets or sets the spokes group IDs')
c.argument('mesh', action=AddMesh, nargs='+', help='Gets or sets the mesh group IDs')
- c.ignore('managed_network_peering_policy_name', 'properties')
+ c.ignore('managed_network_peering_policy_name')
with self.argument_context('managed-network managed-network-peering-policy mesh-topology update') as c:
c.argument('resource_group_name', resource_group_name_type)
@@ -211,7 +208,7 @@ def load_arguments(self, _):
c.argument('hub', action=AddHub, nargs='+', help='Gets or sets the hub virtual network ID')
c.argument('spokes', action=AddSpokes, nargs='+', help='Gets or sets the spokes group IDs')
c.argument('mesh', action=AddMesh, nargs='+', help='Gets or sets the mesh group IDs')
- c.ignore('managed_network_peering_policy_name', 'properties')
+ c.ignore('managed_network_peering_policy_name')
with self.argument_context('managed-network managed-network-peering-policy delete') as c:
c.argument('resource_group_name', resource_group_name_type)
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/commands.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/commands.py
index 7e4929ea0..4e7292b5d 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/commands.py
+++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/commands.py
@@ -18,8 +18,8 @@ def load_command_table(self, _):
from azext_managed_network.generated._client_factory import cf_managed_network
managed_network_managed_network = CliCommandType(
- operations_tmpl='azext_managed_network.vendored_sdks.managednetwork.operations._managed_network_operations#Mana'
- 'gedNetworkOperations.{}',
+ operations_tmpl='azext_managed_network.vendored_sdks.managednetwork.operations._managed_networks_operations#Man'
+ 'agedNetworksOperations.{}',
client_factory=cf_managed_network)
with self.command_group('managed-network mn', managed_network_managed_network, client_factory=cf_managed_network,
is_experimental=True) as g:
@@ -31,8 +31,8 @@ def load_command_table(self, _):
from azext_managed_network.generated._client_factory import cf_scope_assignment
managed_network_scope_assignment = CliCommandType(
- operations_tmpl='azext_managed_network.vendored_sdks.managednetwork.operations._scope_assignment_operations#Sco'
- 'peAssignmentOperations.{}',
+ operations_tmpl='azext_managed_network.vendored_sdks.managednetwork.operations._scope_assignments_operations#Sc'
+ 'opeAssignmentsOperations.{}',
client_factory=cf_scope_assignment)
with self.command_group('managed-network mn scope-assignment', managed_network_scope_assignment,
client_factory=cf_scope_assignment) as g:
@@ -44,8 +44,8 @@ def load_command_table(self, _):
from azext_managed_network.generated._client_factory import cf_managed_network_group
managed_network_managed_network_group = CliCommandType(
- operations_tmpl='azext_managed_network.vendored_sdks.managednetwork.operations._managed_network_group_operation'
- 's#ManagedNetworkGroupOperations.{}',
+ operations_tmpl='azext_managed_network.vendored_sdks.managednetwork.operations._managed_network_groups_operatio'
+ 'ns#ManagedNetworkGroupsOperations.{}',
client_factory=cf_managed_network_group)
with self.command_group('managed-network mn group', managed_network_managed_network_group,
client_factory=cf_managed_network_group) as g:
@@ -58,8 +58,8 @@ def load_command_table(self, _):
from azext_managed_network.generated._client_factory import cf_managed_network_peering_policy
managed_network_managed_network_peering_policy = CliCommandType(
- operations_tmpl='azext_managed_network.vendored_sdks.managednetwork.operations._managed_network_peering_policy_'
- 'operations#ManagedNetworkPeeringPolicyOperations.{}',
+ operations_tmpl='azext_managed_network.vendored_sdks.managednetwork.operations._managed_network_peering_policie'
+ 's_operations#ManagedNetworkPeeringPoliciesOperations.{}',
client_factory=cf_managed_network_peering_policy)
with self.command_group('managed-network managed-network-peering-policy',
managed_network_managed_network_peering_policy,
@@ -71,12 +71,10 @@ def load_command_table(self, _):
'_topology_create', supports_no_wait=True)
g.custom_command('mesh-topology create', 'managed_network_managed_network_peering_policy_mesh_topology_create',
supports_no_wait=True)
- g.generic_update_command('hub-and-spoke-topology update', setter_arg_name='properties',
- setter_name='begin_create_or_update',
+ g.generic_update_command('hub-and-spoke-topology update', setter_name='begin_create_or_update',
custom_func_name='managed_network_managed_network_peering_policy_hub_and_spoke_topolog'
'y_update', supports_no_wait=True)
- g.generic_update_command('mesh-topology update', setter_arg_name='properties',
- setter_name='begin_create_or_update',
+ g.generic_update_command('mesh-topology update', setter_name='begin_create_or_update',
custom_func_name='managed_network_managed_network_peering_policy_mesh_topology_update',
supports_no_wait=True)
g.custom_command('delete', 'managed_network_managed_network_peering_policy_delete', supports_no_wait=True,
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/custom.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/custom.py
index 722cccda7..32aeae1f6 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/custom.py
+++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/generated/custom.py
@@ -28,23 +28,26 @@ def managed_network_mn_list(client,
def managed_network_mn_create(client,
resource_group_name,
managed_network_name,
- location,
- tags=None,
- properties=None):
+ managed_network):
return client.create_or_update(resource_group_name=resource_group_name,
managed_network_name=managed_network_name,
- location=location,
- tags=tags,
- properties=properties)
+ location=managed_network['location'],
+ tags=managed_network['tags'],
+ management_groups=managed_network['management_groups'],
+ subscriptions=managed_network['subscriptions'],
+ virtual_networks=managed_network['virtual_networks'],
+ subnets=managed_network['subnets'])
def managed_network_mn_update(client,
resource_group_name,
managed_network_name,
tags=None):
+ parameters = {}
+ parameters['tags'] = tags
return client.begin_update(resource_group_name=resource_group_name,
managed_network_name=managed_network_name,
- tags=tags)
+ parameters=parameters)
def managed_network_mn_delete(client,
@@ -78,10 +81,12 @@ def managed_network_mn_scope_assignment_create(client,
scope_assignment_name,
location,
assigned_managed_network=None):
+ parameters = {}
+ parameters['location'] = location
+ parameters['assigned_managed_network'] = assigned_managed_network
return client.create_or_update(scope=scope,
scope_assignment_name=scope_assignment_name,
- location=location,
- assigned_managed_network=assigned_managed_network)
+ parameters=parameters)
def managed_network_mn_scope_assignment_update(client,
@@ -89,10 +94,12 @@ def managed_network_mn_scope_assignment_update(client,
scope_assignment_name,
location,
assigned_managed_network=None):
+ parameters = {}
+ parameters['location'] = location
+ parameters['assigned_managed_network'] = assigned_managed_network
return client.create_or_update(scope=scope,
scope_assignment_name=scope_assignment_name,
- location=location,
- assigned_managed_network=assigned_managed_network)
+ parameters=parameters)
def managed_network_mn_scope_assignment_delete(client,
@@ -132,17 +139,19 @@ def managed_network_mn_group_create(client,
virtual_networks=None,
subnets=None,
no_wait=False):
+ managed_network_group = {}
+ managed_network_group['location'] = location
+ managed_network_group['kind'] = "Connectivity"
+ managed_network_group['management_groups'] = management_groups
+ managed_network_group['subscriptions'] = subscriptions
+ managed_network_group['virtual_networks'] = virtual_networks
+ managed_network_group['subnets'] = subnets
return sdk_no_wait(no_wait,
client.begin_create_or_update,
resource_group_name=resource_group_name,
managed_network_name=managed_network_name,
managed_network_group_name=group_name,
- location=location,
- kind="Connectivity",
- management_groups=management_groups,
- subscriptions=subscriptions,
- virtual_networks=virtual_networks,
- subnets=subnets)
+ managed_network_group=managed_network_group)
def managed_network_mn_group_update(client,
@@ -155,17 +164,19 @@ def managed_network_mn_group_update(client,
virtual_networks=None,
subnets=None,
no_wait=False):
+ managed_network_group = {}
+ managed_network_group['location'] = location
+ managed_network_group['kind'] = "Connectivity"
+ managed_network_group['management_groups'] = management_groups
+ managed_network_group['subscriptions'] = subscriptions
+ managed_network_group['virtual_networks'] = virtual_networks
+ managed_network_group['subnets'] = subnets
return sdk_no_wait(no_wait,
client.begin_create_or_update,
resource_group_name=resource_group_name,
managed_network_name=managed_network_name,
managed_network_group_name=group_name,
- location=location,
- kind="Connectivity",
- management_groups=management_groups,
- subscriptions=subscriptions,
- virtual_networks=virtual_networks,
- subnets=subnets)
+ managed_network_group=managed_network_group)
def managed_network_mn_group_delete(client,
@@ -209,18 +220,19 @@ def managed_network_managed_network_peering_policy_hub_and_spoke_topology_create
spokes=None,
mesh=None,
no_wait=False):
- properties = {}
- properties['type'] = 'HubAndSpokeTopology'
- properties['hub'] = hub
- properties['spokes'] = spokes
- properties['mesh'] = mesh
+ managed_network_policy = {}
+ managed_network_policy['location'] = location
+ managed_network_policy['properties'] = {}
+ managed_network_policy['properties']['type'] = 'HubAndSpokeTopology'
+ managed_network_policy['properties']['hub'] = hub
+ managed_network_policy['properties']['spokes'] = spokes
+ managed_network_policy['properties']['mesh'] = mesh
return sdk_no_wait(no_wait,
client.begin_create_or_update,
resource_group_name=resource_group_name,
managed_network_name=managed_network_name,
managed_network_peering_policy_name=policy_name,
- location=location,
- properties=properties)
+ managed_network_policy=managed_network_policy)
def managed_network_managed_network_peering_policy_mesh_topology_create(client,
@@ -232,18 +244,19 @@ def managed_network_managed_network_peering_policy_mesh_topology_create(client,
spokes=None,
mesh=None,
no_wait=False):
- properties = {}
- properties['type'] = 'MeshTopology'
- properties['hub'] = hub
- properties['spokes'] = spokes
- properties['mesh'] = mesh
+ managed_network_policy = {}
+ managed_network_policy['location'] = location
+ managed_network_policy['properties'] = {}
+ managed_network_policy['properties']['type'] = 'MeshTopology'
+ managed_network_policy['properties']['hub'] = hub
+ managed_network_policy['properties']['spokes'] = spokes
+ managed_network_policy['properties']['mesh'] = mesh
return sdk_no_wait(no_wait,
client.begin_create_or_update,
resource_group_name=resource_group_name,
managed_network_name=managed_network_name,
managed_network_peering_policy_name=policy_name,
- location=location,
- properties=properties)
+ managed_network_policy=managed_network_policy)
def managed_network_managed_network_peering_policy_hub_and_spoke_topology_update(instance,
@@ -255,6 +268,8 @@ def managed_network_managed_network_peering_policy_hub_and_spoke_topology_update
spokes=None,
mesh=None,
no_wait=False):
+ if location is not None:
+ instance.managed_network_policy.location = location
instance.properties.type = 'HubAndSpokeTopology'
if hub is not None:
instance.properties.hub = hub
@@ -262,7 +277,7 @@ def managed_network_managed_network_peering_policy_hub_and_spoke_topology_update
instance.properties.spokes = spokes
if mesh is not None:
instance.properties.mesh = mesh
- return instance.properties
+ return instance.undefined
def managed_network_managed_network_peering_policy_mesh_topology_update(instance,
@@ -274,6 +289,8 @@ def managed_network_managed_network_peering_policy_mesh_topology_update(instance
spokes=None,
mesh=None,
no_wait=False):
+ if location is not None:
+ instance.managed_network_policy.location = location
instance.properties.type = 'MeshTopology'
if hub is not None:
instance.properties.hub = hub
@@ -281,7 +298,7 @@ def managed_network_managed_network_peering_policy_mesh_topology_update(instance
instance.properties.spokes = spokes
if mesh is not None:
instance.properties.mesh = mesh
- return instance.properties
+ return instance.undefined
def managed_network_managed_network_peering_policy_delete(client,
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/tests/latest/example_steps.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/tests/latest/example_steps.py
index 8ba9a2e7e..ad1bf9b5d 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/tests/latest/example_steps.py
+++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/tests/latest/example_steps.py
@@ -18,16 +18,16 @@ def step_mn_create(test, rg, checks=None):
if checks is None:
checks = []
test.cmd('az managed-network mn create '
- '--location "eastus" '
- '--properties "{{\\"managementGroups\\":[{{\\"id\\":\\"/providers/Microsoft.Management/managementGroups/20'
- '000000-0001-0000-0000-000000000000\\"}},{{\\"id\\":\\"/providers/Microsoft.Management/managementGroups/20'
- '000000-0002-0000-0000-000000000000\\"}}],\\"subscriptions\\":[{{\\"id\\":\\"subscriptionA\\"}},{{\\"id\\"'
- ':\\"subscriptionB\\"}}],\\"virtualNetworks\\":[{{\\"id\\":\\"/subscriptions/{subscription_id}/resourceGro'
- 'ups/{rg}/providers/Microsoft.Network/virtualNetworks/{vn}\\"}},{{\\"id\\":\\"/subscriptions/{subscription'
- '_id}/resourceGroups/{rg}/providers/Microsoft.Network/virtualNetworks/{vn_2}\\"}}],\\"subnets\\":[{{\\"id'
- '\\":\\"/subscriptions/{subscription_id}/resourceGroups/{rg}/providers/Microsoft.Network/virtualNetworks/{'
- 'vn_3}/subnets/default\\"}},{{\\"id\\":\\"/subscriptions/{subscription_id}/resourceGroups/{rg}/providers/M'
- 'icrosoft.Network/virtualNetworks/{vn_3}/subnets/default\\"}}]}}" '
+ '--managed-network "{{\\"location\\":\\"eastus\\",\\"tags\\":{{}},\\"managementGroups\\":[{{\\"id\\":\\"/p'
+ 'roviders/Microsoft.Management/managementGroups/20000000-0001-0000-0000-000000000000\\"}},{{\\"id\\":\\"/p'
+ 'roviders/Microsoft.Management/managementGroups/20000000-0002-0000-0000-000000000000\\"}}],\\"subscription'
+ 's\\":[{{\\"id\\":\\"subscriptionA\\"}},{{\\"id\\":\\"subscriptionB\\"}}],\\"virtualNetworks\\":[{{\\"id\\'
+ '":\\"/subscriptions/{subscription_id}/resourceGroups/{rg}/providers/Microsoft.Network/virtualNetworks/{vn'
+ '}\\"}},{{\\"id\\":\\"/subscriptions/{subscription_id}/resourceGroups/{rg}/providers/Microsoft.Network/vir'
+ 'tualNetworks/{vn_2}\\"}}],\\"subnets\\":[{{\\"id\\":\\"/subscriptions/{subscription_id}/resourceGroups/{r'
+ 'g}/providers/Microsoft.Network/virtualNetworks/{vn_3}/subnets/default\\"}},{{\\"id\\":\\"/subscriptions/{'
+ 'subscription_id}/resourceGroups/{rg}/providers/Microsoft.Network/virtualNetworks/{vn_3}/subnets/default\\'
+ '"}}]}}" '
'--name "{myManagedNetwork}" '
'--resource-group "{rg}"',
checks=checks)
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/tests/latest/test_ManagedNetworks_scenario.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/tests/latest/test_ManagedNetworks_scenario.py
index 26098355b..ffa4606fb 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/tests/latest/test_ManagedNetworks_scenario.py
+++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/tests/latest/test_ManagedNetworks_scenario.py
@@ -56,7 +56,6 @@ def cleanup_scenario1(test, rg):
def call_scenario1(test, rg):
setup_scenario1(test, rg)
step_mn_create(test, rg, checks=[
- test.check("location", "eastus", case_sensitive=False),
test.check("name", "{myManagedNetwork}", case_sensitive=False),
])
step_mn_group_create(test, rg, checks=[
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/_managed_network_management_client.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/_managed_network_management_client.py
index ff64d510b..6f56c2213 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/_managed_network_management_client.py
+++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/_managed_network_management_client.py
@@ -18,27 +18,27 @@
from azure.core.credentials import TokenCredential
from ._configuration import ManagedNetworkManagementClientConfiguration
-from .operations import ManagedNetworkOperations
-from .operations import ScopeAssignmentOperations
-from .operations import ManagedNetworkGroupOperations
-from .operations import ManagedNetworkPeeringPolicyOperations
-from .operations import OperationOperations
+from .operations import ManagedNetworksOperations
+from .operations import ScopeAssignmentsOperations
+from .operations import ManagedNetworkGroupsOperations
+from .operations import ManagedNetworkPeeringPoliciesOperations
+from .operations import Operations
from . import models
class ManagedNetworkManagementClient(object):
"""The Microsoft Azure Managed Network management API provides a RESTful set of web services that interact with Microsoft Azure Networks service to programmatically view, control, change, and monitor your entire Azure network centrally and with ease.
- :ivar managed_network: ManagedNetworkOperations operations
- :vartype managed_network: managed_network_management_client.operations.ManagedNetworkOperations
- :ivar scope_assignment: ScopeAssignmentOperations operations
- :vartype scope_assignment: managed_network_management_client.operations.ScopeAssignmentOperations
- :ivar managed_network_group: ManagedNetworkGroupOperations operations
- :vartype managed_network_group: managed_network_management_client.operations.ManagedNetworkGroupOperations
- :ivar managed_network_peering_policy: ManagedNetworkPeeringPolicyOperations operations
- :vartype managed_network_peering_policy: managed_network_management_client.operations.ManagedNetworkPeeringPolicyOperations
- :ivar operation: OperationOperations operations
- :vartype operation: managed_network_management_client.operations.OperationOperations
+ :ivar managed_networks: ManagedNetworksOperations operations
+ :vartype managed_networks: managed_network_management_client.operations.ManagedNetworksOperations
+ :ivar scope_assignments: ScopeAssignmentsOperations operations
+ :vartype scope_assignments: managed_network_management_client.operations.ScopeAssignmentsOperations
+ :ivar managed_network_groups: ManagedNetworkGroupsOperations operations
+ :vartype managed_network_groups: managed_network_management_client.operations.ManagedNetworkGroupsOperations
+ :ivar managed_network_peering_policies: ManagedNetworkPeeringPoliciesOperations operations
+ :vartype managed_network_peering_policies: managed_network_management_client.operations.ManagedNetworkPeeringPoliciesOperations
+ :ivar operations: Operations operations
+ :vartype operations: managed_network_management_client.operations.Operations
:param credential: Credential needed for the client to connect to Azure.
:type credential: ~azure.core.credentials.TokenCredential
:param subscription_id: Gets subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
@@ -65,15 +65,15 @@ def __init__(
self._serialize.client_side_validation = False
self._deserialize = Deserializer(client_models)
- self.managed_network = ManagedNetworkOperations(
+ self.managed_networks = ManagedNetworksOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.scope_assignment = ScopeAssignmentOperations(
+ self.scope_assignments = ScopeAssignmentsOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.managed_network_group = ManagedNetworkGroupOperations(
+ self.managed_network_groups = ManagedNetworkGroupsOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.managed_network_peering_policy = ManagedNetworkPeeringPolicyOperations(
+ self.managed_network_peering_policies = ManagedNetworkPeeringPoliciesOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.operation = OperationOperations(
+ self.operations = Operations(
self._client, self._config, self._serialize, self._deserialize)
def close(self):
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/_managed_network_management_client.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/_managed_network_management_client.py
index 6d2d5ce40..fc88e2243 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/_managed_network_management_client.py
+++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/_managed_network_management_client.py
@@ -16,27 +16,27 @@
from azure.core.credentials_async import AsyncTokenCredential
from ._configuration import ManagedNetworkManagementClientConfiguration
-from .operations import ManagedNetworkOperations
-from .operations import ScopeAssignmentOperations
-from .operations import ManagedNetworkGroupOperations
-from .operations import ManagedNetworkPeeringPolicyOperations
-from .operations import OperationOperations
+from .operations import ManagedNetworksOperations
+from .operations import ScopeAssignmentsOperations
+from .operations import ManagedNetworkGroupsOperations
+from .operations import ManagedNetworkPeeringPoliciesOperations
+from .operations import Operations
from .. import models
class ManagedNetworkManagementClient(object):
"""The Microsoft Azure Managed Network management API provides a RESTful set of web services that interact with Microsoft Azure Networks service to programmatically view, control, change, and monitor your entire Azure network centrally and with ease.
- :ivar managed_network: ManagedNetworkOperations operations
- :vartype managed_network: managed_network_management_client.aio.operations.ManagedNetworkOperations
- :ivar scope_assignment: ScopeAssignmentOperations operations
- :vartype scope_assignment: managed_network_management_client.aio.operations.ScopeAssignmentOperations
- :ivar managed_network_group: ManagedNetworkGroupOperations operations
- :vartype managed_network_group: managed_network_management_client.aio.operations.ManagedNetworkGroupOperations
- :ivar managed_network_peering_policy: ManagedNetworkPeeringPolicyOperations operations
- :vartype managed_network_peering_policy: managed_network_management_client.aio.operations.ManagedNetworkPeeringPolicyOperations
- :ivar operation: OperationOperations operations
- :vartype operation: managed_network_management_client.aio.operations.OperationOperations
+ :ivar managed_networks: ManagedNetworksOperations operations
+ :vartype managed_networks: managed_network_management_client.aio.operations.ManagedNetworksOperations
+ :ivar scope_assignments: ScopeAssignmentsOperations operations
+ :vartype scope_assignments: managed_network_management_client.aio.operations.ScopeAssignmentsOperations
+ :ivar managed_network_groups: ManagedNetworkGroupsOperations operations
+ :vartype managed_network_groups: managed_network_management_client.aio.operations.ManagedNetworkGroupsOperations
+ :ivar managed_network_peering_policies: ManagedNetworkPeeringPoliciesOperations operations
+ :vartype managed_network_peering_policies: managed_network_management_client.aio.operations.ManagedNetworkPeeringPoliciesOperations
+ :ivar operations: Operations operations
+ :vartype operations: managed_network_management_client.aio.operations.Operations
:param credential: Credential needed for the client to connect to Azure.
:type credential: ~azure.core.credentials_async.AsyncTokenCredential
:param subscription_id: Gets subscription credentials which uniquely identify Microsoft Azure subscription. The subscription ID forms part of the URI for every service call.
@@ -62,15 +62,15 @@ def __init__(
self._serialize.client_side_validation = False
self._deserialize = Deserializer(client_models)
- self.managed_network = ManagedNetworkOperations(
+ self.managed_networks = ManagedNetworksOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.scope_assignment = ScopeAssignmentOperations(
+ self.scope_assignments = ScopeAssignmentsOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.managed_network_group = ManagedNetworkGroupOperations(
+ self.managed_network_groups = ManagedNetworkGroupsOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.managed_network_peering_policy = ManagedNetworkPeeringPolicyOperations(
+ self.managed_network_peering_policies = ManagedNetworkPeeringPoliciesOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.operation = OperationOperations(
+ self.operations = Operations(
self._client, self._config, self._serialize, self._deserialize)
async def close(self) -> None:
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/__init__.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/__init__.py
index a66156827..4f382e2b2 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/__init__.py
+++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/__init__.py
@@ -6,16 +6,16 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-from ._managed_network_operations import ManagedNetworkOperations
-from ._scope_assignment_operations import ScopeAssignmentOperations
-from ._managed_network_group_operations import ManagedNetworkGroupOperations
-from ._managed_network_peering_policy_operations import ManagedNetworkPeeringPolicyOperations
-from ._operation_operations import OperationOperations
+from ._managed_networks_operations import ManagedNetworksOperations
+from ._scope_assignments_operations import ScopeAssignmentsOperations
+from ._managed_network_groups_operations import ManagedNetworkGroupsOperations
+from ._managed_network_peering_policies_operations import ManagedNetworkPeeringPoliciesOperations
+from ._operations import Operations
__all__ = [
- 'ManagedNetworkOperations',
- 'ScopeAssignmentOperations',
- 'ManagedNetworkGroupOperations',
- 'ManagedNetworkPeeringPolicyOperations',
- 'OperationOperations',
+ 'ManagedNetworksOperations',
+ 'ScopeAssignmentsOperations',
+ 'ManagedNetworkGroupsOperations',
+ 'ManagedNetworkPeeringPoliciesOperations',
+ 'Operations',
]
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_managed_network_group_operations.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_managed_network_groups_operations.py
similarity index 91%
rename from src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_managed_network_group_operations.py
rename to src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_managed_network_groups_operations.py
index a09993eef..4167b9b26 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_managed_network_group_operations.py
+++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_managed_network_groups_operations.py
@@ -5,7 +5,7 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-from typing import Any, AsyncIterable, Callable, Dict, Generic, List, Optional, TypeVar, Union
+from typing import Any, AsyncIterable, Callable, Dict, Generic, Optional, TypeVar, Union
import warnings
from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -21,8 +21,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
-class ManagedNetworkGroupOperations:
- """ManagedNetworkGroupOperations async operations.
+class ManagedNetworkGroupsOperations:
+ """ManagedNetworkGroupsOperations async operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -112,12 +112,7 @@ async def _create_or_update_initial(
resource_group_name: str,
managed_network_name: str,
managed_network_group_name: str,
- location: Optional[str] = None,
- kind: Optional[Union[str, "models.Kind"]] = None,
- management_groups: Optional[List["models.ResourceId"]] = None,
- subscriptions: Optional[List["models.ResourceId"]] = None,
- virtual_networks: Optional[List["models.ResourceId"]] = None,
- subnets: Optional[List["models.ResourceId"]] = None,
+ managed_network_group: "models.ManagedNetworkGroup",
**kwargs
) -> "models.ManagedNetworkGroup":
cls = kwargs.pop('cls', None) # type: ClsType["models.ManagedNetworkGroup"]
@@ -125,8 +120,6 @@ async def _create_or_update_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- managed_network_group = models.ManagedNetworkGroup(location=location, kind=kind, management_groups=management_groups, subscriptions=subscriptions, virtual_networks=virtual_networks, subnets=subnets)
api_version = "2019-06-01-preview"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -179,12 +172,7 @@ async def begin_create_or_update(
resource_group_name: str,
managed_network_name: str,
managed_network_group_name: str,
- location: Optional[str] = None,
- kind: Optional[Union[str, "models.Kind"]] = None,
- management_groups: Optional[List["models.ResourceId"]] = None,
- subscriptions: Optional[List["models.ResourceId"]] = None,
- virtual_networks: Optional[List["models.ResourceId"]] = None,
- subnets: Optional[List["models.ResourceId"]] = None,
+ managed_network_group: "models.ManagedNetworkGroup",
**kwargs
) -> AsyncLROPoller["models.ManagedNetworkGroup"]:
"""The Put ManagedNetworkGroups operation creates or updates a Managed Network Group resource.
@@ -195,18 +183,9 @@ async def begin_create_or_update(
:type managed_network_name: str
:param managed_network_group_name: The name of the Managed Network Group.
:type managed_network_group_name: str
- :param location: The geo-location where the resource lives.
- :type location: str
- :param kind: Responsibility role under which this Managed Network Group will be created.
- :type kind: str or ~managed_network_management_client.models.Kind
- :param management_groups: The collection of management groups covered by the Managed Network.
- :type management_groups: list[~managed_network_management_client.models.ResourceId]
- :param subscriptions: The collection of subscriptions covered by the Managed Network.
- :type subscriptions: list[~managed_network_management_client.models.ResourceId]
- :param virtual_networks: The collection of virtual nets covered by the Managed Network.
- :type virtual_networks: list[~managed_network_management_client.models.ResourceId]
- :param subnets: The collection of subnets covered by the Managed Network.
- :type subnets: list[~managed_network_management_client.models.ResourceId]
+ :param managed_network_group: Parameters supplied to the create/update a Managed Network Group
+ resource.
+ :type managed_network_group: ~managed_network_management_client.models.ManagedNetworkGroup
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -229,12 +208,7 @@ async def begin_create_or_update(
resource_group_name=resource_group_name,
managed_network_name=managed_network_name,
managed_network_group_name=managed_network_group_name,
- location=location,
- kind=kind,
- management_groups=management_groups,
- subscriptions=subscriptions,
- virtual_networks=virtual_networks,
- subnets=subnets,
+ managed_network_group=managed_network_group,
cls=lambda x,y,z: x,
**kwargs
)
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_managed_network_peering_policy_operations.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_managed_network_peering_policies_operations.py
similarity index 96%
rename from src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_managed_network_peering_policy_operations.py
rename to src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_managed_network_peering_policies_operations.py
index e9f197433..179410345 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_managed_network_peering_policy_operations.py
+++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_managed_network_peering_policies_operations.py
@@ -21,8 +21,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
-class ManagedNetworkPeeringPolicyOperations:
- """ManagedNetworkPeeringPolicyOperations async operations.
+class ManagedNetworkPeeringPoliciesOperations:
+ """ManagedNetworkPeeringPoliciesOperations async operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -112,8 +112,7 @@ async def _create_or_update_initial(
resource_group_name: str,
managed_network_name: str,
managed_network_peering_policy_name: str,
- location: Optional[str] = None,
- properties: Optional["models.ManagedNetworkPeeringPolicyProperties"] = None,
+ managed_network_policy: "models.ManagedNetworkPeeringPolicy",
**kwargs
) -> "models.ManagedNetworkPeeringPolicy":
cls = kwargs.pop('cls', None) # type: ClsType["models.ManagedNetworkPeeringPolicy"]
@@ -121,8 +120,6 @@ async def _create_or_update_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- managed_network_policy = models.ManagedNetworkPeeringPolicy(location=location, properties=properties)
api_version = "2019-06-01-preview"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -175,8 +172,7 @@ async def begin_create_or_update(
resource_group_name: str,
managed_network_name: str,
managed_network_peering_policy_name: str,
- location: Optional[str] = None,
- properties: Optional["models.ManagedNetworkPeeringPolicyProperties"] = None,
+ managed_network_policy: "models.ManagedNetworkPeeringPolicy",
**kwargs
) -> AsyncLROPoller["models.ManagedNetworkPeeringPolicy"]:
"""The Put ManagedNetworkPeeringPolicies operation creates/updates a new Managed Network Peering
@@ -188,10 +184,9 @@ async def begin_create_or_update(
:type managed_network_name: str
:param managed_network_peering_policy_name: The name of the Managed Network Peering Policy.
:type managed_network_peering_policy_name: str
- :param location: The geo-location where the resource lives.
- :type location: str
- :param properties: Gets or sets the properties of a Managed Network Policy.
- :type properties: ~managed_network_management_client.models.ManagedNetworkPeeringPolicyProperties
+ :param managed_network_policy: Parameters supplied to create/update a Managed Network Peering
+ Policy.
+ :type managed_network_policy: ~managed_network_management_client.models.ManagedNetworkPeeringPolicy
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -214,8 +209,7 @@ async def begin_create_or_update(
resource_group_name=resource_group_name,
managed_network_name=managed_network_name,
managed_network_peering_policy_name=managed_network_peering_policy_name,
- location=location,
- properties=properties,
+ managed_network_policy=managed_network_policy,
cls=lambda x,y,z: x,
**kwargs
)
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_managed_network_operations.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_managed_networks_operations.py
similarity index 94%
rename from src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_managed_network_operations.py
rename to src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_managed_networks_operations.py
index 91c45e703..d0ac78480 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_managed_network_operations.py
+++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_managed_networks_operations.py
@@ -5,7 +5,7 @@
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-from typing import Any, AsyncIterable, Callable, Dict, Generic, Optional, TypeVar, Union
+from typing import Any, AsyncIterable, Callable, Dict, Generic, List, Optional, TypeVar, Union
import warnings
from azure.core.async_paging import AsyncItemPaged, AsyncList
@@ -21,8 +21,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
-class ManagedNetworkOperations:
- """ManagedNetworkOperations async operations.
+class ManagedNetworksOperations:
+ """ManagedNetworksOperations async operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -109,7 +109,10 @@ async def create_or_update(
managed_network_name: str,
location: Optional[str] = None,
tags: Optional[Dict[str, str]] = None,
- properties: Optional["models.ManagedNetworkProperties"] = None,
+ management_groups: Optional[List["models.ResourceId"]] = None,
+ subscriptions: Optional[List["models.ResourceId"]] = None,
+ virtual_networks: Optional[List["models.ResourceId"]] = None,
+ subnets: Optional[List["models.ResourceId"]] = None,
**kwargs
) -> "models.ManagedNetwork":
"""The Put ManagedNetworks operation creates/updates a Managed Network Resource, specified by
@@ -123,8 +126,14 @@ async def create_or_update(
:type location: str
:param tags: Resource tags.
:type tags: dict[str, str]
- :param properties: The MNC properties.
- :type properties: ~managed_network_management_client.models.ManagedNetworkProperties
+ :param management_groups: The collection of management groups covered by the Managed Network.
+ :type management_groups: list[~managed_network_management_client.models.ResourceId]
+ :param subscriptions: The collection of subscriptions covered by the Managed Network.
+ :type subscriptions: list[~managed_network_management_client.models.ResourceId]
+ :param virtual_networks: The collection of virtual nets covered by the Managed Network.
+ :type virtual_networks: list[~managed_network_management_client.models.ResourceId]
+ :param subnets: The collection of subnets covered by the Managed Network.
+ :type subnets: list[~managed_network_management_client.models.ResourceId]
:keyword callable cls: A custom type or function that will be passed the direct response
:return: ManagedNetwork, or the result of cls(response)
:rtype: ~managed_network_management_client.models.ManagedNetwork
@@ -136,7 +145,7 @@ async def create_or_update(
}
error_map.update(kwargs.pop('error_map', {}))
- _managed_network = models.ManagedNetwork(location=location, tags=tags, properties=properties)
+ managed_network = models.ManagedNetwork(location=location, tags=tags, management_groups=management_groups, subscriptions=subscriptions, virtual_networks=virtual_networks, subnets=subnets)
api_version = "2019-06-01-preview"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -160,7 +169,7 @@ async def create_or_update(
header_parameters['Accept'] = self._serialize.header("accept", accept, 'str')
body_content_kwargs = {} # type: Dict[str, Any]
- body_content = self._serialize.body(_managed_network, 'ManagedNetwork')
+ body_content = self._serialize.body(managed_network, 'ManagedNetwork')
body_content_kwargs['content'] = body_content
request = self._client.put(url, query_parameters, header_parameters, **body_content_kwargs)
pipeline_response = await self._client._pipeline.run(request, stream=False, **kwargs)
@@ -297,7 +306,7 @@ async def _update_initial(
self,
resource_group_name: str,
managed_network_name: str,
- tags: Optional[Dict[str, str]] = None,
+ parameters: "models.ManagedNetworkUpdate",
**kwargs
) -> "models.ManagedNetwork":
cls = kwargs.pop('cls', None) # type: ClsType["models.ManagedNetwork"]
@@ -305,8 +314,6 @@ async def _update_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- parameters = models.ManagedNetworkUpdate(tags=tags)
api_version = "2019-06-01-preview"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -357,7 +364,7 @@ async def begin_update(
self,
resource_group_name: str,
managed_network_name: str,
- tags: Optional[Dict[str, str]] = None,
+ parameters: "models.ManagedNetworkUpdate",
**kwargs
) -> AsyncLROPoller["models.ManagedNetwork"]:
"""Updates the specified Managed Network resource tags.
@@ -366,8 +373,8 @@ async def begin_update(
:type resource_group_name: str
:param managed_network_name: The name of the Managed Network.
:type managed_network_name: str
- :param tags: Resource tags.
- :type tags: dict[str, str]
+ :param parameters: Parameters supplied to update application gateway tags and/or scope.
+ :type parameters: ~managed_network_management_client.models.ManagedNetworkUpdate
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -389,7 +396,7 @@ async def begin_update(
raw_result = await self._update_initial(
resource_group_name=resource_group_name,
managed_network_name=managed_network_name,
- tags=tags,
+ parameters=parameters,
cls=lambda x,y,z: x,
**kwargs
)
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_operation_operations.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_operations.py
similarity index 98%
rename from src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_operation_operations.py
rename to src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_operations.py
index 3ad6e8bf0..162696ae7 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_operation_operations.py
+++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_operations.py
@@ -19,8 +19,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
-class OperationOperations:
- """OperationOperations async operations.
+class Operations:
+ """Operations async operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_scope_assignment_operations.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_scope_assignments_operations.py
similarity index 96%
rename from src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_scope_assignment_operations.py
rename to src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_scope_assignments_operations.py
index ac08ceac5..9e10317da 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_scope_assignment_operations.py
+++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/aio/operations/_scope_assignments_operations.py
@@ -19,8 +19,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
-class ScopeAssignmentOperations:
- """ScopeAssignmentOperations async operations.
+class ScopeAssignmentsOperations:
+ """ScopeAssignmentsOperations async operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -103,8 +103,7 @@ async def create_or_update(
self,
scope: str,
scope_assignment_name: str,
- location: Optional[str] = None,
- assigned_managed_network: Optional[str] = None,
+ parameters: "models.ScopeAssignment",
**kwargs
) -> "models.ScopeAssignment":
"""Creates a scope assignment.
@@ -117,10 +116,9 @@ async def create_or_update(
:type scope: str
:param scope_assignment_name: The name of the scope assignment to create.
:type scope_assignment_name: str
- :param location: The geo-location where the resource lives.
- :type location: str
- :param assigned_managed_network: The managed network ID with scope will be assigned to.
- :type assigned_managed_network: str
+ :param parameters: Parameters supplied to the specify which Managed Network this scope is being
+ assigned.
+ :type parameters: ~managed_network_management_client.models.ScopeAssignment
:keyword callable cls: A custom type or function that will be passed the direct response
:return: ScopeAssignment, or the result of cls(response)
:rtype: ~managed_network_management_client.models.ScopeAssignment
@@ -131,8 +129,6 @@ async def create_or_update(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- parameters = models.ScopeAssignment(location=location, assigned_managed_network=assigned_managed_network)
api_version = "2019-06-01-preview"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/models/_models.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/models/_models.py
index 702e8b45a..133773afe 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/models/_models.py
+++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/models/_models.py
@@ -274,14 +274,34 @@ class ManagedNetwork(TrackedResource):
:type location: str
:param tags: A set of tags. Resource tags.
:type tags: dict[str, str]
- :param properties: The MNC properties.
- :type properties: ~managed_network_management_client.models.ManagedNetworkProperties
+ :ivar provisioning_state: Provisioning state of the ManagedNetwork resource. Possible values
+ include: "Updating", "Deleting", "Failed", "Succeeded".
+ :vartype provisioning_state: str or ~managed_network_management_client.models.ProvisioningState
+ :ivar etag: A unique read-only string that changes whenever the resource is updated.
+ :vartype etag: str
+ :ivar groups: The collection of connectivity related Managed Network Groups within the Managed
+ Network.
+ :vartype groups: list[~managed_network_management_client.models.ManagedNetworkGroup]
+ :ivar peerings: The collection of Managed Network Peering Policies within the Managed Network.
+ :vartype peerings: list[~managed_network_management_client.models.ManagedNetworkPeeringPolicy]
+ :param management_groups: The collection of management groups covered by the Managed Network.
+ :type management_groups: list[~managed_network_management_client.models.ResourceId]
+ :param subscriptions: The collection of subscriptions covered by the Managed Network.
+ :type subscriptions: list[~managed_network_management_client.models.ResourceId]
+ :param virtual_networks: The collection of virtual nets covered by the Managed Network.
+ :type virtual_networks: list[~managed_network_management_client.models.ResourceId]
+ :param subnets: The collection of subnets covered by the Managed Network.
+ :type subnets: list[~managed_network_management_client.models.ResourceId]
"""
_validation = {
'id': {'readonly': True},
'name': {'readonly': True},
'type': {'readonly': True},
+ 'provisioning_state': {'readonly': True},
+ 'etag': {'readonly': True},
+ 'groups': {'readonly': True},
+ 'peerings': {'readonly': True},
}
_attribute_map = {
@@ -290,7 +310,14 @@ class ManagedNetwork(TrackedResource):
'type': {'key': 'type', 'type': 'str'},
'location': {'key': 'location', 'type': 'str'},
'tags': {'key': 'tags', 'type': '{str}'},
- 'properties': {'key': 'properties', 'type': 'ManagedNetworkProperties'},
+ 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+ 'etag': {'key': 'properties.etag', 'type': 'str'},
+ 'groups': {'key': 'properties.connectivity.groups', 'type': '[ManagedNetworkGroup]'},
+ 'peerings': {'key': 'properties.connectivity.peerings', 'type': '[ManagedNetworkPeeringPolicy]'},
+ 'management_groups': {'key': 'properties.scope.managementGroups', 'type': '[ResourceId]'},
+ 'subscriptions': {'key': 'properties.scope.subscriptions', 'type': '[ResourceId]'},
+ 'virtual_networks': {'key': 'properties.scope.virtualNetworks', 'type': '[ResourceId]'},
+ 'subnets': {'key': 'properties.scope.subnets', 'type': '[ResourceId]'},
}
def __init__(
@@ -298,7 +325,14 @@ def __init__(
**kwargs
):
super(ManagedNetwork, self).__init__(**kwargs)
- self.properties = kwargs.get('properties', None)
+ self.provisioning_state = None
+ self.etag = None
+ self.groups = None
+ self.peerings = None
+ self.management_groups = kwargs.get('management_groups', None)
+ self.subscriptions = kwargs.get('subscriptions', None)
+ self.virtual_networks = kwargs.get('virtual_networks', None)
+ self.subnets = kwargs.get('subnets', None)
class ManagedNetworkGroup(Resource):
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/models/_models_py3.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/models/_models_py3.py
index 8188a8f94..1e806aff7 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/models/_models_py3.py
+++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/models/_models_py3.py
@@ -291,14 +291,34 @@ class ManagedNetwork(TrackedResource):
:type location: str
:param tags: A set of tags. Resource tags.
:type tags: dict[str, str]
- :param properties: The MNC properties.
- :type properties: ~managed_network_management_client.models.ManagedNetworkProperties
+ :ivar provisioning_state: Provisioning state of the ManagedNetwork resource. Possible values
+ include: "Updating", "Deleting", "Failed", "Succeeded".
+ :vartype provisioning_state: str or ~managed_network_management_client.models.ProvisioningState
+ :ivar etag: A unique read-only string that changes whenever the resource is updated.
+ :vartype etag: str
+ :ivar groups: The collection of connectivity related Managed Network Groups within the Managed
+ Network.
+ :vartype groups: list[~managed_network_management_client.models.ManagedNetworkGroup]
+ :ivar peerings: The collection of Managed Network Peering Policies within the Managed Network.
+ :vartype peerings: list[~managed_network_management_client.models.ManagedNetworkPeeringPolicy]
+ :param management_groups: The collection of management groups covered by the Managed Network.
+ :type management_groups: list[~managed_network_management_client.models.ResourceId]
+ :param subscriptions: The collection of subscriptions covered by the Managed Network.
+ :type subscriptions: list[~managed_network_management_client.models.ResourceId]
+ :param virtual_networks: The collection of virtual nets covered by the Managed Network.
+ :type virtual_networks: list[~managed_network_management_client.models.ResourceId]
+ :param subnets: The collection of subnets covered by the Managed Network.
+ :type subnets: list[~managed_network_management_client.models.ResourceId]
"""
_validation = {
'id': {'readonly': True},
'name': {'readonly': True},
'type': {'readonly': True},
+ 'provisioning_state': {'readonly': True},
+ 'etag': {'readonly': True},
+ 'groups': {'readonly': True},
+ 'peerings': {'readonly': True},
}
_attribute_map = {
@@ -307,7 +327,14 @@ class ManagedNetwork(TrackedResource):
'type': {'key': 'type', 'type': 'str'},
'location': {'key': 'location', 'type': 'str'},
'tags': {'key': 'tags', 'type': '{str}'},
- 'properties': {'key': 'properties', 'type': 'ManagedNetworkProperties'},
+ 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
+ 'etag': {'key': 'properties.etag', 'type': 'str'},
+ 'groups': {'key': 'properties.connectivity.groups', 'type': '[ManagedNetworkGroup]'},
+ 'peerings': {'key': 'properties.connectivity.peerings', 'type': '[ManagedNetworkPeeringPolicy]'},
+ 'management_groups': {'key': 'properties.scope.managementGroups', 'type': '[ResourceId]'},
+ 'subscriptions': {'key': 'properties.scope.subscriptions', 'type': '[ResourceId]'},
+ 'virtual_networks': {'key': 'properties.scope.virtualNetworks', 'type': '[ResourceId]'},
+ 'subnets': {'key': 'properties.scope.subnets', 'type': '[ResourceId]'},
}
def __init__(
@@ -315,11 +342,21 @@ def __init__(
*,
location: Optional[str] = None,
tags: Optional[Dict[str, str]] = None,
- properties: Optional["ManagedNetworkProperties"] = None,
+ management_groups: Optional[List["ResourceId"]] = None,
+ subscriptions: Optional[List["ResourceId"]] = None,
+ virtual_networks: Optional[List["ResourceId"]] = None,
+ subnets: Optional[List["ResourceId"]] = None,
**kwargs
):
super(ManagedNetwork, self).__init__(location=location, tags=tags, **kwargs)
- self.properties = properties
+ self.provisioning_state = None
+ self.etag = None
+ self.groups = None
+ self.peerings = None
+ self.management_groups = management_groups
+ self.subscriptions = subscriptions
+ self.virtual_networks = virtual_networks
+ self.subnets = subnets
class ManagedNetworkGroup(Resource):
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/__init__.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/__init__.py
index a66156827..4f382e2b2 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/__init__.py
+++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/__init__.py
@@ -6,16 +6,16 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-from ._managed_network_operations import ManagedNetworkOperations
-from ._scope_assignment_operations import ScopeAssignmentOperations
-from ._managed_network_group_operations import ManagedNetworkGroupOperations
-from ._managed_network_peering_policy_operations import ManagedNetworkPeeringPolicyOperations
-from ._operation_operations import OperationOperations
+from ._managed_networks_operations import ManagedNetworksOperations
+from ._scope_assignments_operations import ScopeAssignmentsOperations
+from ._managed_network_groups_operations import ManagedNetworkGroupsOperations
+from ._managed_network_peering_policies_operations import ManagedNetworkPeeringPoliciesOperations
+from ._operations import Operations
__all__ = [
- 'ManagedNetworkOperations',
- 'ScopeAssignmentOperations',
- 'ManagedNetworkGroupOperations',
- 'ManagedNetworkPeeringPolicyOperations',
- 'OperationOperations',
+ 'ManagedNetworksOperations',
+ 'ScopeAssignmentsOperations',
+ 'ManagedNetworkGroupsOperations',
+ 'ManagedNetworkPeeringPoliciesOperations',
+ 'Operations',
]
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_group_operations.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_groups_operations.py
similarity index 90%
rename from src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_group_operations.py
rename to src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_groups_operations.py
index 7e0a91e54..6bba23b54 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_group_operations.py
+++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_groups_operations.py
@@ -20,13 +20,13 @@
if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
- from typing import Any, Callable, Dict, Generic, Iterable, List, Optional, TypeVar, Union
+ from typing import Any, Callable, Dict, Generic, Iterable, Optional, TypeVar, Union
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
-class ManagedNetworkGroupOperations(object):
- """ManagedNetworkGroupOperations operations.
+class ManagedNetworkGroupsOperations(object):
+ """ManagedNetworkGroupsOperations operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -117,12 +117,7 @@ def _create_or_update_initial(
resource_group_name, # type: str
managed_network_name, # type: str
managed_network_group_name, # type: str
- location=None, # type: Optional[str]
- kind=None, # type: Optional[Union[str, "models.Kind"]]
- management_groups=None, # type: Optional[List["models.ResourceId"]]
- subscriptions=None, # type: Optional[List["models.ResourceId"]]
- virtual_networks=None, # type: Optional[List["models.ResourceId"]]
- subnets=None, # type: Optional[List["models.ResourceId"]]
+ managed_network_group, # type: "models.ManagedNetworkGroup"
**kwargs # type: Any
):
# type: (...) -> "models.ManagedNetworkGroup"
@@ -131,8 +126,6 @@ def _create_or_update_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- managed_network_group = models.ManagedNetworkGroup(location=location, kind=kind, management_groups=management_groups, subscriptions=subscriptions, virtual_networks=virtual_networks, subnets=subnets)
api_version = "2019-06-01-preview"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -185,12 +178,7 @@ def begin_create_or_update(
resource_group_name, # type: str
managed_network_name, # type: str
managed_network_group_name, # type: str
- location=None, # type: Optional[str]
- kind=None, # type: Optional[Union[str, "models.Kind"]]
- management_groups=None, # type: Optional[List["models.ResourceId"]]
- subscriptions=None, # type: Optional[List["models.ResourceId"]]
- virtual_networks=None, # type: Optional[List["models.ResourceId"]]
- subnets=None, # type: Optional[List["models.ResourceId"]]
+ managed_network_group, # type: "models.ManagedNetworkGroup"
**kwargs # type: Any
):
# type: (...) -> LROPoller["models.ManagedNetworkGroup"]
@@ -202,18 +190,9 @@ def begin_create_or_update(
:type managed_network_name: str
:param managed_network_group_name: The name of the Managed Network Group.
:type managed_network_group_name: str
- :param location: The geo-location where the resource lives.
- :type location: str
- :param kind: Responsibility role under which this Managed Network Group will be created.
- :type kind: str or ~managed_network_management_client.models.Kind
- :param management_groups: The collection of management groups covered by the Managed Network.
- :type management_groups: list[~managed_network_management_client.models.ResourceId]
- :param subscriptions: The collection of subscriptions covered by the Managed Network.
- :type subscriptions: list[~managed_network_management_client.models.ResourceId]
- :param virtual_networks: The collection of virtual nets covered by the Managed Network.
- :type virtual_networks: list[~managed_network_management_client.models.ResourceId]
- :param subnets: The collection of subnets covered by the Managed Network.
- :type subnets: list[~managed_network_management_client.models.ResourceId]
+ :param managed_network_group: Parameters supplied to the create/update a Managed Network Group
+ resource.
+ :type managed_network_group: ~managed_network_management_client.models.ManagedNetworkGroup
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -236,12 +215,7 @@ def begin_create_or_update(
resource_group_name=resource_group_name,
managed_network_name=managed_network_name,
managed_network_group_name=managed_network_group_name,
- location=location,
- kind=kind,
- management_groups=management_groups,
- subscriptions=subscriptions,
- virtual_networks=virtual_networks,
- subnets=subnets,
+ managed_network_group=managed_network_group,
cls=lambda x,y,z: x,
**kwargs
)
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_peering_policy_operations.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_peering_policies_operations.py
similarity index 96%
rename from src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_peering_policy_operations.py
rename to src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_peering_policies_operations.py
index 678a927d0..e8bb8dd5b 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_peering_policy_operations.py
+++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_peering_policies_operations.py
@@ -25,8 +25,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
-class ManagedNetworkPeeringPolicyOperations(object):
- """ManagedNetworkPeeringPolicyOperations operations.
+class ManagedNetworkPeeringPoliciesOperations(object):
+ """ManagedNetworkPeeringPoliciesOperations operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -117,8 +117,7 @@ def _create_or_update_initial(
resource_group_name, # type: str
managed_network_name, # type: str
managed_network_peering_policy_name, # type: str
- location=None, # type: Optional[str]
- properties=None, # type: Optional["models.ManagedNetworkPeeringPolicyProperties"]
+ managed_network_policy, # type: "models.ManagedNetworkPeeringPolicy"
**kwargs # type: Any
):
# type: (...) -> "models.ManagedNetworkPeeringPolicy"
@@ -127,8 +126,6 @@ def _create_or_update_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- managed_network_policy = models.ManagedNetworkPeeringPolicy(location=location, properties=properties)
api_version = "2019-06-01-preview"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -181,8 +178,7 @@ def begin_create_or_update(
resource_group_name, # type: str
managed_network_name, # type: str
managed_network_peering_policy_name, # type: str
- location=None, # type: Optional[str]
- properties=None, # type: Optional["models.ManagedNetworkPeeringPolicyProperties"]
+ managed_network_policy, # type: "models.ManagedNetworkPeeringPolicy"
**kwargs # type: Any
):
# type: (...) -> LROPoller["models.ManagedNetworkPeeringPolicy"]
@@ -195,10 +191,9 @@ def begin_create_or_update(
:type managed_network_name: str
:param managed_network_peering_policy_name: The name of the Managed Network Peering Policy.
:type managed_network_peering_policy_name: str
- :param location: The geo-location where the resource lives.
- :type location: str
- :param properties: Gets or sets the properties of a Managed Network Policy.
- :type properties: ~managed_network_management_client.models.ManagedNetworkPeeringPolicyProperties
+ :param managed_network_policy: Parameters supplied to create/update a Managed Network Peering
+ Policy.
+ :type managed_network_policy: ~managed_network_management_client.models.ManagedNetworkPeeringPolicy
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -221,8 +216,7 @@ def begin_create_or_update(
resource_group_name=resource_group_name,
managed_network_name=managed_network_name,
managed_network_peering_policy_name=managed_network_peering_policy_name,
- location=location,
- properties=properties,
+ managed_network_policy=managed_network_policy,
cls=lambda x,y,z: x,
**kwargs
)
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_operations.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_networks_operations.py
similarity index 94%
rename from src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_operations.py
rename to src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_networks_operations.py
index 70c69b261..6c55a38b1 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_network_operations.py
+++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_managed_networks_operations.py
@@ -20,13 +20,13 @@
if TYPE_CHECKING:
# pylint: disable=unused-import,ungrouped-imports
- from typing import Any, Callable, Dict, Generic, Iterable, Optional, TypeVar, Union
+ from typing import Any, Callable, Dict, Generic, Iterable, List, Optional, TypeVar, Union
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
-class ManagedNetworkOperations(object):
- """ManagedNetworkOperations operations.
+class ManagedNetworksOperations(object):
+ """ManagedNetworksOperations operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -114,7 +114,10 @@ def create_or_update(
managed_network_name, # type: str
location=None, # type: Optional[str]
tags=None, # type: Optional[Dict[str, str]]
- properties=None, # type: Optional["models.ManagedNetworkProperties"]
+ management_groups=None, # type: Optional[List["models.ResourceId"]]
+ subscriptions=None, # type: Optional[List["models.ResourceId"]]
+ virtual_networks=None, # type: Optional[List["models.ResourceId"]]
+ subnets=None, # type: Optional[List["models.ResourceId"]]
**kwargs # type: Any
):
# type: (...) -> "models.ManagedNetwork"
@@ -129,8 +132,14 @@ def create_or_update(
:type location: str
:param tags: Resource tags.
:type tags: dict[str, str]
- :param properties: The MNC properties.
- :type properties: ~managed_network_management_client.models.ManagedNetworkProperties
+ :param management_groups: The collection of management groups covered by the Managed Network.
+ :type management_groups: list[~managed_network_management_client.models.ResourceId]
+ :param subscriptions: The collection of subscriptions covered by the Managed Network.
+ :type subscriptions: list[~managed_network_management_client.models.ResourceId]
+ :param virtual_networks: The collection of virtual nets covered by the Managed Network.
+ :type virtual_networks: list[~managed_network_management_client.models.ResourceId]
+ :param subnets: The collection of subnets covered by the Managed Network.
+ :type subnets: list[~managed_network_management_client.models.ResourceId]
:keyword callable cls: A custom type or function that will be passed the direct response
:return: ManagedNetwork, or the result of cls(response)
:rtype: ~managed_network_management_client.models.ManagedNetwork
@@ -142,7 +151,7 @@ def create_or_update(
}
error_map.update(kwargs.pop('error_map', {}))
- _managed_network = models.ManagedNetwork(location=location, tags=tags, properties=properties)
+ managed_network = models.ManagedNetwork(location=location, tags=tags, management_groups=management_groups, subscriptions=subscriptions, virtual_networks=virtual_networks, subnets=subnets)
api_version = "2019-06-01-preview"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -166,7 +175,7 @@ def create_or_update(
header_parameters['Accept'] = self._serialize.header("accept", accept, 'str')
body_content_kwargs = {} # type: Dict[str, Any]
- body_content = self._serialize.body(_managed_network, 'ManagedNetwork')
+ body_content = self._serialize.body(managed_network, 'ManagedNetwork')
body_content_kwargs['content'] = body_content
request = self._client.put(url, query_parameters, header_parameters, **body_content_kwargs)
pipeline_response = self._client._pipeline.run(request, stream=False, **kwargs)
@@ -305,7 +314,7 @@ def _update_initial(
self,
resource_group_name, # type: str
managed_network_name, # type: str
- tags=None, # type: Optional[Dict[str, str]]
+ parameters, # type: "models.ManagedNetworkUpdate"
**kwargs # type: Any
):
# type: (...) -> "models.ManagedNetwork"
@@ -314,8 +323,6 @@ def _update_initial(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- parameters = models.ManagedNetworkUpdate(tags=tags)
api_version = "2019-06-01-preview"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -366,7 +373,7 @@ def begin_update(
self,
resource_group_name, # type: str
managed_network_name, # type: str
- tags=None, # type: Optional[Dict[str, str]]
+ parameters, # type: "models.ManagedNetworkUpdate"
**kwargs # type: Any
):
# type: (...) -> LROPoller["models.ManagedNetwork"]
@@ -376,8 +383,8 @@ def begin_update(
:type resource_group_name: str
:param managed_network_name: The name of the Managed Network.
:type managed_network_name: str
- :param tags: Resource tags.
- :type tags: dict[str, str]
+ :param parameters: Parameters supplied to update application gateway tags and/or scope.
+ :type parameters: ~managed_network_management_client.models.ManagedNetworkUpdate
:keyword callable cls: A custom type or function that will be passed the direct response
:keyword str continuation_token: A continuation token to restart a poller from a saved state.
:keyword polling: True for ARMPolling, False for no polling, or a
@@ -399,7 +406,7 @@ def begin_update(
raw_result = self._update_initial(
resource_group_name=resource_group_name,
managed_network_name=managed_network_name,
- tags=tags,
+ parameters=parameters,
cls=lambda x,y,z: x,
**kwargs
)
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_operation_operations.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_operations.py
similarity index 98%
rename from src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_operation_operations.py
rename to src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_operations.py
index b6a8823f8..f06d63354 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_operation_operations.py
+++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_operations.py
@@ -23,8 +23,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
-class OperationOperations(object):
- """OperationOperations operations.
+class Operations(object):
+ """Operations operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_scope_assignment_operations.py b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_scope_assignments_operations.py
similarity index 96%
rename from src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_scope_assignment_operations.py
rename to src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_scope_assignments_operations.py
index 8f3166f27..d5c09a147 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_scope_assignment_operations.py
+++ b/src/test/scenarios/managed-network/output/src/managed-network/azext_managed_network/vendored_sdks/managednetwork/operations/_scope_assignments_operations.py
@@ -23,8 +23,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
-class ScopeAssignmentOperations(object):
- """ScopeAssignmentOperations operations.
+class ScopeAssignmentsOperations(object):
+ """ScopeAssignmentsOperations operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -108,8 +108,7 @@ def create_or_update(
self,
scope, # type: str
scope_assignment_name, # type: str
- location=None, # type: Optional[str]
- assigned_managed_network=None, # type: Optional[str]
+ parameters, # type: "models.ScopeAssignment"
**kwargs # type: Any
):
# type: (...) -> "models.ScopeAssignment"
@@ -123,10 +122,9 @@ def create_or_update(
:type scope: str
:param scope_assignment_name: The name of the scope assignment to create.
:type scope_assignment_name: str
- :param location: The geo-location where the resource lives.
- :type location: str
- :param assigned_managed_network: The managed network ID with scope will be assigned to.
- :type assigned_managed_network: str
+ :param parameters: Parameters supplied to the specify which Managed Network this scope is being
+ assigned.
+ :type parameters: ~managed_network_management_client.models.ScopeAssignment
:keyword callable cls: A custom type or function that will be passed the direct response
:return: ScopeAssignment, or the result of cls(response)
:rtype: ~managed_network_management_client.models.ScopeAssignment
@@ -137,8 +135,6 @@ def create_or_update(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- parameters = models.ScopeAssignment(location=location, assigned_managed_network=assigned_managed_network)
api_version = "2019-06-01-preview"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
diff --git a/src/test/scenarios/managed-network/output/src/managed-network/report.md b/src/test/scenarios/managed-network/output/src/managed-network/report.md
index 119630147..564456f4f 100644
--- a/src/test/scenarios/managed-network/output/src/managed-network/report.md
+++ b/src/test/scenarios/managed-network/output/src/managed-network/report.md
@@ -196,24 +196,23 @@ az managed-network mn list
##### Example
```
-az managed-network mn create --location "eastus" --properties "{\\"managementGroups\\":[{\\"id\\":\\"/providers/Microso\
-ft.Management/managementGroups/20000000-0001-0000-0000-000000000000\\"},{\\"id\\":\\"/providers/Microsoft.Management/ma\
-nagementGroups/20000000-0002-0000-0000-000000000000\\"}],\\"subscriptions\\":[{\\"id\\":\\"subscriptionA\\"},{\\"id\\":\
-\\"subscriptionB\\"}],\\"virtualNetworks\\":[{\\"id\\":\\"/subscriptions/subscriptionC/resourceGroups/myResourceGroup/p\
-roviders/Microsoft.Network/virtualNetworks/myVirtualNetwork\\"},{\\"id\\":\\"/subscriptions/subscriptionC/resourceGroup\
-s/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork2\\"}],\\"subnets\\":[{\\"id\\":\\"/subsc\
-riptions/subscriptionC/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork3/sub\
-nets/default\\"},{\\"id\\":\\"/subscriptions/subscriptionC/resourceGroups/myResourceGroup/providers/Microsoft.Network/v\
-irtualNetworks/myVirtualNetwork3/subnets/default\\"}]}" --name "myManagedNetwork" --resource-group "myResourceGroup"
+az managed-network mn create --managed-network "{\\"location\\":\\"eastus\\",\\"tags\\":{},\\"managementGroups\\":[{\\"\
+id\\":\\"/providers/Microsoft.Management/managementGroups/20000000-0001-0000-0000-000000000000\\"},{\\"id\\":\\"/provid\
+ers/Microsoft.Management/managementGroups/20000000-0002-0000-0000-000000000000\\"}],\\"subscriptions\\":[{\\"id\\":\\"s\
+ubscriptionA\\"},{\\"id\\":\\"subscriptionB\\"}],\\"virtualNetworks\\":[{\\"id\\":\\"/subscriptions/subscriptionC/resou\
+rceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork\\"},{\\"id\\":\\"/subscriptions/\
+subscriptionC/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNetworks/myVirtualNetwork2\\"}],\\"subn\
+ets\\":[{\\"id\\":\\"/subscriptions/subscriptionC/resourceGroups/myResourceGroup/providers/Microsoft.Network/virtualNet\
+works/myVirtualNetwork3/subnets/default\\"},{\\"id\\":\\"/subscriptions/subscriptionC/resourceGroups/myResourceGroup/pr\
+oviders/Microsoft.Network/virtualNetworks/myVirtualNetwork3/subnets/default\\"}]}" --name "myManagedNetwork" \
+--resource-group "myResourceGroup"
```
##### Parameters
|Option|Type|Description|Path (SDK)|Swagger name|
|------|----|-----------|----------|------------|
|**--resource-group-name**|string|The name of the resource group.|resource_group_name|resourceGroupName|
|**--managed-network-name**|string|The name of the Managed Network.|managed_network_name|managedNetworkName|
-|**--location**|string|The geo-location where the resource lives|location|location|
-|**--tags**|dictionary|Resource tags|tags|tags|
-|**--properties**|object|The MNC properties|properties|properties|
+|**--managed-network**|object|Parameters supplied to the create/update a Managed Network Resource|managed_network|managedNetwork|
#### Command `az managed-network mn update`
diff --git a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/generated/_client_factory.py b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/generated/_client_factory.py
index 90e883b94..0b41f0ef3 100644
--- a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/generated/_client_factory.py
+++ b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/generated/_client_factory.py
@@ -17,8 +17,8 @@ def cf_mixed_reality_cl(cli_ctx, *_):
def cf_spatial_anchor_account(cli_ctx, *_):
- return cf_mixed_reality_cl(cli_ctx).spatial_anchor_account
+ return cf_mixed_reality_cl(cli_ctx).spatial_anchors_accounts
def cf_remote_rendering_account(cli_ctx, *_):
- return cf_mixed_reality_cl(cli_ctx).remote_rendering_account
+ return cf_mixed_reality_cl(cli_ctx).remote_rendering_accounts
diff --git a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/generated/commands.py b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/generated/commands.py
index a6be65f3e..b27ea4d68 100644
--- a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/generated/commands.py
+++ b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/generated/commands.py
@@ -17,8 +17,8 @@ def load_command_table(self, _):
from azext_mixed_reality.generated._client_factory import cf_spatial_anchor_account
mixed_reality_spatial_anchor_account = CliCommandType(
- operations_tmpl='azext_mixed_reality.vendored_sdks.mixedreality.operations._spatial_anchor_account_operations#S'
- 'patialAnchorAccountOperations.{}',
+ operations_tmpl='azext_mixed_reality.vendored_sdks.mixedreality.operations._spatial_anchors_accounts_operations'
+ '#SpatialAnchorsAccountsOperations.{}',
client_factory=cf_spatial_anchor_account)
with self.command_group('spatial-anchors-account', mixed_reality_spatial_anchor_account,
client_factory=cf_spatial_anchor_account) as g:
@@ -26,8 +26,8 @@ def load_command_table(self, _):
from azext_mixed_reality.generated._client_factory import cf_remote_rendering_account
mixed_reality_remote_rendering_account = CliCommandType(
- operations_tmpl='azext_mixed_reality.vendored_sdks.mixedreality.operations._remote_rendering_account_operations'
- '#RemoteRenderingAccountOperations.{}',
+ operations_tmpl='azext_mixed_reality.vendored_sdks.mixedreality.operations._remote_rendering_accounts_operation'
+ 's#RemoteRenderingAccountsOperations.{}',
client_factory=cf_remote_rendering_account)
with self.command_group('remote-rendering-account', mixed_reality_remote_rendering_account,
client_factory=cf_remote_rendering_account) as g:
diff --git a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/generated/custom.py b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/generated/custom.py
index 000aaed89..cbe8fd226 100644
--- a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/generated/custom.py
+++ b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/generated/custom.py
@@ -9,8 +9,6 @@
# --------------------------------------------------------------------------
# pylint: disable=too-many-lines
-import json
-
def spatial_anchors_account_regenerate_key(client,
resource_group_name,
@@ -18,9 +16,11 @@ def spatial_anchors_account_regenerate_key(client,
serial=None):
if serial is None:
serial = 1
- return client.regenerate_key(resource_group_name=resource_group_name,
- account_name=account_name,
- serial=serial)
+ regenerate = {}
+ regenerate['serial'] = 1 if serial is None else serial
+ return client.regenerate_keys(resource_group_name=resource_group_name,
+ account_name=account_name,
+ regenerate=regenerate)
def remote_rendering_account_list(client,
@@ -42,11 +42,13 @@ def remote_rendering_account_create(client,
account_name,
location,
tags=None):
+ remote_rendering_account = {}
+ remote_rendering_account['tags'] = tags
+ remote_rendering_account['location'] = location
+ remote_rendering_account['identity'] = "{\"type\": \"SystemAssigned\"}"
return client.create(resource_group_name=resource_group_name,
account_name=account_name,
- tags=tags,
- location=location,
- identity=json.loads("{\"type\": \"SystemAssigned\"}"))
+ remote_rendering_account=remote_rendering_account)
def remote_rendering_account_update(client,
@@ -54,11 +56,13 @@ def remote_rendering_account_update(client,
account_name,
location,
tags=None):
+ remote_rendering_account = {}
+ remote_rendering_account['tags'] = tags
+ remote_rendering_account['location'] = location
+ remote_rendering_account['identity'] = "{\"type\": \"SystemAssigned\"}"
return client.update(resource_group_name=resource_group_name,
account_name=account_name,
- tags=tags,
- location=location,
- identity=json.loads("{\"type\": \"SystemAssigned\"}"))
+ remote_rendering_account=remote_rendering_account)
def remote_rendering_account_delete(client,
@@ -71,8 +75,8 @@ def remote_rendering_account_delete(client,
def remote_rendering_account_list_key(client,
resource_group_name,
account_name):
- return client.list_key(resource_group_name=resource_group_name,
- account_name=account_name)
+ return client.list_keys(resource_group_name=resource_group_name,
+ account_name=account_name)
def remote_rendering_account_regenerate_key(client,
@@ -81,6 +85,8 @@ def remote_rendering_account_regenerate_key(client,
serial=None):
if serial is None:
serial = 1
- return client.regenerate_key(resource_group_name=resource_group_name,
- account_name=account_name,
- serial=serial)
+ regenerate = {}
+ regenerate['serial'] = 1 if serial is None else serial
+ return client.regenerate_keys(resource_group_name=resource_group_name,
+ account_name=account_name,
+ regenerate=regenerate)
diff --git a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/_mixed_reality_client.py b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/_mixed_reality_client.py
index 8e39c5874..5877142bb 100644
--- a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/_mixed_reality_client.py
+++ b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/_mixed_reality_client.py
@@ -18,22 +18,22 @@
from azure.core.credentials import TokenCredential
from ._configuration import MixedRealityClientConfiguration
-from .operations import OperationOperations
+from .operations import Operations
from .operations import MixedRealityClientOperationsMixin
-from .operations import SpatialAnchorAccountOperations
-from .operations import RemoteRenderingAccountOperations
+from .operations import SpatialAnchorsAccountsOperations
+from .operations import RemoteRenderingAccountsOperations
from . import models
class MixedRealityClient(MixedRealityClientOperationsMixin):
"""Mixed Reality Client.
- :ivar operation: OperationOperations operations
- :vartype operation: mixed_reality_client.operations.OperationOperations
- :ivar spatial_anchor_account: SpatialAnchorAccountOperations operations
- :vartype spatial_anchor_account: mixed_reality_client.operations.SpatialAnchorAccountOperations
- :ivar remote_rendering_account: RemoteRenderingAccountOperations operations
- :vartype remote_rendering_account: mixed_reality_client.operations.RemoteRenderingAccountOperations
+ :ivar operations: Operations operations
+ :vartype operations: mixed_reality_client.operations.Operations
+ :ivar spatial_anchors_accounts: SpatialAnchorsAccountsOperations operations
+ :vartype spatial_anchors_accounts: mixed_reality_client.operations.SpatialAnchorsAccountsOperations
+ :ivar remote_rendering_accounts: RemoteRenderingAccountsOperations operations
+ :vartype remote_rendering_accounts: mixed_reality_client.operations.RemoteRenderingAccountsOperations
:param credential: Credential needed for the client to connect to Azure.
:type credential: ~azure.core.credentials.TokenCredential
:param subscription_id: The Azure subscription ID. This is a GUID-formatted string (e.g. 00000000-0000-0000-0000-000000000000).
@@ -59,11 +59,11 @@ def __init__(
self._serialize.client_side_validation = False
self._deserialize = Deserializer(client_models)
- self.operation = OperationOperations(
+ self.operations = Operations(
self._client, self._config, self._serialize, self._deserialize)
- self.spatial_anchor_account = SpatialAnchorAccountOperations(
+ self.spatial_anchors_accounts = SpatialAnchorsAccountsOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.remote_rendering_account = RemoteRenderingAccountOperations(
+ self.remote_rendering_accounts = RemoteRenderingAccountsOperations(
self._client, self._config, self._serialize, self._deserialize)
def close(self):
diff --git a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/_mixed_reality_client.py b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/_mixed_reality_client.py
index 37636b264..b08c89f25 100644
--- a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/_mixed_reality_client.py
+++ b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/_mixed_reality_client.py
@@ -16,22 +16,22 @@
from azure.core.credentials_async import AsyncTokenCredential
from ._configuration import MixedRealityClientConfiguration
-from .operations import OperationOperations
+from .operations import Operations
from .operations import MixedRealityClientOperationsMixin
-from .operations import SpatialAnchorAccountOperations
-from .operations import RemoteRenderingAccountOperations
+from .operations import SpatialAnchorsAccountsOperations
+from .operations import RemoteRenderingAccountsOperations
from .. import models
class MixedRealityClient(MixedRealityClientOperationsMixin):
"""Mixed Reality Client.
- :ivar operation: OperationOperations operations
- :vartype operation: mixed_reality_client.aio.operations.OperationOperations
- :ivar spatial_anchor_account: SpatialAnchorAccountOperations operations
- :vartype spatial_anchor_account: mixed_reality_client.aio.operations.SpatialAnchorAccountOperations
- :ivar remote_rendering_account: RemoteRenderingAccountOperations operations
- :vartype remote_rendering_account: mixed_reality_client.aio.operations.RemoteRenderingAccountOperations
+ :ivar operations: Operations operations
+ :vartype operations: mixed_reality_client.aio.operations.Operations
+ :ivar spatial_anchors_accounts: SpatialAnchorsAccountsOperations operations
+ :vartype spatial_anchors_accounts: mixed_reality_client.aio.operations.SpatialAnchorsAccountsOperations
+ :ivar remote_rendering_accounts: RemoteRenderingAccountsOperations operations
+ :vartype remote_rendering_accounts: mixed_reality_client.aio.operations.RemoteRenderingAccountsOperations
:param credential: Credential needed for the client to connect to Azure.
:type credential: ~azure.core.credentials_async.AsyncTokenCredential
:param subscription_id: The Azure subscription ID. This is a GUID-formatted string (e.g. 00000000-0000-0000-0000-000000000000).
@@ -56,11 +56,11 @@ def __init__(
self._serialize.client_side_validation = False
self._deserialize = Deserializer(client_models)
- self.operation = OperationOperations(
+ self.operations = Operations(
self._client, self._config, self._serialize, self._deserialize)
- self.spatial_anchor_account = SpatialAnchorAccountOperations(
+ self.spatial_anchors_accounts = SpatialAnchorsAccountsOperations(
self._client, self._config, self._serialize, self._deserialize)
- self.remote_rendering_account = RemoteRenderingAccountOperations(
+ self.remote_rendering_accounts = RemoteRenderingAccountsOperations(
self._client, self._config, self._serialize, self._deserialize)
async def close(self) -> None:
diff --git a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/__init__.py b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/__init__.py
index e82d2923f..93f9fc775 100644
--- a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/__init__.py
+++ b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/__init__.py
@@ -6,14 +6,14 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-from ._operation_operations import OperationOperations
+from ._operations import Operations
from ._mixed_reality_client_operations import MixedRealityClientOperationsMixin
-from ._spatial_anchor_account_operations import SpatialAnchorAccountOperations
-from ._remote_rendering_account_operations import RemoteRenderingAccountOperations
+from ._spatial_anchors_accounts_operations import SpatialAnchorsAccountsOperations
+from ._remote_rendering_accounts_operations import RemoteRenderingAccountsOperations
__all__ = [
- 'OperationOperations',
+ 'Operations',
'MixedRealityClientOperationsMixin',
- 'SpatialAnchorAccountOperations',
- 'RemoteRenderingAccountOperations',
+ 'SpatialAnchorsAccountsOperations',
+ 'RemoteRenderingAccountsOperations',
]
diff --git a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/_mixed_reality_client_operations.py b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/_mixed_reality_client_operations.py
index bd7da954a..efb6fb5a3 100644
--- a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/_mixed_reality_client_operations.py
+++ b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/_mixed_reality_client_operations.py
@@ -23,18 +23,15 @@ class MixedRealityClientOperationsMixin:
async def check_name_availability_local(
self,
location: str,
- name: str,
- type: str,
+ check_name_availability: "models.CheckNameAvailabilityRequest",
**kwargs
) -> "models.CheckNameAvailabilityResponse":
"""Check Name Availability for local uniqueness.
:param location: The location in which uniqueness will be verified.
:type location: str
- :param name: Resource Name To Verify.
- :type name: str
- :param type: Fully qualified resource type which includes provider namespace.
- :type type: str
+ :param check_name_availability: Check Name Availability Request.
+ :type check_name_availability: ~mixed_reality_client.models.CheckNameAvailabilityRequest
:keyword callable cls: A custom type or function that will be passed the direct response
:return: CheckNameAvailabilityResponse, or the result of cls(response)
:rtype: ~mixed_reality_client.models.CheckNameAvailabilityResponse
@@ -45,8 +42,6 @@ async def check_name_availability_local(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- check_name_availability = models.CheckNameAvailabilityRequest(name=name, type=type)
api_version = "2020-05-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
diff --git a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/_operation_operations.py b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/_operations.py
similarity index 98%
rename from src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/_operation_operations.py
rename to src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/_operations.py
index de0da0da5..51452e09f 100644
--- a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/_operation_operations.py
+++ b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/_operations.py
@@ -19,8 +19,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
-class OperationOperations:
- """OperationOperations async operations.
+class Operations:
+ """Operations async operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
diff --git a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/_remote_rendering_account_operations.py b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/_remote_rendering_accounts_operations.py
similarity index 93%
rename from src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/_remote_rendering_account_operations.py
rename to src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/_remote_rendering_accounts_operations.py
index 8bef13cbb..181bbd8a1 100644
--- a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/_remote_rendering_account_operations.py
+++ b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/_remote_rendering_accounts_operations.py
@@ -19,8 +19,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
-class RemoteRenderingAccountOperations:
- """RemoteRenderingAccountOperations async operations.
+class RemoteRenderingAccountsOperations:
+ """RemoteRenderingAccountsOperations async operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -298,9 +298,7 @@ async def update(
self,
resource_group_name: str,
account_name: str,
- location: str,
- tags: Optional[Dict[str, str]] = None,
- identity: Optional["models.Identity"] = None,
+ remote_rendering_account: "models.RemoteRenderingAccount",
**kwargs
) -> "models.RemoteRenderingAccount":
"""Updating a Remote Rendering Account.
@@ -309,12 +307,8 @@ async def update(
:type resource_group_name: str
:param account_name: Name of an Mixed Reality Account.
:type account_name: str
- :param location: The geo-location where the resource lives.
- :type location: str
- :param tags: Resource tags.
- :type tags: dict[str, str]
- :param identity: Identity for the resource.
- :type identity: ~mixed_reality_client.models.Identity
+ :param remote_rendering_account: Remote Rendering Account parameter.
+ :type remote_rendering_account: ~mixed_reality_client.models.RemoteRenderingAccount
:keyword callable cls: A custom type or function that will be passed the direct response
:return: RemoteRenderingAccount, or the result of cls(response)
:rtype: ~mixed_reality_client.models.RemoteRenderingAccount
@@ -325,8 +319,6 @@ async def update(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- remote_rendering_account = models.RemoteRenderingAccount(tags=tags, location=location, identity=identity)
api_version = "2020-04-06-preview"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -373,9 +365,7 @@ async def create(
self,
resource_group_name: str,
account_name: str,
- location: str,
- tags: Optional[Dict[str, str]] = None,
- identity: Optional["models.Identity"] = None,
+ remote_rendering_account: "models.RemoteRenderingAccount",
**kwargs
) -> "models.RemoteRenderingAccount":
"""Creating or Updating a Remote Rendering Account.
@@ -384,12 +374,8 @@ async def create(
:type resource_group_name: str
:param account_name: Name of an Mixed Reality Account.
:type account_name: str
- :param location: The geo-location where the resource lives.
- :type location: str
- :param tags: Resource tags.
- :type tags: dict[str, str]
- :param identity: Identity for the resource.
- :type identity: ~mixed_reality_client.models.Identity
+ :param remote_rendering_account: Remote Rendering Account parameter.
+ :type remote_rendering_account: ~mixed_reality_client.models.RemoteRenderingAccount
:keyword callable cls: A custom type or function that will be passed the direct response
:return: RemoteRenderingAccount, or the result of cls(response)
:rtype: ~mixed_reality_client.models.RemoteRenderingAccount
@@ -400,8 +386,6 @@ async def create(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- remote_rendering_account = models.RemoteRenderingAccount(tags=tags, location=location, identity=identity)
api_version = "2020-04-06-preview"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -448,7 +432,7 @@ async def create(
return deserialized
create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/remoteRenderingAccounts/{accountName}'} # type: ignore
- async def list_key(
+ async def list_keys(
self,
resource_group_name: str,
account_name: str,
@@ -474,7 +458,7 @@ async def list_key(
accept = "application/json"
# Construct URL
- url = self.list_key.metadata['url'] # type: ignore
+ url = self.list_keys.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
@@ -505,13 +489,13 @@ async def list_key(
return cls(pipeline_response, deserialized, {})
return deserialized
- list_key.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/remoteRenderingAccounts/{accountName}/listKeys'} # type: ignore
+ list_keys.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/remoteRenderingAccounts/{accountName}/listKeys'} # type: ignore
- async def regenerate_key(
+ async def regenerate_keys(
self,
resource_group_name: str,
account_name: str,
- serial: Optional[Union[int, "models.Serial"]] = "1",
+ regenerate: "models.AccountKeyRegenerateRequest",
**kwargs
) -> "models.AccountKeys":
"""Regenerate specified Key of a Remote Rendering Account.
@@ -520,8 +504,8 @@ async def regenerate_key(
:type resource_group_name: str
:param account_name: Name of an Mixed Reality Account.
:type account_name: str
- :param serial: serial of key to be regenerated.
- :type serial: str or ~mixed_reality_client.models.Serial
+ :param regenerate: The account payload.
+ :type regenerate: ~mixed_reality_client.models.AccountKeyRegenerateRequest
:keyword callable cls: A custom type or function that will be passed the direct response
:return: AccountKeys, or the result of cls(response)
:rtype: ~mixed_reality_client.models.AccountKeys
@@ -532,14 +516,12 @@ async def regenerate_key(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- regenerate = models.AccountKeyRegenerateRequest(serial=serial)
api_version = "2020-04-06-preview"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
# Construct URL
- url = self.regenerate_key.metadata['url'] # type: ignore
+ url = self.regenerate_keys.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
@@ -574,4 +556,4 @@ async def regenerate_key(
return cls(pipeline_response, deserialized, {})
return deserialized
- regenerate_key.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/remoteRenderingAccounts/{accountName}/regenerateKeys'} # type: ignore
+ regenerate_keys.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/remoteRenderingAccounts/{accountName}/regenerateKeys'} # type: ignore
diff --git a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/_spatial_anchor_account_operations.py b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/_spatial_anchors_accounts_operations.py
similarity index 94%
rename from src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/_spatial_anchor_account_operations.py
rename to src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/_spatial_anchors_accounts_operations.py
index 34f7dca7f..a639ce644 100644
--- a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/_spatial_anchor_account_operations.py
+++ b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/aio/operations/_spatial_anchors_accounts_operations.py
@@ -19,8 +19,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, AsyncHttpResponse], T, Dict[str, Any]], Any]]
-class SpatialAnchorAccountOperations:
- """SpatialAnchorAccountOperations async operations.
+class SpatialAnchorsAccountsOperations:
+ """SpatialAnchorsAccountsOperations async operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -294,8 +294,7 @@ async def update(
self,
resource_group_name: str,
account_name: str,
- location: str,
- tags: Optional[Dict[str, str]] = None,
+ spatial_anchors_account: "models.SpatialAnchorsAccount",
**kwargs
) -> "models.SpatialAnchorsAccount":
"""Updating a Spatial Anchors Account.
@@ -304,10 +303,8 @@ async def update(
:type resource_group_name: str
:param account_name: Name of an Mixed Reality Account.
:type account_name: str
- :param location: The geo-location where the resource lives.
- :type location: str
- :param tags: Resource tags.
- :type tags: dict[str, str]
+ :param spatial_anchors_account: Spatial Anchors Account parameter.
+ :type spatial_anchors_account: ~mixed_reality_client.models.SpatialAnchorsAccount
:keyword callable cls: A custom type or function that will be passed the direct response
:return: SpatialAnchorsAccount, or the result of cls(response)
:rtype: ~mixed_reality_client.models.SpatialAnchorsAccount
@@ -318,8 +315,6 @@ async def update(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- spatial_anchors_account = models.SpatialAnchorsAccount(tags=tags, location=location)
api_version = "2020-05-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -365,8 +360,7 @@ async def create(
self,
resource_group_name: str,
account_name: str,
- location: str,
- tags: Optional[Dict[str, str]] = None,
+ spatial_anchors_account: "models.SpatialAnchorsAccount",
**kwargs
) -> "models.SpatialAnchorsAccount":
"""Creating or Updating a Spatial Anchors Account.
@@ -375,10 +369,8 @@ async def create(
:type resource_group_name: str
:param account_name: Name of an Mixed Reality Account.
:type account_name: str
- :param location: The geo-location where the resource lives.
- :type location: str
- :param tags: Resource tags.
- :type tags: dict[str, str]
+ :param spatial_anchors_account: Spatial Anchors Account parameter.
+ :type spatial_anchors_account: ~mixed_reality_client.models.SpatialAnchorsAccount
:keyword callable cls: A custom type or function that will be passed the direct response
:return: SpatialAnchorsAccount, or the result of cls(response)
:rtype: ~mixed_reality_client.models.SpatialAnchorsAccount
@@ -389,8 +381,6 @@ async def create(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- spatial_anchors_account = models.SpatialAnchorsAccount(tags=tags, location=location)
api_version = "2020-05-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -436,7 +426,7 @@ async def create(
return deserialized
create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/spatialAnchorsAccounts/{accountName}'} # type: ignore
- async def list_key(
+ async def list_keys(
self,
resource_group_name: str,
account_name: str,
@@ -462,7 +452,7 @@ async def list_key(
accept = "application/json"
# Construct URL
- url = self.list_key.metadata['url'] # type: ignore
+ url = self.list_keys.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
@@ -492,13 +482,13 @@ async def list_key(
return cls(pipeline_response, deserialized, {})
return deserialized
- list_key.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/spatialAnchorsAccounts/{accountName}/listKeys'} # type: ignore
+ list_keys.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/spatialAnchorsAccounts/{accountName}/listKeys'} # type: ignore
- async def regenerate_key(
+ async def regenerate_keys(
self,
resource_group_name: str,
account_name: str,
- serial: Optional[Union[int, "models.Serial"]] = "1",
+ regenerate: "models.AccountKeyRegenerateRequest",
**kwargs
) -> "models.AccountKeys":
"""Regenerate specified Key of a Spatial Anchors Account.
@@ -507,8 +497,8 @@ async def regenerate_key(
:type resource_group_name: str
:param account_name: Name of an Mixed Reality Account.
:type account_name: str
- :param serial: serial of key to be regenerated.
- :type serial: str or ~mixed_reality_client.models.Serial
+ :param regenerate: Required information for key regeneration.
+ :type regenerate: ~mixed_reality_client.models.AccountKeyRegenerateRequest
:keyword callable cls: A custom type or function that will be passed the direct response
:return: AccountKeys, or the result of cls(response)
:rtype: ~mixed_reality_client.models.AccountKeys
@@ -519,14 +509,12 @@ async def regenerate_key(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- regenerate = models.AccountKeyRegenerateRequest(serial=serial)
api_version = "2020-05-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
# Construct URL
- url = self.regenerate_key.metadata['url'] # type: ignore
+ url = self.regenerate_keys.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
@@ -560,4 +548,4 @@ async def regenerate_key(
return cls(pipeline_response, deserialized, {})
return deserialized
- regenerate_key.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/spatialAnchorsAccounts/{accountName}/regenerateKeys'} # type: ignore
+ regenerate_keys.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/spatialAnchorsAccounts/{accountName}/regenerateKeys'} # type: ignore
diff --git a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/__init__.py b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/__init__.py
index e82d2923f..93f9fc775 100644
--- a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/__init__.py
+++ b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/__init__.py
@@ -6,14 +6,14 @@
# Changes may cause incorrect behavior and will be lost if the code is regenerated.
# --------------------------------------------------------------------------
-from ._operation_operations import OperationOperations
+from ._operations import Operations
from ._mixed_reality_client_operations import MixedRealityClientOperationsMixin
-from ._spatial_anchor_account_operations import SpatialAnchorAccountOperations
-from ._remote_rendering_account_operations import RemoteRenderingAccountOperations
+from ._spatial_anchors_accounts_operations import SpatialAnchorsAccountsOperations
+from ._remote_rendering_accounts_operations import RemoteRenderingAccountsOperations
__all__ = [
- 'OperationOperations',
+ 'Operations',
'MixedRealityClientOperationsMixin',
- 'SpatialAnchorAccountOperations',
- 'RemoteRenderingAccountOperations',
+ 'SpatialAnchorsAccountsOperations',
+ 'RemoteRenderingAccountsOperations',
]
diff --git a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/_mixed_reality_client_operations.py b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/_mixed_reality_client_operations.py
index 2894d445b..1b51b537b 100644
--- a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/_mixed_reality_client_operations.py
+++ b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/_mixed_reality_client_operations.py
@@ -27,8 +27,7 @@ class MixedRealityClientOperationsMixin(object):
def check_name_availability_local(
self,
location, # type: str
- name, # type: str
- type, # type: str
+ check_name_availability, # type: "models.CheckNameAvailabilityRequest"
**kwargs # type: Any
):
# type: (...) -> "models.CheckNameAvailabilityResponse"
@@ -36,10 +35,8 @@ def check_name_availability_local(
:param location: The location in which uniqueness will be verified.
:type location: str
- :param name: Resource Name To Verify.
- :type name: str
- :param type: Fully qualified resource type which includes provider namespace.
- :type type: str
+ :param check_name_availability: Check Name Availability Request.
+ :type check_name_availability: ~mixed_reality_client.models.CheckNameAvailabilityRequest
:keyword callable cls: A custom type or function that will be passed the direct response
:return: CheckNameAvailabilityResponse, or the result of cls(response)
:rtype: ~mixed_reality_client.models.CheckNameAvailabilityResponse
@@ -50,8 +47,6 @@ def check_name_availability_local(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- check_name_availability = models.CheckNameAvailabilityRequest(name=name, type=type)
api_version = "2020-05-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
diff --git a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/_operation_operations.py b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/_operations.py
similarity index 98%
rename from src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/_operation_operations.py
rename to src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/_operations.py
index 2f1dc4011..86f5a28ab 100644
--- a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/_operation_operations.py
+++ b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/_operations.py
@@ -23,8 +23,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
-class OperationOperations(object):
- """OperationOperations operations.
+class Operations(object):
+ """Operations operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
diff --git a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/_remote_rendering_account_operations.py b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/_remote_rendering_accounts_operations.py
similarity index 93%
rename from src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/_remote_rendering_account_operations.py
rename to src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/_remote_rendering_accounts_operations.py
index d3e59df2d..fc82ccd96 100644
--- a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/_remote_rendering_account_operations.py
+++ b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/_remote_rendering_accounts_operations.py
@@ -23,8 +23,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
-class RemoteRenderingAccountOperations(object):
- """RemoteRenderingAccountOperations operations.
+class RemoteRenderingAccountsOperations(object):
+ """RemoteRenderingAccountsOperations operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -306,9 +306,7 @@ def update(
self,
resource_group_name, # type: str
account_name, # type: str
- location, # type: str
- tags=None, # type: Optional[Dict[str, str]]
- identity=None, # type: Optional["models.Identity"]
+ remote_rendering_account, # type: "models.RemoteRenderingAccount"
**kwargs # type: Any
):
# type: (...) -> "models.RemoteRenderingAccount"
@@ -318,12 +316,8 @@ def update(
:type resource_group_name: str
:param account_name: Name of an Mixed Reality Account.
:type account_name: str
- :param location: The geo-location where the resource lives.
- :type location: str
- :param tags: Resource tags.
- :type tags: dict[str, str]
- :param identity: Identity for the resource.
- :type identity: ~mixed_reality_client.models.Identity
+ :param remote_rendering_account: Remote Rendering Account parameter.
+ :type remote_rendering_account: ~mixed_reality_client.models.RemoteRenderingAccount
:keyword callable cls: A custom type or function that will be passed the direct response
:return: RemoteRenderingAccount, or the result of cls(response)
:rtype: ~mixed_reality_client.models.RemoteRenderingAccount
@@ -334,8 +328,6 @@ def update(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- remote_rendering_account = models.RemoteRenderingAccount(tags=tags, location=location, identity=identity)
api_version = "2020-04-06-preview"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -382,9 +374,7 @@ def create(
self,
resource_group_name, # type: str
account_name, # type: str
- location, # type: str
- tags=None, # type: Optional[Dict[str, str]]
- identity=None, # type: Optional["models.Identity"]
+ remote_rendering_account, # type: "models.RemoteRenderingAccount"
**kwargs # type: Any
):
# type: (...) -> "models.RemoteRenderingAccount"
@@ -394,12 +384,8 @@ def create(
:type resource_group_name: str
:param account_name: Name of an Mixed Reality Account.
:type account_name: str
- :param location: The geo-location where the resource lives.
- :type location: str
- :param tags: Resource tags.
- :type tags: dict[str, str]
- :param identity: Identity for the resource.
- :type identity: ~mixed_reality_client.models.Identity
+ :param remote_rendering_account: Remote Rendering Account parameter.
+ :type remote_rendering_account: ~mixed_reality_client.models.RemoteRenderingAccount
:keyword callable cls: A custom type or function that will be passed the direct response
:return: RemoteRenderingAccount, or the result of cls(response)
:rtype: ~mixed_reality_client.models.RemoteRenderingAccount
@@ -410,8 +396,6 @@ def create(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- remote_rendering_account = models.RemoteRenderingAccount(tags=tags, location=location, identity=identity)
api_version = "2020-04-06-preview"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -458,7 +442,7 @@ def create(
return deserialized
create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/remoteRenderingAccounts/{accountName}'} # type: ignore
- def list_key(
+ def list_keys(
self,
resource_group_name, # type: str
account_name, # type: str
@@ -485,7 +469,7 @@ def list_key(
accept = "application/json"
# Construct URL
- url = self.list_key.metadata['url'] # type: ignore
+ url = self.list_keys.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
@@ -516,13 +500,13 @@ def list_key(
return cls(pipeline_response, deserialized, {})
return deserialized
- list_key.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/remoteRenderingAccounts/{accountName}/listKeys'} # type: ignore
+ list_keys.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/remoteRenderingAccounts/{accountName}/listKeys'} # type: ignore
- def regenerate_key(
+ def regenerate_keys(
self,
resource_group_name, # type: str
account_name, # type: str
- serial="1", # type: Optional[Union[int, "models.Serial"]]
+ regenerate, # type: "models.AccountKeyRegenerateRequest"
**kwargs # type: Any
):
# type: (...) -> "models.AccountKeys"
@@ -532,8 +516,8 @@ def regenerate_key(
:type resource_group_name: str
:param account_name: Name of an Mixed Reality Account.
:type account_name: str
- :param serial: serial of key to be regenerated.
- :type serial: str or ~mixed_reality_client.models.Serial
+ :param regenerate: The account payload.
+ :type regenerate: ~mixed_reality_client.models.AccountKeyRegenerateRequest
:keyword callable cls: A custom type or function that will be passed the direct response
:return: AccountKeys, or the result of cls(response)
:rtype: ~mixed_reality_client.models.AccountKeys
@@ -544,14 +528,12 @@ def regenerate_key(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- regenerate = models.AccountKeyRegenerateRequest(serial=serial)
api_version = "2020-04-06-preview"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
# Construct URL
- url = self.regenerate_key.metadata['url'] # type: ignore
+ url = self.regenerate_keys.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
@@ -586,4 +568,4 @@ def regenerate_key(
return cls(pipeline_response, deserialized, {})
return deserialized
- regenerate_key.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/remoteRenderingAccounts/{accountName}/regenerateKeys'} # type: ignore
+ regenerate_keys.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/remoteRenderingAccounts/{accountName}/regenerateKeys'} # type: ignore
diff --git a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/_spatial_anchor_account_operations.py b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/_spatial_anchors_accounts_operations.py
similarity index 94%
rename from src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/_spatial_anchor_account_operations.py
rename to src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/_spatial_anchors_accounts_operations.py
index bc52b50b0..fcd1f039a 100644
--- a/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/_spatial_anchor_account_operations.py
+++ b/src/test/scenarios/mixed-reality/output/ext_Incremental/src/mixed-reality/azext_mixed_reality/vendored_sdks/mixedreality/operations/_spatial_anchors_accounts_operations.py
@@ -23,8 +23,8 @@
T = TypeVar('T')
ClsType = Optional[Callable[[PipelineResponse[HttpRequest, HttpResponse], T, Dict[str, Any]], Any]]
-class SpatialAnchorAccountOperations(object):
- """SpatialAnchorAccountOperations operations.
+class SpatialAnchorsAccountsOperations(object):
+ """SpatialAnchorsAccountsOperations operations.
You should not instantiate this class directly. Instead, you should create a Client instance that
instantiates it for you and attaches it as an attribute.
@@ -302,8 +302,7 @@ def update(
self,
resource_group_name, # type: str
account_name, # type: str
- location, # type: str
- tags=None, # type: Optional[Dict[str, str]]
+ spatial_anchors_account, # type: "models.SpatialAnchorsAccount"
**kwargs # type: Any
):
# type: (...) -> "models.SpatialAnchorsAccount"
@@ -313,10 +312,8 @@ def update(
:type resource_group_name: str
:param account_name: Name of an Mixed Reality Account.
:type account_name: str
- :param location: The geo-location where the resource lives.
- :type location: str
- :param tags: Resource tags.
- :type tags: dict[str, str]
+ :param spatial_anchors_account: Spatial Anchors Account parameter.
+ :type spatial_anchors_account: ~mixed_reality_client.models.SpatialAnchorsAccount
:keyword callable cls: A custom type or function that will be passed the direct response
:return: SpatialAnchorsAccount, or the result of cls(response)
:rtype: ~mixed_reality_client.models.SpatialAnchorsAccount
@@ -327,8 +324,6 @@ def update(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- spatial_anchors_account = models.SpatialAnchorsAccount(tags=tags, location=location)
api_version = "2020-05-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -374,8 +369,7 @@ def create(
self,
resource_group_name, # type: str
account_name, # type: str
- location, # type: str
- tags=None, # type: Optional[Dict[str, str]]
+ spatial_anchors_account, # type: "models.SpatialAnchorsAccount"
**kwargs # type: Any
):
# type: (...) -> "models.SpatialAnchorsAccount"
@@ -385,10 +379,8 @@ def create(
:type resource_group_name: str
:param account_name: Name of an Mixed Reality Account.
:type account_name: str
- :param location: The geo-location where the resource lives.
- :type location: str
- :param tags: Resource tags.
- :type tags: dict[str, str]
+ :param spatial_anchors_account: Spatial Anchors Account parameter.
+ :type spatial_anchors_account: ~mixed_reality_client.models.SpatialAnchorsAccount
:keyword callable cls: A custom type or function that will be passed the direct response
:return: SpatialAnchorsAccount, or the result of cls(response)
:rtype: ~mixed_reality_client.models.SpatialAnchorsAccount
@@ -399,8 +391,6 @@ def create(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- spatial_anchors_account = models.SpatialAnchorsAccount(tags=tags, location=location)
api_version = "2020-05-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
@@ -446,7 +436,7 @@ def create(
return deserialized
create.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/spatialAnchorsAccounts/{accountName}'} # type: ignore
- def list_key(
+ def list_keys(
self,
resource_group_name, # type: str
account_name, # type: str
@@ -473,7 +463,7 @@ def list_key(
accept = "application/json"
# Construct URL
- url = self.list_key.metadata['url'] # type: ignore
+ url = self.list_keys.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
@@ -503,13 +493,13 @@ def list_key(
return cls(pipeline_response, deserialized, {})
return deserialized
- list_key.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/spatialAnchorsAccounts/{accountName}/listKeys'} # type: ignore
+ list_keys.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/spatialAnchorsAccounts/{accountName}/listKeys'} # type: ignore
- def regenerate_key(
+ def regenerate_keys(
self,
resource_group_name, # type: str
account_name, # type: str
- serial="1", # type: Optional[Union[int, "models.Serial"]]
+ regenerate, # type: "models.AccountKeyRegenerateRequest"
**kwargs # type: Any
):
# type: (...) -> "models.AccountKeys"
@@ -519,8 +509,8 @@ def regenerate_key(
:type resource_group_name: str
:param account_name: Name of an Mixed Reality Account.
:type account_name: str
- :param serial: serial of key to be regenerated.
- :type serial: str or ~mixed_reality_client.models.Serial
+ :param regenerate: Required information for key regeneration.
+ :type regenerate: ~mixed_reality_client.models.AccountKeyRegenerateRequest
:keyword callable cls: A custom type or function that will be passed the direct response
:return: AccountKeys, or the result of cls(response)
:rtype: ~mixed_reality_client.models.AccountKeys
@@ -531,14 +521,12 @@ def regenerate_key(
401: ClientAuthenticationError, 404: ResourceNotFoundError, 409: ResourceExistsError
}
error_map.update(kwargs.pop('error_map', {}))
-
- regenerate = models.AccountKeyRegenerateRequest(serial=serial)
api_version = "2020-05-01"
content_type = kwargs.pop("content_type", "application/json")
accept = "application/json"
# Construct URL
- url = self.regenerate_key.metadata['url'] # type: ignore
+ url = self.regenerate_keys.metadata['url'] # type: ignore
path_format_arguments = {
'subscriptionId': self._serialize.url("self._config.subscription_id", self._config.subscription_id, 'str'),
'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str', max_length=90, min_length=1, pattern=r'^[-\w\._\(\)]+$'),
@@ -572,4 +560,4 @@ def regenerate_key(
return cls(pipeline_response, deserialized, {})
return deserialized
- regenerate_key.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/spatialAnchorsAccounts/{accountName}/regenerateKeys'} # type: ignore
+ regenerate_keys.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.MixedReality/spatialAnchorsAccounts/{accountName}/regenerateKeys'} # type: ignore
diff --git a/src/test/scenarios/synapse/output/extnoflatten/src/synapse/HISTORY.rst b/src/test/scenarios/synapse/output/extflatten/src/synapse/HISTORY.rst
similarity index 100%
rename from src/test/scenarios/synapse/output/extnoflatten/src/synapse/HISTORY.rst
rename to src/test/scenarios/synapse/output/extflatten/src/synapse/HISTORY.rst
diff --git a/src/test/scenarios/synapse/output/extnoflatten/src/synapse/README.md b/src/test/scenarios/synapse/output/extflatten/src/synapse/README.md
similarity index 100%
rename from src/test/scenarios/synapse/output/extnoflatten/src/synapse/README.md
rename to src/test/scenarios/synapse/output/extflatten/src/synapse/README.md
diff --git a/src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/__init__.py b/src/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/__init__.py
similarity index 100%
rename from src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/__init__.py
rename to src/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/__init__.py
diff --git a/src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/action.py b/src/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/action.py
similarity index 100%
rename from src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/action.py
rename to src/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/action.py
diff --git a/src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/azext_metadata.json b/src/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/azext_metadata.json
similarity index 100%
rename from src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/azext_metadata.json
rename to src/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/azext_metadata.json
diff --git a/src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/custom.py b/src/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/custom.py
similarity index 100%
rename from src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/custom.py
rename to src/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/custom.py
diff --git a/src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/generated/__init__.py b/src/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/generated/__init__.py
similarity index 100%
rename from src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/generated/__init__.py
rename to src/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/generated/__init__.py
diff --git a/src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/generated/_client_factory.py b/src/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/generated/_client_factory.py
similarity index 68%
rename from src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/generated/_client_factory.py
rename to src/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/generated/_client_factory.py
index 0a61cb574..20531aebe 100644
--- a/src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/generated/_client_factory.py
+++ b/src/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/generated/_client_factory.py
@@ -17,111 +17,111 @@ def cf_synapse_cl(cli_ctx, *_):
def cf_big_data_pool(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).big_data_pools
+ return cf_synapse_cl(cli_ctx).big_data_pool
def cf_operation(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).operations
+ return cf_synapse_cl(cli_ctx).operation
def cf_ip_firewall_rule(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).ip_firewall_rules
+ return cf_synapse_cl(cli_ctx).ip_firewall_rule
def cf_sqlpool(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).sql_pools
+ return cf_synapse_cl(cli_ctx).sql_pool
def cf_sqlpool_metadata_sync_config(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).sql_pool_metadata_sync_configs
+ return cf_synapse_cl(cli_ctx).sql_pool_metadata_sync_config
def cf_sqlpool_operation_result(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).sql_pool_operation_results
+ return cf_synapse_cl(cli_ctx).sql_pool_operation_result
def cf_sqlpool_geo_backup_policy(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).sql_pool_geo_backup_policies
+ return cf_synapse_cl(cli_ctx).sql_pool_geo_backup_policy
def cf_sqlpool_data_warehouse_user_activity(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).sql_pool_data_warehouse_user_activities
+ return cf_synapse_cl(cli_ctx).sql_pool_data_warehouse_user_activity
def cf_sqlpool_restore_point(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).sql_pool_restore_points
+ return cf_synapse_cl(cli_ctx).sql_pool_restore_point
def cf_sqlpool_replication_link(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).sql_pool_replication_links
+ return cf_synapse_cl(cli_ctx).sql_pool_replication_link
def cf_sqlpool_transparent_data_encryption(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).sql_pool_transparent_data_encryptions
+ return cf_synapse_cl(cli_ctx).sql_pool_transparent_data_encryption
def cf_sqlpool_blob_auditing_policy(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).sql_pool_blob_auditing_policies
+ return cf_synapse_cl(cli_ctx).sql_pool_blob_auditing_policy
def cf_sqlpool_operation(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).sql_pool_operations
+ return cf_synapse_cl(cli_ctx).sql_pool_operation
def cf_sqlpool_usage(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).sql_pool_usages
+ return cf_synapse_cl(cli_ctx).sql_pool_usage
def cf_sqlpool_sensitivity_label(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).sql_pool_sensitivity_labels
+ return cf_synapse_cl(cli_ctx).sql_pool_sensitivity_label
def cf_sqlpool_schema(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).sql_pool_schemas
+ return cf_synapse_cl(cli_ctx).sql_pool_schema
def cf_sqlpool_table(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).sql_pool_tables
+ return cf_synapse_cl(cli_ctx).sql_pool_table
def cf_sqlpool_table_column(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).sql_pool_table_columns
+ return cf_synapse_cl(cli_ctx).sql_pool_table_column
def cf_sqlpool_connection_policy(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).sql_pool_connection_policies
+ return cf_synapse_cl(cli_ctx).sql_pool_connection_policy
def cf_sqlpool_vulnerability_assessment(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).sql_pool_vulnerability_assessments
+ return cf_synapse_cl(cli_ctx).sql_pool_vulnerability_assessment
def cf_sqlpool_vulnerability_assessment_scan(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).sql_pool_vulnerability_assessment_scans
+ return cf_synapse_cl(cli_ctx).sql_pool_vulnerability_assessment_scan
def cf_sqlpool_security_alert_policy(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).sql_pool_security_alert_policies
+ return cf_synapse_cl(cli_ctx).sql_pool_security_alert_policy
def cf_sqlpool_vulnerability_assessment_rule_baseline(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).sql_pool_vulnerability_assessment_rule_baselines
+ return cf_synapse_cl(cli_ctx).sql_pool_vulnerability_assessment_rule_baseline
def cf_workspace(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).workspaces
+ return cf_synapse_cl(cli_ctx).workspace
def cf_workspace_aadadmin(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).workspace_aad_admins
+ return cf_synapse_cl(cli_ctx).workspace_aad_admin
def cf_workspace_managed_identity_sqlcontrol_setting(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).workspace_managed_identity_sql_control_settings
+ return cf_synapse_cl(cli_ctx).workspace_managed_identity_sql_control_setting
def cf_integration_runtime(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).integration_runtimes
+ return cf_synapse_cl(cli_ctx).integration_runtime
def cf_integration_runtime_node_ip_address(cli_ctx, *_):
@@ -133,7 +133,7 @@ def cf_integration_runtime_object_metadata(cli_ctx, *_):
def cf_integration_runtime_node(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).integration_runtime_nodes
+ return cf_synapse_cl(cli_ctx).integration_runtime_node
def cf_integration_runtime_credentials(cli_ctx, *_):
@@ -141,11 +141,11 @@ def cf_integration_runtime_credentials(cli_ctx, *_):
def cf_integration_runtime_connection_info(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).integration_runtime_connection_infos
+ return cf_synapse_cl(cli_ctx).integration_runtime_connection_info
def cf_integration_runtime_auth_key(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).integration_runtime_auth_keys
+ return cf_synapse_cl(cli_ctx).integration_runtime_auth_key
def cf_integration_runtime_monitoring_data(cli_ctx, *_):
@@ -157,12 +157,12 @@ def cf_integration_runtime_status(cli_ctx, *_):
def cf_private_link_resource(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).private_link_resources
+ return cf_synapse_cl(cli_ctx).private_link_resource
def cf_private_endpoint_connection(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).private_endpoint_connections
+ return cf_synapse_cl(cli_ctx).private_endpoint_connection
def cf_private_link_hub(cli_ctx, *_):
- return cf_synapse_cl(cli_ctx).private_link_hubs
+ return cf_synapse_cl(cli_ctx).private_link_hub
diff --git a/src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/generated/_help.py b/src/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/generated/_help.py
similarity index 100%
rename from src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/generated/_help.py
rename to src/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/generated/_help.py
diff --git a/src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/generated/_params.py b/src/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/generated/_params.py
similarity index 97%
rename from src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/generated/_params.py
rename to src/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/generated/_params.py
index abd48ef92..72cff5b7e 100644
--- a/src/test/scenarios/synapse/output/extnoflatten/src/synapse/azext_synapse/generated/_params.py
+++ b/src/test/scenarios/synapse/output/extflatten/src/synapse/azext_synapse/generated/_params.py
@@ -319,19 +319,19 @@ def load_arguments(self, _):
'SUCCESSFUL_DATABASE_AUTHENTICATION_GROUP USER_CHANGE_PASSWORD_GROUP BATCH_STARTED_GROUP '
'BATCH_COMPLETED_GROUP These are groups that cover all sql statements and stored procedures '
'executed against the database, and should not be used in combination with other groups as this '
- 'will result in duplicate audit logs. For more information, see [Database-Level Audit Action '
- 'Groups](https://docs.microsoft.com/en-us/sql/relational-databases/security/auditing/sql-server-audi'
- 't-action-groups-and-actions#database-level-audit-action-groups). For Database auditing policy, '
+ 'will result in duplicate audit logs. For more information, see `Database-Level Audit Action '
+ 'Groups `_. For Database auditing policy, '
'specific Actions can also be specified (note that Actions cannot be specified for Server auditing '
'policy). The supported actions to audit are: SELECT UPDATE INSERT DELETE EXECUTE RECEIVE '
'REFERENCES The general form for defining an action to be audited is: {action} ON {object} BY '
- '{principal} Note that