From 579d430ea46431e0a3b0b1f9f1f5398e70422b4a Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Wed, 22 May 2019 14:25:22 -0700 Subject: [PATCH] [AutoPR] eventgrid/resource-manager (#5339) * [AutoPR eventgrid/resource-manager] EventGrid: Swagger for API Version 2019-06-01 (#5289) * Generated from c6e4afda25e5e2474198f5e668afc8e3383e3b31 EventGrid: Swagger work for 2019-06-01 Api Version * Generated from 476ebd879295f7a17e0ccc90f5685ee110dfd8bf address CR comments and fix example * Move to new folder * Remove incorrectly generated SDK * Latest Swagger * Change flattenning * Packaging update of azure-mgmt-eventgrid * ChangeLog * Generated from 7451ada12cc950c6ed59ae3486379f18cd5c3bfe (#5419) Fix it * Generated from 530350244c93e6079291e1c55205a24096349978 (#5420) Change EG flatten parameter for PY --- .../eventgrid/models/input_schema_mapping.py | 44 --- .../models/input_schema_mapping_py3.py | 44 --- .../azure/mgmt/eventgrid/models/json_field.py | 32 --- .../mgmt/eventgrid/models/json_field_py3.py | 32 --- .../models/json_field_with_default.py | 42 --- .../models/json_field_with_default_py3.py | 42 --- .../models/json_input_schema_mapping.py | 66 ----- .../models/json_input_schema_mapping_py3.py | 66 ----- azure-mgmt-eventgrid/dev_requirements.txt | 1 - .../azure-mgmt-eventgrid}/HISTORY.rst | 16 ++ .../azure-mgmt-eventgrid}/MANIFEST.in | 0 .../azure-mgmt-eventgrid}/README.rst | 0 .../azure-mgmt-eventgrid}/azure/__init__.py | 0 .../azure/mgmt/__init__.py | 0 .../azure/mgmt/eventgrid/__init__.py | 0 .../eventgrid/event_grid_management_client.py | 2 +- .../azure/mgmt/eventgrid/models/__init__.py | 16 -- .../mgmt/eventgrid/models/advanced_filter.py | 0 .../eventgrid/models/advanced_filter_py3.py | 0 .../models/bool_equals_advanced_filter.py | 0 .../models/bool_equals_advanced_filter_py3.py | 0 .../models/dead_letter_destination.py | 0 .../models/dead_letter_destination_py3.py | 0 .../azure/mgmt/eventgrid/models/domain.py | 23 +- .../mgmt/eventgrid/models/domain_paged.py | 0 .../azure/mgmt/eventgrid/models/domain_py3.py | 25 +- .../models/domain_regenerate_key_request.py | 2 +- .../domain_regenerate_key_request_py3.py | 2 +- .../models/domain_shared_access_keys.py | 0 .../models/domain_shared_access_keys_py3.py | 0 .../mgmt/eventgrid/models/domain_topic.py | 6 +- .../eventgrid/models/domain_topic_paged.py | 0 .../mgmt/eventgrid/models/domain_topic_py3.py | 6 +- .../models/domain_update_parameters.py | 2 +- .../models/domain_update_parameters_py3.py | 2 +- .../event_grid_management_client_enums.py | 14 - ...vent_hub_event_subscription_destination.py | 0 ..._hub_event_subscription_destination_py3.py | 0 .../eventgrid/models/event_subscription.py | 13 +- .../models/event_subscription_destination.py | 0 .../event_subscription_destination_py3.py | 0 .../models/event_subscription_filter.py | 0 .../models/event_subscription_filter_py3.py | 0 .../models/event_subscription_full_url.py | 0 .../models/event_subscription_full_url_py3.py | 0 .../models/event_subscription_paged.py | 0 .../models/event_subscription_py3.py | 15 +- .../event_subscription_update_parameters.py | 7 - ...vent_subscription_update_parameters_py3.py | 9 +- .../azure/mgmt/eventgrid/models/event_type.py | 6 +- .../mgmt/eventgrid/models/event_type_paged.py | 0 .../mgmt/eventgrid/models/event_type_py3.py | 6 +- ...nnection_event_subscription_destination.py | 0 ...tion_event_subscription_destination_py3.py | 0 .../number_greater_than_advanced_filter.py | 0 ...number_greater_than_advanced_filter_py3.py | 0 ..._greater_than_or_equals_advanced_filter.py | 0 ...ater_than_or_equals_advanced_filter_py3.py | 0 .../models/number_in_advanced_filter.py | 0 .../models/number_in_advanced_filter_py3.py | 0 .../number_less_than_advanced_filter.py | 0 .../number_less_than_advanced_filter_py3.py | 0 ...ber_less_than_or_equals_advanced_filter.py | 0 ...less_than_or_equals_advanced_filter_py3.py | 0 .../models/number_not_in_advanced_filter.py | 0 .../number_not_in_advanced_filter_py3.py | 0 .../azure/mgmt/eventgrid/models/operation.py | 0 .../mgmt/eventgrid/models/operation_info.py | 0 .../eventgrid/models/operation_info_py3.py | 0 .../mgmt/eventgrid/models/operation_paged.py | 0 .../mgmt/eventgrid/models/operation_py3.py | 0 .../azure/mgmt/eventgrid/models/resource.py | 6 +- .../mgmt/eventgrid/models/resource_py3.py | 6 +- .../mgmt/eventgrid/models/retry_policy.py | 0 .../mgmt/eventgrid/models/retry_policy_py3.py | 0 ...us_queue_event_subscription_destination.py | 0 ...ueue_event_subscription_destination_py3.py | 0 .../storage_blob_dead_letter_destination.py | 0 ...torage_blob_dead_letter_destination_py3.py | 0 ...ge_queue_event_subscription_destination.py | 0 ...ueue_event_subscription_destination_py3.py | 0 .../string_begins_with_advanced_filter.py | 0 .../string_begins_with_advanced_filter_py3.py | 0 .../models/string_contains_advanced_filter.py | 0 .../string_contains_advanced_filter_py3.py | 0 .../string_ends_with_advanced_filter.py | 0 .../string_ends_with_advanced_filter_py3.py | 0 .../models/string_in_advanced_filter.py | 0 .../models/string_in_advanced_filter_py3.py | 0 .../models/string_not_in_advanced_filter.py | 0 .../string_not_in_advanced_filter_py3.py | 0 .../azure/mgmt/eventgrid/models/topic.py | 25 +- .../mgmt/eventgrid/models/topic_paged.py | 0 .../azure/mgmt/eventgrid/models/topic_py3.py | 27 +- .../models/topic_regenerate_key_request.py | 0 .../topic_regenerate_key_request_py3.py | 0 .../models/topic_shared_access_keys.py | 0 .../models/topic_shared_access_keys_py3.py | 0 .../mgmt/eventgrid/models/topic_type_info.py | 6 +- .../eventgrid/models/topic_type_info_paged.py | 0 .../eventgrid/models/topic_type_info_py3.py | 6 +- .../models/topic_update_parameters.py | 0 .../models/topic_update_parameters_py3.py | 0 .../mgmt/eventgrid/models/tracked_resource.py | 10 +- .../eventgrid/models/tracked_resource_py3.py | 10 +- ...web_hook_event_subscription_destination.py | 0 ...hook_event_subscription_destination_py3.py | 0 .../mgmt/eventgrid/operations/__init__.py | 0 .../operations/domain_topics_operations.py | 30 ++- .../operations/domains_operations.py | 50 ++-- .../event_subscriptions_operations.py | 252 +++++++++++------- .../mgmt/eventgrid/operations/operations.py | 4 +- .../operations/topic_types_operations.py | 8 +- .../eventgrid/operations/topics_operations.py | 52 ++-- .../azure/mgmt/eventgrid/version.py | 2 +- .../azure-mgmt-eventgrid/dev_requirements.txt | 1 + .../azure-mgmt-eventgrid}/sdk_packaging.toml | 0 .../eventgrid/azure-mgmt-eventgrid}/setup.cfg | 0 .../eventgrid/azure-mgmt-eventgrid}/setup.py | 1 + ...grid.test_domains_and_advanced_filter.yaml | 0 ..._input_mappings_and_queue_destination.yaml | 0 ...azure_mgmt_eventgrid.test_topic_types.yaml | 0 ...azure_mgmt_eventgrid.test_user_topics.yaml | 0 .../tests/test_azure_mgmt_eventgrid.py | 0 124 files changed, 336 insertions(+), 701 deletions(-) delete mode 100644 azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/input_schema_mapping.py delete mode 100644 azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/input_schema_mapping_py3.py delete mode 100644 azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_field.py delete mode 100644 azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_field_py3.py delete mode 100644 azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_field_with_default.py delete mode 100644 azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_field_with_default_py3.py delete mode 100644 azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_input_schema_mapping.py delete mode 100644 azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_input_schema_mapping_py3.py delete mode 100644 azure-mgmt-eventgrid/dev_requirements.txt rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/HISTORY.rst (86%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/MANIFEST.in (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/README.rst (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/__init__.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/__init__.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/__init__.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/event_grid_management_client.py (99%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/__init__.py (92%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/advanced_filter.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/advanced_filter_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/bool_equals_advanced_filter.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/bool_equals_advanced_filter_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/dead_letter_destination.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/dead_letter_destination_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/domain.py (65%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/domain_paged.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/domain_py3.py (63%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/domain_regenerate_key_request.py (99%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/domain_regenerate_key_request_py3.py (99%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/domain_shared_access_keys.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/domain_shared_access_keys_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/domain_topic.py (92%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/domain_topic_paged.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/domain_topic_py3.py (92%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/domain_update_parameters.py (94%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/domain_update_parameters_py3.py (94%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/event_grid_management_client_enums.py (82%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/event_hub_event_subscription_destination.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/event_hub_event_subscription_destination_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/event_subscription.py (86%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/event_subscription_destination.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/event_subscription_destination_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/event_subscription_filter.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/event_subscription_filter_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/event_subscription_full_url.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/event_subscription_full_url_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/event_subscription_paged.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/event_subscription_py3.py (84%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/event_subscription_update_parameters.py (85%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/event_subscription_update_parameters_py3.py (82%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/event_type.py (93%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/event_type_paged.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/event_type_py3.py (93%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/hybrid_connection_event_subscription_destination.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/hybrid_connection_event_subscription_destination_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/number_greater_than_advanced_filter.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/number_greater_than_advanced_filter_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/number_greater_than_or_equals_advanced_filter.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/number_greater_than_or_equals_advanced_filter_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/number_in_advanced_filter.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/number_in_advanced_filter_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/number_less_than_advanced_filter.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/number_less_than_advanced_filter_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/number_less_than_or_equals_advanced_filter.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/number_less_than_or_equals_advanced_filter_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/number_not_in_advanced_filter.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/number_not_in_advanced_filter_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/operation.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/operation_info.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/operation_info_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/operation_paged.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/operation_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/resource.py (89%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/resource_py3.py (90%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/retry_policy.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/retry_policy_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/service_bus_queue_event_subscription_destination.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/service_bus_queue_event_subscription_destination_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/storage_blob_dead_letter_destination.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/storage_blob_dead_letter_destination_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/storage_queue_event_subscription_destination.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/storage_queue_event_subscription_destination_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/string_begins_with_advanced_filter.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/string_begins_with_advanced_filter_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/string_contains_advanced_filter.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/string_contains_advanced_filter_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/string_ends_with_advanced_filter.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/string_ends_with_advanced_filter_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/string_in_advanced_filter.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/string_in_advanced_filter_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/string_not_in_advanced_filter.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/string_not_in_advanced_filter_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/topic.py (62%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/topic_paged.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/topic_py3.py (61%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/topic_regenerate_key_request.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/topic_regenerate_key_request_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/topic_shared_access_keys.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/topic_shared_access_keys_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/topic_type_info.py (95%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/topic_type_info_paged.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/topic_type_info_py3.py (95%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/topic_update_parameters.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/topic_update_parameters_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/tracked_resource.py (86%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/tracked_resource_py3.py (86%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/web_hook_event_subscription_destination.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/models/web_hook_event_subscription_destination_py3.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/operations/__init__.py (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/operations/domain_topics_operations.py (93%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/operations/domains_operations.py (93%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/operations/event_subscriptions_operations.py (85%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/operations/operations.py (97%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/operations/topic_types_operations.py (97%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/operations/topics_operations.py (93%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/azure/mgmt/eventgrid/version.py (95%) create mode 100644 sdk/eventgrid/azure-mgmt-eventgrid/dev_requirements.txt rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/sdk_packaging.toml (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/setup.cfg (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/setup.py (98%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/tests/recordings/test_azure_mgmt_eventgrid.test_domains_and_advanced_filter.yaml (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/tests/recordings/test_azure_mgmt_eventgrid.test_input_mappings_and_queue_destination.yaml (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/tests/recordings/test_azure_mgmt_eventgrid.test_topic_types.yaml (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/tests/recordings/test_azure_mgmt_eventgrid.test_user_topics.yaml (100%) rename {azure-mgmt-eventgrid => sdk/eventgrid/azure-mgmt-eventgrid}/tests/test_azure_mgmt_eventgrid.py (100%) diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/input_schema_mapping.py b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/input_schema_mapping.py deleted file mode 100644 index f99596238470..000000000000 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/input_schema_mapping.py +++ /dev/null @@ -1,44 +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 msrest.serialization import Model - - -class InputSchemaMapping(Model): - """By default, Event Grid expects events to be in the Event Grid event schema. - Specifying an input schema mapping enables publishing to Event Grid using a - custom input schema. Currently, the only supported type of - InputSchemaMapping is 'JsonInputSchemaMapping'. - - You probably want to use the sub-classes and not this class directly. Known - sub-classes are: JsonInputSchemaMapping - - All required parameters must be populated in order to send to Azure. - - :param input_schema_mapping_type: Required. Constant filled by server. - :type input_schema_mapping_type: str - """ - - _validation = { - 'input_schema_mapping_type': {'required': True}, - } - - _attribute_map = { - 'input_schema_mapping_type': {'key': 'inputSchemaMappingType', 'type': 'str'}, - } - - _subtype_map = { - 'input_schema_mapping_type': {'Json': 'JsonInputSchemaMapping'} - } - - def __init__(self, **kwargs): - super(InputSchemaMapping, self).__init__(**kwargs) - self.input_schema_mapping_type = None diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/input_schema_mapping_py3.py b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/input_schema_mapping_py3.py deleted file mode 100644 index b3a12a359f62..000000000000 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/input_schema_mapping_py3.py +++ /dev/null @@ -1,44 +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 msrest.serialization import Model - - -class InputSchemaMapping(Model): - """By default, Event Grid expects events to be in the Event Grid event schema. - Specifying an input schema mapping enables publishing to Event Grid using a - custom input schema. Currently, the only supported type of - InputSchemaMapping is 'JsonInputSchemaMapping'. - - You probably want to use the sub-classes and not this class directly. Known - sub-classes are: JsonInputSchemaMapping - - All required parameters must be populated in order to send to Azure. - - :param input_schema_mapping_type: Required. Constant filled by server. - :type input_schema_mapping_type: str - """ - - _validation = { - 'input_schema_mapping_type': {'required': True}, - } - - _attribute_map = { - 'input_schema_mapping_type': {'key': 'inputSchemaMappingType', 'type': 'str'}, - } - - _subtype_map = { - 'input_schema_mapping_type': {'Json': 'JsonInputSchemaMapping'} - } - - def __init__(self, **kwargs) -> None: - super(InputSchemaMapping, self).__init__(**kwargs) - self.input_schema_mapping_type = None diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_field.py b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_field.py deleted file mode 100644 index 0338424589ca..000000000000 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_field.py +++ /dev/null @@ -1,32 +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 msrest.serialization import Model - - -class JsonField(Model): - """This is used to express the source of an input schema mapping for a single - target field in the Event Grid Event schema. This is currently used in the - mappings for the 'id', 'topic' and 'eventtime' properties. This represents - a field in the input event schema. - - :param source_field: Name of a field in the input event schema that's to - be used as the source of a mapping. - :type source_field: str - """ - - _attribute_map = { - 'source_field': {'key': 'sourceField', 'type': 'str'}, - } - - def __init__(self, **kwargs): - super(JsonField, self).__init__(**kwargs) - self.source_field = kwargs.get('source_field', None) diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_field_py3.py b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_field_py3.py deleted file mode 100644 index 68e6016cafb7..000000000000 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_field_py3.py +++ /dev/null @@ -1,32 +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 msrest.serialization import Model - - -class JsonField(Model): - """This is used to express the source of an input schema mapping for a single - target field in the Event Grid Event schema. This is currently used in the - mappings for the 'id', 'topic' and 'eventtime' properties. This represents - a field in the input event schema. - - :param source_field: Name of a field in the input event schema that's to - be used as the source of a mapping. - :type source_field: str - """ - - _attribute_map = { - 'source_field': {'key': 'sourceField', 'type': 'str'}, - } - - def __init__(self, *, source_field: str=None, **kwargs) -> None: - super(JsonField, self).__init__(**kwargs) - self.source_field = source_field diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_field_with_default.py b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_field_with_default.py deleted file mode 100644 index 5dd27bed8f7c..000000000000 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_field_with_default.py +++ /dev/null @@ -1,42 +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 msrest.serialization import Model - - -class JsonFieldWithDefault(Model): - """This is used to express the source of an input schema mapping for a single - target field - in the Event Grid Event schema. This is currently used in the mappings for - the 'subject', - 'eventtype' and 'dataversion' properties. This represents a field in the - input event schema - along with a default value to be used, and at least one of these two - properties should be provided. - - :param source_field: Name of a field in the input event schema that's to - be used as the source of a mapping. - :type source_field: str - :param default_value: The default value to be used for mapping when a - SourceField is not provided or if there's no property with the specified - name in the published JSON event payload. - :type default_value: str - """ - - _attribute_map = { - 'source_field': {'key': 'sourceField', 'type': 'str'}, - 'default_value': {'key': 'defaultValue', 'type': 'str'}, - } - - def __init__(self, **kwargs): - super(JsonFieldWithDefault, self).__init__(**kwargs) - self.source_field = kwargs.get('source_field', None) - self.default_value = kwargs.get('default_value', None) diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_field_with_default_py3.py b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_field_with_default_py3.py deleted file mode 100644 index 1a17f0469002..000000000000 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_field_with_default_py3.py +++ /dev/null @@ -1,42 +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 msrest.serialization import Model - - -class JsonFieldWithDefault(Model): - """This is used to express the source of an input schema mapping for a single - target field - in the Event Grid Event schema. This is currently used in the mappings for - the 'subject', - 'eventtype' and 'dataversion' properties. This represents a field in the - input event schema - along with a default value to be used, and at least one of these two - properties should be provided. - - :param source_field: Name of a field in the input event schema that's to - be used as the source of a mapping. - :type source_field: str - :param default_value: The default value to be used for mapping when a - SourceField is not provided or if there's no property with the specified - name in the published JSON event payload. - :type default_value: str - """ - - _attribute_map = { - 'source_field': {'key': 'sourceField', 'type': 'str'}, - 'default_value': {'key': 'defaultValue', 'type': 'str'}, - } - - def __init__(self, *, source_field: str=None, default_value: str=None, **kwargs) -> None: - super(JsonFieldWithDefault, self).__init__(**kwargs) - self.source_field = source_field - self.default_value = default_value diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_input_schema_mapping.py b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_input_schema_mapping.py deleted file mode 100644 index a7635fe6717e..000000000000 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_input_schema_mapping.py +++ /dev/null @@ -1,66 +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 .input_schema_mapping import InputSchemaMapping - - -class JsonInputSchemaMapping(InputSchemaMapping): - """This enables publishing to Event Grid using a custom input schema. This can - be used to map properties from a custom input JSON schema to the Event Grid - event schema. - - All required parameters must be populated in order to send to Azure. - - :param input_schema_mapping_type: Required. Constant filled by server. - :type input_schema_mapping_type: str - :param id: The mapping information for the Id property of the Event Grid - Event. - :type id: ~azure.mgmt.eventgrid.models.JsonField - :param topic: The mapping information for the Topic property of the Event - Grid Event. - :type topic: ~azure.mgmt.eventgrid.models.JsonField - :param event_time: The mapping information for the EventTime property of - the Event Grid Event. - :type event_time: ~azure.mgmt.eventgrid.models.JsonField - :param event_type: The mapping information for the EventType property of - the Event Grid Event. - :type event_type: ~azure.mgmt.eventgrid.models.JsonFieldWithDefault - :param subject: The mapping information for the Subject property of the - Event Grid Event. - :type subject: ~azure.mgmt.eventgrid.models.JsonFieldWithDefault - :param data_version: The mapping information for the DataVersion property - of the Event Grid Event. - :type data_version: ~azure.mgmt.eventgrid.models.JsonFieldWithDefault - """ - - _validation = { - 'input_schema_mapping_type': {'required': True}, - } - - _attribute_map = { - 'input_schema_mapping_type': {'key': 'inputSchemaMappingType', 'type': 'str'}, - 'id': {'key': 'properties.id', 'type': 'JsonField'}, - 'topic': {'key': 'properties.topic', 'type': 'JsonField'}, - 'event_time': {'key': 'properties.eventTime', 'type': 'JsonField'}, - 'event_type': {'key': 'properties.eventType', 'type': 'JsonFieldWithDefault'}, - 'subject': {'key': 'properties.subject', 'type': 'JsonFieldWithDefault'}, - 'data_version': {'key': 'properties.dataVersion', 'type': 'JsonFieldWithDefault'}, - } - - def __init__(self, **kwargs): - super(JsonInputSchemaMapping, self).__init__(**kwargs) - self.id = kwargs.get('id', None) - self.topic = kwargs.get('topic', None) - self.event_time = kwargs.get('event_time', None) - self.event_type = kwargs.get('event_type', None) - self.subject = kwargs.get('subject', None) - self.data_version = kwargs.get('data_version', None) - self.input_schema_mapping_type = 'Json' diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_input_schema_mapping_py3.py b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_input_schema_mapping_py3.py deleted file mode 100644 index 4d3ff8a1b8f4..000000000000 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_input_schema_mapping_py3.py +++ /dev/null @@ -1,66 +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 .input_schema_mapping_py3 import InputSchemaMapping - - -class JsonInputSchemaMapping(InputSchemaMapping): - """This enables publishing to Event Grid using a custom input schema. This can - be used to map properties from a custom input JSON schema to the Event Grid - event schema. - - All required parameters must be populated in order to send to Azure. - - :param input_schema_mapping_type: Required. Constant filled by server. - :type input_schema_mapping_type: str - :param id: The mapping information for the Id property of the Event Grid - Event. - :type id: ~azure.mgmt.eventgrid.models.JsonField - :param topic: The mapping information for the Topic property of the Event - Grid Event. - :type topic: ~azure.mgmt.eventgrid.models.JsonField - :param event_time: The mapping information for the EventTime property of - the Event Grid Event. - :type event_time: ~azure.mgmt.eventgrid.models.JsonField - :param event_type: The mapping information for the EventType property of - the Event Grid Event. - :type event_type: ~azure.mgmt.eventgrid.models.JsonFieldWithDefault - :param subject: The mapping information for the Subject property of the - Event Grid Event. - :type subject: ~azure.mgmt.eventgrid.models.JsonFieldWithDefault - :param data_version: The mapping information for the DataVersion property - of the Event Grid Event. - :type data_version: ~azure.mgmt.eventgrid.models.JsonFieldWithDefault - """ - - _validation = { - 'input_schema_mapping_type': {'required': True}, - } - - _attribute_map = { - 'input_schema_mapping_type': {'key': 'inputSchemaMappingType', 'type': 'str'}, - 'id': {'key': 'properties.id', 'type': 'JsonField'}, - 'topic': {'key': 'properties.topic', 'type': 'JsonField'}, - 'event_time': {'key': 'properties.eventTime', 'type': 'JsonField'}, - 'event_type': {'key': 'properties.eventType', 'type': 'JsonFieldWithDefault'}, - 'subject': {'key': 'properties.subject', 'type': 'JsonFieldWithDefault'}, - 'data_version': {'key': 'properties.dataVersion', 'type': 'JsonFieldWithDefault'}, - } - - def __init__(self, *, id=None, topic=None, event_time=None, event_type=None, subject=None, data_version=None, **kwargs) -> None: - super(JsonInputSchemaMapping, self).__init__(**kwargs) - self.id = id - self.topic = topic - self.event_time = event_time - self.event_type = event_type - self.subject = subject - self.data_version = data_version - self.input_schema_mapping_type = 'Json' diff --git a/azure-mgmt-eventgrid/dev_requirements.txt b/azure-mgmt-eventgrid/dev_requirements.txt deleted file mode 100644 index 331cfed8ea26..000000000000 --- a/azure-mgmt-eventgrid/dev_requirements.txt +++ /dev/null @@ -1 +0,0 @@ --e ../azure-sdk-tools diff --git a/azure-mgmt-eventgrid/HISTORY.rst b/sdk/eventgrid/azure-mgmt-eventgrid/HISTORY.rst similarity index 86% rename from azure-mgmt-eventgrid/HISTORY.rst rename to sdk/eventgrid/azure-mgmt-eventgrid/HISTORY.rst index e8d2954ad463..4701116d11dc 100644 --- a/azure-mgmt-eventgrid/HISTORY.rst +++ b/sdk/eventgrid/azure-mgmt-eventgrid/HISTORY.rst @@ -3,6 +3,22 @@ Release History =============== +2.1.0 (2019-05-22) +++++++++++++++++++ + +Not all preview features of the 2.1.0rc1 were confirmed in this 2.1.0 stable version. In particular, the following features will still be available only in the 2.1.0rc1 for now: + +- Input mapping/Delivery Schema. +- "label" filtering parameter in all operations + +All other features are now considerd stable to use in production. This includes: + +- Domains, which include all domain related operation including adding/deleting domain topics manually. +- Pagination/filtering +- Servicebus queue as destination +- Advanced filtering, which was introduced in previous preview version. +- Showing and selecting default event types instead of ‘all’ + 2.1.0rc1 (2019-03-11) +++++++++++++++++++++ diff --git a/azure-mgmt-eventgrid/MANIFEST.in b/sdk/eventgrid/azure-mgmt-eventgrid/MANIFEST.in similarity index 100% rename from azure-mgmt-eventgrid/MANIFEST.in rename to sdk/eventgrid/azure-mgmt-eventgrid/MANIFEST.in diff --git a/azure-mgmt-eventgrid/README.rst b/sdk/eventgrid/azure-mgmt-eventgrid/README.rst similarity index 100% rename from azure-mgmt-eventgrid/README.rst rename to sdk/eventgrid/azure-mgmt-eventgrid/README.rst diff --git a/azure-mgmt-eventgrid/azure/__init__.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/__init__.py similarity index 100% rename from azure-mgmt-eventgrid/azure/__init__.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/__init__.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/__init__.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/__init__.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/__init__.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/__init__.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/__init__.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/__init__.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/__init__.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/__init__.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/event_grid_management_client.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/event_grid_management_client.py similarity index 99% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/event_grid_management_client.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/event_grid_management_client.py index 6b4c86bf4de9..2f32c2f09f38 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/event_grid_management_client.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/event_grid_management_client.py @@ -92,7 +92,7 @@ def __init__( super(EventGridManagementClient, self).__init__(self.config.credentials, self.config) client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)} - self.api_version = '2019-02-01-preview' + self.api_version = '2019-06-01' self._serialize = Serializer(client_models) self._deserialize = Deserializer(client_models) diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/__init__.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/__init__.py similarity index 92% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/__init__.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/__init__.py index ea9b806e4adc..d0e9d4733032 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/__init__.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/__init__.py @@ -10,11 +10,7 @@ # -------------------------------------------------------------------------- try: - from .input_schema_mapping_py3 import InputSchemaMapping from .resource_py3 import Resource - from .json_field_py3 import JsonField - from .json_field_with_default_py3 import JsonFieldWithDefault - from .json_input_schema_mapping_py3 import JsonInputSchemaMapping from .tracked_resource_py3 import TrackedResource from .domain_py3 import Domain from .domain_update_parameters_py3 import DomainUpdateParameters @@ -56,11 +52,7 @@ from .event_type_py3 import EventType from .topic_type_info_py3 import TopicTypeInfo except (SyntaxError, ImportError): - from .input_schema_mapping import InputSchemaMapping from .resource import Resource - from .json_field import JsonField - from .json_field_with_default import JsonFieldWithDefault - from .json_input_schema_mapping import JsonInputSchemaMapping from .tracked_resource import TrackedResource from .domain import Domain from .domain_update_parameters import DomainUpdateParameters @@ -110,21 +102,15 @@ from .topic_type_info_paged import TopicTypeInfoPaged from .event_grid_management_client_enums import ( DomainProvisioningState, - InputSchema, DomainTopicProvisioningState, EventSubscriptionProvisioningState, - EventDeliverySchema, TopicProvisioningState, ResourceRegionType, TopicTypeProvisioningState, ) __all__ = [ - 'InputSchemaMapping', 'Resource', - 'JsonField', - 'JsonFieldWithDefault', - 'JsonInputSchemaMapping', 'TrackedResource', 'Domain', 'DomainUpdateParameters', @@ -173,10 +159,8 @@ 'EventTypePaged', 'TopicTypeInfoPaged', 'DomainProvisioningState', - 'InputSchema', 'DomainTopicProvisioningState', 'EventSubscriptionProvisioningState', - 'EventDeliverySchema', 'TopicProvisioningState', 'ResourceRegionType', 'TopicTypeProvisioningState', diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/advanced_filter.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/advanced_filter.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/advanced_filter.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/advanced_filter.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/advanced_filter_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/advanced_filter_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/advanced_filter_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/advanced_filter_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/bool_equals_advanced_filter.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/bool_equals_advanced_filter.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/bool_equals_advanced_filter.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/bool_equals_advanced_filter.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/bool_equals_advanced_filter_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/bool_equals_advanced_filter_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/bool_equals_advanced_filter_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/bool_equals_advanced_filter_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/dead_letter_destination.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/dead_letter_destination.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/dead_letter_destination.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/dead_letter_destination.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/dead_letter_destination_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/dead_letter_destination_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/dead_letter_destination_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/dead_letter_destination_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain.py similarity index 65% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain.py index 2b5ee6d6a06f..c6cbf8a1bd2f 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain.py @@ -20,15 +20,15 @@ class Domain(TrackedResource): All required parameters must be populated in order to send to Azure. - :ivar id: Fully qualified identifier of the resource + :ivar id: Fully qualified identifier of the resource. :vartype id: str - :ivar name: Name of the resource + :ivar name: Name of the resource. :vartype name: str - :ivar type: Type of the resource + :ivar type: Type of the resource. :vartype type: str - :param location: Required. Location of the resource + :param location: Required. Location of the resource. :type location: str - :param tags: Tags of the resource + :param tags: Tags of the resource. :type tags: dict[str, str] :ivar provisioning_state: Provisioning state of the domain. Possible values include: 'Creating', 'Updating', 'Deleting', 'Succeeded', @@ -37,15 +37,6 @@ class Domain(TrackedResource): ~azure.mgmt.eventgrid.models.DomainProvisioningState :ivar endpoint: Endpoint for the domain. :vartype endpoint: str - :param input_schema: This determines the format that Event Grid should - expect for incoming events published to the domain. Possible values - include: 'EventGridSchema', 'CustomEventSchema', 'CloudEventV01Schema'. - Default value: "EventGridSchema" . - :type input_schema: str or ~azure.mgmt.eventgrid.models.InputSchema - :param input_schema_mapping: Information about the InputSchemaMapping - which specified the info about mapping event payload. - :type input_schema_mapping: - ~azure.mgmt.eventgrid.models.InputSchemaMapping """ _validation = { @@ -65,13 +56,9 @@ class Domain(TrackedResource): 'tags': {'key': 'tags', 'type': '{str}'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'endpoint': {'key': 'properties.endpoint', 'type': 'str'}, - 'input_schema': {'key': 'properties.inputSchema', 'type': 'str'}, - 'input_schema_mapping': {'key': 'properties.inputSchemaMapping', 'type': 'InputSchemaMapping'}, } def __init__(self, **kwargs): super(Domain, self).__init__(**kwargs) self.provisioning_state = None self.endpoint = None - self.input_schema = kwargs.get('input_schema', "EventGridSchema") - self.input_schema_mapping = kwargs.get('input_schema_mapping', None) diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_paged.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_paged.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_paged.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_paged.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_py3.py similarity index 63% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_py3.py index 54a47b578a0b..b01e2e563a0e 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_py3.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_py3.py @@ -20,15 +20,15 @@ class Domain(TrackedResource): All required parameters must be populated in order to send to Azure. - :ivar id: Fully qualified identifier of the resource + :ivar id: Fully qualified identifier of the resource. :vartype id: str - :ivar name: Name of the resource + :ivar name: Name of the resource. :vartype name: str - :ivar type: Type of the resource + :ivar type: Type of the resource. :vartype type: str - :param location: Required. Location of the resource + :param location: Required. Location of the resource. :type location: str - :param tags: Tags of the resource + :param tags: Tags of the resource. :type tags: dict[str, str] :ivar provisioning_state: Provisioning state of the domain. Possible values include: 'Creating', 'Updating', 'Deleting', 'Succeeded', @@ -37,15 +37,6 @@ class Domain(TrackedResource): ~azure.mgmt.eventgrid.models.DomainProvisioningState :ivar endpoint: Endpoint for the domain. :vartype endpoint: str - :param input_schema: This determines the format that Event Grid should - expect for incoming events published to the domain. Possible values - include: 'EventGridSchema', 'CustomEventSchema', 'CloudEventV01Schema'. - Default value: "EventGridSchema" . - :type input_schema: str or ~azure.mgmt.eventgrid.models.InputSchema - :param input_schema_mapping: Information about the InputSchemaMapping - which specified the info about mapping event payload. - :type input_schema_mapping: - ~azure.mgmt.eventgrid.models.InputSchemaMapping """ _validation = { @@ -65,13 +56,9 @@ class Domain(TrackedResource): 'tags': {'key': 'tags', 'type': '{str}'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'endpoint': {'key': 'properties.endpoint', 'type': 'str'}, - 'input_schema': {'key': 'properties.inputSchema', 'type': 'str'}, - 'input_schema_mapping': {'key': 'properties.inputSchemaMapping', 'type': 'InputSchemaMapping'}, } - def __init__(self, *, location: str, tags=None, input_schema="EventGridSchema", input_schema_mapping=None, **kwargs) -> None: + def __init__(self, *, location: str, tags=None, **kwargs) -> None: super(Domain, self).__init__(location=location, tags=tags, **kwargs) self.provisioning_state = None self.endpoint = None - self.input_schema = input_schema - self.input_schema_mapping = input_schema_mapping diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_regenerate_key_request.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_regenerate_key_request.py similarity index 99% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_regenerate_key_request.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_regenerate_key_request.py index cacf0e74fb26..266a703414a5 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_regenerate_key_request.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_regenerate_key_request.py @@ -17,7 +17,7 @@ class DomainRegenerateKeyRequest(Model): All required parameters must be populated in order to send to Azure. - :param key_name: Required. Key name to regenerate key1 or key2 + :param key_name: Required. Key name to regenerate key1 or key2. :type key_name: str """ diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_regenerate_key_request_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_regenerate_key_request_py3.py similarity index 99% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_regenerate_key_request_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_regenerate_key_request_py3.py index 9d024c87c0c6..62d2c0f7279d 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_regenerate_key_request_py3.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_regenerate_key_request_py3.py @@ -17,7 +17,7 @@ class DomainRegenerateKeyRequest(Model): All required parameters must be populated in order to send to Azure. - :param key_name: Required. Key name to regenerate key1 or key2 + :param key_name: Required. Key name to regenerate key1 or key2. :type key_name: str """ diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_shared_access_keys.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_shared_access_keys.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_shared_access_keys.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_shared_access_keys.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_shared_access_keys_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_shared_access_keys_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_shared_access_keys_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_shared_access_keys_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_topic.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_topic.py similarity index 92% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_topic.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_topic.py index 2521df5e3a9e..c0c5ae3619ff 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_topic.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_topic.py @@ -18,11 +18,11 @@ class DomainTopic(Resource): Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified identifier of the resource + :ivar id: Fully qualified identifier of the resource. :vartype id: str - :ivar name: Name of the resource + :ivar name: Name of the resource. :vartype name: str - :ivar type: Type of the resource + :ivar type: Type of the resource. :vartype type: str :param provisioning_state: Provisioning state of the domain topic. Possible values include: 'Creating', 'Updating', 'Deleting', 'Succeeded', diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_topic_paged.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_topic_paged.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_topic_paged.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_topic_paged.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_topic_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_topic_py3.py similarity index 92% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_topic_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_topic_py3.py index 8324a899e841..ef8d3d687696 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_topic_py3.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_topic_py3.py @@ -18,11 +18,11 @@ class DomainTopic(Resource): Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified identifier of the resource + :ivar id: Fully qualified identifier of the resource. :vartype id: str - :ivar name: Name of the resource + :ivar name: Name of the resource. :vartype name: str - :ivar type: Type of the resource + :ivar type: Type of the resource. :vartype type: str :param provisioning_state: Provisioning state of the domain topic. Possible values include: 'Creating', 'Updating', 'Deleting', 'Succeeded', diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_update_parameters.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_update_parameters.py similarity index 94% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_update_parameters.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_update_parameters.py index 1bc4fca2bc30..ca98e1a44b26 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_update_parameters.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_update_parameters.py @@ -15,7 +15,7 @@ class DomainUpdateParameters(Model): """Properties of the Domain update. - :param tags: Tags of the domains resource + :param tags: Tags of the domains resource. :type tags: dict[str, str] """ diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_update_parameters_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_update_parameters_py3.py similarity index 94% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_update_parameters_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_update_parameters_py3.py index f876c6e4adbd..681a18a5f227 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_update_parameters_py3.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/domain_update_parameters_py3.py @@ -15,7 +15,7 @@ class DomainUpdateParameters(Model): """Properties of the Domain update. - :param tags: Tags of the domains resource + :param tags: Tags of the domains resource. :type tags: dict[str, str] """ diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_grid_management_client_enums.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_grid_management_client_enums.py similarity index 82% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_grid_management_client_enums.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_grid_management_client_enums.py index 7b9aaad58749..c0d3b4079d5c 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_grid_management_client_enums.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_grid_management_client_enums.py @@ -22,13 +22,6 @@ class DomainProvisioningState(str, Enum): failed = "Failed" -class InputSchema(str, Enum): - - event_grid_schema = "EventGridSchema" - custom_event_schema = "CustomEventSchema" - cloud_event_v01_schema = "CloudEventV01Schema" - - class DomainTopicProvisioningState(str, Enum): creating = "Creating" @@ -50,13 +43,6 @@ class EventSubscriptionProvisioningState(str, Enum): awaiting_manual_action = "AwaitingManualAction" -class EventDeliverySchema(str, Enum): - - event_grid_schema = "EventGridSchema" - cloud_event_v01_schema = "CloudEventV01Schema" - custom_input_schema = "CustomInputSchema" - - class TopicProvisioningState(str, Enum): creating = "Creating" diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_hub_event_subscription_destination.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_hub_event_subscription_destination.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_hub_event_subscription_destination.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_hub_event_subscription_destination.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_hub_event_subscription_destination_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_hub_event_subscription_destination_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_hub_event_subscription_destination_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_hub_event_subscription_destination_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription.py similarity index 86% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription.py index fb5f0a3419ce..7e4034ed7f4c 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription.py @@ -18,11 +18,11 @@ class EventSubscription(Resource): Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified identifier of the resource + :ivar id: Fully qualified identifier of the resource. :vartype id: str - :ivar name: Name of the resource + :ivar name: Name of the resource. :vartype name: str - :ivar type: Type of the resource + :ivar type: Type of the resource. :vartype type: str :ivar topic: Name of the topic of the event subscription. :vartype topic: str @@ -41,11 +41,6 @@ class EventSubscription(Resource): :type labels: list[str] :param expiration_time_utc: Expiration time of the event subscription. :type expiration_time_utc: datetime - :param event_delivery_schema: The event delivery schema for the event - subscription. Possible values include: 'EventGridSchema', - 'CloudEventV01Schema', 'CustomInputSchema' - :type event_delivery_schema: str or - ~azure.mgmt.eventgrid.models.EventDeliverySchema :param retry_policy: The retry policy for events. This can be used to configure maximum number of delivery attempts and time to live for events. :type retry_policy: ~azure.mgmt.eventgrid.models.RetryPolicy @@ -73,7 +68,6 @@ class EventSubscription(Resource): 'filter': {'key': 'properties.filter', 'type': 'EventSubscriptionFilter'}, 'labels': {'key': 'properties.labels', 'type': '[str]'}, 'expiration_time_utc': {'key': 'properties.expirationTimeUtc', 'type': 'iso-8601'}, - 'event_delivery_schema': {'key': 'properties.eventDeliverySchema', 'type': 'str'}, 'retry_policy': {'key': 'properties.retryPolicy', 'type': 'RetryPolicy'}, 'dead_letter_destination': {'key': 'properties.deadLetterDestination', 'type': 'DeadLetterDestination'}, } @@ -86,6 +80,5 @@ def __init__(self, **kwargs): self.filter = kwargs.get('filter', None) self.labels = kwargs.get('labels', None) self.expiration_time_utc = kwargs.get('expiration_time_utc', None) - self.event_delivery_schema = kwargs.get('event_delivery_schema', None) self.retry_policy = kwargs.get('retry_policy', None) self.dead_letter_destination = kwargs.get('dead_letter_destination', None) diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_destination.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_destination.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_destination.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_destination.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_destination_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_destination_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_destination_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_destination_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_filter.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_filter.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_filter.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_filter.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_filter_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_filter_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_filter_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_filter_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_full_url.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_full_url.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_full_url.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_full_url.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_full_url_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_full_url_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_full_url_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_full_url_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_paged.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_paged.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_paged.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_paged.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_py3.py similarity index 84% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_py3.py index 246622ce3702..8fed85e7b1dc 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_py3.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_py3.py @@ -18,11 +18,11 @@ class EventSubscription(Resource): Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified identifier of the resource + :ivar id: Fully qualified identifier of the resource. :vartype id: str - :ivar name: Name of the resource + :ivar name: Name of the resource. :vartype name: str - :ivar type: Type of the resource + :ivar type: Type of the resource. :vartype type: str :ivar topic: Name of the topic of the event subscription. :vartype topic: str @@ -41,11 +41,6 @@ class EventSubscription(Resource): :type labels: list[str] :param expiration_time_utc: Expiration time of the event subscription. :type expiration_time_utc: datetime - :param event_delivery_schema: The event delivery schema for the event - subscription. Possible values include: 'EventGridSchema', - 'CloudEventV01Schema', 'CustomInputSchema' - :type event_delivery_schema: str or - ~azure.mgmt.eventgrid.models.EventDeliverySchema :param retry_policy: The retry policy for events. This can be used to configure maximum number of delivery attempts and time to live for events. :type retry_policy: ~azure.mgmt.eventgrid.models.RetryPolicy @@ -73,12 +68,11 @@ class EventSubscription(Resource): 'filter': {'key': 'properties.filter', 'type': 'EventSubscriptionFilter'}, 'labels': {'key': 'properties.labels', 'type': '[str]'}, 'expiration_time_utc': {'key': 'properties.expirationTimeUtc', 'type': 'iso-8601'}, - 'event_delivery_schema': {'key': 'properties.eventDeliverySchema', 'type': 'str'}, 'retry_policy': {'key': 'properties.retryPolicy', 'type': 'RetryPolicy'}, 'dead_letter_destination': {'key': 'properties.deadLetterDestination', 'type': 'DeadLetterDestination'}, } - def __init__(self, *, destination=None, filter=None, labels=None, expiration_time_utc=None, event_delivery_schema=None, retry_policy=None, dead_letter_destination=None, **kwargs) -> None: + def __init__(self, *, destination=None, filter=None, labels=None, expiration_time_utc=None, retry_policy=None, dead_letter_destination=None, **kwargs) -> None: super(EventSubscription, self).__init__(**kwargs) self.topic = None self.provisioning_state = None @@ -86,6 +80,5 @@ def __init__(self, *, destination=None, filter=None, labels=None, expiration_tim self.filter = filter self.labels = labels self.expiration_time_utc = expiration_time_utc - self.event_delivery_schema = event_delivery_schema self.retry_policy = retry_policy self.dead_letter_destination = dead_letter_destination diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_update_parameters.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_update_parameters.py similarity index 85% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_update_parameters.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_update_parameters.py index 5371a06679cc..0d76071f0078 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_update_parameters.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_update_parameters.py @@ -26,11 +26,6 @@ class EventSubscriptionUpdateParameters(Model): :param expiration_time_utc: Information about the expiration time for the event subscription. :type expiration_time_utc: datetime - :param event_delivery_schema: The event delivery schema for the event - subscription. Possible values include: 'EventGridSchema', - 'CloudEventV01Schema', 'CustomInputSchema' - :type event_delivery_schema: str or - ~azure.mgmt.eventgrid.models.EventDeliverySchema :param retry_policy: The retry policy for events. This can be used to configure maximum number of delivery attempts and time to live for events. :type retry_policy: ~azure.mgmt.eventgrid.models.RetryPolicy @@ -45,7 +40,6 @@ class EventSubscriptionUpdateParameters(Model): 'filter': {'key': 'filter', 'type': 'EventSubscriptionFilter'}, 'labels': {'key': 'labels', 'type': '[str]'}, 'expiration_time_utc': {'key': 'expirationTimeUtc', 'type': 'iso-8601'}, - 'event_delivery_schema': {'key': 'eventDeliverySchema', 'type': 'str'}, 'retry_policy': {'key': 'retryPolicy', 'type': 'RetryPolicy'}, 'dead_letter_destination': {'key': 'deadLetterDestination', 'type': 'DeadLetterDestination'}, } @@ -56,6 +50,5 @@ def __init__(self, **kwargs): self.filter = kwargs.get('filter', None) self.labels = kwargs.get('labels', None) self.expiration_time_utc = kwargs.get('expiration_time_utc', None) - self.event_delivery_schema = kwargs.get('event_delivery_schema', None) self.retry_policy = kwargs.get('retry_policy', None) self.dead_letter_destination = kwargs.get('dead_letter_destination', None) diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_update_parameters_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_update_parameters_py3.py similarity index 82% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_update_parameters_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_update_parameters_py3.py index 3f415aa3e8cb..a124a7623031 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_update_parameters_py3.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_update_parameters_py3.py @@ -26,11 +26,6 @@ class EventSubscriptionUpdateParameters(Model): :param expiration_time_utc: Information about the expiration time for the event subscription. :type expiration_time_utc: datetime - :param event_delivery_schema: The event delivery schema for the event - subscription. Possible values include: 'EventGridSchema', - 'CloudEventV01Schema', 'CustomInputSchema' - :type event_delivery_schema: str or - ~azure.mgmt.eventgrid.models.EventDeliverySchema :param retry_policy: The retry policy for events. This can be used to configure maximum number of delivery attempts and time to live for events. :type retry_policy: ~azure.mgmt.eventgrid.models.RetryPolicy @@ -45,17 +40,15 @@ class EventSubscriptionUpdateParameters(Model): 'filter': {'key': 'filter', 'type': 'EventSubscriptionFilter'}, 'labels': {'key': 'labels', 'type': '[str]'}, 'expiration_time_utc': {'key': 'expirationTimeUtc', 'type': 'iso-8601'}, - 'event_delivery_schema': {'key': 'eventDeliverySchema', 'type': 'str'}, 'retry_policy': {'key': 'retryPolicy', 'type': 'RetryPolicy'}, 'dead_letter_destination': {'key': 'deadLetterDestination', 'type': 'DeadLetterDestination'}, } - def __init__(self, *, destination=None, filter=None, labels=None, expiration_time_utc=None, event_delivery_schema=None, retry_policy=None, dead_letter_destination=None, **kwargs) -> None: + def __init__(self, *, destination=None, filter=None, labels=None, expiration_time_utc=None, retry_policy=None, dead_letter_destination=None, **kwargs) -> None: super(EventSubscriptionUpdateParameters, self).__init__(**kwargs) self.destination = destination self.filter = filter self.labels = labels self.expiration_time_utc = expiration_time_utc - self.event_delivery_schema = event_delivery_schema self.retry_policy = retry_policy self.dead_letter_destination = dead_letter_destination diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_type.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_type.py similarity index 93% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_type.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_type.py index 1623e18030eb..3695b2342878 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_type.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_type.py @@ -18,11 +18,11 @@ class EventType(Resource): Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified identifier of the resource + :ivar id: Fully qualified identifier of the resource. :vartype id: str - :ivar name: Name of the resource + :ivar name: Name of the resource. :vartype name: str - :ivar type: Type of the resource + :ivar type: Type of the resource. :vartype type: str :param display_name: Display name of the event type. :type display_name: str diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_type_paged.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_type_paged.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_type_paged.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_type_paged.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_type_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_type_py3.py similarity index 93% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_type_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_type_py3.py index 52f1f6093586..ba779720ebf8 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_type_py3.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_type_py3.py @@ -18,11 +18,11 @@ class EventType(Resource): Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified identifier of the resource + :ivar id: Fully qualified identifier of the resource. :vartype id: str - :ivar name: Name of the resource + :ivar name: Name of the resource. :vartype name: str - :ivar type: Type of the resource + :ivar type: Type of the resource. :vartype type: str :param display_name: Display name of the event type. :type display_name: str diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/hybrid_connection_event_subscription_destination.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/hybrid_connection_event_subscription_destination.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/hybrid_connection_event_subscription_destination.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/hybrid_connection_event_subscription_destination.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/hybrid_connection_event_subscription_destination_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/hybrid_connection_event_subscription_destination_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/hybrid_connection_event_subscription_destination_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/hybrid_connection_event_subscription_destination_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_greater_than_advanced_filter.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_greater_than_advanced_filter.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_greater_than_advanced_filter.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_greater_than_advanced_filter.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_greater_than_advanced_filter_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_greater_than_advanced_filter_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_greater_than_advanced_filter_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_greater_than_advanced_filter_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_greater_than_or_equals_advanced_filter.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_greater_than_or_equals_advanced_filter.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_greater_than_or_equals_advanced_filter.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_greater_than_or_equals_advanced_filter.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_greater_than_or_equals_advanced_filter_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_greater_than_or_equals_advanced_filter_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_greater_than_or_equals_advanced_filter_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_greater_than_or_equals_advanced_filter_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_in_advanced_filter.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_in_advanced_filter.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_in_advanced_filter.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_in_advanced_filter.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_in_advanced_filter_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_in_advanced_filter_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_in_advanced_filter_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_in_advanced_filter_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_less_than_advanced_filter.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_less_than_advanced_filter.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_less_than_advanced_filter.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_less_than_advanced_filter.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_less_than_advanced_filter_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_less_than_advanced_filter_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_less_than_advanced_filter_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_less_than_advanced_filter_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_less_than_or_equals_advanced_filter.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_less_than_or_equals_advanced_filter.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_less_than_or_equals_advanced_filter.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_less_than_or_equals_advanced_filter.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_less_than_or_equals_advanced_filter_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_less_than_or_equals_advanced_filter_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_less_than_or_equals_advanced_filter_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_less_than_or_equals_advanced_filter_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_not_in_advanced_filter.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_not_in_advanced_filter.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_not_in_advanced_filter.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_not_in_advanced_filter.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_not_in_advanced_filter_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_not_in_advanced_filter_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_not_in_advanced_filter_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/number_not_in_advanced_filter_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/operation.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/operation.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/operation.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/operation.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/operation_info.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/operation_info.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/operation_info.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/operation_info.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/operation_info_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/operation_info_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/operation_info_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/operation_info_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/operation_paged.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/operation_paged.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/operation_paged.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/operation_paged.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/operation_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/operation_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/operation_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/operation_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/resource.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/resource.py similarity index 89% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/resource.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/resource.py index b2d2b17be38f..98c7040f0350 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/resource.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/resource.py @@ -18,11 +18,11 @@ class Resource(Model): Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified identifier of the resource + :ivar id: Fully qualified identifier of the resource. :vartype id: str - :ivar name: Name of the resource + :ivar name: Name of the resource. :vartype name: str - :ivar type: Type of the resource + :ivar type: Type of the resource. :vartype type: str """ diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/resource_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/resource_py3.py similarity index 90% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/resource_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/resource_py3.py index 79dce3e5b3bb..b8ac5f18a8d4 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/resource_py3.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/resource_py3.py @@ -18,11 +18,11 @@ class Resource(Model): Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified identifier of the resource + :ivar id: Fully qualified identifier of the resource. :vartype id: str - :ivar name: Name of the resource + :ivar name: Name of the resource. :vartype name: str - :ivar type: Type of the resource + :ivar type: Type of the resource. :vartype type: str """ diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/retry_policy.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/retry_policy.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/retry_policy.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/retry_policy.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/retry_policy_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/retry_policy_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/retry_policy_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/retry_policy_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/service_bus_queue_event_subscription_destination.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/service_bus_queue_event_subscription_destination.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/service_bus_queue_event_subscription_destination.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/service_bus_queue_event_subscription_destination.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/service_bus_queue_event_subscription_destination_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/service_bus_queue_event_subscription_destination_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/service_bus_queue_event_subscription_destination_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/service_bus_queue_event_subscription_destination_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_blob_dead_letter_destination.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_blob_dead_letter_destination.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_blob_dead_letter_destination.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_blob_dead_letter_destination.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_blob_dead_letter_destination_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_blob_dead_letter_destination_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_blob_dead_letter_destination_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_blob_dead_letter_destination_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_queue_event_subscription_destination.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_queue_event_subscription_destination.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_queue_event_subscription_destination.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_queue_event_subscription_destination.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_queue_event_subscription_destination_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_queue_event_subscription_destination_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_queue_event_subscription_destination_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_queue_event_subscription_destination_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_begins_with_advanced_filter.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_begins_with_advanced_filter.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_begins_with_advanced_filter.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_begins_with_advanced_filter.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_begins_with_advanced_filter_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_begins_with_advanced_filter_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_begins_with_advanced_filter_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_begins_with_advanced_filter_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_contains_advanced_filter.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_contains_advanced_filter.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_contains_advanced_filter.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_contains_advanced_filter.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_contains_advanced_filter_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_contains_advanced_filter_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_contains_advanced_filter_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_contains_advanced_filter_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_ends_with_advanced_filter.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_ends_with_advanced_filter.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_ends_with_advanced_filter.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_ends_with_advanced_filter.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_ends_with_advanced_filter_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_ends_with_advanced_filter_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_ends_with_advanced_filter_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_ends_with_advanced_filter_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_in_advanced_filter.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_in_advanced_filter.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_in_advanced_filter.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_in_advanced_filter.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_in_advanced_filter_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_in_advanced_filter_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_in_advanced_filter_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_in_advanced_filter_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_not_in_advanced_filter.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_not_in_advanced_filter.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_not_in_advanced_filter.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_not_in_advanced_filter.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_not_in_advanced_filter_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_not_in_advanced_filter_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_not_in_advanced_filter_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/string_not_in_advanced_filter_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic.py similarity index 62% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic.py index 50d28d5206e5..21dfede3186c 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic.py @@ -20,15 +20,15 @@ class Topic(TrackedResource): All required parameters must be populated in order to send to Azure. - :ivar id: Fully qualified identifier of the resource + :ivar id: Fully qualified identifier of the resource. :vartype id: str - :ivar name: Name of the resource + :ivar name: Name of the resource. :vartype name: str - :ivar type: Type of the resource + :ivar type: Type of the resource. :vartype type: str - :param location: Required. Location of the resource + :param location: Required. Location of the resource. :type location: str - :param tags: Tags of the resource + :param tags: Tags of the resource. :type tags: dict[str, str] :ivar provisioning_state: Provisioning state of the topic. Possible values include: 'Creating', 'Updating', 'Deleting', 'Succeeded', 'Canceled', @@ -37,17 +37,6 @@ class Topic(TrackedResource): ~azure.mgmt.eventgrid.models.TopicProvisioningState :ivar endpoint: Endpoint for the topic. :vartype endpoint: str - :param input_schema: This determines the format that Event Grid should - expect for incoming events published to the topic. Possible values - include: 'EventGridSchema', 'CustomEventSchema', 'CloudEventV01Schema'. - Default value: "EventGridSchema" . - :type input_schema: str or ~azure.mgmt.eventgrid.models.InputSchema - :param input_schema_mapping: This enables publishing using custom event - schemas. An InputSchemaMapping can be specified to map various properties - of a source schema to various required properties of the EventGridEvent - schema. - :type input_schema_mapping: - ~azure.mgmt.eventgrid.models.InputSchemaMapping """ _validation = { @@ -67,13 +56,9 @@ class Topic(TrackedResource): 'tags': {'key': 'tags', 'type': '{str}'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'endpoint': {'key': 'properties.endpoint', 'type': 'str'}, - 'input_schema': {'key': 'properties.inputSchema', 'type': 'str'}, - 'input_schema_mapping': {'key': 'properties.inputSchemaMapping', 'type': 'InputSchemaMapping'}, } def __init__(self, **kwargs): super(Topic, self).__init__(**kwargs) self.provisioning_state = None self.endpoint = None - self.input_schema = kwargs.get('input_schema', "EventGridSchema") - self.input_schema_mapping = kwargs.get('input_schema_mapping', None) diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_paged.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_paged.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_paged.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_paged.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_py3.py similarity index 61% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_py3.py index 9c562e93663a..98751fa42f8c 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_py3.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_py3.py @@ -20,15 +20,15 @@ class Topic(TrackedResource): All required parameters must be populated in order to send to Azure. - :ivar id: Fully qualified identifier of the resource + :ivar id: Fully qualified identifier of the resource. :vartype id: str - :ivar name: Name of the resource + :ivar name: Name of the resource. :vartype name: str - :ivar type: Type of the resource + :ivar type: Type of the resource. :vartype type: str - :param location: Required. Location of the resource + :param location: Required. Location of the resource. :type location: str - :param tags: Tags of the resource + :param tags: Tags of the resource. :type tags: dict[str, str] :ivar provisioning_state: Provisioning state of the topic. Possible values include: 'Creating', 'Updating', 'Deleting', 'Succeeded', 'Canceled', @@ -37,17 +37,6 @@ class Topic(TrackedResource): ~azure.mgmt.eventgrid.models.TopicProvisioningState :ivar endpoint: Endpoint for the topic. :vartype endpoint: str - :param input_schema: This determines the format that Event Grid should - expect for incoming events published to the topic. Possible values - include: 'EventGridSchema', 'CustomEventSchema', 'CloudEventV01Schema'. - Default value: "EventGridSchema" . - :type input_schema: str or ~azure.mgmt.eventgrid.models.InputSchema - :param input_schema_mapping: This enables publishing using custom event - schemas. An InputSchemaMapping can be specified to map various properties - of a source schema to various required properties of the EventGridEvent - schema. - :type input_schema_mapping: - ~azure.mgmt.eventgrid.models.InputSchemaMapping """ _validation = { @@ -67,13 +56,9 @@ class Topic(TrackedResource): 'tags': {'key': 'tags', 'type': '{str}'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, 'endpoint': {'key': 'properties.endpoint', 'type': 'str'}, - 'input_schema': {'key': 'properties.inputSchema', 'type': 'str'}, - 'input_schema_mapping': {'key': 'properties.inputSchemaMapping', 'type': 'InputSchemaMapping'}, } - def __init__(self, *, location: str, tags=None, input_schema="EventGridSchema", input_schema_mapping=None, **kwargs) -> None: + def __init__(self, *, location: str, tags=None, **kwargs) -> None: super(Topic, self).__init__(location=location, tags=tags, **kwargs) self.provisioning_state = None self.endpoint = None - self.input_schema = input_schema - self.input_schema_mapping = input_schema_mapping diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_regenerate_key_request.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_regenerate_key_request.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_regenerate_key_request.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_regenerate_key_request.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_regenerate_key_request_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_regenerate_key_request_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_regenerate_key_request_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_regenerate_key_request_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_shared_access_keys.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_shared_access_keys.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_shared_access_keys.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_shared_access_keys.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_shared_access_keys_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_shared_access_keys_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_shared_access_keys_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_shared_access_keys_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_type_info.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_type_info.py similarity index 95% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_type_info.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_type_info.py index 54f144767714..30f84e5c3664 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_type_info.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_type_info.py @@ -18,11 +18,11 @@ class TopicTypeInfo(Resource): Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified identifier of the resource + :ivar id: Fully qualified identifier of the resource. :vartype id: str - :ivar name: Name of the resource + :ivar name: Name of the resource. :vartype name: str - :ivar type: Type of the resource + :ivar type: Type of the resource. :vartype type: str :param provider: Namespace of the provider of the topic type. :type provider: str diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_type_info_paged.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_type_info_paged.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_type_info_paged.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_type_info_paged.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_type_info_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_type_info_py3.py similarity index 95% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_type_info_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_type_info_py3.py index c5bae7879489..857812caa7e7 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_type_info_py3.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_type_info_py3.py @@ -18,11 +18,11 @@ class TopicTypeInfo(Resource): Variables are only populated by the server, and will be ignored when sending a request. - :ivar id: Fully qualified identifier of the resource + :ivar id: Fully qualified identifier of the resource. :vartype id: str - :ivar name: Name of the resource + :ivar name: Name of the resource. :vartype name: str - :ivar type: Type of the resource + :ivar type: Type of the resource. :vartype type: str :param provider: Namespace of the provider of the topic type. :type provider: str diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_update_parameters.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_update_parameters.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_update_parameters.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_update_parameters.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_update_parameters_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_update_parameters_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_update_parameters_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_update_parameters_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/tracked_resource.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/tracked_resource.py similarity index 86% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/tracked_resource.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/tracked_resource.py index d059b97f3e78..cdd27c52cbf6 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/tracked_resource.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/tracked_resource.py @@ -20,15 +20,15 @@ class TrackedResource(Resource): All required parameters must be populated in order to send to Azure. - :ivar id: Fully qualified identifier of the resource + :ivar id: Fully qualified identifier of the resource. :vartype id: str - :ivar name: Name of the resource + :ivar name: Name of the resource. :vartype name: str - :ivar type: Type of the resource + :ivar type: Type of the resource. :vartype type: str - :param location: Required. Location of the resource + :param location: Required. Location of the resource. :type location: str - :param tags: Tags of the resource + :param tags: Tags of the resource. :type tags: dict[str, str] """ diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/tracked_resource_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/tracked_resource_py3.py similarity index 86% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/tracked_resource_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/tracked_resource_py3.py index dd17171e3b84..58c772bdd51b 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/tracked_resource_py3.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/tracked_resource_py3.py @@ -20,15 +20,15 @@ class TrackedResource(Resource): All required parameters must be populated in order to send to Azure. - :ivar id: Fully qualified identifier of the resource + :ivar id: Fully qualified identifier of the resource. :vartype id: str - :ivar name: Name of the resource + :ivar name: Name of the resource. :vartype name: str - :ivar type: Type of the resource + :ivar type: Type of the resource. :vartype type: str - :param location: Required. Location of the resource + :param location: Required. Location of the resource. :type location: str - :param tags: Tags of the resource + :param tags: Tags of the resource. :type tags: dict[str, str] """ diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/web_hook_event_subscription_destination.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/web_hook_event_subscription_destination.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/web_hook_event_subscription_destination.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/web_hook_event_subscription_destination.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/web_hook_event_subscription_destination_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/web_hook_event_subscription_destination_py3.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/web_hook_event_subscription_destination_py3.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/web_hook_event_subscription_destination_py3.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/__init__.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/__init__.py similarity index 100% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/__init__.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/__init__.py diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/domain_topics_operations.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/domain_topics_operations.py similarity index 93% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/domain_topics_operations.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/domain_topics_operations.py index a05fe9556fdf..7cc064f4006e 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/domain_topics_operations.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/domain_topics_operations.py @@ -25,7 +25,7 @@ class DomainTopicsOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-02-01-preview". + :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-06-01". """ models = models @@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2019-02-01-preview" + self.api_version = "2019-06-01" self.config = config @@ -48,9 +48,9 @@ def get( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param domain_name: Name of the domain + :param domain_name: Name of the domain. :type domain_name: str - :param domain_topic_name: Name of the topic + :param domain_topic_name: Name of the topic. :type domain_topic_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -164,9 +164,9 @@ def create_or_update( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param domain_name: Name of the domain + :param domain_name: Name of the domain. :type domain_name: str - :param domain_topic_name: Name of the domain topic + :param domain_topic_name: Name of the domain topic. :type domain_topic_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: The poller return type is ClientRawResponse, the @@ -256,9 +256,9 @@ def delete( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param domain_name: Name of the domain + :param domain_name: Name of the domain. :type domain_name: str - :param domain_topic_name: Name of the domain topic + :param domain_topic_name: Name of the domain topic. :type domain_topic_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: The poller return type is ClientRawResponse, the @@ -305,9 +305,19 @@ def list_by_domain( :type resource_group_name: str :param domain_name: Domain name. :type domain_name: str - :param filter: Filter the results using OData syntax. + :param filter: The query used to filter the search results using OData + syntax. Filtering is permitted on the 'name' property only and with + limited number of OData operations. These operations are: the + 'contains' function as well as the following logical operations: not, + and, or, eq (for equal), and ne (for not equal). No arithmetic + operations are supported. The following is a valid filter example: + $filter=contains(namE, 'PATTERN') and name ne 'PATTERN-1'. The + following is not a valid filter example: $filter=location eq 'westus'. :type filter: str - :param top: The number of results to return. + :param top: The number of results to return per page for the list + operation. Valid range for top parameter is 1 to 100. If not + specified, the default number of results to be returned is 20 items + per page. :type top: int :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/domains_operations.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/domains_operations.py similarity index 93% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/domains_operations.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/domains_operations.py index 63e49c9c4823..38106c0b61c9 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/domains_operations.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/domains_operations.py @@ -25,7 +25,7 @@ class DomainsOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-02-01-preview". + :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-06-01". """ models = models @@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2019-02-01-preview" + self.api_version = "2019-06-01" self.config = config @@ -48,7 +48,7 @@ def get( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param domain_name: Name of the domain + :param domain_name: Name of the domain. :type domain_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -164,9 +164,9 @@ def create_or_update( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param domain_name: Name of the domain + :param domain_name: Name of the domain. :type domain_name: str - :param domain_info: Domain information + :param domain_info: Domain information. :type domain_info: ~azure.mgmt.eventgrid.models.Domain :param dict custom_headers: headers that will be added to the request :param bool raw: The poller return type is ClientRawResponse, the @@ -255,7 +255,7 @@ def delete( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param domain_name: Name of the domain + :param domain_name: Name of the domain. :type domain_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: The poller return type is ClientRawResponse, the @@ -351,9 +351,9 @@ def update( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param domain_name: Name of the domain + :param domain_name: Name of the domain. :type domain_name: str - :param tags: Tags of the domains resource + :param tags: Tags of the domains resource. :type tags: dict[str, str] :param dict custom_headers: headers that will be added to the request :param bool raw: The poller return type is ClientRawResponse, the @@ -401,9 +401,19 @@ def list_by_subscription( List all the domains under an Azure subscription. - :param filter: Filter the results using OData syntax. + :param filter: The query used to filter the search results using OData + syntax. Filtering is permitted on the 'name' property only and with + limited number of OData operations. These operations are: the + 'contains' function as well as the following logical operations: not, + and, or, eq (for equal), and ne (for not equal). No arithmetic + operations are supported. The following is a valid filter example: + $filter=contains(namE, 'PATTERN') and name ne 'PATTERN-1'. The + following is not a valid filter example: $filter=location eq 'westus'. :type filter: str - :param top: The number of results to return. + :param top: The number of results to return per page for the list + operation. Valid range for top parameter is 1 to 100. If not + specified, the default number of results to be returned is 20 items + per page. :type top: int :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -478,9 +488,19 @@ def list_by_resource_group( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param filter: Filter the results using OData syntax. + :param filter: The query used to filter the search results using OData + syntax. Filtering is permitted on the 'name' property only and with + limited number of OData operations. These operations are: the + 'contains' function as well as the following logical operations: not, + and, or, eq (for equal), and ne (for not equal). No arithmetic + operations are supported. The following is a valid filter example: + $filter=contains(namE, 'PATTERN') and name ne 'PATTERN-1'. The + following is not a valid filter example: $filter=location eq 'westus'. :type filter: str - :param top: The number of results to return. + :param top: The number of results to return per page for the list + operation. Valid range for top parameter is 1 to 100. If not + specified, the default number of results to be returned is 20 items + per page. :type top: int :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -556,7 +576,7 @@ def list_shared_access_keys( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param domain_name: Name of the domain + :param domain_name: Name of the domain. :type domain_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -621,9 +641,9 @@ def regenerate_key( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param domain_name: Name of the domain + :param domain_name: Name of the domain. :type domain_name: str - :param key_name: Key name to regenerate key1 or key2 + :param key_name: Key name to regenerate key1 or key2. :type key_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/event_subscriptions_operations.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/event_subscriptions_operations.py similarity index 85% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/event_subscriptions_operations.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/event_subscriptions_operations.py index 2120d4b737d8..569bcfaf9159 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/event_subscriptions_operations.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/event_subscriptions_operations.py @@ -25,7 +25,7 @@ class EventSubscriptionsOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-02-01-preview". + :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-06-01". """ models = models @@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2019-02-01-preview" + self.api_version = "2019-06-01" self.config = config @@ -56,7 +56,7 @@ def get( '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventGrid/topics/{topicName}' for an EventGrid topic. :type scope: str - :param event_subscription_name: Name of the event subscription + :param event_subscription_name: Name of the event subscription. :type event_subscription_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -184,7 +184,7 @@ def create_or_update( should use alphanumeric letters only. :type event_subscription_name: str :param event_subscription_info: Event subscription properties - containing the destination and filter information + containing the destination and filter information. :type event_subscription_info: ~azure.mgmt.eventgrid.models.EventSubscription :param dict custom_headers: headers that will be added to the request @@ -281,7 +281,7 @@ def delete( '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventGrid/topics/{topicName}' for an EventGrid topic. :type scope: str - :param event_subscription_name: Name of the event subscription + :param event_subscription_name: Name of the event subscription. :type event_subscription_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: The poller return type is ClientRawResponse, the @@ -383,10 +383,10 @@ def update( for an EventGrid topic. :type scope: str :param event_subscription_name: Name of the event subscription to be - updated + updated. :type event_subscription_name: str :param event_subscription_update_parameters: Updated event - subscription information + subscription information. :type event_subscription_update_parameters: ~azure.mgmt.eventgrid.models.EventSubscriptionUpdateParameters :param dict custom_headers: headers that will be added to the request @@ -446,7 +446,7 @@ def get_full_url( '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventGrid/topics/{topicName}' for an EventGrid topic. :type scope: str - :param event_subscription_name: Name of the event subscription + :param event_subscription_name: Name of the event subscription. :type event_subscription_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -502,20 +502,27 @@ def get_full_url( get_full_url.metadata = {'url': '/{scope}/providers/Microsoft.EventGrid/eventSubscriptions/{eventSubscriptionName}/getFullUrl'} def list_global_by_subscription( - self, filter=None, top=None, label=None, custom_headers=None, raw=False, **operation_config): + self, filter=None, top=None, custom_headers=None, raw=False, **operation_config): """Get an aggregated list of all global event subscriptions under an Azure subscription. List all aggregated global event subscriptions under a specific Azure subscription. - :param filter: Filter the results using OData syntax. + :param filter: The query used to filter the search results using OData + syntax. Filtering is permitted on the 'name' property only and with + limited number of OData operations. These operations are: the + 'contains' function as well as the following logical operations: not, + and, or, eq (for equal), and ne (for not equal). No arithmetic + operations are supported. The following is a valid filter example: + $filter=contains(namE, 'PATTERN') and name ne 'PATTERN-1'. The + following is not a valid filter example: $filter=location eq 'westus'. :type filter: str - :param top: The number of results to return. + :param top: The number of results to return per page for the list + operation. Valid range for top parameter is 1 to 100. If not + specified, the default number of results to be returned is 20 items + per page. :type top: int - :param label: The label used to filter the results for event - subscriptions list. - :type label: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -543,8 +550,6 @@ def internal_paging(next_link=None, raw=False): query_parameters['$filter'] = self._serialize.query("filter", filter, 'str') if top is not None: query_parameters['$top'] = self._serialize.query("top", top, 'int') - if label is not None: - query_parameters['label'] = self._serialize.query("label", label, 'str') else: url = next_link @@ -583,21 +588,28 @@ def internal_paging(next_link=None, raw=False): list_global_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.EventGrid/eventSubscriptions'} def list_global_by_subscription_for_topic_type( - self, topic_type_name, filter=None, top=None, label=None, custom_headers=None, raw=False, **operation_config): + self, topic_type_name, filter=None, top=None, custom_headers=None, raw=False, **operation_config): """List all global event subscriptions for a topic type. List all global event subscriptions under an Azure subscription for a topic type. - :param topic_type_name: Name of the topic type + :param topic_type_name: Name of the topic type. :type topic_type_name: str - :param filter: Filter the results using OData syntax. + :param filter: The query used to filter the search results using OData + syntax. Filtering is permitted on the 'name' property only and with + limited number of OData operations. These operations are: the + 'contains' function as well as the following logical operations: not, + and, or, eq (for equal), and ne (for not equal). No arithmetic + operations are supported. The following is a valid filter example: + $filter=contains(namE, 'PATTERN') and name ne 'PATTERN-1'. The + following is not a valid filter example: $filter=location eq 'westus'. :type filter: str - :param top: The number of results to return. + :param top: The number of results to return per page for the list + operation. Valid range for top parameter is 1 to 100. If not + specified, the default number of results to be returned is 20 items + per page. :type top: int - :param label: The label used to filter the results for event - subscriptions list. - :type label: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -626,8 +638,6 @@ def internal_paging(next_link=None, raw=False): query_parameters['$filter'] = self._serialize.query("filter", filter, 'str') if top is not None: query_parameters['$top'] = self._serialize.query("top", top, 'int') - if label is not None: - query_parameters['label'] = self._serialize.query("label", label, 'str') else: url = next_link @@ -666,7 +676,7 @@ def internal_paging(next_link=None, raw=False): list_global_by_subscription_for_topic_type.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.EventGrid/topicTypes/{topicTypeName}/eventSubscriptions'} def list_global_by_resource_group( - self, resource_group_name, filter=None, top=None, label=None, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, filter=None, top=None, custom_headers=None, raw=False, **operation_config): """List all global event subscriptions under an Azure subscription and resource group. @@ -676,13 +686,20 @@ def list_global_by_resource_group( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param filter: Filter the results using OData syntax. + :param filter: The query used to filter the search results using OData + syntax. Filtering is permitted on the 'name' property only and with + limited number of OData operations. These operations are: the + 'contains' function as well as the following logical operations: not, + and, or, eq (for equal), and ne (for not equal). No arithmetic + operations are supported. The following is a valid filter example: + $filter=contains(namE, 'PATTERN') and name ne 'PATTERN-1'. The + following is not a valid filter example: $filter=location eq 'westus'. :type filter: str - :param top: The number of results to return. + :param top: The number of results to return per page for the list + operation. Valid range for top parameter is 1 to 100. If not + specified, the default number of results to be returned is 20 items + per page. :type top: int - :param label: The label used to filter the results for event - subscriptions list. - :type label: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -711,8 +728,6 @@ def internal_paging(next_link=None, raw=False): query_parameters['$filter'] = self._serialize.query("filter", filter, 'str') if top is not None: query_parameters['$top'] = self._serialize.query("top", top, 'int') - if label is not None: - query_parameters['label'] = self._serialize.query("label", label, 'str') else: url = next_link @@ -751,7 +766,7 @@ def internal_paging(next_link=None, raw=False): list_global_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventGrid/eventSubscriptions'} def list_global_by_resource_group_for_topic_type( - self, resource_group_name, topic_type_name, filter=None, top=None, label=None, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, topic_type_name, filter=None, top=None, custom_headers=None, raw=False, **operation_config): """List all global event subscriptions under a resource group for a topic type. @@ -761,15 +776,22 @@ def list_global_by_resource_group_for_topic_type( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param topic_type_name: Name of the topic type + :param topic_type_name: Name of the topic type. :type topic_type_name: str - :param filter: Filter the results using OData syntax. + :param filter: The query used to filter the search results using OData + syntax. Filtering is permitted on the 'name' property only and with + limited number of OData operations. These operations are: the + 'contains' function as well as the following logical operations: not, + and, or, eq (for equal), and ne (for not equal). No arithmetic + operations are supported. The following is a valid filter example: + $filter=contains(namE, 'PATTERN') and name ne 'PATTERN-1'. The + following is not a valid filter example: $filter=location eq 'westus'. :type filter: str - :param top: The number of results to return. + :param top: The number of results to return per page for the list + operation. Valid range for top parameter is 1 to 100. If not + specified, the default number of results to be returned is 20 items + per page. :type top: int - :param label: The label used to filter the results for event - subscriptions list. - :type label: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -799,8 +821,6 @@ def internal_paging(next_link=None, raw=False): query_parameters['$filter'] = self._serialize.query("filter", filter, 'str') if top is not None: query_parameters['$top'] = self._serialize.query("top", top, 'int') - if label is not None: - query_parameters['label'] = self._serialize.query("label", label, 'str') else: url = next_link @@ -839,21 +859,28 @@ def internal_paging(next_link=None, raw=False): list_global_by_resource_group_for_topic_type.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventGrid/topicTypes/{topicTypeName}/eventSubscriptions'} def list_regional_by_subscription( - self, location, filter=None, top=None, label=None, custom_headers=None, raw=False, **operation_config): + self, location, filter=None, top=None, custom_headers=None, raw=False, **operation_config): """List all regional event subscriptions under an Azure subscription. List all event subscriptions from the given location under a specific Azure subscription. - :param location: Name of the location + :param location: Name of the location. :type location: str - :param filter: Filter the results using OData syntax. + :param filter: The query used to filter the search results using OData + syntax. Filtering is permitted on the 'name' property only and with + limited number of OData operations. These operations are: the + 'contains' function as well as the following logical operations: not, + and, or, eq (for equal), and ne (for not equal). No arithmetic + operations are supported. The following is a valid filter example: + $filter=contains(namE, 'PATTERN') and name ne 'PATTERN-1'. The + following is not a valid filter example: $filter=location eq 'westus'. :type filter: str - :param top: The number of results to return. + :param top: The number of results to return per page for the list + operation. Valid range for top parameter is 1 to 100. If not + specified, the default number of results to be returned is 20 items + per page. :type top: int - :param label: The label used to filter the results for event - subscriptions list. - :type label: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -882,8 +909,6 @@ def internal_paging(next_link=None, raw=False): query_parameters['$filter'] = self._serialize.query("filter", filter, 'str') if top is not None: query_parameters['$top'] = self._serialize.query("top", top, 'int') - if label is not None: - query_parameters['label'] = self._serialize.query("label", label, 'str') else: url = next_link @@ -922,7 +947,7 @@ def internal_paging(next_link=None, raw=False): list_regional_by_subscription.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.EventGrid/locations/{location}/eventSubscriptions'} def list_regional_by_resource_group( - self, resource_group_name, location, filter=None, top=None, label=None, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, location, filter=None, top=None, custom_headers=None, raw=False, **operation_config): """List all regional event subscriptions under an Azure subscription and resource group. @@ -932,15 +957,22 @@ def list_regional_by_resource_group( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param location: Name of the location + :param location: Name of the location. :type location: str - :param filter: Filter the results using OData syntax. + :param filter: The query used to filter the search results using OData + syntax. Filtering is permitted on the 'name' property only and with + limited number of OData operations. These operations are: the + 'contains' function as well as the following logical operations: not, + and, or, eq (for equal), and ne (for not equal). No arithmetic + operations are supported. The following is a valid filter example: + $filter=contains(namE, 'PATTERN') and name ne 'PATTERN-1'. The + following is not a valid filter example: $filter=location eq 'westus'. :type filter: str - :param top: The number of results to return. + :param top: The number of results to return per page for the list + operation. Valid range for top parameter is 1 to 100. If not + specified, the default number of results to be returned is 20 items + per page. :type top: int - :param label: The label used to filter the results for event - subscriptions list. - :type label: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -970,8 +1002,6 @@ def internal_paging(next_link=None, raw=False): query_parameters['$filter'] = self._serialize.query("filter", filter, 'str') if top is not None: query_parameters['$top'] = self._serialize.query("top", top, 'int') - if label is not None: - query_parameters['label'] = self._serialize.query("label", label, 'str') else: url = next_link @@ -1010,24 +1040,31 @@ def internal_paging(next_link=None, raw=False): list_regional_by_resource_group.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventGrid/locations/{location}/eventSubscriptions'} def list_regional_by_subscription_for_topic_type( - self, location, topic_type_name, filter=None, top=None, label=None, custom_headers=None, raw=False, **operation_config): + self, location, topic_type_name, filter=None, top=None, custom_headers=None, raw=False, **operation_config): """List all regional event subscriptions under an Azure subscription for a topic type. List all event subscriptions from the given location under a specific Azure subscription and topic type. - :param location: Name of the location + :param location: Name of the location. :type location: str - :param topic_type_name: Name of the topic type + :param topic_type_name: Name of the topic type. :type topic_type_name: str - :param filter: Filter the results using OData syntax. + :param filter: The query used to filter the search results using OData + syntax. Filtering is permitted on the 'name' property only and with + limited number of OData operations. These operations are: the + 'contains' function as well as the following logical operations: not, + and, or, eq (for equal), and ne (for not equal). No arithmetic + operations are supported. The following is a valid filter example: + $filter=contains(namE, 'PATTERN') and name ne 'PATTERN-1'. The + following is not a valid filter example: $filter=location eq 'westus'. :type filter: str - :param top: The number of results to return. + :param top: The number of results to return per page for the list + operation. Valid range for top parameter is 1 to 100. If not + specified, the default number of results to be returned is 20 items + per page. :type top: int - :param label: The label used to filter the results for event - subscriptions list. - :type label: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -1057,8 +1094,6 @@ def internal_paging(next_link=None, raw=False): query_parameters['$filter'] = self._serialize.query("filter", filter, 'str') if top is not None: query_parameters['$top'] = self._serialize.query("top", top, 'int') - if label is not None: - query_parameters['label'] = self._serialize.query("label", label, 'str') else: url = next_link @@ -1097,7 +1132,7 @@ def internal_paging(next_link=None, raw=False): list_regional_by_subscription_for_topic_type.metadata = {'url': '/subscriptions/{subscriptionId}/providers/Microsoft.EventGrid/locations/{location}/topicTypes/{topicTypeName}/eventSubscriptions'} def list_regional_by_resource_group_for_topic_type( - self, resource_group_name, location, topic_type_name, filter=None, top=None, label=None, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, location, topic_type_name, filter=None, top=None, custom_headers=None, raw=False, **operation_config): """List all regional event subscriptions under an Azure subscription and resource group for a topic type. @@ -1107,17 +1142,24 @@ def list_regional_by_resource_group_for_topic_type( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param location: Name of the location + :param location: Name of the location. :type location: str - :param topic_type_name: Name of the topic type + :param topic_type_name: Name of the topic type. :type topic_type_name: str - :param filter: Filter the results using OData syntax. + :param filter: The query used to filter the search results using OData + syntax. Filtering is permitted on the 'name' property only and with + limited number of OData operations. These operations are: the + 'contains' function as well as the following logical operations: not, + and, or, eq (for equal), and ne (for not equal). No arithmetic + operations are supported. The following is a valid filter example: + $filter=contains(namE, 'PATTERN') and name ne 'PATTERN-1'. The + following is not a valid filter example: $filter=location eq 'westus'. :type filter: str - :param top: The number of results to return. + :param top: The number of results to return per page for the list + operation. Valid range for top parameter is 1 to 100. If not + specified, the default number of results to be returned is 20 items + per page. :type top: int - :param label: The label used to filter the results for event - subscriptions list. - :type label: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -1148,8 +1190,6 @@ def internal_paging(next_link=None, raw=False): query_parameters['$filter'] = self._serialize.query("filter", filter, 'str') if top is not None: query_parameters['$top'] = self._serialize.query("top", top, 'int') - if label is not None: - query_parameters['label'] = self._serialize.query("label", label, 'str') else: url = next_link @@ -1188,7 +1228,7 @@ def internal_paging(next_link=None, raw=False): list_regional_by_resource_group_for_topic_type.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventGrid/locations/{location}/topicTypes/{topicTypeName}/eventSubscriptions'} def list_by_resource( - self, resource_group_name, provider_namespace, resource_type_name, resource_name, filter=None, top=None, label=None, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, provider_namespace, resource_type_name, resource_name, filter=None, top=None, custom_headers=None, raw=False, **operation_config): """List all event subscriptions for a specific topic. List all event subscriptions that have been created for a specific @@ -1197,19 +1237,26 @@ def list_by_resource( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param provider_namespace: Namespace of the provider of the topic + :param provider_namespace: Namespace of the provider of the topic. :type provider_namespace: str - :param resource_type_name: Name of the resource type + :param resource_type_name: Name of the resource type. :type resource_type_name: str - :param resource_name: Name of the resource + :param resource_name: Name of the resource. :type resource_name: str - :param filter: Filter the results using OData syntax. + :param filter: The query used to filter the search results using OData + syntax. Filtering is permitted on the 'name' property only and with + limited number of OData operations. These operations are: the + 'contains' function as well as the following logical operations: not, + and, or, eq (for equal), and ne (for not equal). No arithmetic + operations are supported. The following is a valid filter example: + $filter=contains(namE, 'PATTERN') and name ne 'PATTERN-1'. The + following is not a valid filter example: $filter=location eq 'westus'. :type filter: str - :param top: The number of results to return. + :param top: The number of results to return per page for the list + operation. Valid range for top parameter is 1 to 100. If not + specified, the default number of results to be returned is 20 items + per page. :type top: int - :param label: The label used to filter the results for event - subscriptions list. - :type label: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -1241,8 +1288,6 @@ def internal_paging(next_link=None, raw=False): query_parameters['$filter'] = self._serialize.query("filter", filter, 'str') if top is not None: query_parameters['$top'] = self._serialize.query("top", top, 'int') - if label is not None: - query_parameters['label'] = self._serialize.query("label", label, 'str') else: url = next_link @@ -1281,7 +1326,7 @@ def internal_paging(next_link=None, raw=False): list_by_resource.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/{providerNamespace}/{resourceTypeName}/{resourceName}/providers/Microsoft.EventGrid/eventSubscriptions'} def list_by_domain_topic( - self, resource_group_name, domain_name, topic_name, filter=None, top=None, label=None, custom_headers=None, raw=False, **operation_config): + self, resource_group_name, domain_name, topic_name, filter=None, top=None, custom_headers=None, raw=False, **operation_config): """List all event subscriptions for a specific domain topic. List all event subscriptions that have been created for a specific @@ -1290,17 +1335,24 @@ def list_by_domain_topic( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param domain_name: Name of the top level domain + :param domain_name: Name of the top level domain. :type domain_name: str - :param topic_name: Name of the domain topic + :param topic_name: Name of the domain topic. :type topic_name: str - :param filter: Filter the results using OData syntax. + :param filter: The query used to filter the search results using OData + syntax. Filtering is permitted on the 'name' property only and with + limited number of OData operations. These operations are: the + 'contains' function as well as the following logical operations: not, + and, or, eq (for equal), and ne (for not equal). No arithmetic + operations are supported. The following is a valid filter example: + $filter=contains(namE, 'PATTERN') and name ne 'PATTERN-1'. The + following is not a valid filter example: $filter=location eq 'westus'. :type filter: str - :param top: The number of results to return. + :param top: The number of results to return per page for the list + operation. Valid range for top parameter is 1 to 100. If not + specified, the default number of results to be returned is 20 items + per page. :type top: int - :param label: The label used to filter the results for event - subscriptions list. - :type label: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the deserialized response @@ -1331,8 +1383,6 @@ def internal_paging(next_link=None, raw=False): query_parameters['$filter'] = self._serialize.query("filter", filter, 'str') if top is not None: query_parameters['$top'] = self._serialize.query("top", top, 'int') - if label is not None: - query_parameters['label'] = self._serialize.query("label", label, 'str') else: url = next_link diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/operations.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/operations.py similarity index 97% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/operations.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/operations.py index 65fd7d6505d3..8b96334cfa65 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/operations.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/operations.py @@ -23,7 +23,7 @@ class Operations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-02-01-preview". + :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-06-01". """ models = models @@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2019-02-01-preview" + self.api_version = "2019-06-01" self.config = config diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/topic_types_operations.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/topic_types_operations.py similarity index 97% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/topic_types_operations.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/topic_types_operations.py index 50eea56f61a1..a3c8825d49d3 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/topic_types_operations.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/topic_types_operations.py @@ -23,7 +23,7 @@ class TopicTypesOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-02-01-preview". + :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-06-01". """ models = models @@ -33,7 +33,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2019-02-01-preview" + self.api_version = "2019-06-01" self.config = config @@ -105,7 +105,7 @@ def get( Get information about a topic type. - :param topic_type_name: Name of the topic type + :param topic_type_name: Name of the topic type. :type topic_type_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -165,7 +165,7 @@ def list_event_types( List event types for a topic type. - :param topic_type_name: Name of the topic type + :param topic_type_name: Name of the topic type. :type topic_type_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/topics_operations.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/topics_operations.py similarity index 93% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/topics_operations.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/topics_operations.py index 945c5bfea30f..701ecfc0cb3c 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/topics_operations.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/topics_operations.py @@ -25,7 +25,7 @@ class TopicsOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-02-01-preview". + :ivar api_version: Version of the API to be used with the client request. Constant value: "2019-06-01". """ models = models @@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2019-02-01-preview" + self.api_version = "2019-06-01" self.config = config @@ -48,7 +48,7 @@ def get( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param topic_name: Name of the topic + :param topic_name: Name of the topic. :type topic_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -163,9 +163,9 @@ def create_or_update( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param topic_name: Name of the topic + :param topic_name: Name of the topic. :type topic_name: str - :param topic_info: Topic information + :param topic_info: Topic information. :type topic_info: ~azure.mgmt.eventgrid.models.Topic :param dict custom_headers: headers that will be added to the request :param bool raw: The poller return type is ClientRawResponse, the @@ -254,7 +254,7 @@ def delete( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param topic_name: Name of the topic + :param topic_name: Name of the topic. :type topic_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: The poller return type is ClientRawResponse, the @@ -350,7 +350,7 @@ def update( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param topic_name: Name of the topic + :param topic_name: Name of the topic. :type topic_name: str :param tags: Tags of the resource :type tags: dict[str, str] @@ -400,9 +400,19 @@ def list_by_subscription( List all the topics under an Azure subscription. - :param filter: Filter the results using OData syntax. + :param filter: The query used to filter the search results using OData + syntax. Filtering is permitted on the 'name' property only and with + limited number of OData operations. These operations are: the + 'contains' function as well as the following logical operations: not, + and, or, eq (for equal), and ne (for not equal). No arithmetic + operations are supported. The following is a valid filter example: + $filter=contains(namE, 'PATTERN') and name ne 'PATTERN-1'. The + following is not a valid filter example: $filter=location eq 'westus'. :type filter: str - :param top: The number of results to return. + :param top: The number of results to return per page for the list + operation. Valid range for top parameter is 1 to 100. If not + specified, the default number of results to be returned is 20 items + per page. :type top: int :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -477,9 +487,19 @@ def list_by_resource_group( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param filter: Filter the results using OData syntax. + :param filter: The query used to filter the search results using OData + syntax. Filtering is permitted on the 'name' property only and with + limited number of OData operations. These operations are: the + 'contains' function as well as the following logical operations: not, + and, or, eq (for equal), and ne (for not equal). No arithmetic + operations are supported. The following is a valid filter example: + $filter=contains(namE, 'PATTERN') and name ne 'PATTERN-1'. The + following is not a valid filter example: $filter=location eq 'westus'. :type filter: str - :param top: The number of results to return. + :param top: The number of results to return per page for the list + operation. Valid range for top parameter is 1 to 100. If not + specified, the default number of results to be returned is 20 items + per page. :type top: int :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -555,7 +575,7 @@ def list_shared_access_keys( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param topic_name: Name of the topic + :param topic_name: Name of the topic. :type topic_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the @@ -620,7 +640,7 @@ def regenerate_key( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param topic_name: Name of the topic + :param topic_name: Name of the topic. :type topic_name: str :param key_name: Key name to regenerate key1 or key2 :type key_name: str @@ -693,11 +713,11 @@ def list_event_types( :param resource_group_name: The name of the resource group within the user's subscription. :type resource_group_name: str - :param provider_namespace: Namespace of the provider of the topic + :param provider_namespace: Namespace of the provider of the topic. :type provider_namespace: str - :param resource_type_name: Name of the topic type + :param resource_type_name: Name of the topic type. :type resource_type_name: str - :param resource_name: Name of the topic + :param resource_name: Name of the topic. :type resource_name: str :param dict custom_headers: headers that will be added to the request :param bool raw: returns the direct response alongside the diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/version.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/version.py similarity index 95% rename from azure-mgmt-eventgrid/azure/mgmt/eventgrid/version.py rename to sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/version.py index 7f9ee360ad1f..1a46faeb7ce7 100644 --- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/version.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "2.1.0rc1" +VERSION = "2.2.0" diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/dev_requirements.txt b/sdk/eventgrid/azure-mgmt-eventgrid/dev_requirements.txt new file mode 100644 index 000000000000..1f0e0d86b735 --- /dev/null +++ b/sdk/eventgrid/azure-mgmt-eventgrid/dev_requirements.txt @@ -0,0 +1 @@ +-e ../../../azure-sdk-tools diff --git a/azure-mgmt-eventgrid/sdk_packaging.toml b/sdk/eventgrid/azure-mgmt-eventgrid/sdk_packaging.toml similarity index 100% rename from azure-mgmt-eventgrid/sdk_packaging.toml rename to sdk/eventgrid/azure-mgmt-eventgrid/sdk_packaging.toml diff --git a/azure-mgmt-eventgrid/setup.cfg b/sdk/eventgrid/azure-mgmt-eventgrid/setup.cfg similarity index 100% rename from azure-mgmt-eventgrid/setup.cfg rename to sdk/eventgrid/azure-mgmt-eventgrid/setup.cfg diff --git a/azure-mgmt-eventgrid/setup.py b/sdk/eventgrid/azure-mgmt-eventgrid/setup.py similarity index 98% rename from azure-mgmt-eventgrid/setup.py rename to sdk/eventgrid/azure-mgmt-eventgrid/setup.py index 8fd5d1b00bde..4722ac89c69d 100644 --- a/azure-mgmt-eventgrid/setup.py +++ b/sdk/eventgrid/azure-mgmt-eventgrid/setup.py @@ -53,6 +53,7 @@ version=version, description='Microsoft Azure {} Client Library for Python'.format(PACKAGE_PPRINT_NAME), long_description=readme + '\n\n' + history, + long_description_content_type='text/x-rst', license='MIT License', author='Microsoft Corporation', author_email='azpysdkhelp@microsoft.com', diff --git a/azure-mgmt-eventgrid/tests/recordings/test_azure_mgmt_eventgrid.test_domains_and_advanced_filter.yaml b/sdk/eventgrid/azure-mgmt-eventgrid/tests/recordings/test_azure_mgmt_eventgrid.test_domains_and_advanced_filter.yaml similarity index 100% rename from azure-mgmt-eventgrid/tests/recordings/test_azure_mgmt_eventgrid.test_domains_and_advanced_filter.yaml rename to sdk/eventgrid/azure-mgmt-eventgrid/tests/recordings/test_azure_mgmt_eventgrid.test_domains_and_advanced_filter.yaml diff --git a/azure-mgmt-eventgrid/tests/recordings/test_azure_mgmt_eventgrid.test_input_mappings_and_queue_destination.yaml b/sdk/eventgrid/azure-mgmt-eventgrid/tests/recordings/test_azure_mgmt_eventgrid.test_input_mappings_and_queue_destination.yaml similarity index 100% rename from azure-mgmt-eventgrid/tests/recordings/test_azure_mgmt_eventgrid.test_input_mappings_and_queue_destination.yaml rename to sdk/eventgrid/azure-mgmt-eventgrid/tests/recordings/test_azure_mgmt_eventgrid.test_input_mappings_and_queue_destination.yaml diff --git a/azure-mgmt-eventgrid/tests/recordings/test_azure_mgmt_eventgrid.test_topic_types.yaml b/sdk/eventgrid/azure-mgmt-eventgrid/tests/recordings/test_azure_mgmt_eventgrid.test_topic_types.yaml similarity index 100% rename from azure-mgmt-eventgrid/tests/recordings/test_azure_mgmt_eventgrid.test_topic_types.yaml rename to sdk/eventgrid/azure-mgmt-eventgrid/tests/recordings/test_azure_mgmt_eventgrid.test_topic_types.yaml diff --git a/azure-mgmt-eventgrid/tests/recordings/test_azure_mgmt_eventgrid.test_user_topics.yaml b/sdk/eventgrid/azure-mgmt-eventgrid/tests/recordings/test_azure_mgmt_eventgrid.test_user_topics.yaml similarity index 100% rename from azure-mgmt-eventgrid/tests/recordings/test_azure_mgmt_eventgrid.test_user_topics.yaml rename to sdk/eventgrid/azure-mgmt-eventgrid/tests/recordings/test_azure_mgmt_eventgrid.test_user_topics.yaml diff --git a/azure-mgmt-eventgrid/tests/test_azure_mgmt_eventgrid.py b/sdk/eventgrid/azure-mgmt-eventgrid/tests/test_azure_mgmt_eventgrid.py similarity index 100% rename from azure-mgmt-eventgrid/tests/test_azure_mgmt_eventgrid.py rename to sdk/eventgrid/azure-mgmt-eventgrid/tests/test_azure_mgmt_eventgrid.py