From 7e9446759f1caad94f8cf8318c8bed9d299046a4 Mon Sep 17 00:00:00 2001
From: Azure SDK for Python bot <aspysdk2@microsoft.com>
Date: Fri, 6 Jul 2018 18:21:23 +0000
Subject: [PATCH] Generated from e1fc2e1bdad54c396693d98c655354fc82f8f36b

1) Fix for linter error "Properties of a PATCH request body must not be default-valued. PATCH operation: 'EventSubscriptions_Update' Model Definition: 'EventSubscriptionUpdateParameters' Property: 'eventDeliverySchema'".
2) Updated the default value of EventDeliverySchema to the correct value used by the service.
---
 .../models/event_hub_event_subscription_destination_py3.py  | 2 +-
 .../azure/mgmt/eventgrid/models/event_subscription.py       | 4 ++--
 .../azure/mgmt/eventgrid/models/event_subscription_py3.py   | 6 +++---
 .../models/event_subscription_update_parameters.py          | 5 ++---
 .../models/event_subscription_update_parameters_py3.py      | 5 ++---
 .../azure/mgmt/eventgrid/models/event_type_py3.py           | 2 +-
 .../hybrid_connection_event_subscription_destination_py3.py | 2 +-
 .../mgmt/eventgrid/models/json_input_schema_mapping_py3.py  | 2 +-
 .../models/storage_blob_dead_letter_destination_py3.py      | 2 +-
 .../storage_queue_event_subscription_destination_py3.py     | 2 +-
 .../azure/mgmt/eventgrid/models/topic_py3.py                | 2 +-
 .../azure/mgmt/eventgrid/models/topic_type_info_py3.py      | 2 +-
 .../azure/mgmt/eventgrid/models/tracked_resource_py3.py     | 2 +-
 .../models/web_hook_event_subscription_destination_py3.py   | 2 +-
 azure-mgmt-eventgrid/azure/mgmt/eventgrid/version.py        | 2 +-
 15 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_hub_event_subscription_destination_py3.py b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_hub_event_subscription_destination_py3.py
index 5d6d29000b39..3e86991a1375 100644
--- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_hub_event_subscription_destination_py3.py
+++ b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_hub_event_subscription_destination_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .event_subscription_destination import EventSubscriptionDestination
+from .event_subscription_destination_py3 import EventSubscriptionDestination
 
 
 class EventHubEventSubscriptionDestination(EventSubscriptionDestination):
diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription.py b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription.py
index 747419ac4275..6e7fb83355d4 100644
--- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription.py
+++ b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription.py
@@ -42,7 +42,7 @@ class EventSubscription(Resource):
     :param event_delivery_schema: The event delivery schema for the event
      subscription. Possible values include: 'EventGridSchema',
      'InputEventSchema', 'CloudEventV01Schema'. Default value:
-     "EventGridSchema" .
+     "InputEventSchema" .
     :type event_delivery_schema: str or
      ~azure.mgmt.eventgrid.models.EventDeliverySchema
     :param retry_policy: The retry policy for events. This can be used to
@@ -83,6 +83,6 @@ def __init__(self, **kwargs):
         self.destination = kwargs.get('destination', None)
         self.filter = kwargs.get('filter', None)
         self.labels = kwargs.get('labels', None)
-        self.event_delivery_schema = kwargs.get('event_delivery_schema', "EventGridSchema")
+        self.event_delivery_schema = kwargs.get('event_delivery_schema', "InputEventSchema")
         self.retry_policy = kwargs.get('retry_policy', None)
         self.dead_letter_destination = kwargs.get('dead_letter_destination', None)
diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_py3.py b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_py3.py
index 2343a939d830..59cb87e4c9f5 100644
--- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_py3.py
+++ b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class EventSubscription(Resource):
@@ -42,7 +42,7 @@ class EventSubscription(Resource):
     :param event_delivery_schema: The event delivery schema for the event
      subscription. Possible values include: 'EventGridSchema',
      'InputEventSchema', 'CloudEventV01Schema'. Default value:
-     "EventGridSchema" .
+     "InputEventSchema" .
     :type event_delivery_schema: str or
      ~azure.mgmt.eventgrid.models.EventDeliverySchema
     :param retry_policy: The retry policy for events. This can be used to
@@ -76,7 +76,7 @@ class EventSubscription(Resource):
         'dead_letter_destination': {'key': 'properties.deadLetterDestination', 'type': 'DeadLetterDestination'},
     }
 
-    def __init__(self, *, destination=None, filter=None, labels=None, event_delivery_schema="EventGridSchema", retry_policy=None, dead_letter_destination=None, **kwargs) -> None:
+    def __init__(self, *, destination=None, filter=None, labels=None, event_delivery_schema="InputEventSchema", retry_policy=None, dead_letter_destination=None, **kwargs) -> None:
         super(EventSubscription, self).__init__(**kwargs)
         self.topic = None
         self.provisioning_state = None
diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_update_parameters.py b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_update_parameters.py
index c077f27fc04e..07b295319084 100644
--- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_update_parameters.py
+++ b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_update_parameters.py
@@ -25,8 +25,7 @@ class EventSubscriptionUpdateParameters(Model):
     :type labels: list[str]
     :param event_delivery_schema: The event delivery schema for the event
      subscription. Possible values include: 'EventGridSchema',
-     'InputEventSchema', 'CloudEventV01Schema'. Default value:
-     "EventGridSchema" .
+     'InputEventSchema', 'CloudEventV01Schema'
     :type event_delivery_schema: str or
      ~azure.mgmt.eventgrid.models.EventDeliverySchema
     :param retry_policy: The retry policy for events. This can be used to
@@ -52,6 +51,6 @@ def __init__(self, **kwargs):
         self.destination = kwargs.get('destination', None)
         self.filter = kwargs.get('filter', None)
         self.labels = kwargs.get('labels', None)
-        self.event_delivery_schema = kwargs.get('event_delivery_schema', "EventGridSchema")
+        self.event_delivery_schema = kwargs.get('event_delivery_schema', None)
         self.retry_policy = kwargs.get('retry_policy', None)
         self.dead_letter_destination = kwargs.get('dead_letter_destination', None)
diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_update_parameters_py3.py b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_update_parameters_py3.py
index 18bb5ec06d64..f88ad534e83f 100644
--- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_update_parameters_py3.py
+++ b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_subscription_update_parameters_py3.py
@@ -25,8 +25,7 @@ class EventSubscriptionUpdateParameters(Model):
     :type labels: list[str]
     :param event_delivery_schema: The event delivery schema for the event
      subscription. Possible values include: 'EventGridSchema',
-     'InputEventSchema', 'CloudEventV01Schema'. Default value:
-     "EventGridSchema" .
+     'InputEventSchema', 'CloudEventV01Schema'
     :type event_delivery_schema: str or
      ~azure.mgmt.eventgrid.models.EventDeliverySchema
     :param retry_policy: The retry policy for events. This can be used to
@@ -47,7 +46,7 @@ class EventSubscriptionUpdateParameters(Model):
         'dead_letter_destination': {'key': 'deadLetterDestination', 'type': 'DeadLetterDestination'},
     }
 
-    def __init__(self, *, destination=None, filter=None, labels=None, event_delivery_schema="EventGridSchema", retry_policy=None, dead_letter_destination=None, **kwargs) -> None:
+    def __init__(self, *, destination=None, filter=None, labels=None, event_delivery_schema=None, retry_policy=None, dead_letter_destination=None, **kwargs) -> None:
         super(EventSubscriptionUpdateParameters, self).__init__(**kwargs)
         self.destination = destination
         self.filter = filter
diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_type_py3.py b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_type_py3.py
index 1ecafe196244..b2fb69868f3f 100644
--- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_type_py3.py
+++ b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/event_type_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class EventType(Resource):
diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/hybrid_connection_event_subscription_destination_py3.py b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/hybrid_connection_event_subscription_destination_py3.py
index 54d0fe6e5202..cbc2c2800399 100644
--- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/hybrid_connection_event_subscription_destination_py3.py
+++ b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/hybrid_connection_event_subscription_destination_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .event_subscription_destination import EventSubscriptionDestination
+from .event_subscription_destination_py3 import EventSubscriptionDestination
 
 
 class HybridConnectionEventSubscriptionDestination(EventSubscriptionDestination):
diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_input_schema_mapping_py3.py b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_input_schema_mapping_py3.py
index 64c492a5c4f2..4d3ff8a1b8f4 100644
--- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_input_schema_mapping_py3.py
+++ b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/json_input_schema_mapping_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .input_schema_mapping import InputSchemaMapping
+from .input_schema_mapping_py3 import InputSchemaMapping
 
 
 class JsonInputSchemaMapping(InputSchemaMapping):
diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_blob_dead_letter_destination_py3.py b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_blob_dead_letter_destination_py3.py
index 44c3330323ce..65e0813f852e 100644
--- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_blob_dead_letter_destination_py3.py
+++ b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_blob_dead_letter_destination_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .dead_letter_destination import DeadLetterDestination
+from .dead_letter_destination_py3 import DeadLetterDestination
 
 
 class StorageBlobDeadLetterDestination(DeadLetterDestination):
diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_queue_event_subscription_destination_py3.py b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_queue_event_subscription_destination_py3.py
index 3b331c76ac26..0804b774727a 100644
--- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_queue_event_subscription_destination_py3.py
+++ b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/storage_queue_event_subscription_destination_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .event_subscription_destination import EventSubscriptionDestination
+from .event_subscription_destination_py3 import EventSubscriptionDestination
 
 
 class StorageQueueEventSubscriptionDestination(EventSubscriptionDestination):
diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_py3.py b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_py3.py
index 59235fefaed1..9c562e93663a 100644
--- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_py3.py
+++ b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .tracked_resource import TrackedResource
+from .tracked_resource_py3 import TrackedResource
 
 
 class Topic(TrackedResource):
diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_type_info_py3.py b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_type_info_py3.py
index 2061b765cba3..c5bae7879489 100644
--- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_type_info_py3.py
+++ b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/topic_type_info_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class TopicTypeInfo(Resource):
diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/tracked_resource_py3.py b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/tracked_resource_py3.py
index a1f410b1b1ae..dd17171e3b84 100644
--- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/tracked_resource_py3.py
+++ b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/tracked_resource_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .resource import Resource
+from .resource_py3 import Resource
 
 
 class TrackedResource(Resource):
diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/web_hook_event_subscription_destination_py3.py b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/web_hook_event_subscription_destination_py3.py
index 924e23deb39a..2aa7e58c0cf3 100644
--- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/web_hook_event_subscription_destination_py3.py
+++ b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/web_hook_event_subscription_destination_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .event_subscription_destination import EventSubscriptionDestination
+from .event_subscription_destination_py3 import EventSubscriptionDestination
 
 
 class WebHookEventSubscriptionDestination(EventSubscriptionDestination):
diff --git a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/version.py b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/version.py
index 8d86cf0470d7..a39916c162ce 100644
--- a/azure-mgmt-eventgrid/azure/mgmt/eventgrid/version.py
+++ b/azure-mgmt-eventgrid/azure/mgmt/eventgrid/version.py
@@ -9,5 +9,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "2.0.0rc1"
+VERSION = "1.0.0"