diff --git a/.docsettings.yml b/.docsettings.yml
index 2a97003c25da..1352cb4ab4eb 100644
--- a/.docsettings.yml
+++ b/.docsettings.yml
@@ -43,7 +43,7 @@ known_content_issues:
   - ['azure-cognitiveservices-vision-customvision/README.rst', '#4554']
   - ['azure-cognitiveservices-vision-face/README.rst', '#4554']
   - ['azure-cognitiveservices-vision-nspkg/README.rst', '#4554']
-  - ['azure-eventgrid/README.rst', '#4554']
+  - ['sdk/eventgrid/azure-eventgrid/README.rst', '#4554']
   - ['azure-graphrbac/README.rst', '#4554']
   - ['sdk/keyvault/azure-keyvault/README.rst', '#4554']
   - ['azure-loganalytics/README.rst', '#4554']
diff --git a/azure-eventgrid/MANIFEST.in b/azure-eventgrid/MANIFEST.in
deleted file mode 100644
index bb37a2723dae..000000000000
--- a/azure-eventgrid/MANIFEST.in
+++ /dev/null
@@ -1 +0,0 @@
-include *.rst
diff --git a/azure-eventgrid/azure/eventgrid/models/__init__.py b/azure-eventgrid/azure/eventgrid/models/__init__.py
deleted file mode 100644
index 4398f6ccd602..000000000000
--- a/azure-eventgrid/azure/eventgrid/models/__init__.py
+++ /dev/null
@@ -1,134 +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.
-# --------------------------------------------------------------------------
-
-try:
-    from .storage_blob_created_event_data_py3 import StorageBlobCreatedEventData
-    from .storage_blob_deleted_event_data_py3 import StorageBlobDeletedEventData
-    from .event_hub_capture_file_created_event_data_py3 import EventHubCaptureFileCreatedEventData
-    from .resource_write_success_data_py3 import ResourceWriteSuccessData
-    from .resource_write_failure_data_py3 import ResourceWriteFailureData
-    from .resource_write_cancel_data_py3 import ResourceWriteCancelData
-    from .resource_delete_success_data_py3 import ResourceDeleteSuccessData
-    from .resource_delete_failure_data_py3 import ResourceDeleteFailureData
-    from .resource_delete_cancel_data_py3 import ResourceDeleteCancelData
-    from .resource_action_success_data_py3 import ResourceActionSuccessData
-    from .resource_action_failure_data_py3 import ResourceActionFailureData
-    from .resource_action_cancel_data_py3 import ResourceActionCancelData
-    from .event_grid_event_py3 import EventGridEvent
-    from .subscription_validation_event_data_py3 import SubscriptionValidationEventData
-    from .subscription_validation_response_py3 import SubscriptionValidationResponse
-    from .subscription_deleted_event_data_py3 import SubscriptionDeletedEventData
-    from .iot_hub_device_created_event_data_py3 import IotHubDeviceCreatedEventData
-    from .iot_hub_device_deleted_event_data_py3 import IotHubDeviceDeletedEventData
-    from .iot_hub_device_connected_event_data_py3 import IotHubDeviceConnectedEventData
-    from .iot_hub_device_disconnected_event_data_py3 import IotHubDeviceDisconnectedEventData
-    from .device_twin_metadata_py3 import DeviceTwinMetadata
-    from .device_twin_properties_py3 import DeviceTwinProperties
-    from .device_twin_info_properties_py3 import DeviceTwinInfoProperties
-    from .device_twin_info_x509_thumbprint_py3 import DeviceTwinInfoX509Thumbprint
-    from .device_twin_info_py3 import DeviceTwinInfo
-    from .device_life_cycle_event_properties_py3 import DeviceLifeCycleEventProperties
-    from .device_connection_state_event_info_py3 import DeviceConnectionStateEventInfo
-    from .device_connection_state_event_properties_py3 import DeviceConnectionStateEventProperties
-    from .container_registry_image_pushed_event_data_py3 import ContainerRegistryImagePushedEventData
-    from .container_registry_image_deleted_event_data_py3 import ContainerRegistryImageDeletedEventData
-    from .container_registry_event_target_py3 import ContainerRegistryEventTarget
-    from .container_registry_event_request_py3 import ContainerRegistryEventRequest
-    from .container_registry_event_actor_py3 import ContainerRegistryEventActor
-    from .container_registry_event_source_py3 import ContainerRegistryEventSource
-    from .container_registry_event_data_py3 import ContainerRegistryEventData
-    from .service_bus_active_messages_available_with_no_listeners_event_data_py3 import ServiceBusActiveMessagesAvailableWithNoListenersEventData
-    from .service_bus_deadletter_messages_available_with_no_listeners_event_data_py3 import ServiceBusDeadletterMessagesAvailableWithNoListenersEventData
-    from .media_job_state_change_event_data_py3 import MediaJobStateChangeEventData
-except (SyntaxError, ImportError):
-    from .storage_blob_created_event_data import StorageBlobCreatedEventData
-    from .storage_blob_deleted_event_data import StorageBlobDeletedEventData
-    from .event_hub_capture_file_created_event_data import EventHubCaptureFileCreatedEventData
-    from .resource_write_success_data import ResourceWriteSuccessData
-    from .resource_write_failure_data import ResourceWriteFailureData
-    from .resource_write_cancel_data import ResourceWriteCancelData
-    from .resource_delete_success_data import ResourceDeleteSuccessData
-    from .resource_delete_failure_data import ResourceDeleteFailureData
-    from .resource_delete_cancel_data import ResourceDeleteCancelData
-    from .resource_action_success_data import ResourceActionSuccessData
-    from .resource_action_failure_data import ResourceActionFailureData
-    from .resource_action_cancel_data import ResourceActionCancelData
-    from .event_grid_event import EventGridEvent
-    from .subscription_validation_event_data import SubscriptionValidationEventData
-    from .subscription_validation_response import SubscriptionValidationResponse
-    from .subscription_deleted_event_data import SubscriptionDeletedEventData
-    from .iot_hub_device_created_event_data import IotHubDeviceCreatedEventData
-    from .iot_hub_device_deleted_event_data import IotHubDeviceDeletedEventData
-    from .iot_hub_device_connected_event_data import IotHubDeviceConnectedEventData
-    from .iot_hub_device_disconnected_event_data import IotHubDeviceDisconnectedEventData
-    from .device_twin_metadata import DeviceTwinMetadata
-    from .device_twin_properties import DeviceTwinProperties
-    from .device_twin_info_properties import DeviceTwinInfoProperties
-    from .device_twin_info_x509_thumbprint import DeviceTwinInfoX509Thumbprint
-    from .device_twin_info import DeviceTwinInfo
-    from .device_life_cycle_event_properties import DeviceLifeCycleEventProperties
-    from .device_connection_state_event_info import DeviceConnectionStateEventInfo
-    from .device_connection_state_event_properties import DeviceConnectionStateEventProperties
-    from .container_registry_image_pushed_event_data import ContainerRegistryImagePushedEventData
-    from .container_registry_image_deleted_event_data import ContainerRegistryImageDeletedEventData
-    from .container_registry_event_target import ContainerRegistryEventTarget
-    from .container_registry_event_request import ContainerRegistryEventRequest
-    from .container_registry_event_actor import ContainerRegistryEventActor
-    from .container_registry_event_source import ContainerRegistryEventSource
-    from .container_registry_event_data import ContainerRegistryEventData
-    from .service_bus_active_messages_available_with_no_listeners_event_data import ServiceBusActiveMessagesAvailableWithNoListenersEventData
-    from .service_bus_deadletter_messages_available_with_no_listeners_event_data import ServiceBusDeadletterMessagesAvailableWithNoListenersEventData
-    from .media_job_state_change_event_data import MediaJobStateChangeEventData
-from .event_grid_client_enums import (
-    JobState,
-)
-
-__all__ = [
-    'StorageBlobCreatedEventData',
-    'StorageBlobDeletedEventData',
-    'EventHubCaptureFileCreatedEventData',
-    'ResourceWriteSuccessData',
-    'ResourceWriteFailureData',
-    'ResourceWriteCancelData',
-    'ResourceDeleteSuccessData',
-    'ResourceDeleteFailureData',
-    'ResourceDeleteCancelData',
-    'ResourceActionSuccessData',
-    'ResourceActionFailureData',
-    'ResourceActionCancelData',
-    'EventGridEvent',
-    'SubscriptionValidationEventData',
-    'SubscriptionValidationResponse',
-    'SubscriptionDeletedEventData',
-    'IotHubDeviceCreatedEventData',
-    'IotHubDeviceDeletedEventData',
-    'IotHubDeviceConnectedEventData',
-    'IotHubDeviceDisconnectedEventData',
-    'DeviceTwinMetadata',
-    'DeviceTwinProperties',
-    'DeviceTwinInfoProperties',
-    'DeviceTwinInfoX509Thumbprint',
-    'DeviceTwinInfo',
-    'DeviceLifeCycleEventProperties',
-    'DeviceConnectionStateEventInfo',
-    'DeviceConnectionStateEventProperties',
-    'ContainerRegistryImagePushedEventData',
-    'ContainerRegistryImageDeletedEventData',
-    'ContainerRegistryEventTarget',
-    'ContainerRegistryEventRequest',
-    'ContainerRegistryEventActor',
-    'ContainerRegistryEventSource',
-    'ContainerRegistryEventData',
-    'ServiceBusActiveMessagesAvailableWithNoListenersEventData',
-    'ServiceBusDeadletterMessagesAvailableWithNoListenersEventData',
-    'MediaJobStateChangeEventData',
-    'JobState',
-]
diff --git a/azure-eventgrid/azure/eventgrid/models/event_grid_client_enums.py b/azure-eventgrid/azure/eventgrid/models/event_grid_client_enums.py
deleted file mode 100644
index f76069221076..000000000000
--- a/azure-eventgrid/azure/eventgrid/models/event_grid_client_enums.py
+++ /dev/null
@@ -1,23 +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 enum import Enum
-
-
-class JobState(str, Enum):
-
-    canceled = "Canceled"  #: The job was canceled. This is a final state for the job.
-    canceling = "Canceling"  #: The job is in the process of being canceled. This is a transient state for the job.
-    error = "Error"  #: The job has encountered an error. This is a final state for the job.
-    finished = "Finished"  #: The job is finished. This is a final state for the job.
-    processing = "Processing"  #: The job is processing. This is a transient state for the job.
-    queued = "Queued"  #: The job is in a queued state, waiting for resources to become available. This is a transient state.
-    scheduled = "Scheduled"  #: The job is being scheduled to run on an available resource. This is a transient state, between queued and processing states.
diff --git a/azure-eventgrid/dev_requirements.txt b/azure-eventgrid/dev_requirements.txt
deleted file mode 100644
index a8bc678cf846..000000000000
--- a/azure-eventgrid/dev_requirements.txt
+++ /dev/null
@@ -1 +0,0 @@
--e ../azure-sdk-tools
\ No newline at end of file
diff --git a/azure-eventgrid/HISTORY.rst b/sdk/eventgrid/azure-eventgrid/HISTORY.rst
similarity index 92%
rename from azure-eventgrid/HISTORY.rst
rename to sdk/eventgrid/azure-eventgrid/HISTORY.rst
index 95183a60ed6b..fe428932442c 100644
--- a/azure-eventgrid/HISTORY.rst
+++ b/sdk/eventgrid/azure-eventgrid/HISTORY.rst
@@ -3,6 +3,11 @@
 Release History
 ===============
 
+1.3.0 (2019-05-20)
+++++++++++++++++++
+
+- Event Schemas for new event types from IotHub, Media Services, Container Registry, Maps, and AppConfiguration services.
+
 1.2.0 (2018-08-28)
 ++++++++++++++++++
 
@@ -34,7 +39,7 @@ This version uses a next-generation code generator that *might* introduce breaki
 
   - Return type changes from `msrestazure.azure_operation.AzureOperationPoller` to `msrest.polling.LROPoller`. External API is the same.
   - Return type is now **always** a `msrest.polling.LROPoller`, regardless of the optional parameters used.
-  - The behavior has changed when using `raw=True`. Instead of returning the initial call result as `ClientRawResponse`, 
+  - The behavior has changed when using `raw=True`. Instead of returning the initial call result as `ClientRawResponse`,
     without polling, now this returns an LROPoller. After polling, the final resource will be returned as a `ClientRawResponse`.
   - New `polling` parameter. The default behavior is `Polling=True` which will poll using ARM algorithm. When `Polling=False`,
     the response of the initial call will be returned without polling.
diff --git a/sdk/eventgrid/azure-eventgrid/MANIFEST.in b/sdk/eventgrid/azure-eventgrid/MANIFEST.in
new file mode 100644
index 000000000000..74c0ac7e42a1
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/MANIFEST.in
@@ -0,0 +1,4 @@
+recursive-include tests *.py *.yaml
+include *.rst
+include azure/__init__.py
+
diff --git a/azure-eventgrid/README.rst b/sdk/eventgrid/azure-eventgrid/README.rst
similarity index 68%
rename from azure-eventgrid/README.rst
rename to sdk/eventgrid/azure-eventgrid/README.rst
index 301f2d708942..917e45cba5e9 100644
--- a/azure-eventgrid/README.rst
+++ b/sdk/eventgrid/azure-eventgrid/README.rst
@@ -8,25 +8,6 @@ This package has been tested with Python 2.7, 3.4, 3.5, 3.6 and 3.7.
 For a more complete set of Azure libraries, see the `azure <https://pypi.python.org/pypi/azure>`__ bundle package.
 
 
-Compatibility
-=============
-
-**IMPORTANT**: If you have an earlier version of the azure package
-(version < 1.0), you should uninstall it before installing this package.
-
-You can check the version using pip:
-
-.. code:: shell
-
-    pip freeze
-
-If you see azure==0.11.0 (or any version below 1.0), uninstall it first:
-
-.. code:: shell
-
-    pip uninstall azure
-
-
 Usage
 =====
 
diff --git a/azure-eventgrid/azure/__init__.py b/sdk/eventgrid/azure-eventgrid/azure/__init__.py
similarity index 100%
rename from azure-eventgrid/azure/__init__.py
rename to sdk/eventgrid/azure-eventgrid/azure/__init__.py
diff --git a/azure-eventgrid/azure/eventgrid/__init__.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/__init__.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/__init__.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/__init__.py
diff --git a/azure-eventgrid/azure/eventgrid/event_grid_client.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/event_grid_client.py
similarity index 95%
rename from azure-eventgrid/azure/eventgrid/event_grid_client.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/event_grid_client.py
index 224b1e7be6e6..cd2878ff4c78 100644
--- a/azure-eventgrid/azure/eventgrid/event_grid_client.py
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/event_grid_client.py
@@ -104,9 +104,8 @@ def publish_events(
         body_content = self._serialize.body(events, '[EventGridEvent]')
 
         # Construct and send request
-        request = self._client.post(url, query_parameters)
-        response = self._client.send(
-            request, header_parameters, body_content, stream=False, **operation_config)
+        request = self._client.post(url, query_parameters, header_parameters, body_content)
+        response = self._client.send(request, stream=False, **operation_config)
 
         if response.status_code not in [200]:
             raise HttpOperationError(self._deserialize, response)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/__init__.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/__init__.py
new file mode 100644
index 000000000000..30defc1761ca
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/__init__.py
@@ -0,0 +1,266 @@
+# 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.
+# --------------------------------------------------------------------------
+
+try:
+    from .storage_blob_created_event_data_py3 import StorageBlobCreatedEventData
+    from .storage_blob_deleted_event_data_py3 import StorageBlobDeletedEventData
+    from .event_hub_capture_file_created_event_data_py3 import EventHubCaptureFileCreatedEventData
+    from .resource_write_success_data_py3 import ResourceWriteSuccessData
+    from .resource_write_failure_data_py3 import ResourceWriteFailureData
+    from .resource_write_cancel_data_py3 import ResourceWriteCancelData
+    from .resource_delete_success_data_py3 import ResourceDeleteSuccessData
+    from .resource_delete_failure_data_py3 import ResourceDeleteFailureData
+    from .resource_delete_cancel_data_py3 import ResourceDeleteCancelData
+    from .resource_action_success_data_py3 import ResourceActionSuccessData
+    from .resource_action_failure_data_py3 import ResourceActionFailureData
+    from .resource_action_cancel_data_py3 import ResourceActionCancelData
+    from .event_grid_event_py3 import EventGridEvent
+    from .subscription_validation_event_data_py3 import SubscriptionValidationEventData
+    from .subscription_validation_response_py3 import SubscriptionValidationResponse
+    from .subscription_deleted_event_data_py3 import SubscriptionDeletedEventData
+    from .iot_hub_device_created_event_data_py3 import IotHubDeviceCreatedEventData
+    from .iot_hub_device_deleted_event_data_py3 import IotHubDeviceDeletedEventData
+    from .iot_hub_device_connected_event_data_py3 import IotHubDeviceConnectedEventData
+    from .iot_hub_device_disconnected_event_data_py3 import IotHubDeviceDisconnectedEventData
+    from .iot_hub_device_telemetry_event_data_py3 import IotHubDeviceTelemetryEventData
+    from .device_twin_metadata_py3 import DeviceTwinMetadata
+    from .device_twin_properties_py3 import DeviceTwinProperties
+    from .device_twin_info_properties_py3 import DeviceTwinInfoProperties
+    from .device_twin_info_x509_thumbprint_py3 import DeviceTwinInfoX509Thumbprint
+    from .device_twin_info_py3 import DeviceTwinInfo
+    from .device_life_cycle_event_properties_py3 import DeviceLifeCycleEventProperties
+    from .device_connection_state_event_info_py3 import DeviceConnectionStateEventInfo
+    from .device_connection_state_event_properties_py3 import DeviceConnectionStateEventProperties
+    from .device_telemetry_event_properties_py3 import DeviceTelemetryEventProperties
+    from .container_registry_image_pushed_event_data_py3 import ContainerRegistryImagePushedEventData
+    from .container_registry_image_deleted_event_data_py3 import ContainerRegistryImageDeletedEventData
+    from .container_registry_chart_pushed_event_data_py3 import ContainerRegistryChartPushedEventData
+    from .container_registry_chart_deleted_event_data_py3 import ContainerRegistryChartDeletedEventData
+    from .container_registry_event_target_py3 import ContainerRegistryEventTarget
+    from .container_registry_event_request_py3 import ContainerRegistryEventRequest
+    from .container_registry_event_actor_py3 import ContainerRegistryEventActor
+    from .container_registry_event_source_py3 import ContainerRegistryEventSource
+    from .container_registry_event_data_py3 import ContainerRegistryEventData
+    from .container_registry_artifact_event_target_py3 import ContainerRegistryArtifactEventTarget
+    from .container_registry_artifact_event_data_py3 import ContainerRegistryArtifactEventData
+    from .service_bus_active_messages_available_with_no_listeners_event_data_py3 import ServiceBusActiveMessagesAvailableWithNoListenersEventData
+    from .service_bus_deadletter_messages_available_with_no_listeners_event_data_py3 import ServiceBusDeadletterMessagesAvailableWithNoListenersEventData
+    from .media_job_state_change_event_data_py3 import MediaJobStateChangeEventData
+    from .media_job_error_detail_py3 import MediaJobErrorDetail
+    from .media_job_error_py3 import MediaJobError
+    from .media_job_output_py3 import MediaJobOutput
+    from .media_job_output_asset_py3 import MediaJobOutputAsset
+    from .media_job_output_progress_event_data_py3 import MediaJobOutputProgressEventData
+    from .media_job_output_state_change_event_data_py3 import MediaJobOutputStateChangeEventData
+    from .media_job_scheduled_event_data_py3 import MediaJobScheduledEventData
+    from .media_job_processing_event_data_py3 import MediaJobProcessingEventData
+    from .media_job_canceling_event_data_py3 import MediaJobCancelingEventData
+    from .media_job_finished_event_data_py3 import MediaJobFinishedEventData
+    from .media_job_canceled_event_data_py3 import MediaJobCanceledEventData
+    from .media_job_errored_event_data_py3 import MediaJobErroredEventData
+    from .media_job_output_canceled_event_data_py3 import MediaJobOutputCanceledEventData
+    from .media_job_output_canceling_event_data_py3 import MediaJobOutputCancelingEventData
+    from .media_job_output_errored_event_data_py3 import MediaJobOutputErroredEventData
+    from .media_job_output_finished_event_data_py3 import MediaJobOutputFinishedEventData
+    from .media_job_output_processing_event_data_py3 import MediaJobOutputProcessingEventData
+    from .media_job_output_scheduled_event_data_py3 import MediaJobOutputScheduledEventData
+    from .media_live_event_encoder_connected_event_data_py3 import MediaLiveEventEncoderConnectedEventData
+    from .media_live_event_connection_rejected_event_data_py3 import MediaLiveEventConnectionRejectedEventData
+    from .media_live_event_encoder_disconnected_event_data_py3 import MediaLiveEventEncoderDisconnectedEventData
+    from .media_live_event_incoming_stream_received_event_data_py3 import MediaLiveEventIncomingStreamReceivedEventData
+    from .media_live_event_incoming_streams_out_of_sync_event_data_py3 import MediaLiveEventIncomingStreamsOutOfSyncEventData
+    from .media_live_event_incoming_video_streams_out_of_sync_event_data_py3 import MediaLiveEventIncomingVideoStreamsOutOfSyncEventData
+    from .media_live_event_incoming_data_chunk_dropped_event_data_py3 import MediaLiveEventIncomingDataChunkDroppedEventData
+    from .media_live_event_ingest_heartbeat_event_data_py3 import MediaLiveEventIngestHeartbeatEventData
+    from .media_live_event_track_discontinuity_detected_event_data_py3 import MediaLiveEventTrackDiscontinuityDetectedEventData
+    from .maps_geofence_entered_event_data_py3 import MapsGeofenceEnteredEventData
+    from .maps_geofence_exited_event_data_py3 import MapsGeofenceExitedEventData
+    from .maps_geofence_result_event_data_py3 import MapsGeofenceResultEventData
+    from .maps_geofence_geometry_py3 import MapsGeofenceGeometry
+    from .maps_geofence_event_properties_py3 import MapsGeofenceEventProperties
+    from .app_configuration_key_value_modified_event_data_py3 import AppConfigurationKeyValueModifiedEventData
+    from .app_configuration_key_value_deleted_event_data_py3 import AppConfigurationKeyValueDeletedEventData
+    from .signal_rservice_client_connection_connected_event_data_py3 import SignalRServiceClientConnectionConnectedEventData
+    from .signal_rservice_client_connection_disconnected_event_data_py3 import SignalRServiceClientConnectionDisconnectedEventData
+except (SyntaxError, ImportError):
+    from .storage_blob_created_event_data import StorageBlobCreatedEventData
+    from .storage_blob_deleted_event_data import StorageBlobDeletedEventData
+    from .event_hub_capture_file_created_event_data import EventHubCaptureFileCreatedEventData
+    from .resource_write_success_data import ResourceWriteSuccessData
+    from .resource_write_failure_data import ResourceWriteFailureData
+    from .resource_write_cancel_data import ResourceWriteCancelData
+    from .resource_delete_success_data import ResourceDeleteSuccessData
+    from .resource_delete_failure_data import ResourceDeleteFailureData
+    from .resource_delete_cancel_data import ResourceDeleteCancelData
+    from .resource_action_success_data import ResourceActionSuccessData
+    from .resource_action_failure_data import ResourceActionFailureData
+    from .resource_action_cancel_data import ResourceActionCancelData
+    from .event_grid_event import EventGridEvent
+    from .subscription_validation_event_data import SubscriptionValidationEventData
+    from .subscription_validation_response import SubscriptionValidationResponse
+    from .subscription_deleted_event_data import SubscriptionDeletedEventData
+    from .iot_hub_device_created_event_data import IotHubDeviceCreatedEventData
+    from .iot_hub_device_deleted_event_data import IotHubDeviceDeletedEventData
+    from .iot_hub_device_connected_event_data import IotHubDeviceConnectedEventData
+    from .iot_hub_device_disconnected_event_data import IotHubDeviceDisconnectedEventData
+    from .iot_hub_device_telemetry_event_data import IotHubDeviceTelemetryEventData
+    from .device_twin_metadata import DeviceTwinMetadata
+    from .device_twin_properties import DeviceTwinProperties
+    from .device_twin_info_properties import DeviceTwinInfoProperties
+    from .device_twin_info_x509_thumbprint import DeviceTwinInfoX509Thumbprint
+    from .device_twin_info import DeviceTwinInfo
+    from .device_life_cycle_event_properties import DeviceLifeCycleEventProperties
+    from .device_connection_state_event_info import DeviceConnectionStateEventInfo
+    from .device_connection_state_event_properties import DeviceConnectionStateEventProperties
+    from .device_telemetry_event_properties import DeviceTelemetryEventProperties
+    from .container_registry_image_pushed_event_data import ContainerRegistryImagePushedEventData
+    from .container_registry_image_deleted_event_data import ContainerRegistryImageDeletedEventData
+    from .container_registry_chart_pushed_event_data import ContainerRegistryChartPushedEventData
+    from .container_registry_chart_deleted_event_data import ContainerRegistryChartDeletedEventData
+    from .container_registry_event_target import ContainerRegistryEventTarget
+    from .container_registry_event_request import ContainerRegistryEventRequest
+    from .container_registry_event_actor import ContainerRegistryEventActor
+    from .container_registry_event_source import ContainerRegistryEventSource
+    from .container_registry_event_data import ContainerRegistryEventData
+    from .container_registry_artifact_event_target import ContainerRegistryArtifactEventTarget
+    from .container_registry_artifact_event_data import ContainerRegistryArtifactEventData
+    from .service_bus_active_messages_available_with_no_listeners_event_data import ServiceBusActiveMessagesAvailableWithNoListenersEventData
+    from .service_bus_deadletter_messages_available_with_no_listeners_event_data import ServiceBusDeadletterMessagesAvailableWithNoListenersEventData
+    from .media_job_state_change_event_data import MediaJobStateChangeEventData
+    from .media_job_error_detail import MediaJobErrorDetail
+    from .media_job_error import MediaJobError
+    from .media_job_output import MediaJobOutput
+    from .media_job_output_asset import MediaJobOutputAsset
+    from .media_job_output_progress_event_data import MediaJobOutputProgressEventData
+    from .media_job_output_state_change_event_data import MediaJobOutputStateChangeEventData
+    from .media_job_scheduled_event_data import MediaJobScheduledEventData
+    from .media_job_processing_event_data import MediaJobProcessingEventData
+    from .media_job_canceling_event_data import MediaJobCancelingEventData
+    from .media_job_finished_event_data import MediaJobFinishedEventData
+    from .media_job_canceled_event_data import MediaJobCanceledEventData
+    from .media_job_errored_event_data import MediaJobErroredEventData
+    from .media_job_output_canceled_event_data import MediaJobOutputCanceledEventData
+    from .media_job_output_canceling_event_data import MediaJobOutputCancelingEventData
+    from .media_job_output_errored_event_data import MediaJobOutputErroredEventData
+    from .media_job_output_finished_event_data import MediaJobOutputFinishedEventData
+    from .media_job_output_processing_event_data import MediaJobOutputProcessingEventData
+    from .media_job_output_scheduled_event_data import MediaJobOutputScheduledEventData
+    from .media_live_event_encoder_connected_event_data import MediaLiveEventEncoderConnectedEventData
+    from .media_live_event_connection_rejected_event_data import MediaLiveEventConnectionRejectedEventData
+    from .media_live_event_encoder_disconnected_event_data import MediaLiveEventEncoderDisconnectedEventData
+    from .media_live_event_incoming_stream_received_event_data import MediaLiveEventIncomingStreamReceivedEventData
+    from .media_live_event_incoming_streams_out_of_sync_event_data import MediaLiveEventIncomingStreamsOutOfSyncEventData
+    from .media_live_event_incoming_video_streams_out_of_sync_event_data import MediaLiveEventIncomingVideoStreamsOutOfSyncEventData
+    from .media_live_event_incoming_data_chunk_dropped_event_data import MediaLiveEventIncomingDataChunkDroppedEventData
+    from .media_live_event_ingest_heartbeat_event_data import MediaLiveEventIngestHeartbeatEventData
+    from .media_live_event_track_discontinuity_detected_event_data import MediaLiveEventTrackDiscontinuityDetectedEventData
+    from .maps_geofence_entered_event_data import MapsGeofenceEnteredEventData
+    from .maps_geofence_exited_event_data import MapsGeofenceExitedEventData
+    from .maps_geofence_result_event_data import MapsGeofenceResultEventData
+    from .maps_geofence_geometry import MapsGeofenceGeometry
+    from .maps_geofence_event_properties import MapsGeofenceEventProperties
+    from .app_configuration_key_value_modified_event_data import AppConfigurationKeyValueModifiedEventData
+    from .app_configuration_key_value_deleted_event_data import AppConfigurationKeyValueDeletedEventData
+    from .signal_rservice_client_connection_connected_event_data import SignalRServiceClientConnectionConnectedEventData
+    from .signal_rservice_client_connection_disconnected_event_data import SignalRServiceClientConnectionDisconnectedEventData
+from .event_grid_client_enums import (
+    MediaJobState,
+    MediaJobErrorCode,
+    MediaJobErrorCategory,
+    MediaJobRetry,
+)
+
+__all__ = [
+    'StorageBlobCreatedEventData',
+    'StorageBlobDeletedEventData',
+    'EventHubCaptureFileCreatedEventData',
+    'ResourceWriteSuccessData',
+    'ResourceWriteFailureData',
+    'ResourceWriteCancelData',
+    'ResourceDeleteSuccessData',
+    'ResourceDeleteFailureData',
+    'ResourceDeleteCancelData',
+    'ResourceActionSuccessData',
+    'ResourceActionFailureData',
+    'ResourceActionCancelData',
+    'EventGridEvent',
+    'SubscriptionValidationEventData',
+    'SubscriptionValidationResponse',
+    'SubscriptionDeletedEventData',
+    'IotHubDeviceCreatedEventData',
+    'IotHubDeviceDeletedEventData',
+    'IotHubDeviceConnectedEventData',
+    'IotHubDeviceDisconnectedEventData',
+    'IotHubDeviceTelemetryEventData',
+    'DeviceTwinMetadata',
+    'DeviceTwinProperties',
+    'DeviceTwinInfoProperties',
+    'DeviceTwinInfoX509Thumbprint',
+    'DeviceTwinInfo',
+    'DeviceLifeCycleEventProperties',
+    'DeviceConnectionStateEventInfo',
+    'DeviceConnectionStateEventProperties',
+    'DeviceTelemetryEventProperties',
+    'ContainerRegistryImagePushedEventData',
+    'ContainerRegistryImageDeletedEventData',
+    'ContainerRegistryChartPushedEventData',
+    'ContainerRegistryChartDeletedEventData',
+    'ContainerRegistryEventTarget',
+    'ContainerRegistryEventRequest',
+    'ContainerRegistryEventActor',
+    'ContainerRegistryEventSource',
+    'ContainerRegistryEventData',
+    'ContainerRegistryArtifactEventTarget',
+    'ContainerRegistryArtifactEventData',
+    'ServiceBusActiveMessagesAvailableWithNoListenersEventData',
+    'ServiceBusDeadletterMessagesAvailableWithNoListenersEventData',
+    'MediaJobStateChangeEventData',
+    'MediaJobErrorDetail',
+    'MediaJobError',
+    'MediaJobOutput',
+    'MediaJobOutputAsset',
+    'MediaJobOutputProgressEventData',
+    'MediaJobOutputStateChangeEventData',
+    'MediaJobScheduledEventData',
+    'MediaJobProcessingEventData',
+    'MediaJobCancelingEventData',
+    'MediaJobFinishedEventData',
+    'MediaJobCanceledEventData',
+    'MediaJobErroredEventData',
+    'MediaJobOutputCanceledEventData',
+    'MediaJobOutputCancelingEventData',
+    'MediaJobOutputErroredEventData',
+    'MediaJobOutputFinishedEventData',
+    'MediaJobOutputProcessingEventData',
+    'MediaJobOutputScheduledEventData',
+    'MediaLiveEventEncoderConnectedEventData',
+    'MediaLiveEventConnectionRejectedEventData',
+    'MediaLiveEventEncoderDisconnectedEventData',
+    'MediaLiveEventIncomingStreamReceivedEventData',
+    'MediaLiveEventIncomingStreamsOutOfSyncEventData',
+    'MediaLiveEventIncomingVideoStreamsOutOfSyncEventData',
+    'MediaLiveEventIncomingDataChunkDroppedEventData',
+    'MediaLiveEventIngestHeartbeatEventData',
+    'MediaLiveEventTrackDiscontinuityDetectedEventData',
+    'MapsGeofenceEnteredEventData',
+    'MapsGeofenceExitedEventData',
+    'MapsGeofenceResultEventData',
+    'MapsGeofenceGeometry',
+    'MapsGeofenceEventProperties',
+    'AppConfigurationKeyValueModifiedEventData',
+    'AppConfigurationKeyValueDeletedEventData',
+    'SignalRServiceClientConnectionConnectedEventData',
+    'SignalRServiceClientConnectionDisconnectedEventData',
+    'MediaJobState',
+    'MediaJobErrorCode',
+    'MediaJobErrorCategory',
+    'MediaJobRetry',
+]
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/app_configuration_key_value_deleted_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/app_configuration_key_value_deleted_event_data.py
new file mode 100644
index 000000000000..8a0adb6c209a
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/app_configuration_key_value_deleted_event_data.py
@@ -0,0 +1,38 @@
+# 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 AppConfigurationKeyValueDeletedEventData(Model):
+    """Schema of the Data property of an EventGridEvent for an
+    Microsoft.AppConfiguration.KeyValueDeleted event.
+
+    :param key: The key used to identify the key-value that was deleted.
+    :type key: str
+    :param label: The label, if any, used to identify the key-value that was
+     deleted.
+    :type label: str
+    :param etag: The etag representing the key-value that was deleted.
+    :type etag: str
+    """
+
+    _attribute_map = {
+        'key': {'key': 'key', 'type': 'str'},
+        'label': {'key': 'label', 'type': 'str'},
+        'etag': {'key': 'etag', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(AppConfigurationKeyValueDeletedEventData, self).__init__(**kwargs)
+        self.key = kwargs.get('key', None)
+        self.label = kwargs.get('label', None)
+        self.etag = kwargs.get('etag', None)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/app_configuration_key_value_deleted_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/app_configuration_key_value_deleted_event_data_py3.py
new file mode 100644
index 000000000000..28ac0ab4055f
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/app_configuration_key_value_deleted_event_data_py3.py
@@ -0,0 +1,38 @@
+# 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 AppConfigurationKeyValueDeletedEventData(Model):
+    """Schema of the Data property of an EventGridEvent for an
+    Microsoft.AppConfiguration.KeyValueDeleted event.
+
+    :param key: The key used to identify the key-value that was deleted.
+    :type key: str
+    :param label: The label, if any, used to identify the key-value that was
+     deleted.
+    :type label: str
+    :param etag: The etag representing the key-value that was deleted.
+    :type etag: str
+    """
+
+    _attribute_map = {
+        'key': {'key': 'key', 'type': 'str'},
+        'label': {'key': 'label', 'type': 'str'},
+        'etag': {'key': 'etag', 'type': 'str'},
+    }
+
+    def __init__(self, *, key: str=None, label: str=None, etag: str=None, **kwargs) -> None:
+        super(AppConfigurationKeyValueDeletedEventData, self).__init__(**kwargs)
+        self.key = key
+        self.label = label
+        self.etag = etag
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/app_configuration_key_value_modified_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/app_configuration_key_value_modified_event_data.py
new file mode 100644
index 000000000000..e0147ee242b2
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/app_configuration_key_value_modified_event_data.py
@@ -0,0 +1,38 @@
+# 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 AppConfigurationKeyValueModifiedEventData(Model):
+    """Schema of the Data property of an EventGridEvent for an
+    Microsoft.AppConfiguration.KeyValueModified event.
+
+    :param key: The key used to identify the key-value that was modified.
+    :type key: str
+    :param label: The label, if any, used to identify the key-value that was
+     modified.
+    :type label: str
+    :param etag: The etag representing the new state of the key-value.
+    :type etag: str
+    """
+
+    _attribute_map = {
+        'key': {'key': 'key', 'type': 'str'},
+        'label': {'key': 'label', 'type': 'str'},
+        'etag': {'key': 'etag', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(AppConfigurationKeyValueModifiedEventData, self).__init__(**kwargs)
+        self.key = kwargs.get('key', None)
+        self.label = kwargs.get('label', None)
+        self.etag = kwargs.get('etag', None)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/app_configuration_key_value_modified_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/app_configuration_key_value_modified_event_data_py3.py
new file mode 100644
index 000000000000..b37c56469de8
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/app_configuration_key_value_modified_event_data_py3.py
@@ -0,0 +1,38 @@
+# 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 AppConfigurationKeyValueModifiedEventData(Model):
+    """Schema of the Data property of an EventGridEvent for an
+    Microsoft.AppConfiguration.KeyValueModified event.
+
+    :param key: The key used to identify the key-value that was modified.
+    :type key: str
+    :param label: The label, if any, used to identify the key-value that was
+     modified.
+    :type label: str
+    :param etag: The etag representing the new state of the key-value.
+    :type etag: str
+    """
+
+    _attribute_map = {
+        'key': {'key': 'key', 'type': 'str'},
+        'label': {'key': 'label', 'type': 'str'},
+        'etag': {'key': 'etag', 'type': 'str'},
+    }
+
+    def __init__(self, *, key: str=None, label: str=None, etag: str=None, **kwargs) -> None:
+        super(AppConfigurationKeyValueModifiedEventData, self).__init__(**kwargs)
+        self.key = key
+        self.label = label
+        self.etag = etag
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_artifact_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_artifact_event_data.py
new file mode 100644
index 000000000000..464d9ede7215
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_artifact_event_data.py
@@ -0,0 +1,40 @@
+# 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 ContainerRegistryArtifactEventData(Model):
+    """The content of the event request message.
+
+    :param id: The event ID.
+    :type id: str
+    :param timestamp: The time at which the event occurred.
+    :type timestamp: datetime
+    :param action: The action that encompasses the provided event.
+    :type action: str
+    :param target: The target of the event.
+    :type target: ~azure.eventgrid.models.ContainerRegistryArtifactEventTarget
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'timestamp': {'key': 'timestamp', 'type': 'iso-8601'},
+        'action': {'key': 'action', 'type': 'str'},
+        'target': {'key': 'target', 'type': 'ContainerRegistryArtifactEventTarget'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ContainerRegistryArtifactEventData, self).__init__(**kwargs)
+        self.id = kwargs.get('id', None)
+        self.timestamp = kwargs.get('timestamp', None)
+        self.action = kwargs.get('action', None)
+        self.target = kwargs.get('target', None)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_artifact_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_artifact_event_data_py3.py
new file mode 100644
index 000000000000..abd508e82b8e
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_artifact_event_data_py3.py
@@ -0,0 +1,40 @@
+# 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 ContainerRegistryArtifactEventData(Model):
+    """The content of the event request message.
+
+    :param id: The event ID.
+    :type id: str
+    :param timestamp: The time at which the event occurred.
+    :type timestamp: datetime
+    :param action: The action that encompasses the provided event.
+    :type action: str
+    :param target: The target of the event.
+    :type target: ~azure.eventgrid.models.ContainerRegistryArtifactEventTarget
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'timestamp': {'key': 'timestamp', 'type': 'iso-8601'},
+        'action': {'key': 'action', 'type': 'str'},
+        'target': {'key': 'target', 'type': 'ContainerRegistryArtifactEventTarget'},
+    }
+
+    def __init__(self, *, id: str=None, timestamp=None, action: str=None, target=None, **kwargs) -> None:
+        super(ContainerRegistryArtifactEventData, self).__init__(**kwargs)
+        self.id = id
+        self.timestamp = timestamp
+        self.action = action
+        self.target = target
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_artifact_event_target.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_artifact_event_target.py
new file mode 100644
index 000000000000..661b8c55564a
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_artifact_event_target.py
@@ -0,0 +1,52 @@
+# 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 ContainerRegistryArtifactEventTarget(Model):
+    """The target of the event.
+
+    :param media_type: The MIME type of the artifact.
+    :type media_type: str
+    :param size: The size in bytes of the artifact.
+    :type size: long
+    :param digest: The digest of the artifact.
+    :type digest: str
+    :param repository: The repository name of the artifact.
+    :type repository: str
+    :param tag: The tag of the artifact.
+    :type tag: str
+    :param name: The name of the artifact.
+    :type name: str
+    :param version: The version of the artifact.
+    :type version: str
+    """
+
+    _attribute_map = {
+        'media_type': {'key': 'mediaType', 'type': 'str'},
+        'size': {'key': 'size', 'type': 'long'},
+        'digest': {'key': 'digest', 'type': 'str'},
+        'repository': {'key': 'repository', 'type': 'str'},
+        'tag': {'key': 'tag', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'version': {'key': 'version', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ContainerRegistryArtifactEventTarget, self).__init__(**kwargs)
+        self.media_type = kwargs.get('media_type', None)
+        self.size = kwargs.get('size', None)
+        self.digest = kwargs.get('digest', None)
+        self.repository = kwargs.get('repository', None)
+        self.tag = kwargs.get('tag', None)
+        self.name = kwargs.get('name', None)
+        self.version = kwargs.get('version', None)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_artifact_event_target_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_artifact_event_target_py3.py
new file mode 100644
index 000000000000..1acf124735a7
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_artifact_event_target_py3.py
@@ -0,0 +1,52 @@
+# 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 ContainerRegistryArtifactEventTarget(Model):
+    """The target of the event.
+
+    :param media_type: The MIME type of the artifact.
+    :type media_type: str
+    :param size: The size in bytes of the artifact.
+    :type size: long
+    :param digest: The digest of the artifact.
+    :type digest: str
+    :param repository: The repository name of the artifact.
+    :type repository: str
+    :param tag: The tag of the artifact.
+    :type tag: str
+    :param name: The name of the artifact.
+    :type name: str
+    :param version: The version of the artifact.
+    :type version: str
+    """
+
+    _attribute_map = {
+        'media_type': {'key': 'mediaType', 'type': 'str'},
+        'size': {'key': 'size', 'type': 'long'},
+        'digest': {'key': 'digest', 'type': 'str'},
+        'repository': {'key': 'repository', 'type': 'str'},
+        'tag': {'key': 'tag', 'type': 'str'},
+        'name': {'key': 'name', 'type': 'str'},
+        'version': {'key': 'version', 'type': 'str'},
+    }
+
+    def __init__(self, *, media_type: str=None, size: int=None, digest: str=None, repository: str=None, tag: str=None, name: str=None, version: str=None, **kwargs) -> None:
+        super(ContainerRegistryArtifactEventTarget, self).__init__(**kwargs)
+        self.media_type = media_type
+        self.size = size
+        self.digest = digest
+        self.repository = repository
+        self.tag = tag
+        self.name = name
+        self.version = version
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_chart_deleted_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_chart_deleted_event_data.py
new file mode 100644
index 000000000000..bfca65e364b9
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_chart_deleted_event_data.py
@@ -0,0 +1,37 @@
+# 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 .container_registry_artifact_event_data import ContainerRegistryArtifactEventData
+
+
+class ContainerRegistryChartDeletedEventData(ContainerRegistryArtifactEventData):
+    """Schema of the Data property of an EventGridEvent for a
+    Microsoft.ContainerRegistry.ChartDeleted event.
+
+    :param id: The event ID.
+    :type id: str
+    :param timestamp: The time at which the event occurred.
+    :type timestamp: datetime
+    :param action: The action that encompasses the provided event.
+    :type action: str
+    :param target: The target of the event.
+    :type target: ~azure.eventgrid.models.ContainerRegistryArtifactEventTarget
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'timestamp': {'key': 'timestamp', 'type': 'iso-8601'},
+        'action': {'key': 'action', 'type': 'str'},
+        'target': {'key': 'target', 'type': 'ContainerRegistryArtifactEventTarget'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ContainerRegistryChartDeletedEventData, self).__init__(**kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_chart_deleted_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_chart_deleted_event_data_py3.py
new file mode 100644
index 000000000000..7c8b2d18d26a
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_chart_deleted_event_data_py3.py
@@ -0,0 +1,37 @@
+# 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 .container_registry_artifact_event_data_py3 import ContainerRegistryArtifactEventData
+
+
+class ContainerRegistryChartDeletedEventData(ContainerRegistryArtifactEventData):
+    """Schema of the Data property of an EventGridEvent for a
+    Microsoft.ContainerRegistry.ChartDeleted event.
+
+    :param id: The event ID.
+    :type id: str
+    :param timestamp: The time at which the event occurred.
+    :type timestamp: datetime
+    :param action: The action that encompasses the provided event.
+    :type action: str
+    :param target: The target of the event.
+    :type target: ~azure.eventgrid.models.ContainerRegistryArtifactEventTarget
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'timestamp': {'key': 'timestamp', 'type': 'iso-8601'},
+        'action': {'key': 'action', 'type': 'str'},
+        'target': {'key': 'target', 'type': 'ContainerRegistryArtifactEventTarget'},
+    }
+
+    def __init__(self, *, id: str=None, timestamp=None, action: str=None, target=None, **kwargs) -> None:
+        super(ContainerRegistryChartDeletedEventData, self).__init__(id=id, timestamp=timestamp, action=action, target=target, **kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_chart_pushed_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_chart_pushed_event_data.py
new file mode 100644
index 000000000000..5a2b4b37e6cf
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_chart_pushed_event_data.py
@@ -0,0 +1,37 @@
+# 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 .container_registry_artifact_event_data import ContainerRegistryArtifactEventData
+
+
+class ContainerRegistryChartPushedEventData(ContainerRegistryArtifactEventData):
+    """Schema of the Data property of an EventGridEvent for a
+    Microsoft.ContainerRegistry.ChartPushed event.
+
+    :param id: The event ID.
+    :type id: str
+    :param timestamp: The time at which the event occurred.
+    :type timestamp: datetime
+    :param action: The action that encompasses the provided event.
+    :type action: str
+    :param target: The target of the event.
+    :type target: ~azure.eventgrid.models.ContainerRegistryArtifactEventTarget
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'timestamp': {'key': 'timestamp', 'type': 'iso-8601'},
+        'action': {'key': 'action', 'type': 'str'},
+        'target': {'key': 'target', 'type': 'ContainerRegistryArtifactEventTarget'},
+    }
+
+    def __init__(self, **kwargs):
+        super(ContainerRegistryChartPushedEventData, self).__init__(**kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_chart_pushed_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_chart_pushed_event_data_py3.py
new file mode 100644
index 000000000000..ecce11098dac
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_chart_pushed_event_data_py3.py
@@ -0,0 +1,37 @@
+# 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 .container_registry_artifact_event_data_py3 import ContainerRegistryArtifactEventData
+
+
+class ContainerRegistryChartPushedEventData(ContainerRegistryArtifactEventData):
+    """Schema of the Data property of an EventGridEvent for a
+    Microsoft.ContainerRegistry.ChartPushed event.
+
+    :param id: The event ID.
+    :type id: str
+    :param timestamp: The time at which the event occurred.
+    :type timestamp: datetime
+    :param action: The action that encompasses the provided event.
+    :type action: str
+    :param target: The target of the event.
+    :type target: ~azure.eventgrid.models.ContainerRegistryArtifactEventTarget
+    """
+
+    _attribute_map = {
+        'id': {'key': 'id', 'type': 'str'},
+        'timestamp': {'key': 'timestamp', 'type': 'iso-8601'},
+        'action': {'key': 'action', 'type': 'str'},
+        'target': {'key': 'target', 'type': 'ContainerRegistryArtifactEventTarget'},
+    }
+
+    def __init__(self, *, id: str=None, timestamp=None, action: str=None, target=None, **kwargs) -> None:
+        super(ContainerRegistryChartPushedEventData, self).__init__(id=id, timestamp=timestamp, action=action, target=target, **kwargs)
diff --git a/azure-eventgrid/azure/eventgrid/models/container_registry_event_actor.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_event_actor.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/container_registry_event_actor.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_event_actor.py
diff --git a/azure-eventgrid/azure/eventgrid/models/container_registry_event_actor_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_event_actor_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/container_registry_event_actor_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_event_actor_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/container_registry_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_event_data.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/container_registry_event_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_event_data.py
diff --git a/azure-eventgrid/azure/eventgrid/models/container_registry_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_event_data_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/container_registry_event_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_event_data_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/container_registry_event_request.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_event_request.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/container_registry_event_request.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_event_request.py
diff --git a/azure-eventgrid/azure/eventgrid/models/container_registry_event_request_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_event_request_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/container_registry_event_request_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_event_request_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/container_registry_event_source.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_event_source.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/container_registry_event_source.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_event_source.py
diff --git a/azure-eventgrid/azure/eventgrid/models/container_registry_event_source_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_event_source_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/container_registry_event_source_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_event_source_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/container_registry_event_target.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_event_target.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/container_registry_event_target.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_event_target.py
diff --git a/azure-eventgrid/azure/eventgrid/models/container_registry_event_target_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_event_target_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/container_registry_event_target_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_event_target_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/container_registry_image_deleted_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_image_deleted_event_data.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/container_registry_image_deleted_event_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_image_deleted_event_data.py
diff --git a/azure-eventgrid/azure/eventgrid/models/container_registry_image_deleted_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_image_deleted_event_data_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/container_registry_image_deleted_event_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_image_deleted_event_data_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/container_registry_image_pushed_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_image_pushed_event_data.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/container_registry_image_pushed_event_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_image_pushed_event_data.py
diff --git a/azure-eventgrid/azure/eventgrid/models/container_registry_image_pushed_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_image_pushed_event_data_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/container_registry_image_pushed_event_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/container_registry_image_pushed_event_data_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/device_connection_state_event_info.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_connection_state_event_info.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/device_connection_state_event_info.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_connection_state_event_info.py
diff --git a/azure-eventgrid/azure/eventgrid/models/device_connection_state_event_info_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_connection_state_event_info_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/device_connection_state_event_info_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_connection_state_event_info_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/device_connection_state_event_properties.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_connection_state_event_properties.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/device_connection_state_event_properties.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_connection_state_event_properties.py
diff --git a/azure-eventgrid/azure/eventgrid/models/device_connection_state_event_properties_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_connection_state_event_properties_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/device_connection_state_event_properties_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_connection_state_event_properties_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/device_life_cycle_event_properties.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_life_cycle_event_properties.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/device_life_cycle_event_properties.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_life_cycle_event_properties.py
diff --git a/azure-eventgrid/azure/eventgrid/models/device_life_cycle_event_properties_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_life_cycle_event_properties_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/device_life_cycle_event_properties_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_life_cycle_event_properties_py3.py
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_telemetry_event_properties.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_telemetry_event_properties.py
new file mode 100644
index 000000000000..5ef54c29c86d
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_telemetry_event_properties.py
@@ -0,0 +1,39 @@
+# 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 DeviceTelemetryEventProperties(Model):
+    """Schema of the Data property of an EventGridEvent for a device telemetry
+    event (DeviceTelemetry).
+
+    :param body: The content of the message from the device.
+    :type body: object
+    :param properties: Application properties are user-defined strings that
+     can be added to the message. These fields are optional.
+    :type properties: dict[str, str]
+    :param system_properties: System properties help identify contents and
+     source of the messages.
+    :type system_properties: dict[str, str]
+    """
+
+    _attribute_map = {
+        'body': {'key': 'body', 'type': 'object'},
+        'properties': {'key': 'properties', 'type': '{str}'},
+        'system_properties': {'key': 'systemProperties', 'type': '{str}'},
+    }
+
+    def __init__(self, **kwargs):
+        super(DeviceTelemetryEventProperties, self).__init__(**kwargs)
+        self.body = kwargs.get('body', None)
+        self.properties = kwargs.get('properties', None)
+        self.system_properties = kwargs.get('system_properties', None)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_telemetry_event_properties_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_telemetry_event_properties_py3.py
new file mode 100644
index 000000000000..57fdb9114dc5
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_telemetry_event_properties_py3.py
@@ -0,0 +1,39 @@
+# 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 DeviceTelemetryEventProperties(Model):
+    """Schema of the Data property of an EventGridEvent for a device telemetry
+    event (DeviceTelemetry).
+
+    :param body: The content of the message from the device.
+    :type body: object
+    :param properties: Application properties are user-defined strings that
+     can be added to the message. These fields are optional.
+    :type properties: dict[str, str]
+    :param system_properties: System properties help identify contents and
+     source of the messages.
+    :type system_properties: dict[str, str]
+    """
+
+    _attribute_map = {
+        'body': {'key': 'body', 'type': 'object'},
+        'properties': {'key': 'properties', 'type': '{str}'},
+        'system_properties': {'key': 'systemProperties', 'type': '{str}'},
+    }
+
+    def __init__(self, *, body=None, properties=None, system_properties=None, **kwargs) -> None:
+        super(DeviceTelemetryEventProperties, self).__init__(**kwargs)
+        self.body = body
+        self.properties = properties
+        self.system_properties = system_properties
diff --git a/azure-eventgrid/azure/eventgrid/models/device_twin_info.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_twin_info.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/device_twin_info.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_twin_info.py
diff --git a/azure-eventgrid/azure/eventgrid/models/device_twin_info_properties.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_twin_info_properties.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/device_twin_info_properties.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_twin_info_properties.py
diff --git a/azure-eventgrid/azure/eventgrid/models/device_twin_info_properties_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_twin_info_properties_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/device_twin_info_properties_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_twin_info_properties_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/device_twin_info_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_twin_info_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/device_twin_info_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_twin_info_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/device_twin_info_x509_thumbprint.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_twin_info_x509_thumbprint.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/device_twin_info_x509_thumbprint.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_twin_info_x509_thumbprint.py
diff --git a/azure-eventgrid/azure/eventgrid/models/device_twin_info_x509_thumbprint_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_twin_info_x509_thumbprint_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/device_twin_info_x509_thumbprint_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_twin_info_x509_thumbprint_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/device_twin_metadata.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_twin_metadata.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/device_twin_metadata.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_twin_metadata.py
diff --git a/azure-eventgrid/azure/eventgrid/models/device_twin_metadata_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_twin_metadata_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/device_twin_metadata_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_twin_metadata_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/device_twin_properties.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_twin_properties.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/device_twin_properties.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_twin_properties.py
diff --git a/azure-eventgrid/azure/eventgrid/models/device_twin_properties_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_twin_properties_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/device_twin_properties_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/device_twin_properties_py3.py
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/event_grid_client_enums.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/event_grid_client_enums.py
new file mode 100644
index 000000000000..eabef54f1c86
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/event_grid_client_enums.py
@@ -0,0 +1,51 @@
+# 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 enum import Enum
+
+
+class MediaJobState(str, Enum):
+
+    canceled = "Canceled"  #: The job was canceled. This is a final state for the job.
+    canceling = "Canceling"  #: The job is in the process of being canceled. This is a transient state for the job.
+    error = "Error"  #: The job has encountered an error. This is a final state for the job.
+    finished = "Finished"  #: The job is finished. This is a final state for the job.
+    processing = "Processing"  #: The job is processing. This is a transient state for the job.
+    queued = "Queued"  #: The job is in a queued state, waiting for resources to become available. This is a transient state.
+    scheduled = "Scheduled"  #: The job is being scheduled to run on an available resource. This is a transient state, between queued and processing states.
+
+
+class MediaJobErrorCode(str, Enum):
+
+    service_error = "ServiceError"  #: Fatal service error, please contact support.
+    service_transient_error = "ServiceTransientError"  #: Transient error, please retry, if retry is unsuccessful, please contact support.
+    download_not_accessible = "DownloadNotAccessible"  #: While trying to download the input files, the files were not accessible, please check the availability of the source.
+    download_transient_error = "DownloadTransientError"  #: While trying to download the input files, there was an issue during transfer (storage service, network errors), see details and check your source.
+    upload_not_accessible = "UploadNotAccessible"  #: While trying to upload the output files, the destination was not reachable, please check the availability of the destination.
+    upload_transient_error = "UploadTransientError"  #: While trying to upload the output files, there was an issue during transfer (storage service, network errors), see details and check your destination.
+    configuration_unsupported = "ConfigurationUnsupported"  #: There was a problem with the combination of input files and the configuration settings applied, fix the configuration settings and retry with the same input, or change input to match the configuration.
+    content_malformed = "ContentMalformed"  #: There was a problem with the input content (for example: zero byte files, or corrupt/non-decodable files), check the input files.
+    content_unsupported = "ContentUnsupported"  #: There was a problem with the format of the input (not valid media file, or an unsupported file/codec), check the validity of the input files.
+
+
+class MediaJobErrorCategory(str, Enum):
+
+    service = "Service"  #: The error is service related.
+    download = "Download"  #: The error is download related.
+    upload = "Upload"  #: The error is upload related.
+    configuration = "Configuration"  #: The error is configuration related.
+    content = "Content"  #: The error is related to data in the input files.
+
+
+class MediaJobRetry(str, Enum):
+
+    do_not_retry = "DoNotRetry"  #: Issue needs to be investigated and then the job resubmitted with corrections or retried once the underlying issue has been corrected.
+    may_retry = "MayRetry"  #: Issue may be resolved after waiting for a period of time and resubmitting the same Job.
diff --git a/azure-eventgrid/azure/eventgrid/models/event_grid_event.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/event_grid_event.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/event_grid_event.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/event_grid_event.py
diff --git a/azure-eventgrid/azure/eventgrid/models/event_grid_event_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/event_grid_event_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/event_grid_event_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/event_grid_event_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/event_hub_capture_file_created_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/event_hub_capture_file_created_event_data.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/event_hub_capture_file_created_event_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/event_hub_capture_file_created_event_data.py
diff --git a/azure-eventgrid/azure/eventgrid/models/event_hub_capture_file_created_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/event_hub_capture_file_created_event_data_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/event_hub_capture_file_created_event_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/event_hub_capture_file_created_event_data_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/iot_hub_device_connected_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/iot_hub_device_connected_event_data.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/iot_hub_device_connected_event_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/iot_hub_device_connected_event_data.py
diff --git a/azure-eventgrid/azure/eventgrid/models/iot_hub_device_connected_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/iot_hub_device_connected_event_data_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/iot_hub_device_connected_event_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/iot_hub_device_connected_event_data_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/iot_hub_device_created_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/iot_hub_device_created_event_data.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/iot_hub_device_created_event_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/iot_hub_device_created_event_data.py
diff --git a/azure-eventgrid/azure/eventgrid/models/iot_hub_device_created_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/iot_hub_device_created_event_data_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/iot_hub_device_created_event_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/iot_hub_device_created_event_data_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/iot_hub_device_deleted_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/iot_hub_device_deleted_event_data.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/iot_hub_device_deleted_event_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/iot_hub_device_deleted_event_data.py
diff --git a/azure-eventgrid/azure/eventgrid/models/iot_hub_device_deleted_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/iot_hub_device_deleted_event_data_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/iot_hub_device_deleted_event_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/iot_hub_device_deleted_event_data_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/iot_hub_device_disconnected_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/iot_hub_device_disconnected_event_data.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/iot_hub_device_disconnected_event_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/iot_hub_device_disconnected_event_data.py
diff --git a/azure-eventgrid/azure/eventgrid/models/iot_hub_device_disconnected_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/iot_hub_device_disconnected_event_data_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/iot_hub_device_disconnected_event_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/iot_hub_device_disconnected_event_data_py3.py
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/iot_hub_device_telemetry_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/iot_hub_device_telemetry_event_data.py
new file mode 100644
index 000000000000..68327f110245
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/iot_hub_device_telemetry_event_data.py
@@ -0,0 +1,35 @@
+# 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 .device_telemetry_event_properties import DeviceTelemetryEventProperties
+
+
+class IotHubDeviceTelemetryEventData(DeviceTelemetryEventProperties):
+    """Event data for Microsoft.Devices.DeviceTelemetry event.
+
+    :param body: The content of the message from the device.
+    :type body: object
+    :param properties: Application properties are user-defined strings that
+     can be added to the message. These fields are optional.
+    :type properties: dict[str, str]
+    :param system_properties: System properties help identify contents and
+     source of the messages.
+    :type system_properties: dict[str, str]
+    """
+
+    _attribute_map = {
+        'body': {'key': 'body', 'type': 'object'},
+        'properties': {'key': 'properties', 'type': '{str}'},
+        'system_properties': {'key': 'systemProperties', 'type': '{str}'},
+    }
+
+    def __init__(self, **kwargs):
+        super(IotHubDeviceTelemetryEventData, self).__init__(**kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/iot_hub_device_telemetry_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/iot_hub_device_telemetry_event_data_py3.py
new file mode 100644
index 000000000000..99ff68ce2594
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/iot_hub_device_telemetry_event_data_py3.py
@@ -0,0 +1,35 @@
+# 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 .device_telemetry_event_properties_py3 import DeviceTelemetryEventProperties
+
+
+class IotHubDeviceTelemetryEventData(DeviceTelemetryEventProperties):
+    """Event data for Microsoft.Devices.DeviceTelemetry event.
+
+    :param body: The content of the message from the device.
+    :type body: object
+    :param properties: Application properties are user-defined strings that
+     can be added to the message. These fields are optional.
+    :type properties: dict[str, str]
+    :param system_properties: System properties help identify contents and
+     source of the messages.
+    :type system_properties: dict[str, str]
+    """
+
+    _attribute_map = {
+        'body': {'key': 'body', 'type': 'object'},
+        'properties': {'key': 'properties', 'type': '{str}'},
+        'system_properties': {'key': 'systemProperties', 'type': '{str}'},
+    }
+
+    def __init__(self, *, body=None, properties=None, system_properties=None, **kwargs) -> None:
+        super(IotHubDeviceTelemetryEventData, self).__init__(body=body, properties=properties, system_properties=system_properties, **kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_entered_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_entered_event_data.py
new file mode 100644
index 000000000000..ad261166eab6
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_entered_event_data.py
@@ -0,0 +1,44 @@
+# 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 .maps_geofence_event_properties import MapsGeofenceEventProperties
+
+
+class MapsGeofenceEnteredEventData(MapsGeofenceEventProperties):
+    """Schema of the Data property of an EventGridEvent for a
+    Microsoft.Maps.GeofenceEntered event.
+
+    :param expired_geofence_geometry_id: Lists of the geometry ID of the
+     geofence which is expired relative to the user time in the request.
+    :type expired_geofence_geometry_id: list[str]
+    :param geometries: Lists the fence geometries that either fully contain
+     the coordinate position or have an overlap with the searchBuffer around
+     the fence.
+    :type geometries: list[~azure.eventgrid.models.MapsGeofenceGeometry]
+    :param invalid_period_geofence_geometry_id: Lists of the geometry ID of
+     the geofence which is in invalid period relative to the user time in the
+     request.
+    :type invalid_period_geofence_geometry_id: list[str]
+    :param is_event_published: True if at least one event is published to the
+     Azure Maps event subscriber, false if no event is published to the Azure
+     Maps event subscriber.
+    :type is_event_published: bool
+    """
+
+    _attribute_map = {
+        'expired_geofence_geometry_id': {'key': 'expiredGeofenceGeometryId', 'type': '[str]'},
+        'geometries': {'key': 'geometries', 'type': '[MapsGeofenceGeometry]'},
+        'invalid_period_geofence_geometry_id': {'key': 'invalidPeriodGeofenceGeometryId', 'type': '[str]'},
+        'is_event_published': {'key': 'isEventPublished', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MapsGeofenceEnteredEventData, self).__init__(**kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_entered_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_entered_event_data_py3.py
new file mode 100644
index 000000000000..4a49e99df5ab
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_entered_event_data_py3.py
@@ -0,0 +1,44 @@
+# 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 .maps_geofence_event_properties_py3 import MapsGeofenceEventProperties
+
+
+class MapsGeofenceEnteredEventData(MapsGeofenceEventProperties):
+    """Schema of the Data property of an EventGridEvent for a
+    Microsoft.Maps.GeofenceEntered event.
+
+    :param expired_geofence_geometry_id: Lists of the geometry ID of the
+     geofence which is expired relative to the user time in the request.
+    :type expired_geofence_geometry_id: list[str]
+    :param geometries: Lists the fence geometries that either fully contain
+     the coordinate position or have an overlap with the searchBuffer around
+     the fence.
+    :type geometries: list[~azure.eventgrid.models.MapsGeofenceGeometry]
+    :param invalid_period_geofence_geometry_id: Lists of the geometry ID of
+     the geofence which is in invalid period relative to the user time in the
+     request.
+    :type invalid_period_geofence_geometry_id: list[str]
+    :param is_event_published: True if at least one event is published to the
+     Azure Maps event subscriber, false if no event is published to the Azure
+     Maps event subscriber.
+    :type is_event_published: bool
+    """
+
+    _attribute_map = {
+        'expired_geofence_geometry_id': {'key': 'expiredGeofenceGeometryId', 'type': '[str]'},
+        'geometries': {'key': 'geometries', 'type': '[MapsGeofenceGeometry]'},
+        'invalid_period_geofence_geometry_id': {'key': 'invalidPeriodGeofenceGeometryId', 'type': '[str]'},
+        'is_event_published': {'key': 'isEventPublished', 'type': 'bool'},
+    }
+
+    def __init__(self, *, expired_geofence_geometry_id=None, geometries=None, invalid_period_geofence_geometry_id=None, is_event_published: bool=None, **kwargs) -> None:
+        super(MapsGeofenceEnteredEventData, self).__init__(expired_geofence_geometry_id=expired_geofence_geometry_id, geometries=geometries, invalid_period_geofence_geometry_id=invalid_period_geofence_geometry_id, is_event_published=is_event_published, **kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_event_properties.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_event_properties.py
new file mode 100644
index 000000000000..a09219f411ca
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_event_properties.py
@@ -0,0 +1,48 @@
+# 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 MapsGeofenceEventProperties(Model):
+    """Schema of the Data property of an EventGridEvent for a Geofence event
+    (GeofenceEntered, GeofenceExited, GeofenceResult).
+
+    :param expired_geofence_geometry_id: Lists of the geometry ID of the
+     geofence which is expired relative to the user time in the request.
+    :type expired_geofence_geometry_id: list[str]
+    :param geometries: Lists the fence geometries that either fully contain
+     the coordinate position or have an overlap with the searchBuffer around
+     the fence.
+    :type geometries: list[~azure.eventgrid.models.MapsGeofenceGeometry]
+    :param invalid_period_geofence_geometry_id: Lists of the geometry ID of
+     the geofence which is in invalid period relative to the user time in the
+     request.
+    :type invalid_period_geofence_geometry_id: list[str]
+    :param is_event_published: True if at least one event is published to the
+     Azure Maps event subscriber, false if no event is published to the Azure
+     Maps event subscriber.
+    :type is_event_published: bool
+    """
+
+    _attribute_map = {
+        'expired_geofence_geometry_id': {'key': 'expiredGeofenceGeometryId', 'type': '[str]'},
+        'geometries': {'key': 'geometries', 'type': '[MapsGeofenceGeometry]'},
+        'invalid_period_geofence_geometry_id': {'key': 'invalidPeriodGeofenceGeometryId', 'type': '[str]'},
+        'is_event_published': {'key': 'isEventPublished', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MapsGeofenceEventProperties, self).__init__(**kwargs)
+        self.expired_geofence_geometry_id = kwargs.get('expired_geofence_geometry_id', None)
+        self.geometries = kwargs.get('geometries', None)
+        self.invalid_period_geofence_geometry_id = kwargs.get('invalid_period_geofence_geometry_id', None)
+        self.is_event_published = kwargs.get('is_event_published', None)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_event_properties_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_event_properties_py3.py
new file mode 100644
index 000000000000..aaf8b3a60c08
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_event_properties_py3.py
@@ -0,0 +1,48 @@
+# 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 MapsGeofenceEventProperties(Model):
+    """Schema of the Data property of an EventGridEvent for a Geofence event
+    (GeofenceEntered, GeofenceExited, GeofenceResult).
+
+    :param expired_geofence_geometry_id: Lists of the geometry ID of the
+     geofence which is expired relative to the user time in the request.
+    :type expired_geofence_geometry_id: list[str]
+    :param geometries: Lists the fence geometries that either fully contain
+     the coordinate position or have an overlap with the searchBuffer around
+     the fence.
+    :type geometries: list[~azure.eventgrid.models.MapsGeofenceGeometry]
+    :param invalid_period_geofence_geometry_id: Lists of the geometry ID of
+     the geofence which is in invalid period relative to the user time in the
+     request.
+    :type invalid_period_geofence_geometry_id: list[str]
+    :param is_event_published: True if at least one event is published to the
+     Azure Maps event subscriber, false if no event is published to the Azure
+     Maps event subscriber.
+    :type is_event_published: bool
+    """
+
+    _attribute_map = {
+        'expired_geofence_geometry_id': {'key': 'expiredGeofenceGeometryId', 'type': '[str]'},
+        'geometries': {'key': 'geometries', 'type': '[MapsGeofenceGeometry]'},
+        'invalid_period_geofence_geometry_id': {'key': 'invalidPeriodGeofenceGeometryId', 'type': '[str]'},
+        'is_event_published': {'key': 'isEventPublished', 'type': 'bool'},
+    }
+
+    def __init__(self, *, expired_geofence_geometry_id=None, geometries=None, invalid_period_geofence_geometry_id=None, is_event_published: bool=None, **kwargs) -> None:
+        super(MapsGeofenceEventProperties, self).__init__(**kwargs)
+        self.expired_geofence_geometry_id = expired_geofence_geometry_id
+        self.geometries = geometries
+        self.invalid_period_geofence_geometry_id = invalid_period_geofence_geometry_id
+        self.is_event_published = is_event_published
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_exited_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_exited_event_data.py
new file mode 100644
index 000000000000..f7c5aa0fc15a
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_exited_event_data.py
@@ -0,0 +1,44 @@
+# 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 .maps_geofence_event_properties import MapsGeofenceEventProperties
+
+
+class MapsGeofenceExitedEventData(MapsGeofenceEventProperties):
+    """Schema of the Data property of an EventGridEvent for a
+    Microsoft.Maps.GeofenceExited event.
+
+    :param expired_geofence_geometry_id: Lists of the geometry ID of the
+     geofence which is expired relative to the user time in the request.
+    :type expired_geofence_geometry_id: list[str]
+    :param geometries: Lists the fence geometries that either fully contain
+     the coordinate position or have an overlap with the searchBuffer around
+     the fence.
+    :type geometries: list[~azure.eventgrid.models.MapsGeofenceGeometry]
+    :param invalid_period_geofence_geometry_id: Lists of the geometry ID of
+     the geofence which is in invalid period relative to the user time in the
+     request.
+    :type invalid_period_geofence_geometry_id: list[str]
+    :param is_event_published: True if at least one event is published to the
+     Azure Maps event subscriber, false if no event is published to the Azure
+     Maps event subscriber.
+    :type is_event_published: bool
+    """
+
+    _attribute_map = {
+        'expired_geofence_geometry_id': {'key': 'expiredGeofenceGeometryId', 'type': '[str]'},
+        'geometries': {'key': 'geometries', 'type': '[MapsGeofenceGeometry]'},
+        'invalid_period_geofence_geometry_id': {'key': 'invalidPeriodGeofenceGeometryId', 'type': '[str]'},
+        'is_event_published': {'key': 'isEventPublished', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MapsGeofenceExitedEventData, self).__init__(**kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_exited_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_exited_event_data_py3.py
new file mode 100644
index 000000000000..6bec05c2212f
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_exited_event_data_py3.py
@@ -0,0 +1,44 @@
+# 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 .maps_geofence_event_properties_py3 import MapsGeofenceEventProperties
+
+
+class MapsGeofenceExitedEventData(MapsGeofenceEventProperties):
+    """Schema of the Data property of an EventGridEvent for a
+    Microsoft.Maps.GeofenceExited event.
+
+    :param expired_geofence_geometry_id: Lists of the geometry ID of the
+     geofence which is expired relative to the user time in the request.
+    :type expired_geofence_geometry_id: list[str]
+    :param geometries: Lists the fence geometries that either fully contain
+     the coordinate position or have an overlap with the searchBuffer around
+     the fence.
+    :type geometries: list[~azure.eventgrid.models.MapsGeofenceGeometry]
+    :param invalid_period_geofence_geometry_id: Lists of the geometry ID of
+     the geofence which is in invalid period relative to the user time in the
+     request.
+    :type invalid_period_geofence_geometry_id: list[str]
+    :param is_event_published: True if at least one event is published to the
+     Azure Maps event subscriber, false if no event is published to the Azure
+     Maps event subscriber.
+    :type is_event_published: bool
+    """
+
+    _attribute_map = {
+        'expired_geofence_geometry_id': {'key': 'expiredGeofenceGeometryId', 'type': '[str]'},
+        'geometries': {'key': 'geometries', 'type': '[MapsGeofenceGeometry]'},
+        'invalid_period_geofence_geometry_id': {'key': 'invalidPeriodGeofenceGeometryId', 'type': '[str]'},
+        'is_event_published': {'key': 'isEventPublished', 'type': 'bool'},
+    }
+
+    def __init__(self, *, expired_geofence_geometry_id=None, geometries=None, invalid_period_geofence_geometry_id=None, is_event_published: bool=None, **kwargs) -> None:
+        super(MapsGeofenceExitedEventData, self).__init__(expired_geofence_geometry_id=expired_geofence_geometry_id, geometries=geometries, invalid_period_geofence_geometry_id=invalid_period_geofence_geometry_id, is_event_published=is_event_published, **kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_geometry.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_geometry.py
new file mode 100644
index 000000000000..b7cff8da378a
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_geometry.py
@@ -0,0 +1,58 @@
+# 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 MapsGeofenceGeometry(Model):
+    """The geofence geometry.
+
+    :param device_id: ID of the device.
+    :type device_id: str
+    :param distance: Distance from the coordinate to the closest border of the
+     geofence. Positive means the coordinate is outside of the geofence. If the
+     coordinate is outside of the geofence, but more than the value of
+     searchBuffer away from the closest geofence border, then the value is 999.
+     Negative means the coordinate is inside of the geofence. If the coordinate
+     is inside the polygon, but more than the value of searchBuffer away from
+     the closest geofencing border,then the value is -999. A value of 999 means
+     that there is great confidence the coordinate is well outside the
+     geofence. A value of -999 means that there is great confidence the
+     coordinate is well within the geofence.
+    :type distance: float
+    :param geometry_id: The unique ID for the geofence geometry.
+    :type geometry_id: str
+    :param nearest_lat: Latitude of the nearest point of the geometry.
+    :type nearest_lat: float
+    :param nearest_lon: Longitude of the nearest point of the geometry.
+    :type nearest_lon: float
+    :param ud_id: The unique id returned from user upload service when
+     uploading a geofence. Will not be included in geofencing post API.
+    :type ud_id: str
+    """
+
+    _attribute_map = {
+        'device_id': {'key': 'deviceId', 'type': 'str'},
+        'distance': {'key': 'distance', 'type': 'float'},
+        'geometry_id': {'key': 'geometryId', 'type': 'str'},
+        'nearest_lat': {'key': 'nearestLat', 'type': 'float'},
+        'nearest_lon': {'key': 'nearestLon', 'type': 'float'},
+        'ud_id': {'key': 'udId', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MapsGeofenceGeometry, self).__init__(**kwargs)
+        self.device_id = kwargs.get('device_id', None)
+        self.distance = kwargs.get('distance', None)
+        self.geometry_id = kwargs.get('geometry_id', None)
+        self.nearest_lat = kwargs.get('nearest_lat', None)
+        self.nearest_lon = kwargs.get('nearest_lon', None)
+        self.ud_id = kwargs.get('ud_id', None)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_geometry_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_geometry_py3.py
new file mode 100644
index 000000000000..bd6690005053
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_geometry_py3.py
@@ -0,0 +1,58 @@
+# 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 MapsGeofenceGeometry(Model):
+    """The geofence geometry.
+
+    :param device_id: ID of the device.
+    :type device_id: str
+    :param distance: Distance from the coordinate to the closest border of the
+     geofence. Positive means the coordinate is outside of the geofence. If the
+     coordinate is outside of the geofence, but more than the value of
+     searchBuffer away from the closest geofence border, then the value is 999.
+     Negative means the coordinate is inside of the geofence. If the coordinate
+     is inside the polygon, but more than the value of searchBuffer away from
+     the closest geofencing border,then the value is -999. A value of 999 means
+     that there is great confidence the coordinate is well outside the
+     geofence. A value of -999 means that there is great confidence the
+     coordinate is well within the geofence.
+    :type distance: float
+    :param geometry_id: The unique ID for the geofence geometry.
+    :type geometry_id: str
+    :param nearest_lat: Latitude of the nearest point of the geometry.
+    :type nearest_lat: float
+    :param nearest_lon: Longitude of the nearest point of the geometry.
+    :type nearest_lon: float
+    :param ud_id: The unique id returned from user upload service when
+     uploading a geofence. Will not be included in geofencing post API.
+    :type ud_id: str
+    """
+
+    _attribute_map = {
+        'device_id': {'key': 'deviceId', 'type': 'str'},
+        'distance': {'key': 'distance', 'type': 'float'},
+        'geometry_id': {'key': 'geometryId', 'type': 'str'},
+        'nearest_lat': {'key': 'nearestLat', 'type': 'float'},
+        'nearest_lon': {'key': 'nearestLon', 'type': 'float'},
+        'ud_id': {'key': 'udId', 'type': 'str'},
+    }
+
+    def __init__(self, *, device_id: str=None, distance: float=None, geometry_id: str=None, nearest_lat: float=None, nearest_lon: float=None, ud_id: str=None, **kwargs) -> None:
+        super(MapsGeofenceGeometry, self).__init__(**kwargs)
+        self.device_id = device_id
+        self.distance = distance
+        self.geometry_id = geometry_id
+        self.nearest_lat = nearest_lat
+        self.nearest_lon = nearest_lon
+        self.ud_id = ud_id
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_result_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_result_event_data.py
new file mode 100644
index 000000000000..a609225c822e
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_result_event_data.py
@@ -0,0 +1,44 @@
+# 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 .maps_geofence_event_properties import MapsGeofenceEventProperties
+
+
+class MapsGeofenceResultEventData(MapsGeofenceEventProperties):
+    """Schema of the Data property of an EventGridEvent for a
+    Microsoft.Maps.GeofenceResult event.
+
+    :param expired_geofence_geometry_id: Lists of the geometry ID of the
+     geofence which is expired relative to the user time in the request.
+    :type expired_geofence_geometry_id: list[str]
+    :param geometries: Lists the fence geometries that either fully contain
+     the coordinate position or have an overlap with the searchBuffer around
+     the fence.
+    :type geometries: list[~azure.eventgrid.models.MapsGeofenceGeometry]
+    :param invalid_period_geofence_geometry_id: Lists of the geometry ID of
+     the geofence which is in invalid period relative to the user time in the
+     request.
+    :type invalid_period_geofence_geometry_id: list[str]
+    :param is_event_published: True if at least one event is published to the
+     Azure Maps event subscriber, false if no event is published to the Azure
+     Maps event subscriber.
+    :type is_event_published: bool
+    """
+
+    _attribute_map = {
+        'expired_geofence_geometry_id': {'key': 'expiredGeofenceGeometryId', 'type': '[str]'},
+        'geometries': {'key': 'geometries', 'type': '[MapsGeofenceGeometry]'},
+        'invalid_period_geofence_geometry_id': {'key': 'invalidPeriodGeofenceGeometryId', 'type': '[str]'},
+        'is_event_published': {'key': 'isEventPublished', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MapsGeofenceResultEventData, self).__init__(**kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_result_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_result_event_data_py3.py
new file mode 100644
index 000000000000..24a1bebf7180
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/maps_geofence_result_event_data_py3.py
@@ -0,0 +1,44 @@
+# 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 .maps_geofence_event_properties_py3 import MapsGeofenceEventProperties
+
+
+class MapsGeofenceResultEventData(MapsGeofenceEventProperties):
+    """Schema of the Data property of an EventGridEvent for a
+    Microsoft.Maps.GeofenceResult event.
+
+    :param expired_geofence_geometry_id: Lists of the geometry ID of the
+     geofence which is expired relative to the user time in the request.
+    :type expired_geofence_geometry_id: list[str]
+    :param geometries: Lists the fence geometries that either fully contain
+     the coordinate position or have an overlap with the searchBuffer around
+     the fence.
+    :type geometries: list[~azure.eventgrid.models.MapsGeofenceGeometry]
+    :param invalid_period_geofence_geometry_id: Lists of the geometry ID of
+     the geofence which is in invalid period relative to the user time in the
+     request.
+    :type invalid_period_geofence_geometry_id: list[str]
+    :param is_event_published: True if at least one event is published to the
+     Azure Maps event subscriber, false if no event is published to the Azure
+     Maps event subscriber.
+    :type is_event_published: bool
+    """
+
+    _attribute_map = {
+        'expired_geofence_geometry_id': {'key': 'expiredGeofenceGeometryId', 'type': '[str]'},
+        'geometries': {'key': 'geometries', 'type': '[MapsGeofenceGeometry]'},
+        'invalid_period_geofence_geometry_id': {'key': 'invalidPeriodGeofenceGeometryId', 'type': '[str]'},
+        'is_event_published': {'key': 'isEventPublished', 'type': 'bool'},
+    }
+
+    def __init__(self, *, expired_geofence_geometry_id=None, geometries=None, invalid_period_geofence_geometry_id=None, is_event_published: bool=None, **kwargs) -> None:
+        super(MapsGeofenceResultEventData, self).__init__(expired_geofence_geometry_id=expired_geofence_geometry_id, geometries=geometries, invalid_period_geofence_geometry_id=invalid_period_geofence_geometry_id, is_event_published=is_event_published, **kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_canceled_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_canceled_event_data.py
new file mode 100644
index 000000000000..f8a820f2b8fb
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_canceled_event_data.py
@@ -0,0 +1,49 @@
+# 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 .media_job_state_change_event_data import MediaJobStateChangeEventData
+
+
+class MediaJobCanceledEventData(MediaJobStateChangeEventData):
+    """Job canceled event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :ivar state: The new state of the Job. Possible values include:
+     'Canceled', 'Canceling', 'Error', 'Finished', 'Processing', 'Queued',
+     'Scheduled'
+    :vartype state: str or ~azure.eventgrid.models.MediaJobState
+    :param correlation_data: Gets the Job correlation data.
+    :type correlation_data: dict[str, str]
+    :param outputs: Gets the Job outputs.
+    :type outputs: list[~azure.eventgrid.models.MediaJobOutput]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+        'state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'state': {'key': 'state', 'type': 'MediaJobState'},
+        'correlation_data': {'key': 'correlationData', 'type': '{str}'},
+        'outputs': {'key': 'outputs', 'type': '[MediaJobOutput]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaJobCanceledEventData, self).__init__(**kwargs)
+        self.outputs = kwargs.get('outputs', None)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_canceled_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_canceled_event_data_py3.py
new file mode 100644
index 000000000000..2febfeb9d2d5
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_canceled_event_data_py3.py
@@ -0,0 +1,49 @@
+# 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 .media_job_state_change_event_data_py3 import MediaJobStateChangeEventData
+
+
+class MediaJobCanceledEventData(MediaJobStateChangeEventData):
+    """Job canceled event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :ivar state: The new state of the Job. Possible values include:
+     'Canceled', 'Canceling', 'Error', 'Finished', 'Processing', 'Queued',
+     'Scheduled'
+    :vartype state: str or ~azure.eventgrid.models.MediaJobState
+    :param correlation_data: Gets the Job correlation data.
+    :type correlation_data: dict[str, str]
+    :param outputs: Gets the Job outputs.
+    :type outputs: list[~azure.eventgrid.models.MediaJobOutput]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+        'state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'state': {'key': 'state', 'type': 'MediaJobState'},
+        'correlation_data': {'key': 'correlationData', 'type': '{str}'},
+        'outputs': {'key': 'outputs', 'type': '[MediaJobOutput]'},
+    }
+
+    def __init__(self, *, correlation_data=None, outputs=None, **kwargs) -> None:
+        super(MediaJobCanceledEventData, self).__init__(correlation_data=correlation_data, **kwargs)
+        self.outputs = outputs
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_canceling_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_canceling_event_data.py
new file mode 100644
index 000000000000..4c25c6c2cae9
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_canceling_event_data.py
@@ -0,0 +1,45 @@
+# 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 .media_job_state_change_event_data import MediaJobStateChangeEventData
+
+
+class MediaJobCancelingEventData(MediaJobStateChangeEventData):
+    """Job canceling event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :ivar state: The new state of the Job. Possible values include:
+     'Canceled', 'Canceling', 'Error', 'Finished', 'Processing', 'Queued',
+     'Scheduled'
+    :vartype state: str or ~azure.eventgrid.models.MediaJobState
+    :param correlation_data: Gets the Job correlation data.
+    :type correlation_data: dict[str, str]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+        'state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'state': {'key': 'state', 'type': 'MediaJobState'},
+        'correlation_data': {'key': 'correlationData', 'type': '{str}'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaJobCancelingEventData, self).__init__(**kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_canceling_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_canceling_event_data_py3.py
new file mode 100644
index 000000000000..1ed04a59b0c5
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_canceling_event_data_py3.py
@@ -0,0 +1,45 @@
+# 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 .media_job_state_change_event_data_py3 import MediaJobStateChangeEventData
+
+
+class MediaJobCancelingEventData(MediaJobStateChangeEventData):
+    """Job canceling event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :ivar state: The new state of the Job. Possible values include:
+     'Canceled', 'Canceling', 'Error', 'Finished', 'Processing', 'Queued',
+     'Scheduled'
+    :vartype state: str or ~azure.eventgrid.models.MediaJobState
+    :param correlation_data: Gets the Job correlation data.
+    :type correlation_data: dict[str, str]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+        'state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'state': {'key': 'state', 'type': 'MediaJobState'},
+        'correlation_data': {'key': 'correlationData', 'type': '{str}'},
+    }
+
+    def __init__(self, *, correlation_data=None, **kwargs) -> None:
+        super(MediaJobCancelingEventData, self).__init__(correlation_data=correlation_data, **kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_error.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_error.py
new file mode 100644
index 000000000000..2a4c16b33889
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_error.py
@@ -0,0 +1,63 @@
+# 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 MediaJobError(Model):
+    """Details of JobOutput errors.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar code: Error code describing the error. Possible values include:
+     'ServiceError', 'ServiceTransientError', 'DownloadNotAccessible',
+     'DownloadTransientError', 'UploadNotAccessible', 'UploadTransientError',
+     'ConfigurationUnsupported', 'ContentMalformed', 'ContentUnsupported'
+    :vartype code: str or ~azure.eventgrid.models.MediaJobErrorCode
+    :ivar message: A human-readable language-dependent representation of the
+     error.
+    :vartype message: str
+    :ivar category: Helps with categorization of errors. Possible values
+     include: 'Service', 'Download', 'Upload', 'Configuration', 'Content'
+    :vartype category: str or ~azure.eventgrid.models.MediaJobErrorCategory
+    :ivar retry: Indicates that it may be possible to retry the Job. If retry
+     is unsuccessful, please contact Azure support via Azure Portal. Possible
+     values include: 'DoNotRetry', 'MayRetry'
+    :vartype retry: str or ~azure.eventgrid.models.MediaJobRetry
+    :ivar details: An array of details about specific errors that led to this
+     reported error.
+    :vartype details: list[~azure.eventgrid.models.MediaJobErrorDetail]
+    """
+
+    _validation = {
+        'code': {'readonly': True},
+        'message': {'readonly': True},
+        'category': {'readonly': True},
+        'retry': {'readonly': True},
+        'details': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'MediaJobErrorCode'},
+        'message': {'key': 'message', 'type': 'str'},
+        'category': {'key': 'category', 'type': 'MediaJobErrorCategory'},
+        'retry': {'key': 'retry', 'type': 'MediaJobRetry'},
+        'details': {'key': 'details', 'type': '[MediaJobErrorDetail]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaJobError, self).__init__(**kwargs)
+        self.code = None
+        self.message = None
+        self.category = None
+        self.retry = None
+        self.details = None
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_error_detail.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_error_detail.py
new file mode 100644
index 000000000000..acbb98e6c437
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_error_detail.py
@@ -0,0 +1,40 @@
+# 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 MediaJobErrorDetail(Model):
+    """Details of JobOutput errors.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar code: Code describing the error detail.
+    :vartype code: str
+    :ivar message: A human-readable representation of the error.
+    :vartype message: str
+    """
+
+    _validation = {
+        'code': {'readonly': True},
+        'message': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'str'},
+        'message': {'key': 'message', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaJobErrorDetail, self).__init__(**kwargs)
+        self.code = None
+        self.message = None
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_error_detail_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_error_detail_py3.py
new file mode 100644
index 000000000000..9c419b996add
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_error_detail_py3.py
@@ -0,0 +1,40 @@
+# 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 MediaJobErrorDetail(Model):
+    """Details of JobOutput errors.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar code: Code describing the error detail.
+    :vartype code: str
+    :ivar message: A human-readable representation of the error.
+    :vartype message: str
+    """
+
+    _validation = {
+        'code': {'readonly': True},
+        'message': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'str'},
+        'message': {'key': 'message', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(MediaJobErrorDetail, self).__init__(**kwargs)
+        self.code = None
+        self.message = None
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_error_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_error_py3.py
new file mode 100644
index 000000000000..afd055ba62ec
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_error_py3.py
@@ -0,0 +1,63 @@
+# 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 MediaJobError(Model):
+    """Details of JobOutput errors.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar code: Error code describing the error. Possible values include:
+     'ServiceError', 'ServiceTransientError', 'DownloadNotAccessible',
+     'DownloadTransientError', 'UploadNotAccessible', 'UploadTransientError',
+     'ConfigurationUnsupported', 'ContentMalformed', 'ContentUnsupported'
+    :vartype code: str or ~azure.eventgrid.models.MediaJobErrorCode
+    :ivar message: A human-readable language-dependent representation of the
+     error.
+    :vartype message: str
+    :ivar category: Helps with categorization of errors. Possible values
+     include: 'Service', 'Download', 'Upload', 'Configuration', 'Content'
+    :vartype category: str or ~azure.eventgrid.models.MediaJobErrorCategory
+    :ivar retry: Indicates that it may be possible to retry the Job. If retry
+     is unsuccessful, please contact Azure support via Azure Portal. Possible
+     values include: 'DoNotRetry', 'MayRetry'
+    :vartype retry: str or ~azure.eventgrid.models.MediaJobRetry
+    :ivar details: An array of details about specific errors that led to this
+     reported error.
+    :vartype details: list[~azure.eventgrid.models.MediaJobErrorDetail]
+    """
+
+    _validation = {
+        'code': {'readonly': True},
+        'message': {'readonly': True},
+        'category': {'readonly': True},
+        'retry': {'readonly': True},
+        'details': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'code': {'key': 'code', 'type': 'MediaJobErrorCode'},
+        'message': {'key': 'message', 'type': 'str'},
+        'category': {'key': 'category', 'type': 'MediaJobErrorCategory'},
+        'retry': {'key': 'retry', 'type': 'MediaJobRetry'},
+        'details': {'key': 'details', 'type': '[MediaJobErrorDetail]'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(MediaJobError, self).__init__(**kwargs)
+        self.code = None
+        self.message = None
+        self.category = None
+        self.retry = None
+        self.details = None
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_errored_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_errored_event_data.py
new file mode 100644
index 000000000000..91b5cda1eeec
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_errored_event_data.py
@@ -0,0 +1,49 @@
+# 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 .media_job_state_change_event_data import MediaJobStateChangeEventData
+
+
+class MediaJobErroredEventData(MediaJobStateChangeEventData):
+    """Job error state event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :ivar state: The new state of the Job. Possible values include:
+     'Canceled', 'Canceling', 'Error', 'Finished', 'Processing', 'Queued',
+     'Scheduled'
+    :vartype state: str or ~azure.eventgrid.models.MediaJobState
+    :param correlation_data: Gets the Job correlation data.
+    :type correlation_data: dict[str, str]
+    :param outputs: Gets the Job outputs.
+    :type outputs: list[~azure.eventgrid.models.MediaJobOutput]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+        'state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'state': {'key': 'state', 'type': 'MediaJobState'},
+        'correlation_data': {'key': 'correlationData', 'type': '{str}'},
+        'outputs': {'key': 'outputs', 'type': '[MediaJobOutput]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaJobErroredEventData, self).__init__(**kwargs)
+        self.outputs = kwargs.get('outputs', None)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_errored_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_errored_event_data_py3.py
new file mode 100644
index 000000000000..2a2e7b7af094
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_errored_event_data_py3.py
@@ -0,0 +1,49 @@
+# 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 .media_job_state_change_event_data_py3 import MediaJobStateChangeEventData
+
+
+class MediaJobErroredEventData(MediaJobStateChangeEventData):
+    """Job error state event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :ivar state: The new state of the Job. Possible values include:
+     'Canceled', 'Canceling', 'Error', 'Finished', 'Processing', 'Queued',
+     'Scheduled'
+    :vartype state: str or ~azure.eventgrid.models.MediaJobState
+    :param correlation_data: Gets the Job correlation data.
+    :type correlation_data: dict[str, str]
+    :param outputs: Gets the Job outputs.
+    :type outputs: list[~azure.eventgrid.models.MediaJobOutput]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+        'state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'state': {'key': 'state', 'type': 'MediaJobState'},
+        'correlation_data': {'key': 'correlationData', 'type': '{str}'},
+        'outputs': {'key': 'outputs', 'type': '[MediaJobOutput]'},
+    }
+
+    def __init__(self, *, correlation_data=None, outputs=None, **kwargs) -> None:
+        super(MediaJobErroredEventData, self).__init__(correlation_data=correlation_data, **kwargs)
+        self.outputs = outputs
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_finished_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_finished_event_data.py
new file mode 100644
index 000000000000..29d2f2a1420e
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_finished_event_data.py
@@ -0,0 +1,49 @@
+# 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 .media_job_state_change_event_data import MediaJobStateChangeEventData
+
+
+class MediaJobFinishedEventData(MediaJobStateChangeEventData):
+    """Job finished event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :ivar state: The new state of the Job. Possible values include:
+     'Canceled', 'Canceling', 'Error', 'Finished', 'Processing', 'Queued',
+     'Scheduled'
+    :vartype state: str or ~azure.eventgrid.models.MediaJobState
+    :param correlation_data: Gets the Job correlation data.
+    :type correlation_data: dict[str, str]
+    :param outputs: Gets the Job outputs.
+    :type outputs: list[~azure.eventgrid.models.MediaJobOutput]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+        'state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'state': {'key': 'state', 'type': 'MediaJobState'},
+        'correlation_data': {'key': 'correlationData', 'type': '{str}'},
+        'outputs': {'key': 'outputs', 'type': '[MediaJobOutput]'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaJobFinishedEventData, self).__init__(**kwargs)
+        self.outputs = kwargs.get('outputs', None)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_finished_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_finished_event_data_py3.py
new file mode 100644
index 000000000000..9e9ee8d588c0
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_finished_event_data_py3.py
@@ -0,0 +1,49 @@
+# 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 .media_job_state_change_event_data_py3 import MediaJobStateChangeEventData
+
+
+class MediaJobFinishedEventData(MediaJobStateChangeEventData):
+    """Job finished event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :ivar state: The new state of the Job. Possible values include:
+     'Canceled', 'Canceling', 'Error', 'Finished', 'Processing', 'Queued',
+     'Scheduled'
+    :vartype state: str or ~azure.eventgrid.models.MediaJobState
+    :param correlation_data: Gets the Job correlation data.
+    :type correlation_data: dict[str, str]
+    :param outputs: Gets the Job outputs.
+    :type outputs: list[~azure.eventgrid.models.MediaJobOutput]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+        'state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'state': {'key': 'state', 'type': 'MediaJobState'},
+        'correlation_data': {'key': 'correlationData', 'type': '{str}'},
+        'outputs': {'key': 'outputs', 'type': '[MediaJobOutput]'},
+    }
+
+    def __init__(self, *, correlation_data=None, outputs=None, **kwargs) -> None:
+        super(MediaJobFinishedEventData, self).__init__(correlation_data=correlation_data, **kwargs)
+        self.outputs = outputs
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output.py
new file mode 100644
index 000000000000..ec105fd697dd
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output.py
@@ -0,0 +1,61 @@
+# 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 MediaJobOutput(Model):
+    """The event data for a Job output.
+
+    You probably want to use the sub-classes and not this class directly. Known
+    sub-classes are: MediaJobOutputAsset
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param error: Gets the Job output error.
+    :type error: ~azure.eventgrid.models.MediaJobError
+    :param label: Gets the Job output label.
+    :type label: str
+    :param progress: Required. Gets the Job output progress.
+    :type progress: long
+    :param state: Required. Gets the Job output state. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :type state: str or ~azure.eventgrid.models.MediaJobState
+    :param odatatype: Required. Constant filled by server.
+    :type odatatype: str
+    """
+
+    _validation = {
+        'progress': {'required': True},
+        'state': {'required': True},
+        'odatatype': {'required': True},
+    }
+
+    _attribute_map = {
+        'error': {'key': 'error', 'type': 'MediaJobError'},
+        'label': {'key': 'label', 'type': 'str'},
+        'progress': {'key': 'progress', 'type': 'long'},
+        'state': {'key': 'state', 'type': 'MediaJobState'},
+        'odatatype': {'key': '@odata\\.type', 'type': 'str'},
+    }
+
+    _subtype_map = {
+        'odatatype': {'#Microsoft.Media.JobOutputAsset': 'MediaJobOutputAsset'}
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaJobOutput, self).__init__(**kwargs)
+        self.error = kwargs.get('error', None)
+        self.label = kwargs.get('label', None)
+        self.progress = kwargs.get('progress', None)
+        self.state = kwargs.get('state', None)
+        self.odatatype = None
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_asset.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_asset.py
new file mode 100644
index 000000000000..efe51ce529f5
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_asset.py
@@ -0,0 +1,54 @@
+# 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 .media_job_output import MediaJobOutput
+
+
+class MediaJobOutputAsset(MediaJobOutput):
+    """The event data for a Job output asset.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param error: Gets the Job output error.
+    :type error: ~azure.eventgrid.models.MediaJobError
+    :param label: Gets the Job output label.
+    :type label: str
+    :param progress: Required. Gets the Job output progress.
+    :type progress: long
+    :param state: Required. Gets the Job output state. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :type state: str or ~azure.eventgrid.models.MediaJobState
+    :param odatatype: Required. Constant filled by server.
+    :type odatatype: str
+    :param asset_name: Gets the Job output asset name.
+    :type asset_name: str
+    """
+
+    _validation = {
+        'progress': {'required': True},
+        'state': {'required': True},
+        'odatatype': {'required': True},
+    }
+
+    _attribute_map = {
+        'error': {'key': 'error', 'type': 'MediaJobError'},
+        'label': {'key': 'label', 'type': 'str'},
+        'progress': {'key': 'progress', 'type': 'long'},
+        'state': {'key': 'state', 'type': 'MediaJobState'},
+        'odatatype': {'key': '@odata\\.type', 'type': 'str'},
+        'asset_name': {'key': 'assetName', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaJobOutputAsset, self).__init__(**kwargs)
+        self.asset_name = kwargs.get('asset_name', None)
+        self.odatatype = '#Microsoft.Media.JobOutputAsset'
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_asset_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_asset_py3.py
new file mode 100644
index 000000000000..de6fc83d47c8
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_asset_py3.py
@@ -0,0 +1,54 @@
+# 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 .media_job_output_py3 import MediaJobOutput
+
+
+class MediaJobOutputAsset(MediaJobOutput):
+    """The event data for a Job output asset.
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param error: Gets the Job output error.
+    :type error: ~azure.eventgrid.models.MediaJobError
+    :param label: Gets the Job output label.
+    :type label: str
+    :param progress: Required. Gets the Job output progress.
+    :type progress: long
+    :param state: Required. Gets the Job output state. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :type state: str or ~azure.eventgrid.models.MediaJobState
+    :param odatatype: Required. Constant filled by server.
+    :type odatatype: str
+    :param asset_name: Gets the Job output asset name.
+    :type asset_name: str
+    """
+
+    _validation = {
+        'progress': {'required': True},
+        'state': {'required': True},
+        'odatatype': {'required': True},
+    }
+
+    _attribute_map = {
+        'error': {'key': 'error', 'type': 'MediaJobError'},
+        'label': {'key': 'label', 'type': 'str'},
+        'progress': {'key': 'progress', 'type': 'long'},
+        'state': {'key': 'state', 'type': 'MediaJobState'},
+        'odatatype': {'key': '@odata\\.type', 'type': 'str'},
+        'asset_name': {'key': 'assetName', 'type': 'str'},
+    }
+
+    def __init__(self, *, progress: int, state, error=None, label: str=None, asset_name: str=None, **kwargs) -> None:
+        super(MediaJobOutputAsset, self).__init__(error=error, label=label, progress=progress, state=state, **kwargs)
+        self.asset_name = asset_name
+        self.odatatype = '#Microsoft.Media.JobOutputAsset'
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_canceled_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_canceled_event_data.py
new file mode 100644
index 000000000000..c082ca91470f
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_canceled_event_data.py
@@ -0,0 +1,42 @@
+# 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 .media_job_output_state_change_event_data import MediaJobOutputStateChangeEventData
+
+
+class MediaJobOutputCanceledEventData(MediaJobOutputStateChangeEventData):
+    """Job output canceled event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :param output: Gets the output.
+    :type output: ~azure.eventgrid.models.MediaJobOutput
+    :param job_correlation_data: Gets the Job correlation data.
+    :type job_correlation_data: dict[str, str]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'output': {'key': 'output', 'type': 'MediaJobOutput'},
+        'job_correlation_data': {'key': 'jobCorrelationData', 'type': '{str}'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaJobOutputCanceledEventData, self).__init__(**kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_canceled_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_canceled_event_data_py3.py
new file mode 100644
index 000000000000..07fe3029aeb5
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_canceled_event_data_py3.py
@@ -0,0 +1,42 @@
+# 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 .media_job_output_state_change_event_data_py3 import MediaJobOutputStateChangeEventData
+
+
+class MediaJobOutputCanceledEventData(MediaJobOutputStateChangeEventData):
+    """Job output canceled event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :param output: Gets the output.
+    :type output: ~azure.eventgrid.models.MediaJobOutput
+    :param job_correlation_data: Gets the Job correlation data.
+    :type job_correlation_data: dict[str, str]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'output': {'key': 'output', 'type': 'MediaJobOutput'},
+        'job_correlation_data': {'key': 'jobCorrelationData', 'type': '{str}'},
+    }
+
+    def __init__(self, *, output=None, job_correlation_data=None, **kwargs) -> None:
+        super(MediaJobOutputCanceledEventData, self).__init__(output=output, job_correlation_data=job_correlation_data, **kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_canceling_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_canceling_event_data.py
new file mode 100644
index 000000000000..5b8f61dc1432
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_canceling_event_data.py
@@ -0,0 +1,42 @@
+# 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 .media_job_output_state_change_event_data import MediaJobOutputStateChangeEventData
+
+
+class MediaJobOutputCancelingEventData(MediaJobOutputStateChangeEventData):
+    """Job output canceling event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :param output: Gets the output.
+    :type output: ~azure.eventgrid.models.MediaJobOutput
+    :param job_correlation_data: Gets the Job correlation data.
+    :type job_correlation_data: dict[str, str]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'output': {'key': 'output', 'type': 'MediaJobOutput'},
+        'job_correlation_data': {'key': 'jobCorrelationData', 'type': '{str}'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaJobOutputCancelingEventData, self).__init__(**kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_canceling_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_canceling_event_data_py3.py
new file mode 100644
index 000000000000..440bb91f08f4
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_canceling_event_data_py3.py
@@ -0,0 +1,42 @@
+# 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 .media_job_output_state_change_event_data_py3 import MediaJobOutputStateChangeEventData
+
+
+class MediaJobOutputCancelingEventData(MediaJobOutputStateChangeEventData):
+    """Job output canceling event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :param output: Gets the output.
+    :type output: ~azure.eventgrid.models.MediaJobOutput
+    :param job_correlation_data: Gets the Job correlation data.
+    :type job_correlation_data: dict[str, str]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'output': {'key': 'output', 'type': 'MediaJobOutput'},
+        'job_correlation_data': {'key': 'jobCorrelationData', 'type': '{str}'},
+    }
+
+    def __init__(self, *, output=None, job_correlation_data=None, **kwargs) -> None:
+        super(MediaJobOutputCancelingEventData, self).__init__(output=output, job_correlation_data=job_correlation_data, **kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_errored_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_errored_event_data.py
new file mode 100644
index 000000000000..b6e9bf9f4bf0
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_errored_event_data.py
@@ -0,0 +1,42 @@
+# 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 .media_job_output_state_change_event_data import MediaJobOutputStateChangeEventData
+
+
+class MediaJobOutputErroredEventData(MediaJobOutputStateChangeEventData):
+    """Job output error event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :param output: Gets the output.
+    :type output: ~azure.eventgrid.models.MediaJobOutput
+    :param job_correlation_data: Gets the Job correlation data.
+    :type job_correlation_data: dict[str, str]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'output': {'key': 'output', 'type': 'MediaJobOutput'},
+        'job_correlation_data': {'key': 'jobCorrelationData', 'type': '{str}'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaJobOutputErroredEventData, self).__init__(**kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_errored_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_errored_event_data_py3.py
new file mode 100644
index 000000000000..c6f8c6ed5eb2
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_errored_event_data_py3.py
@@ -0,0 +1,42 @@
+# 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 .media_job_output_state_change_event_data_py3 import MediaJobOutputStateChangeEventData
+
+
+class MediaJobOutputErroredEventData(MediaJobOutputStateChangeEventData):
+    """Job output error event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :param output: Gets the output.
+    :type output: ~azure.eventgrid.models.MediaJobOutput
+    :param job_correlation_data: Gets the Job correlation data.
+    :type job_correlation_data: dict[str, str]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'output': {'key': 'output', 'type': 'MediaJobOutput'},
+        'job_correlation_data': {'key': 'jobCorrelationData', 'type': '{str}'},
+    }
+
+    def __init__(self, *, output=None, job_correlation_data=None, **kwargs) -> None:
+        super(MediaJobOutputErroredEventData, self).__init__(output=output, job_correlation_data=job_correlation_data, **kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_finished_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_finished_event_data.py
new file mode 100644
index 000000000000..ad08587a4d2a
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_finished_event_data.py
@@ -0,0 +1,42 @@
+# 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 .media_job_output_state_change_event_data import MediaJobOutputStateChangeEventData
+
+
+class MediaJobOutputFinishedEventData(MediaJobOutputStateChangeEventData):
+    """Job output finished event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :param output: Gets the output.
+    :type output: ~azure.eventgrid.models.MediaJobOutput
+    :param job_correlation_data: Gets the Job correlation data.
+    :type job_correlation_data: dict[str, str]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'output': {'key': 'output', 'type': 'MediaJobOutput'},
+        'job_correlation_data': {'key': 'jobCorrelationData', 'type': '{str}'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaJobOutputFinishedEventData, self).__init__(**kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_finished_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_finished_event_data_py3.py
new file mode 100644
index 000000000000..d973441dfb22
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_finished_event_data_py3.py
@@ -0,0 +1,42 @@
+# 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 .media_job_output_state_change_event_data_py3 import MediaJobOutputStateChangeEventData
+
+
+class MediaJobOutputFinishedEventData(MediaJobOutputStateChangeEventData):
+    """Job output finished event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :param output: Gets the output.
+    :type output: ~azure.eventgrid.models.MediaJobOutput
+    :param job_correlation_data: Gets the Job correlation data.
+    :type job_correlation_data: dict[str, str]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'output': {'key': 'output', 'type': 'MediaJobOutput'},
+        'job_correlation_data': {'key': 'jobCorrelationData', 'type': '{str}'},
+    }
+
+    def __init__(self, *, output=None, job_correlation_data=None, **kwargs) -> None:
+        super(MediaJobOutputFinishedEventData, self).__init__(output=output, job_correlation_data=job_correlation_data, **kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_processing_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_processing_event_data.py
new file mode 100644
index 000000000000..40bc09600888
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_processing_event_data.py
@@ -0,0 +1,42 @@
+# 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 .media_job_output_state_change_event_data import MediaJobOutputStateChangeEventData
+
+
+class MediaJobOutputProcessingEventData(MediaJobOutputStateChangeEventData):
+    """Job output processing event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :param output: Gets the output.
+    :type output: ~azure.eventgrid.models.MediaJobOutput
+    :param job_correlation_data: Gets the Job correlation data.
+    :type job_correlation_data: dict[str, str]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'output': {'key': 'output', 'type': 'MediaJobOutput'},
+        'job_correlation_data': {'key': 'jobCorrelationData', 'type': '{str}'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaJobOutputProcessingEventData, self).__init__(**kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_processing_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_processing_event_data_py3.py
new file mode 100644
index 000000000000..ccf97c3470ec
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_processing_event_data_py3.py
@@ -0,0 +1,42 @@
+# 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 .media_job_output_state_change_event_data_py3 import MediaJobOutputStateChangeEventData
+
+
+class MediaJobOutputProcessingEventData(MediaJobOutputStateChangeEventData):
+    """Job output processing event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :param output: Gets the output.
+    :type output: ~azure.eventgrid.models.MediaJobOutput
+    :param job_correlation_data: Gets the Job correlation data.
+    :type job_correlation_data: dict[str, str]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'output': {'key': 'output', 'type': 'MediaJobOutput'},
+        'job_correlation_data': {'key': 'jobCorrelationData', 'type': '{str}'},
+    }
+
+    def __init__(self, *, output=None, job_correlation_data=None, **kwargs) -> None:
+        super(MediaJobOutputProcessingEventData, self).__init__(output=output, job_correlation_data=job_correlation_data, **kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_progress_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_progress_event_data.py
new file mode 100644
index 000000000000..37c2c9662421
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_progress_event_data.py
@@ -0,0 +1,36 @@
+# 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 MediaJobOutputProgressEventData(Model):
+    """Job Output Progress Event Data.
+
+    :param label: Gets the Job output label.
+    :type label: str
+    :param progress: Gets the Job output progress.
+    :type progress: long
+    :param job_correlation_data: Gets the Job correlation data.
+    :type job_correlation_data: dict[str, str]
+    """
+
+    _attribute_map = {
+        'label': {'key': 'label', 'type': 'str'},
+        'progress': {'key': 'progress', 'type': 'long'},
+        'job_correlation_data': {'key': 'jobCorrelationData', 'type': '{str}'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaJobOutputProgressEventData, self).__init__(**kwargs)
+        self.label = kwargs.get('label', None)
+        self.progress = kwargs.get('progress', None)
+        self.job_correlation_data = kwargs.get('job_correlation_data', None)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_progress_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_progress_event_data_py3.py
new file mode 100644
index 000000000000..3f23816b7c37
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_progress_event_data_py3.py
@@ -0,0 +1,36 @@
+# 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 MediaJobOutputProgressEventData(Model):
+    """Job Output Progress Event Data.
+
+    :param label: Gets the Job output label.
+    :type label: str
+    :param progress: Gets the Job output progress.
+    :type progress: long
+    :param job_correlation_data: Gets the Job correlation data.
+    :type job_correlation_data: dict[str, str]
+    """
+
+    _attribute_map = {
+        'label': {'key': 'label', 'type': 'str'},
+        'progress': {'key': 'progress', 'type': 'long'},
+        'job_correlation_data': {'key': 'jobCorrelationData', 'type': '{str}'},
+    }
+
+    def __init__(self, *, label: str=None, progress: int=None, job_correlation_data=None, **kwargs) -> None:
+        super(MediaJobOutputProgressEventData, self).__init__(**kwargs)
+        self.label = label
+        self.progress = progress
+        self.job_correlation_data = job_correlation_data
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_py3.py
new file mode 100644
index 000000000000..8be196363b90
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_py3.py
@@ -0,0 +1,61 @@
+# 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 MediaJobOutput(Model):
+    """The event data for a Job output.
+
+    You probably want to use the sub-classes and not this class directly. Known
+    sub-classes are: MediaJobOutputAsset
+
+    All required parameters must be populated in order to send to Azure.
+
+    :param error: Gets the Job output error.
+    :type error: ~azure.eventgrid.models.MediaJobError
+    :param label: Gets the Job output label.
+    :type label: str
+    :param progress: Required. Gets the Job output progress.
+    :type progress: long
+    :param state: Required. Gets the Job output state. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :type state: str or ~azure.eventgrid.models.MediaJobState
+    :param odatatype: Required. Constant filled by server.
+    :type odatatype: str
+    """
+
+    _validation = {
+        'progress': {'required': True},
+        'state': {'required': True},
+        'odatatype': {'required': True},
+    }
+
+    _attribute_map = {
+        'error': {'key': 'error', 'type': 'MediaJobError'},
+        'label': {'key': 'label', 'type': 'str'},
+        'progress': {'key': 'progress', 'type': 'long'},
+        'state': {'key': 'state', 'type': 'MediaJobState'},
+        'odatatype': {'key': '@odata\\.type', 'type': 'str'},
+    }
+
+    _subtype_map = {
+        'odatatype': {'#Microsoft.Media.JobOutputAsset': 'MediaJobOutputAsset'}
+    }
+
+    def __init__(self, *, progress: int, state, error=None, label: str=None, **kwargs) -> None:
+        super(MediaJobOutput, self).__init__(**kwargs)
+        self.error = error
+        self.label = label
+        self.progress = progress
+        self.state = state
+        self.odatatype = None
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_scheduled_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_scheduled_event_data.py
new file mode 100644
index 000000000000..add4742a19e3
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_scheduled_event_data.py
@@ -0,0 +1,42 @@
+# 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 .media_job_output_state_change_event_data import MediaJobOutputStateChangeEventData
+
+
+class MediaJobOutputScheduledEventData(MediaJobOutputStateChangeEventData):
+    """Job output scheduled event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :param output: Gets the output.
+    :type output: ~azure.eventgrid.models.MediaJobOutput
+    :param job_correlation_data: Gets the Job correlation data.
+    :type job_correlation_data: dict[str, str]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'output': {'key': 'output', 'type': 'MediaJobOutput'},
+        'job_correlation_data': {'key': 'jobCorrelationData', 'type': '{str}'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaJobOutputScheduledEventData, self).__init__(**kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_scheduled_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_scheduled_event_data_py3.py
new file mode 100644
index 000000000000..a0ebd525de32
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_scheduled_event_data_py3.py
@@ -0,0 +1,42 @@
+# 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 .media_job_output_state_change_event_data_py3 import MediaJobOutputStateChangeEventData
+
+
+class MediaJobOutputScheduledEventData(MediaJobOutputStateChangeEventData):
+    """Job output scheduled event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :param output: Gets the output.
+    :type output: ~azure.eventgrid.models.MediaJobOutput
+    :param job_correlation_data: Gets the Job correlation data.
+    :type job_correlation_data: dict[str, str]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'output': {'key': 'output', 'type': 'MediaJobOutput'},
+        'job_correlation_data': {'key': 'jobCorrelationData', 'type': '{str}'},
+    }
+
+    def __init__(self, *, output=None, job_correlation_data=None, **kwargs) -> None:
+        super(MediaJobOutputScheduledEventData, self).__init__(output=output, job_correlation_data=job_correlation_data, **kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_state_change_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_state_change_event_data.py
new file mode 100644
index 000000000000..f60b5b944a15
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_state_change_event_data.py
@@ -0,0 +1,46 @@
+# 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 MediaJobOutputStateChangeEventData(Model):
+    """Schema of the Data property of an EventGridEvent for a
+    Microsoft.Media.JobOutputStateChange event.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :param output: Gets the output.
+    :type output: ~azure.eventgrid.models.MediaJobOutput
+    :param job_correlation_data: Gets the Job correlation data.
+    :type job_correlation_data: dict[str, str]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'output': {'key': 'output', 'type': 'MediaJobOutput'},
+        'job_correlation_data': {'key': 'jobCorrelationData', 'type': '{str}'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaJobOutputStateChangeEventData, self).__init__(**kwargs)
+        self.previous_state = None
+        self.output = kwargs.get('output', None)
+        self.job_correlation_data = kwargs.get('job_correlation_data', None)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_state_change_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_state_change_event_data_py3.py
new file mode 100644
index 000000000000..7c66b5dde9df
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_output_state_change_event_data_py3.py
@@ -0,0 +1,46 @@
+# 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 MediaJobOutputStateChangeEventData(Model):
+    """Schema of the Data property of an EventGridEvent for a
+    Microsoft.Media.JobOutputStateChange event.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :param output: Gets the output.
+    :type output: ~azure.eventgrid.models.MediaJobOutput
+    :param job_correlation_data: Gets the Job correlation data.
+    :type job_correlation_data: dict[str, str]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'output': {'key': 'output', 'type': 'MediaJobOutput'},
+        'job_correlation_data': {'key': 'jobCorrelationData', 'type': '{str}'},
+    }
+
+    def __init__(self, *, output=None, job_correlation_data=None, **kwargs) -> None:
+        super(MediaJobOutputStateChangeEventData, self).__init__(**kwargs)
+        self.previous_state = None
+        self.output = output
+        self.job_correlation_data = job_correlation_data
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_processing_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_processing_event_data.py
new file mode 100644
index 000000000000..9723cb17d9c5
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_processing_event_data.py
@@ -0,0 +1,45 @@
+# 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 .media_job_state_change_event_data import MediaJobStateChangeEventData
+
+
+class MediaJobProcessingEventData(MediaJobStateChangeEventData):
+    """Job processing event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :ivar state: The new state of the Job. Possible values include:
+     'Canceled', 'Canceling', 'Error', 'Finished', 'Processing', 'Queued',
+     'Scheduled'
+    :vartype state: str or ~azure.eventgrid.models.MediaJobState
+    :param correlation_data: Gets the Job correlation data.
+    :type correlation_data: dict[str, str]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+        'state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'state': {'key': 'state', 'type': 'MediaJobState'},
+        'correlation_data': {'key': 'correlationData', 'type': '{str}'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaJobProcessingEventData, self).__init__(**kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_processing_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_processing_event_data_py3.py
new file mode 100644
index 000000000000..6fa5a6bada00
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_processing_event_data_py3.py
@@ -0,0 +1,45 @@
+# 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 .media_job_state_change_event_data_py3 import MediaJobStateChangeEventData
+
+
+class MediaJobProcessingEventData(MediaJobStateChangeEventData):
+    """Job processing event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :ivar state: The new state of the Job. Possible values include:
+     'Canceled', 'Canceling', 'Error', 'Finished', 'Processing', 'Queued',
+     'Scheduled'
+    :vartype state: str or ~azure.eventgrid.models.MediaJobState
+    :param correlation_data: Gets the Job correlation data.
+    :type correlation_data: dict[str, str]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+        'state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'state': {'key': 'state', 'type': 'MediaJobState'},
+        'correlation_data': {'key': 'correlationData', 'type': '{str}'},
+    }
+
+    def __init__(self, *, correlation_data=None, **kwargs) -> None:
+        super(MediaJobProcessingEventData, self).__init__(correlation_data=correlation_data, **kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_scheduled_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_scheduled_event_data.py
new file mode 100644
index 000000000000..e7f3ac435b4b
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_scheduled_event_data.py
@@ -0,0 +1,45 @@
+# 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 .media_job_state_change_event_data import MediaJobStateChangeEventData
+
+
+class MediaJobScheduledEventData(MediaJobStateChangeEventData):
+    """Job scheduled event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :ivar state: The new state of the Job. Possible values include:
+     'Canceled', 'Canceling', 'Error', 'Finished', 'Processing', 'Queued',
+     'Scheduled'
+    :vartype state: str or ~azure.eventgrid.models.MediaJobState
+    :param correlation_data: Gets the Job correlation data.
+    :type correlation_data: dict[str, str]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+        'state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'state': {'key': 'state', 'type': 'MediaJobState'},
+        'correlation_data': {'key': 'correlationData', 'type': '{str}'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaJobScheduledEventData, self).__init__(**kwargs)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_scheduled_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_scheduled_event_data_py3.py
new file mode 100644
index 000000000000..a48b518f50d7
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_scheduled_event_data_py3.py
@@ -0,0 +1,45 @@
+# 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 .media_job_state_change_event_data_py3 import MediaJobStateChangeEventData
+
+
+class MediaJobScheduledEventData(MediaJobStateChangeEventData):
+    """Job scheduled event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar previous_state: The previous state of the Job. Possible values
+     include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
+     'Queued', 'Scheduled'
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
+    :ivar state: The new state of the Job. Possible values include:
+     'Canceled', 'Canceling', 'Error', 'Finished', 'Processing', 'Queued',
+     'Scheduled'
+    :vartype state: str or ~azure.eventgrid.models.MediaJobState
+    :param correlation_data: Gets the Job correlation data.
+    :type correlation_data: dict[str, str]
+    """
+
+    _validation = {
+        'previous_state': {'readonly': True},
+        'state': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'state': {'key': 'state', 'type': 'MediaJobState'},
+        'correlation_data': {'key': 'correlationData', 'type': '{str}'},
+    }
+
+    def __init__(self, *, correlation_data=None, **kwargs) -> None:
+        super(MediaJobScheduledEventData, self).__init__(correlation_data=correlation_data, **kwargs)
diff --git a/azure-eventgrid/azure/eventgrid/models/media_job_state_change_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_state_change_event_data.py
similarity index 72%
rename from azure-eventgrid/azure/eventgrid/models/media_job_state_change_event_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_state_change_event_data.py
index 02f704f2ca2b..180cc78a98fa 100644
--- a/azure-eventgrid/azure/eventgrid/models/media_job_state_change_event_data.py
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_state_change_event_data.py
@@ -22,11 +22,13 @@ class MediaJobStateChangeEventData(Model):
     :ivar previous_state: The previous state of the Job. Possible values
      include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
      'Queued', 'Scheduled'
-    :vartype previous_state: str or ~azure.eventgrid.models.JobState
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
     :ivar state: The new state of the Job. Possible values include:
      'Canceled', 'Canceling', 'Error', 'Finished', 'Processing', 'Queued',
      'Scheduled'
-    :vartype state: str or ~azure.eventgrid.models.JobState
+    :vartype state: str or ~azure.eventgrid.models.MediaJobState
+    :param correlation_data: Gets the Job correlation data.
+    :type correlation_data: dict[str, str]
     """
 
     _validation = {
@@ -35,11 +37,13 @@ class MediaJobStateChangeEventData(Model):
     }
 
     _attribute_map = {
-        'previous_state': {'key': 'previousState', 'type': 'JobState'},
-        'state': {'key': 'state', 'type': 'JobState'},
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'state': {'key': 'state', 'type': 'MediaJobState'},
+        'correlation_data': {'key': 'correlationData', 'type': '{str}'},
     }
 
     def __init__(self, **kwargs):
         super(MediaJobStateChangeEventData, self).__init__(**kwargs)
         self.previous_state = None
         self.state = None
+        self.correlation_data = kwargs.get('correlation_data', None)
diff --git a/azure-eventgrid/azure/eventgrid/models/media_job_state_change_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_state_change_event_data_py3.py
similarity index 70%
rename from azure-eventgrid/azure/eventgrid/models/media_job_state_change_event_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_state_change_event_data_py3.py
index ce69d00211eb..669d790a1843 100644
--- a/azure-eventgrid/azure/eventgrid/models/media_job_state_change_event_data_py3.py
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_job_state_change_event_data_py3.py
@@ -22,11 +22,13 @@ class MediaJobStateChangeEventData(Model):
     :ivar previous_state: The previous state of the Job. Possible values
      include: 'Canceled', 'Canceling', 'Error', 'Finished', 'Processing',
      'Queued', 'Scheduled'
-    :vartype previous_state: str or ~azure.eventgrid.models.JobState
+    :vartype previous_state: str or ~azure.eventgrid.models.MediaJobState
     :ivar state: The new state of the Job. Possible values include:
      'Canceled', 'Canceling', 'Error', 'Finished', 'Processing', 'Queued',
      'Scheduled'
-    :vartype state: str or ~azure.eventgrid.models.JobState
+    :vartype state: str or ~azure.eventgrid.models.MediaJobState
+    :param correlation_data: Gets the Job correlation data.
+    :type correlation_data: dict[str, str]
     """
 
     _validation = {
@@ -35,11 +37,13 @@ class MediaJobStateChangeEventData(Model):
     }
 
     _attribute_map = {
-        'previous_state': {'key': 'previousState', 'type': 'JobState'},
-        'state': {'key': 'state', 'type': 'JobState'},
+        'previous_state': {'key': 'previousState', 'type': 'MediaJobState'},
+        'state': {'key': 'state', 'type': 'MediaJobState'},
+        'correlation_data': {'key': 'correlationData', 'type': '{str}'},
     }
 
-    def __init__(self, **kwargs) -> None:
+    def __init__(self, *, correlation_data=None, **kwargs) -> None:
         super(MediaJobStateChangeEventData, self).__init__(**kwargs)
         self.previous_state = None
         self.state = None
+        self.correlation_data = correlation_data
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_connection_rejected_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_connection_rejected_event_data.py
new file mode 100644
index 000000000000..76a49ae592bd
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_connection_rejected_event_data.py
@@ -0,0 +1,55 @@
+# 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 MediaLiveEventConnectionRejectedEventData(Model):
+    """Encoder connection rejected event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar ingest_url: Gets the ingest URL provided by the live event.
+    :vartype ingest_url: str
+    :ivar stream_id: Gets the stream Id.
+    :vartype stream_id: str
+    :ivar encoder_ip: Gets the remote IP.
+    :vartype encoder_ip: str
+    :ivar encoder_port: Gets the remote port.
+    :vartype encoder_port: str
+    :ivar result_code: Gets the result code.
+    :vartype result_code: str
+    """
+
+    _validation = {
+        'ingest_url': {'readonly': True},
+        'stream_id': {'readonly': True},
+        'encoder_ip': {'readonly': True},
+        'encoder_port': {'readonly': True},
+        'result_code': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'ingest_url': {'key': 'ingestUrl', 'type': 'str'},
+        'stream_id': {'key': 'streamId', 'type': 'str'},
+        'encoder_ip': {'key': 'encoderIp', 'type': 'str'},
+        'encoder_port': {'key': 'encoderPort', 'type': 'str'},
+        'result_code': {'key': 'resultCode', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaLiveEventConnectionRejectedEventData, self).__init__(**kwargs)
+        self.ingest_url = None
+        self.stream_id = None
+        self.encoder_ip = None
+        self.encoder_port = None
+        self.result_code = None
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_connection_rejected_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_connection_rejected_event_data_py3.py
new file mode 100644
index 000000000000..3727fde97d6b
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_connection_rejected_event_data_py3.py
@@ -0,0 +1,55 @@
+# 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 MediaLiveEventConnectionRejectedEventData(Model):
+    """Encoder connection rejected event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar ingest_url: Gets the ingest URL provided by the live event.
+    :vartype ingest_url: str
+    :ivar stream_id: Gets the stream Id.
+    :vartype stream_id: str
+    :ivar encoder_ip: Gets the remote IP.
+    :vartype encoder_ip: str
+    :ivar encoder_port: Gets the remote port.
+    :vartype encoder_port: str
+    :ivar result_code: Gets the result code.
+    :vartype result_code: str
+    """
+
+    _validation = {
+        'ingest_url': {'readonly': True},
+        'stream_id': {'readonly': True},
+        'encoder_ip': {'readonly': True},
+        'encoder_port': {'readonly': True},
+        'result_code': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'ingest_url': {'key': 'ingestUrl', 'type': 'str'},
+        'stream_id': {'key': 'streamId', 'type': 'str'},
+        'encoder_ip': {'key': 'encoderIp', 'type': 'str'},
+        'encoder_port': {'key': 'encoderPort', 'type': 'str'},
+        'result_code': {'key': 'resultCode', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(MediaLiveEventConnectionRejectedEventData, self).__init__(**kwargs)
+        self.ingest_url = None
+        self.stream_id = None
+        self.encoder_ip = None
+        self.encoder_port = None
+        self.result_code = None
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_encoder_connected_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_encoder_connected_event_data.py
new file mode 100644
index 000000000000..8b89a722d117
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_encoder_connected_event_data.py
@@ -0,0 +1,50 @@
+# 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 MediaLiveEventEncoderConnectedEventData(Model):
+    """Encoder connect event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar ingest_url: Gets the ingest URL provided by the live event.
+    :vartype ingest_url: str
+    :ivar stream_id: Gets the stream Id.
+    :vartype stream_id: str
+    :ivar encoder_ip: Gets the remote IP.
+    :vartype encoder_ip: str
+    :ivar encoder_port: Gets the remote port.
+    :vartype encoder_port: str
+    """
+
+    _validation = {
+        'ingest_url': {'readonly': True},
+        'stream_id': {'readonly': True},
+        'encoder_ip': {'readonly': True},
+        'encoder_port': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'ingest_url': {'key': 'ingestUrl', 'type': 'str'},
+        'stream_id': {'key': 'streamId', 'type': 'str'},
+        'encoder_ip': {'key': 'encoderIp', 'type': 'str'},
+        'encoder_port': {'key': 'encoderPort', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaLiveEventEncoderConnectedEventData, self).__init__(**kwargs)
+        self.ingest_url = None
+        self.stream_id = None
+        self.encoder_ip = None
+        self.encoder_port = None
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_encoder_connected_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_encoder_connected_event_data_py3.py
new file mode 100644
index 000000000000..64d9148ba712
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_encoder_connected_event_data_py3.py
@@ -0,0 +1,50 @@
+# 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 MediaLiveEventEncoderConnectedEventData(Model):
+    """Encoder connect event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar ingest_url: Gets the ingest URL provided by the live event.
+    :vartype ingest_url: str
+    :ivar stream_id: Gets the stream Id.
+    :vartype stream_id: str
+    :ivar encoder_ip: Gets the remote IP.
+    :vartype encoder_ip: str
+    :ivar encoder_port: Gets the remote port.
+    :vartype encoder_port: str
+    """
+
+    _validation = {
+        'ingest_url': {'readonly': True},
+        'stream_id': {'readonly': True},
+        'encoder_ip': {'readonly': True},
+        'encoder_port': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'ingest_url': {'key': 'ingestUrl', 'type': 'str'},
+        'stream_id': {'key': 'streamId', 'type': 'str'},
+        'encoder_ip': {'key': 'encoderIp', 'type': 'str'},
+        'encoder_port': {'key': 'encoderPort', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(MediaLiveEventEncoderConnectedEventData, self).__init__(**kwargs)
+        self.ingest_url = None
+        self.stream_id = None
+        self.encoder_ip = None
+        self.encoder_port = None
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_encoder_disconnected_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_encoder_disconnected_event_data.py
new file mode 100644
index 000000000000..8fd787e6ebfa
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_encoder_disconnected_event_data.py
@@ -0,0 +1,55 @@
+# 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 MediaLiveEventEncoderDisconnectedEventData(Model):
+    """Encoder disconnected event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar ingest_url: Gets the ingest URL provided by the live event.
+    :vartype ingest_url: str
+    :ivar stream_id: Gets the stream Id.
+    :vartype stream_id: str
+    :ivar encoder_ip: Gets the remote IP.
+    :vartype encoder_ip: str
+    :ivar encoder_port: Gets the remote port.
+    :vartype encoder_port: str
+    :ivar result_code: Gets the result code.
+    :vartype result_code: str
+    """
+
+    _validation = {
+        'ingest_url': {'readonly': True},
+        'stream_id': {'readonly': True},
+        'encoder_ip': {'readonly': True},
+        'encoder_port': {'readonly': True},
+        'result_code': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'ingest_url': {'key': 'ingestUrl', 'type': 'str'},
+        'stream_id': {'key': 'streamId', 'type': 'str'},
+        'encoder_ip': {'key': 'encoderIp', 'type': 'str'},
+        'encoder_port': {'key': 'encoderPort', 'type': 'str'},
+        'result_code': {'key': 'resultCode', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaLiveEventEncoderDisconnectedEventData, self).__init__(**kwargs)
+        self.ingest_url = None
+        self.stream_id = None
+        self.encoder_ip = None
+        self.encoder_port = None
+        self.result_code = None
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_encoder_disconnected_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_encoder_disconnected_event_data_py3.py
new file mode 100644
index 000000000000..14df222bddac
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_encoder_disconnected_event_data_py3.py
@@ -0,0 +1,55 @@
+# 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 MediaLiveEventEncoderDisconnectedEventData(Model):
+    """Encoder disconnected event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar ingest_url: Gets the ingest URL provided by the live event.
+    :vartype ingest_url: str
+    :ivar stream_id: Gets the stream Id.
+    :vartype stream_id: str
+    :ivar encoder_ip: Gets the remote IP.
+    :vartype encoder_ip: str
+    :ivar encoder_port: Gets the remote port.
+    :vartype encoder_port: str
+    :ivar result_code: Gets the result code.
+    :vartype result_code: str
+    """
+
+    _validation = {
+        'ingest_url': {'readonly': True},
+        'stream_id': {'readonly': True},
+        'encoder_ip': {'readonly': True},
+        'encoder_port': {'readonly': True},
+        'result_code': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'ingest_url': {'key': 'ingestUrl', 'type': 'str'},
+        'stream_id': {'key': 'streamId', 'type': 'str'},
+        'encoder_ip': {'key': 'encoderIp', 'type': 'str'},
+        'encoder_port': {'key': 'encoderPort', 'type': 'str'},
+        'result_code': {'key': 'resultCode', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(MediaLiveEventEncoderDisconnectedEventData, self).__init__(**kwargs)
+        self.ingest_url = None
+        self.stream_id = None
+        self.encoder_ip = None
+        self.encoder_port = None
+        self.result_code = None
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_data_chunk_dropped_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_data_chunk_dropped_event_data.py
new file mode 100644
index 000000000000..6210002346cd
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_data_chunk_dropped_event_data.py
@@ -0,0 +1,61 @@
+# 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 MediaLiveEventIncomingDataChunkDroppedEventData(Model):
+    """Ingest fragment dropped event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar timestamp: Gets the timestamp of the data chunk dropped.
+    :vartype timestamp: str
+    :ivar track_type: Gets the type of the track (Audio / Video).
+    :vartype track_type: str
+    :ivar bitrate: Gets the bitrate of the track.
+    :vartype bitrate: long
+    :ivar timescale: Gets the timescale of the Timestamp.
+    :vartype timescale: str
+    :ivar result_code: Gets the result code for fragment drop operation.
+    :vartype result_code: str
+    :ivar track_name: Gets the name of the track for which fragment is
+     dropped.
+    :vartype track_name: str
+    """
+
+    _validation = {
+        'timestamp': {'readonly': True},
+        'track_type': {'readonly': True},
+        'bitrate': {'readonly': True},
+        'timescale': {'readonly': True},
+        'result_code': {'readonly': True},
+        'track_name': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'timestamp': {'key': 'timestamp', 'type': 'str'},
+        'track_type': {'key': 'trackType', 'type': 'str'},
+        'bitrate': {'key': 'bitrate', 'type': 'long'},
+        'timescale': {'key': 'timescale', 'type': 'str'},
+        'result_code': {'key': 'resultCode', 'type': 'str'},
+        'track_name': {'key': 'trackName', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaLiveEventIncomingDataChunkDroppedEventData, self).__init__(**kwargs)
+        self.timestamp = None
+        self.track_type = None
+        self.bitrate = None
+        self.timescale = None
+        self.result_code = None
+        self.track_name = None
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_data_chunk_dropped_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_data_chunk_dropped_event_data_py3.py
new file mode 100644
index 000000000000..00fed549af42
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_data_chunk_dropped_event_data_py3.py
@@ -0,0 +1,61 @@
+# 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 MediaLiveEventIncomingDataChunkDroppedEventData(Model):
+    """Ingest fragment dropped event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar timestamp: Gets the timestamp of the data chunk dropped.
+    :vartype timestamp: str
+    :ivar track_type: Gets the type of the track (Audio / Video).
+    :vartype track_type: str
+    :ivar bitrate: Gets the bitrate of the track.
+    :vartype bitrate: long
+    :ivar timescale: Gets the timescale of the Timestamp.
+    :vartype timescale: str
+    :ivar result_code: Gets the result code for fragment drop operation.
+    :vartype result_code: str
+    :ivar track_name: Gets the name of the track for which fragment is
+     dropped.
+    :vartype track_name: str
+    """
+
+    _validation = {
+        'timestamp': {'readonly': True},
+        'track_type': {'readonly': True},
+        'bitrate': {'readonly': True},
+        'timescale': {'readonly': True},
+        'result_code': {'readonly': True},
+        'track_name': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'timestamp': {'key': 'timestamp', 'type': 'str'},
+        'track_type': {'key': 'trackType', 'type': 'str'},
+        'bitrate': {'key': 'bitrate', 'type': 'long'},
+        'timescale': {'key': 'timescale', 'type': 'str'},
+        'result_code': {'key': 'resultCode', 'type': 'str'},
+        'track_name': {'key': 'trackName', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(MediaLiveEventIncomingDataChunkDroppedEventData, self).__init__(**kwargs)
+        self.timestamp = None
+        self.track_type = None
+        self.bitrate = None
+        self.timescale = None
+        self.result_code = None
+        self.track_name = None
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_stream_received_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_stream_received_event_data.py
new file mode 100644
index 000000000000..756218ad5856
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_stream_received_event_data.py
@@ -0,0 +1,75 @@
+# 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 MediaLiveEventIncomingStreamReceivedEventData(Model):
+    """Encoder connect event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar ingest_url: Gets the ingest URL provided by the live event.
+    :vartype ingest_url: str
+    :ivar track_type: Gets the type of the track (Audio / Video).
+    :vartype track_type: str
+    :ivar track_name: Gets the track name.
+    :vartype track_name: str
+    :ivar bitrate: Gets the bitrate of the track.
+    :vartype bitrate: long
+    :ivar encoder_ip: Gets the remote IP.
+    :vartype encoder_ip: str
+    :ivar encoder_port: Gets the remote port.
+    :vartype encoder_port: str
+    :ivar timestamp: Gets the first timestamp of the data chunk received.
+    :vartype timestamp: str
+    :ivar duration: Gets the duration of the first data chunk.
+    :vartype duration: str
+    :ivar timescale: Gets the timescale in which timestamp is represented.
+    :vartype timescale: str
+    """
+
+    _validation = {
+        'ingest_url': {'readonly': True},
+        'track_type': {'readonly': True},
+        'track_name': {'readonly': True},
+        'bitrate': {'readonly': True},
+        'encoder_ip': {'readonly': True},
+        'encoder_port': {'readonly': True},
+        'timestamp': {'readonly': True},
+        'duration': {'readonly': True},
+        'timescale': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'ingest_url': {'key': 'ingestUrl', 'type': 'str'},
+        'track_type': {'key': 'trackType', 'type': 'str'},
+        'track_name': {'key': 'trackName', 'type': 'str'},
+        'bitrate': {'key': 'bitrate', 'type': 'long'},
+        'encoder_ip': {'key': 'encoderIp', 'type': 'str'},
+        'encoder_port': {'key': 'encoderPort', 'type': 'str'},
+        'timestamp': {'key': 'timestamp', 'type': 'str'},
+        'duration': {'key': 'duration', 'type': 'str'},
+        'timescale': {'key': 'timescale', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaLiveEventIncomingStreamReceivedEventData, self).__init__(**kwargs)
+        self.ingest_url = None
+        self.track_type = None
+        self.track_name = None
+        self.bitrate = None
+        self.encoder_ip = None
+        self.encoder_port = None
+        self.timestamp = None
+        self.duration = None
+        self.timescale = None
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_stream_received_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_stream_received_event_data_py3.py
new file mode 100644
index 000000000000..928dfc666158
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_stream_received_event_data_py3.py
@@ -0,0 +1,75 @@
+# 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 MediaLiveEventIncomingStreamReceivedEventData(Model):
+    """Encoder connect event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar ingest_url: Gets the ingest URL provided by the live event.
+    :vartype ingest_url: str
+    :ivar track_type: Gets the type of the track (Audio / Video).
+    :vartype track_type: str
+    :ivar track_name: Gets the track name.
+    :vartype track_name: str
+    :ivar bitrate: Gets the bitrate of the track.
+    :vartype bitrate: long
+    :ivar encoder_ip: Gets the remote IP.
+    :vartype encoder_ip: str
+    :ivar encoder_port: Gets the remote port.
+    :vartype encoder_port: str
+    :ivar timestamp: Gets the first timestamp of the data chunk received.
+    :vartype timestamp: str
+    :ivar duration: Gets the duration of the first data chunk.
+    :vartype duration: str
+    :ivar timescale: Gets the timescale in which timestamp is represented.
+    :vartype timescale: str
+    """
+
+    _validation = {
+        'ingest_url': {'readonly': True},
+        'track_type': {'readonly': True},
+        'track_name': {'readonly': True},
+        'bitrate': {'readonly': True},
+        'encoder_ip': {'readonly': True},
+        'encoder_port': {'readonly': True},
+        'timestamp': {'readonly': True},
+        'duration': {'readonly': True},
+        'timescale': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'ingest_url': {'key': 'ingestUrl', 'type': 'str'},
+        'track_type': {'key': 'trackType', 'type': 'str'},
+        'track_name': {'key': 'trackName', 'type': 'str'},
+        'bitrate': {'key': 'bitrate', 'type': 'long'},
+        'encoder_ip': {'key': 'encoderIp', 'type': 'str'},
+        'encoder_port': {'key': 'encoderPort', 'type': 'str'},
+        'timestamp': {'key': 'timestamp', 'type': 'str'},
+        'duration': {'key': 'duration', 'type': 'str'},
+        'timescale': {'key': 'timescale', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(MediaLiveEventIncomingStreamReceivedEventData, self).__init__(**kwargs)
+        self.ingest_url = None
+        self.track_type = None
+        self.track_name = None
+        self.bitrate = None
+        self.encoder_ip = None
+        self.encoder_port = None
+        self.timestamp = None
+        self.duration = None
+        self.timescale = None
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_streams_out_of_sync_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_streams_out_of_sync_event_data.py
new file mode 100644
index 000000000000..c0fef1d78f95
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_streams_out_of_sync_event_data.py
@@ -0,0 +1,65 @@
+# 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 MediaLiveEventIncomingStreamsOutOfSyncEventData(Model):
+    """Incoming streams out of sync event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar min_last_timestamp: Gets the minimum last timestamp received.
+    :vartype min_last_timestamp: str
+    :ivar type_of_stream_with_min_last_timestamp: Gets the type of stream with
+     minimum last timestamp.
+    :vartype type_of_stream_with_min_last_timestamp: str
+    :ivar max_last_timestamp: Gets the maximum timestamp among all the tracks
+     (audio or video).
+    :vartype max_last_timestamp: str
+    :ivar type_of_stream_with_max_last_timestamp: Gets the type of stream with
+     maximum last timestamp.
+    :vartype type_of_stream_with_max_last_timestamp: str
+    :ivar timescale_of_min_last_timestamp: Gets the timescale in which
+     "MinLastTimestamp" is represented.
+    :vartype timescale_of_min_last_timestamp: str
+    :ivar timescale_of_max_last_timestamp: Gets the timescale in which
+     "MaxLastTimestamp" is represented.
+    :vartype timescale_of_max_last_timestamp: str
+    """
+
+    _validation = {
+        'min_last_timestamp': {'readonly': True},
+        'type_of_stream_with_min_last_timestamp': {'readonly': True},
+        'max_last_timestamp': {'readonly': True},
+        'type_of_stream_with_max_last_timestamp': {'readonly': True},
+        'timescale_of_min_last_timestamp': {'readonly': True},
+        'timescale_of_max_last_timestamp': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'min_last_timestamp': {'key': 'minLastTimestamp', 'type': 'str'},
+        'type_of_stream_with_min_last_timestamp': {'key': 'typeOfStreamWithMinLastTimestamp', 'type': 'str'},
+        'max_last_timestamp': {'key': 'maxLastTimestamp', 'type': 'str'},
+        'type_of_stream_with_max_last_timestamp': {'key': 'typeOfStreamWithMaxLastTimestamp', 'type': 'str'},
+        'timescale_of_min_last_timestamp': {'key': 'timescaleOfMinLastTimestamp', 'type': 'str'},
+        'timescale_of_max_last_timestamp': {'key': 'timescaleOfMaxLastTimestamp', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaLiveEventIncomingStreamsOutOfSyncEventData, self).__init__(**kwargs)
+        self.min_last_timestamp = None
+        self.type_of_stream_with_min_last_timestamp = None
+        self.max_last_timestamp = None
+        self.type_of_stream_with_max_last_timestamp = None
+        self.timescale_of_min_last_timestamp = None
+        self.timescale_of_max_last_timestamp = None
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_streams_out_of_sync_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_streams_out_of_sync_event_data_py3.py
new file mode 100644
index 000000000000..0d1a4789aa37
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_streams_out_of_sync_event_data_py3.py
@@ -0,0 +1,65 @@
+# 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 MediaLiveEventIncomingStreamsOutOfSyncEventData(Model):
+    """Incoming streams out of sync event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar min_last_timestamp: Gets the minimum last timestamp received.
+    :vartype min_last_timestamp: str
+    :ivar type_of_stream_with_min_last_timestamp: Gets the type of stream with
+     minimum last timestamp.
+    :vartype type_of_stream_with_min_last_timestamp: str
+    :ivar max_last_timestamp: Gets the maximum timestamp among all the tracks
+     (audio or video).
+    :vartype max_last_timestamp: str
+    :ivar type_of_stream_with_max_last_timestamp: Gets the type of stream with
+     maximum last timestamp.
+    :vartype type_of_stream_with_max_last_timestamp: str
+    :ivar timescale_of_min_last_timestamp: Gets the timescale in which
+     "MinLastTimestamp" is represented.
+    :vartype timescale_of_min_last_timestamp: str
+    :ivar timescale_of_max_last_timestamp: Gets the timescale in which
+     "MaxLastTimestamp" is represented.
+    :vartype timescale_of_max_last_timestamp: str
+    """
+
+    _validation = {
+        'min_last_timestamp': {'readonly': True},
+        'type_of_stream_with_min_last_timestamp': {'readonly': True},
+        'max_last_timestamp': {'readonly': True},
+        'type_of_stream_with_max_last_timestamp': {'readonly': True},
+        'timescale_of_min_last_timestamp': {'readonly': True},
+        'timescale_of_max_last_timestamp': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'min_last_timestamp': {'key': 'minLastTimestamp', 'type': 'str'},
+        'type_of_stream_with_min_last_timestamp': {'key': 'typeOfStreamWithMinLastTimestamp', 'type': 'str'},
+        'max_last_timestamp': {'key': 'maxLastTimestamp', 'type': 'str'},
+        'type_of_stream_with_max_last_timestamp': {'key': 'typeOfStreamWithMaxLastTimestamp', 'type': 'str'},
+        'timescale_of_min_last_timestamp': {'key': 'timescaleOfMinLastTimestamp', 'type': 'str'},
+        'timescale_of_max_last_timestamp': {'key': 'timescaleOfMaxLastTimestamp', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(MediaLiveEventIncomingStreamsOutOfSyncEventData, self).__init__(**kwargs)
+        self.min_last_timestamp = None
+        self.type_of_stream_with_min_last_timestamp = None
+        self.max_last_timestamp = None
+        self.type_of_stream_with_max_last_timestamp = None
+        self.timescale_of_min_last_timestamp = None
+        self.timescale_of_max_last_timestamp = None
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_video_streams_out_of_sync_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_video_streams_out_of_sync_event_data.py
new file mode 100644
index 000000000000..e29df8e47d3f
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_video_streams_out_of_sync_event_data.py
@@ -0,0 +1,60 @@
+# 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 MediaLiveEventIncomingVideoStreamsOutOfSyncEventData(Model):
+    """Incoming video stream out of synch event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar first_timestamp: Gets the first timestamp received for one of the
+     quality levels.
+    :vartype first_timestamp: str
+    :ivar first_duration: Gets the duration of the data chunk with first
+     timestamp.
+    :vartype first_duration: str
+    :ivar second_timestamp: Gets the timestamp received for some other quality
+     levels.
+    :vartype second_timestamp: str
+    :ivar second_duration: Gets the duration of the data chunk with second
+     timestamp.
+    :vartype second_duration: str
+    :ivar timescale: Gets the timescale in which both the timestamps and
+     durations are represented.
+    :vartype timescale: str
+    """
+
+    _validation = {
+        'first_timestamp': {'readonly': True},
+        'first_duration': {'readonly': True},
+        'second_timestamp': {'readonly': True},
+        'second_duration': {'readonly': True},
+        'timescale': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'first_timestamp': {'key': 'firstTimestamp', 'type': 'str'},
+        'first_duration': {'key': 'firstDuration', 'type': 'str'},
+        'second_timestamp': {'key': 'secondTimestamp', 'type': 'str'},
+        'second_duration': {'key': 'secondDuration', 'type': 'str'},
+        'timescale': {'key': 'timescale', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaLiveEventIncomingVideoStreamsOutOfSyncEventData, self).__init__(**kwargs)
+        self.first_timestamp = None
+        self.first_duration = None
+        self.second_timestamp = None
+        self.second_duration = None
+        self.timescale = None
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_video_streams_out_of_sync_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_video_streams_out_of_sync_event_data_py3.py
new file mode 100644
index 000000000000..f0963a0d6ec2
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_incoming_video_streams_out_of_sync_event_data_py3.py
@@ -0,0 +1,60 @@
+# 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 MediaLiveEventIncomingVideoStreamsOutOfSyncEventData(Model):
+    """Incoming video stream out of synch event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar first_timestamp: Gets the first timestamp received for one of the
+     quality levels.
+    :vartype first_timestamp: str
+    :ivar first_duration: Gets the duration of the data chunk with first
+     timestamp.
+    :vartype first_duration: str
+    :ivar second_timestamp: Gets the timestamp received for some other quality
+     levels.
+    :vartype second_timestamp: str
+    :ivar second_duration: Gets the duration of the data chunk with second
+     timestamp.
+    :vartype second_duration: str
+    :ivar timescale: Gets the timescale in which both the timestamps and
+     durations are represented.
+    :vartype timescale: str
+    """
+
+    _validation = {
+        'first_timestamp': {'readonly': True},
+        'first_duration': {'readonly': True},
+        'second_timestamp': {'readonly': True},
+        'second_duration': {'readonly': True},
+        'timescale': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'first_timestamp': {'key': 'firstTimestamp', 'type': 'str'},
+        'first_duration': {'key': 'firstDuration', 'type': 'str'},
+        'second_timestamp': {'key': 'secondTimestamp', 'type': 'str'},
+        'second_duration': {'key': 'secondDuration', 'type': 'str'},
+        'timescale': {'key': 'timescale', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(MediaLiveEventIncomingVideoStreamsOutOfSyncEventData, self).__init__(**kwargs)
+        self.first_timestamp = None
+        self.first_duration = None
+        self.second_timestamp = None
+        self.second_duration = None
+        self.timescale = None
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_ingest_heartbeat_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_ingest_heartbeat_event_data.py
new file mode 100644
index 000000000000..67928e5bd938
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_ingest_heartbeat_event_data.py
@@ -0,0 +1,91 @@
+# 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 MediaLiveEventIngestHeartbeatEventData(Model):
+    """Ingest fragment dropped event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar track_type: Gets the type of the track (Audio / Video).
+    :vartype track_type: str
+    :ivar track_name: Gets the track name.
+    :vartype track_name: str
+    :ivar bitrate: Gets the bitrate of the track.
+    :vartype bitrate: long
+    :ivar incoming_bitrate: Gets the incoming bitrate.
+    :vartype incoming_bitrate: long
+    :ivar last_timestamp: Gets the last timestamp.
+    :vartype last_timestamp: str
+    :ivar timescale: Gets the timescale of the last timestamp.
+    :vartype timescale: str
+    :ivar overlap_count: Gets the fragment Overlap count.
+    :vartype overlap_count: long
+    :ivar discontinuity_count: Gets the fragment Discontinuity count.
+    :vartype discontinuity_count: long
+    :ivar nonincreasing_count: Gets Non increasing count.
+    :vartype nonincreasing_count: long
+    :ivar unexpected_bitrate: Gets a value indicating whether unexpected
+     bitrate is present or not.
+    :vartype unexpected_bitrate: bool
+    :ivar state: Gets the state of the live event.
+    :vartype state: str
+    :ivar healthy: Gets a value indicating whether preview is healthy or not.
+    :vartype healthy: bool
+    """
+
+    _validation = {
+        'track_type': {'readonly': True},
+        'track_name': {'readonly': True},
+        'bitrate': {'readonly': True},
+        'incoming_bitrate': {'readonly': True},
+        'last_timestamp': {'readonly': True},
+        'timescale': {'readonly': True},
+        'overlap_count': {'readonly': True},
+        'discontinuity_count': {'readonly': True},
+        'nonincreasing_count': {'readonly': True},
+        'unexpected_bitrate': {'readonly': True},
+        'state': {'readonly': True},
+        'healthy': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'track_type': {'key': 'trackType', 'type': 'str'},
+        'track_name': {'key': 'trackName', 'type': 'str'},
+        'bitrate': {'key': 'bitrate', 'type': 'long'},
+        'incoming_bitrate': {'key': 'incomingBitrate', 'type': 'long'},
+        'last_timestamp': {'key': 'lastTimestamp', 'type': 'str'},
+        'timescale': {'key': 'timescale', 'type': 'str'},
+        'overlap_count': {'key': 'overlapCount', 'type': 'long'},
+        'discontinuity_count': {'key': 'discontinuityCount', 'type': 'long'},
+        'nonincreasing_count': {'key': 'nonincreasingCount', 'type': 'long'},
+        'unexpected_bitrate': {'key': 'unexpectedBitrate', 'type': 'bool'},
+        'state': {'key': 'state', 'type': 'str'},
+        'healthy': {'key': 'healthy', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaLiveEventIngestHeartbeatEventData, self).__init__(**kwargs)
+        self.track_type = None
+        self.track_name = None
+        self.bitrate = None
+        self.incoming_bitrate = None
+        self.last_timestamp = None
+        self.timescale = None
+        self.overlap_count = None
+        self.discontinuity_count = None
+        self.nonincreasing_count = None
+        self.unexpected_bitrate = None
+        self.state = None
+        self.healthy = None
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_ingest_heartbeat_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_ingest_heartbeat_event_data_py3.py
new file mode 100644
index 000000000000..6f9447c3a23e
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_ingest_heartbeat_event_data_py3.py
@@ -0,0 +1,91 @@
+# 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 MediaLiveEventIngestHeartbeatEventData(Model):
+    """Ingest fragment dropped event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar track_type: Gets the type of the track (Audio / Video).
+    :vartype track_type: str
+    :ivar track_name: Gets the track name.
+    :vartype track_name: str
+    :ivar bitrate: Gets the bitrate of the track.
+    :vartype bitrate: long
+    :ivar incoming_bitrate: Gets the incoming bitrate.
+    :vartype incoming_bitrate: long
+    :ivar last_timestamp: Gets the last timestamp.
+    :vartype last_timestamp: str
+    :ivar timescale: Gets the timescale of the last timestamp.
+    :vartype timescale: str
+    :ivar overlap_count: Gets the fragment Overlap count.
+    :vartype overlap_count: long
+    :ivar discontinuity_count: Gets the fragment Discontinuity count.
+    :vartype discontinuity_count: long
+    :ivar nonincreasing_count: Gets Non increasing count.
+    :vartype nonincreasing_count: long
+    :ivar unexpected_bitrate: Gets a value indicating whether unexpected
+     bitrate is present or not.
+    :vartype unexpected_bitrate: bool
+    :ivar state: Gets the state of the live event.
+    :vartype state: str
+    :ivar healthy: Gets a value indicating whether preview is healthy or not.
+    :vartype healthy: bool
+    """
+
+    _validation = {
+        'track_type': {'readonly': True},
+        'track_name': {'readonly': True},
+        'bitrate': {'readonly': True},
+        'incoming_bitrate': {'readonly': True},
+        'last_timestamp': {'readonly': True},
+        'timescale': {'readonly': True},
+        'overlap_count': {'readonly': True},
+        'discontinuity_count': {'readonly': True},
+        'nonincreasing_count': {'readonly': True},
+        'unexpected_bitrate': {'readonly': True},
+        'state': {'readonly': True},
+        'healthy': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'track_type': {'key': 'trackType', 'type': 'str'},
+        'track_name': {'key': 'trackName', 'type': 'str'},
+        'bitrate': {'key': 'bitrate', 'type': 'long'},
+        'incoming_bitrate': {'key': 'incomingBitrate', 'type': 'long'},
+        'last_timestamp': {'key': 'lastTimestamp', 'type': 'str'},
+        'timescale': {'key': 'timescale', 'type': 'str'},
+        'overlap_count': {'key': 'overlapCount', 'type': 'long'},
+        'discontinuity_count': {'key': 'discontinuityCount', 'type': 'long'},
+        'nonincreasing_count': {'key': 'nonincreasingCount', 'type': 'long'},
+        'unexpected_bitrate': {'key': 'unexpectedBitrate', 'type': 'bool'},
+        'state': {'key': 'state', 'type': 'str'},
+        'healthy': {'key': 'healthy', 'type': 'bool'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(MediaLiveEventIngestHeartbeatEventData, self).__init__(**kwargs)
+        self.track_type = None
+        self.track_name = None
+        self.bitrate = None
+        self.incoming_bitrate = None
+        self.last_timestamp = None
+        self.timescale = None
+        self.overlap_count = None
+        self.discontinuity_count = None
+        self.nonincreasing_count = None
+        self.unexpected_bitrate = None
+        self.state = None
+        self.healthy = None
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_track_discontinuity_detected_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_track_discontinuity_detected_event_data.py
new file mode 100644
index 000000000000..d60c04d8f294
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_track_discontinuity_detected_event_data.py
@@ -0,0 +1,67 @@
+# 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 MediaLiveEventTrackDiscontinuityDetectedEventData(Model):
+    """Ingest track discontinuity detected event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar track_type: Gets the type of the track (Audio / Video).
+    :vartype track_type: str
+    :ivar track_name: Gets the track name.
+    :vartype track_name: str
+    :ivar bitrate: Gets the bitrate.
+    :vartype bitrate: long
+    :ivar previous_timestamp: Gets the timestamp of the previous fragment.
+    :vartype previous_timestamp: str
+    :ivar new_timestamp: Gets the timestamp of the current fragment.
+    :vartype new_timestamp: str
+    :ivar timescale: Gets the timescale in which both timestamps and
+     discontinuity gap are represented.
+    :vartype timescale: str
+    :ivar discontinuity_gap: Gets the discontinuity gap between
+     PreviousTimestamp and NewTimestamp.
+    :vartype discontinuity_gap: str
+    """
+
+    _validation = {
+        'track_type': {'readonly': True},
+        'track_name': {'readonly': True},
+        'bitrate': {'readonly': True},
+        'previous_timestamp': {'readonly': True},
+        'new_timestamp': {'readonly': True},
+        'timescale': {'readonly': True},
+        'discontinuity_gap': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'track_type': {'key': 'trackType', 'type': 'str'},
+        'track_name': {'key': 'trackName', 'type': 'str'},
+        'bitrate': {'key': 'bitrate', 'type': 'long'},
+        'previous_timestamp': {'key': 'previousTimestamp', 'type': 'str'},
+        'new_timestamp': {'key': 'newTimestamp', 'type': 'str'},
+        'timescale': {'key': 'timescale', 'type': 'str'},
+        'discontinuity_gap': {'key': 'discontinuityGap', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(MediaLiveEventTrackDiscontinuityDetectedEventData, self).__init__(**kwargs)
+        self.track_type = None
+        self.track_name = None
+        self.bitrate = None
+        self.previous_timestamp = None
+        self.new_timestamp = None
+        self.timescale = None
+        self.discontinuity_gap = None
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_track_discontinuity_detected_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_track_discontinuity_detected_event_data_py3.py
new file mode 100644
index 000000000000..872d6094d5ce
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/media_live_event_track_discontinuity_detected_event_data_py3.py
@@ -0,0 +1,67 @@
+# 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 MediaLiveEventTrackDiscontinuityDetectedEventData(Model):
+    """Ingest track discontinuity detected event data.
+
+    Variables are only populated by the server, and will be ignored when
+    sending a request.
+
+    :ivar track_type: Gets the type of the track (Audio / Video).
+    :vartype track_type: str
+    :ivar track_name: Gets the track name.
+    :vartype track_name: str
+    :ivar bitrate: Gets the bitrate.
+    :vartype bitrate: long
+    :ivar previous_timestamp: Gets the timestamp of the previous fragment.
+    :vartype previous_timestamp: str
+    :ivar new_timestamp: Gets the timestamp of the current fragment.
+    :vartype new_timestamp: str
+    :ivar timescale: Gets the timescale in which both timestamps and
+     discontinuity gap are represented.
+    :vartype timescale: str
+    :ivar discontinuity_gap: Gets the discontinuity gap between
+     PreviousTimestamp and NewTimestamp.
+    :vartype discontinuity_gap: str
+    """
+
+    _validation = {
+        'track_type': {'readonly': True},
+        'track_name': {'readonly': True},
+        'bitrate': {'readonly': True},
+        'previous_timestamp': {'readonly': True},
+        'new_timestamp': {'readonly': True},
+        'timescale': {'readonly': True},
+        'discontinuity_gap': {'readonly': True},
+    }
+
+    _attribute_map = {
+        'track_type': {'key': 'trackType', 'type': 'str'},
+        'track_name': {'key': 'trackName', 'type': 'str'},
+        'bitrate': {'key': 'bitrate', 'type': 'long'},
+        'previous_timestamp': {'key': 'previousTimestamp', 'type': 'str'},
+        'new_timestamp': {'key': 'newTimestamp', 'type': 'str'},
+        'timescale': {'key': 'timescale', 'type': 'str'},
+        'discontinuity_gap': {'key': 'discontinuityGap', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs) -> None:
+        super(MediaLiveEventTrackDiscontinuityDetectedEventData, self).__init__(**kwargs)
+        self.track_type = None
+        self.track_name = None
+        self.bitrate = None
+        self.previous_timestamp = None
+        self.new_timestamp = None
+        self.timescale = None
+        self.discontinuity_gap = None
diff --git a/azure-eventgrid/azure/eventgrid/models/resource_action_cancel_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_action_cancel_data.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/resource_action_cancel_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_action_cancel_data.py
diff --git a/azure-eventgrid/azure/eventgrid/models/resource_action_cancel_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_action_cancel_data_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/resource_action_cancel_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_action_cancel_data_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/resource_action_failure_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_action_failure_data.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/resource_action_failure_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_action_failure_data.py
diff --git a/azure-eventgrid/azure/eventgrid/models/resource_action_failure_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_action_failure_data_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/resource_action_failure_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_action_failure_data_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/resource_action_success_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_action_success_data.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/resource_action_success_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_action_success_data.py
diff --git a/azure-eventgrid/azure/eventgrid/models/resource_action_success_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_action_success_data_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/resource_action_success_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_action_success_data_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/resource_delete_cancel_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_delete_cancel_data.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/resource_delete_cancel_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_delete_cancel_data.py
diff --git a/azure-eventgrid/azure/eventgrid/models/resource_delete_cancel_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_delete_cancel_data_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/resource_delete_cancel_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_delete_cancel_data_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/resource_delete_failure_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_delete_failure_data.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/resource_delete_failure_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_delete_failure_data.py
diff --git a/azure-eventgrid/azure/eventgrid/models/resource_delete_failure_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_delete_failure_data_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/resource_delete_failure_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_delete_failure_data_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/resource_delete_success_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_delete_success_data.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/resource_delete_success_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_delete_success_data.py
diff --git a/azure-eventgrid/azure/eventgrid/models/resource_delete_success_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_delete_success_data_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/resource_delete_success_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_delete_success_data_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/resource_write_cancel_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_write_cancel_data.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/resource_write_cancel_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_write_cancel_data.py
diff --git a/azure-eventgrid/azure/eventgrid/models/resource_write_cancel_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_write_cancel_data_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/resource_write_cancel_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_write_cancel_data_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/resource_write_failure_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_write_failure_data.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/resource_write_failure_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_write_failure_data.py
diff --git a/azure-eventgrid/azure/eventgrid/models/resource_write_failure_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_write_failure_data_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/resource_write_failure_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_write_failure_data_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/resource_write_success_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_write_success_data.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/resource_write_success_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_write_success_data.py
diff --git a/azure-eventgrid/azure/eventgrid/models/resource_write_success_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_write_success_data_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/resource_write_success_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/resource_write_success_data_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/service_bus_active_messages_available_with_no_listeners_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/service_bus_active_messages_available_with_no_listeners_event_data.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/service_bus_active_messages_available_with_no_listeners_event_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/service_bus_active_messages_available_with_no_listeners_event_data.py
diff --git a/azure-eventgrid/azure/eventgrid/models/service_bus_active_messages_available_with_no_listeners_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/service_bus_active_messages_available_with_no_listeners_event_data_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/service_bus_active_messages_available_with_no_listeners_event_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/service_bus_active_messages_available_with_no_listeners_event_data_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/service_bus_deadletter_messages_available_with_no_listeners_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/service_bus_deadletter_messages_available_with_no_listeners_event_data.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/service_bus_deadletter_messages_available_with_no_listeners_event_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/service_bus_deadletter_messages_available_with_no_listeners_event_data.py
diff --git a/azure-eventgrid/azure/eventgrid/models/service_bus_deadletter_messages_available_with_no_listeners_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/service_bus_deadletter_messages_available_with_no_listeners_event_data_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/service_bus_deadletter_messages_available_with_no_listeners_event_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/service_bus_deadletter_messages_available_with_no_listeners_event_data_py3.py
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/signal_rservice_client_connection_connected_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/signal_rservice_client_connection_connected_event_data.py
new file mode 100644
index 000000000000..f48d5ff56765
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/signal_rservice_client_connection_connected_event_data.py
@@ -0,0 +1,41 @@
+# 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 SignalRServiceClientConnectionConnectedEventData(Model):
+    """Schema of the Data property of an EventGridEvent for a
+    Microsoft.SignalRService.ClientConnectionConnected event.
+
+    :param timestamp: The time at which the event occurred.
+    :type timestamp: datetime
+    :param hub: The hub of connected client connection.
+    :type hub: str
+    :param connection_id: The connection Id of connected client connection.
+    :type connection_id: str
+    :param user_id: The user Id of connected client connection.
+    :type user_id: str
+    """
+
+    _attribute_map = {
+        'timestamp': {'key': 'timestamp', 'type': 'iso-8601'},
+        'hub': {'key': 'hub', 'type': 'str'},
+        'connection_id': {'key': 'connectionId', 'type': 'str'},
+        'user_id': {'key': 'userId', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(SignalRServiceClientConnectionConnectedEventData, self).__init__(**kwargs)
+        self.timestamp = kwargs.get('timestamp', None)
+        self.hub = kwargs.get('hub', None)
+        self.connection_id = kwargs.get('connection_id', None)
+        self.user_id = kwargs.get('user_id', None)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/signal_rservice_client_connection_connected_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/signal_rservice_client_connection_connected_event_data_py3.py
new file mode 100644
index 000000000000..2237e0ed5bec
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/signal_rservice_client_connection_connected_event_data_py3.py
@@ -0,0 +1,41 @@
+# 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 SignalRServiceClientConnectionConnectedEventData(Model):
+    """Schema of the Data property of an EventGridEvent for a
+    Microsoft.SignalRService.ClientConnectionConnected event.
+
+    :param timestamp: The time at which the event occurred.
+    :type timestamp: datetime
+    :param hub: The hub of connected client connection.
+    :type hub: str
+    :param connection_id: The connection Id of connected client connection.
+    :type connection_id: str
+    :param user_id: The user Id of connected client connection.
+    :type user_id: str
+    """
+
+    _attribute_map = {
+        'timestamp': {'key': 'timestamp', 'type': 'iso-8601'},
+        'hub': {'key': 'hub', 'type': 'str'},
+        'connection_id': {'key': 'connectionId', 'type': 'str'},
+        'user_id': {'key': 'userId', 'type': 'str'},
+    }
+
+    def __init__(self, *, timestamp=None, hub: str=None, connection_id: str=None, user_id: str=None, **kwargs) -> None:
+        super(SignalRServiceClientConnectionConnectedEventData, self).__init__(**kwargs)
+        self.timestamp = timestamp
+        self.hub = hub
+        self.connection_id = connection_id
+        self.user_id = user_id
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/signal_rservice_client_connection_disconnected_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/signal_rservice_client_connection_disconnected_event_data.py
new file mode 100644
index 000000000000..d888c23cd9dc
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/signal_rservice_client_connection_disconnected_event_data.py
@@ -0,0 +1,46 @@
+# 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 SignalRServiceClientConnectionDisconnectedEventData(Model):
+    """Schema of the Data property of an EventGridEvent for a
+    Microsoft.SignalRService.ClientConnectionDisconnected event.
+
+    :param timestamp: The time at which the event occurred.
+    :type timestamp: datetime
+    :param hub: The hub of connected client connection.
+    :type hub: str
+    :param connection_id: The connection Id of connected client connection.
+    :type connection_id: str
+    :param user_id: The user Id of connected client connection.
+    :type user_id: str
+    :param error_message: The message of error that cause the client
+     connection disconnected.
+    :type error_message: str
+    """
+
+    _attribute_map = {
+        'timestamp': {'key': 'timestamp', 'type': 'iso-8601'},
+        'hub': {'key': 'hub', 'type': 'str'},
+        'connection_id': {'key': 'connectionId', 'type': 'str'},
+        'user_id': {'key': 'userId', 'type': 'str'},
+        'error_message': {'key': 'errorMessage', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(SignalRServiceClientConnectionDisconnectedEventData, self).__init__(**kwargs)
+        self.timestamp = kwargs.get('timestamp', None)
+        self.hub = kwargs.get('hub', None)
+        self.connection_id = kwargs.get('connection_id', None)
+        self.user_id = kwargs.get('user_id', None)
+        self.error_message = kwargs.get('error_message', None)
diff --git a/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/signal_rservice_client_connection_disconnected_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/signal_rservice_client_connection_disconnected_event_data_py3.py
new file mode 100644
index 000000000000..44e722c83d3a
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/signal_rservice_client_connection_disconnected_event_data_py3.py
@@ -0,0 +1,46 @@
+# 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 SignalRServiceClientConnectionDisconnectedEventData(Model):
+    """Schema of the Data property of an EventGridEvent for a
+    Microsoft.SignalRService.ClientConnectionDisconnected event.
+
+    :param timestamp: The time at which the event occurred.
+    :type timestamp: datetime
+    :param hub: The hub of connected client connection.
+    :type hub: str
+    :param connection_id: The connection Id of connected client connection.
+    :type connection_id: str
+    :param user_id: The user Id of connected client connection.
+    :type user_id: str
+    :param error_message: The message of error that cause the client
+     connection disconnected.
+    :type error_message: str
+    """
+
+    _attribute_map = {
+        'timestamp': {'key': 'timestamp', 'type': 'iso-8601'},
+        'hub': {'key': 'hub', 'type': 'str'},
+        'connection_id': {'key': 'connectionId', 'type': 'str'},
+        'user_id': {'key': 'userId', 'type': 'str'},
+        'error_message': {'key': 'errorMessage', 'type': 'str'},
+    }
+
+    def __init__(self, *, timestamp=None, hub: str=None, connection_id: str=None, user_id: str=None, error_message: str=None, **kwargs) -> None:
+        super(SignalRServiceClientConnectionDisconnectedEventData, self).__init__(**kwargs)
+        self.timestamp = timestamp
+        self.hub = hub
+        self.connection_id = connection_id
+        self.user_id = user_id
+        self.error_message = error_message
diff --git a/azure-eventgrid/azure/eventgrid/models/storage_blob_created_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/storage_blob_created_event_data.py
similarity index 97%
rename from azure-eventgrid/azure/eventgrid/models/storage_blob_created_event_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/storage_blob_created_event_data.py
index 3482b112e469..edb52bb6a720 100644
--- a/azure-eventgrid/azure/eventgrid/models/storage_blob_created_event_data.py
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/storage_blob_created_event_data.py
@@ -31,7 +31,7 @@ class StorageBlobCreatedEventData(Model):
     :type content_type: str
     :param content_length: The size of the blob in bytes. This is the same as
      what would be returned in the Content-Length header from the blob.
-    :type content_length: int
+    :type content_length: long
     :param blob_type: The type of blob.
     :type blob_type: str
     :param url: The path to the blob.
@@ -53,7 +53,7 @@ class StorageBlobCreatedEventData(Model):
         'request_id': {'key': 'requestId', 'type': 'str'},
         'e_tag': {'key': 'eTag', 'type': 'str'},
         'content_type': {'key': 'contentType', 'type': 'str'},
-        'content_length': {'key': 'contentLength', 'type': 'int'},
+        'content_length': {'key': 'contentLength', 'type': 'long'},
         'blob_type': {'key': 'blobType', 'type': 'str'},
         'url': {'key': 'url', 'type': 'str'},
         'sequencer': {'key': 'sequencer', 'type': 'str'},
diff --git a/azure-eventgrid/azure/eventgrid/models/storage_blob_created_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/storage_blob_created_event_data_py3.py
similarity index 97%
rename from azure-eventgrid/azure/eventgrid/models/storage_blob_created_event_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/storage_blob_created_event_data_py3.py
index a66406468c31..78914ab25fba 100644
--- a/azure-eventgrid/azure/eventgrid/models/storage_blob_created_event_data_py3.py
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/storage_blob_created_event_data_py3.py
@@ -31,7 +31,7 @@ class StorageBlobCreatedEventData(Model):
     :type content_type: str
     :param content_length: The size of the blob in bytes. This is the same as
      what would be returned in the Content-Length header from the blob.
-    :type content_length: int
+    :type content_length: long
     :param blob_type: The type of blob.
     :type blob_type: str
     :param url: The path to the blob.
@@ -53,7 +53,7 @@ class StorageBlobCreatedEventData(Model):
         'request_id': {'key': 'requestId', 'type': 'str'},
         'e_tag': {'key': 'eTag', 'type': 'str'},
         'content_type': {'key': 'contentType', 'type': 'str'},
-        'content_length': {'key': 'contentLength', 'type': 'int'},
+        'content_length': {'key': 'contentLength', 'type': 'long'},
         'blob_type': {'key': 'blobType', 'type': 'str'},
         'url': {'key': 'url', 'type': 'str'},
         'sequencer': {'key': 'sequencer', 'type': 'str'},
diff --git a/azure-eventgrid/azure/eventgrid/models/storage_blob_deleted_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/storage_blob_deleted_event_data.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/storage_blob_deleted_event_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/storage_blob_deleted_event_data.py
diff --git a/azure-eventgrid/azure/eventgrid/models/storage_blob_deleted_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/storage_blob_deleted_event_data_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/storage_blob_deleted_event_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/storage_blob_deleted_event_data_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/subscription_deleted_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/subscription_deleted_event_data.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/subscription_deleted_event_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/subscription_deleted_event_data.py
diff --git a/azure-eventgrid/azure/eventgrid/models/subscription_deleted_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/subscription_deleted_event_data_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/subscription_deleted_event_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/subscription_deleted_event_data_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/subscription_validation_event_data.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/subscription_validation_event_data.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/subscription_validation_event_data.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/subscription_validation_event_data.py
diff --git a/azure-eventgrid/azure/eventgrid/models/subscription_validation_event_data_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/subscription_validation_event_data_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/subscription_validation_event_data_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/subscription_validation_event_data_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/models/subscription_validation_response.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/subscription_validation_response.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/subscription_validation_response.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/subscription_validation_response.py
diff --git a/azure-eventgrid/azure/eventgrid/models/subscription_validation_response_py3.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/subscription_validation_response_py3.py
similarity index 100%
rename from azure-eventgrid/azure/eventgrid/models/subscription_validation_response_py3.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/models/subscription_validation_response_py3.py
diff --git a/azure-eventgrid/azure/eventgrid/version.py b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/version.py
similarity index 96%
rename from azure-eventgrid/azure/eventgrid/version.py
rename to sdk/eventgrid/azure-eventgrid/azure/eventgrid/version.py
index 9c644827672b..d24076f8d84b 100644
--- a/azure-eventgrid/azure/eventgrid/version.py
+++ b/sdk/eventgrid/azure-eventgrid/azure/eventgrid/version.py
@@ -9,5 +9,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "1.2.0"
+VERSION = "1.3.0"
 
diff --git a/sdk/eventgrid/azure-eventgrid/dev_requirements.txt b/sdk/eventgrid/azure-eventgrid/dev_requirements.txt
new file mode 100644
index 000000000000..8ffd9e3035d1
--- /dev/null
+++ b/sdk/eventgrid/azure-eventgrid/dev_requirements.txt
@@ -0,0 +1 @@
+-e ../../../azure-sdk-tools
\ No newline at end of file
diff --git a/azure-eventgrid/sdk_packaging.toml b/sdk/eventgrid/azure-eventgrid/sdk_packaging.toml
similarity index 100%
rename from azure-eventgrid/sdk_packaging.toml
rename to sdk/eventgrid/azure-eventgrid/sdk_packaging.toml
diff --git a/azure-eventgrid/setup.cfg b/sdk/eventgrid/azure-eventgrid/setup.cfg
similarity index 100%
rename from azure-eventgrid/setup.cfg
rename to sdk/eventgrid/azure-eventgrid/setup.cfg
diff --git a/azure-eventgrid/setup.py b/sdk/eventgrid/azure-eventgrid/setup.py
similarity index 98%
rename from azure-eventgrid/setup.py
rename to sdk/eventgrid/azure-eventgrid/setup.py
index 35c7d8087e6a..f43c64560ac5 100644
--- a/azure-eventgrid/setup.py
+++ b/sdk/eventgrid/azure-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-eventgrid/tests/recordings/test_event_grid_basic.yaml b/sdk/eventgrid/azure-eventgrid/tests/recordings/test_event_grid_basic.yaml
similarity index 100%
rename from azure-eventgrid/tests/recordings/test_event_grid_basic.yaml
rename to sdk/eventgrid/azure-eventgrid/tests/recordings/test_event_grid_basic.yaml
diff --git a/azure-eventgrid/tests/test_azure_eventgrid.py b/sdk/eventgrid/azure-eventgrid/tests/test_azure_eventgrid.py
similarity index 100%
rename from azure-eventgrid/tests/test_azure_eventgrid.py
rename to sdk/eventgrid/azure-eventgrid/tests/test_azure_eventgrid.py