diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/_event_grid_management_client.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/_event_grid_management_client.py
index 55742ee39e7e..c0acd1541bf7 100644
--- a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/_event_grid_management_client.py
+++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/_event_grid_management_client.py
@@ -58,7 +58,7 @@ def __init__(
         super(EventGridManagementClient, self).__init__(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
-        self.api_version = '2020-01-01-preview'
+        self.api_version = '2020-04-01-preview'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/__init__.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/__init__.py
index d296b874bb81..b3e80dc36b0b 100644
--- a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/__init__.py
+++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/__init__.py
@@ -27,6 +27,7 @@
     from ._models_py3 import EventSubscriptionUpdateParameters
     from ._models_py3 import EventType
     from ._models_py3 import HybridConnectionEventSubscriptionDestination
+    from ._models_py3 import InboundIpRule
     from ._models_py3 import InputSchemaMapping
     from ._models_py3 import JsonField
     from ._models_py3 import JsonFieldWithDefault
@@ -75,6 +76,7 @@
     from ._models import EventSubscriptionUpdateParameters
     from ._models import EventType
     from ._models import HybridConnectionEventSubscriptionDestination
+    from ._models import InboundIpRule
     from ._models import InputSchemaMapping
     from ._models import JsonField
     from ._models import JsonFieldWithDefault
@@ -115,6 +117,7 @@
 from ._event_grid_management_client_enums import (
     DomainProvisioningState,
     InputSchema,
+    IpActionType,
     DomainTopicProvisioningState,
     EventSubscriptionProvisioningState,
     EventDeliverySchema,
@@ -141,6 +144,7 @@
     'EventSubscriptionUpdateParameters',
     'EventType',
     'HybridConnectionEventSubscriptionDestination',
+    'InboundIpRule',
     'InputSchemaMapping',
     'JsonField',
     'JsonFieldWithDefault',
@@ -180,6 +184,7 @@
     'TopicTypeInfoPaged',
     'DomainProvisioningState',
     'InputSchema',
+    'IpActionType',
     'DomainTopicProvisioningState',
     'EventSubscriptionProvisioningState',
     'EventDeliverySchema',
diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_event_grid_management_client_enums.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_event_grid_management_client_enums.py
index b1f83e5054e0..8772bd438926 100644
--- a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_event_grid_management_client_enums.py
+++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_event_grid_management_client_enums.py
@@ -29,6 +29,11 @@ class InputSchema(str, Enum):
     cloud_event_schema_v1_0 = "CloudEventSchemaV1_0"
 
 
+class IpActionType(str, Enum):
+
+    allow = "Allow"
+
+
 class DomainTopicProvisioningState(str, Enum):
 
     creating = "Creating"
diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_models.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_models.py
index b5f5182e765f..974bf4c7b8ab 100644
--- a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_models.py
+++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_models.py
@@ -205,7 +205,7 @@ class Resource(Model):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar id: Fully qualified identifier of the resource
+    :ivar id: Fully qualified identifier of the resource.
     :vartype id: str
     :ivar name: Name of the resource
     :vartype name: str
@@ -240,15 +240,15 @@ class TrackedResource(Resource):
 
     All required parameters must be populated in order to send to Azure.
 
-    :ivar id: Fully qualified identifier of the resource
+    :ivar id: Fully qualified identifier of the resource.
     :vartype id: str
     :ivar name: Name of the resource
     :vartype name: str
     :ivar type: Type of the resource
     :vartype type: str
-    :param location: Required. Location of the resource
+    :param location: Required. Location of the resource.
     :type location: str
-    :param tags: Tags of the resource
+    :param tags: Tags of the resource.
     :type tags: dict[str, str]
     """
 
@@ -281,15 +281,15 @@ class Domain(TrackedResource):
 
     All required parameters must be populated in order to send to Azure.
 
-    :ivar id: Fully qualified identifier of the resource
+    :ivar id: Fully qualified identifier of the resource.
     :vartype id: str
     :ivar name: Name of the resource
     :vartype name: str
     :ivar type: Type of the resource
     :vartype type: str
-    :param location: Required. Location of the resource
+    :param location: Required. Location of the resource.
     :type location: str
-    :param tags: Tags of the resource
+    :param tags: Tags of the resource.
     :type tags: dict[str, str]
     :ivar provisioning_state: Provisioning state of the domain. Possible
      values include: 'Creating', 'Updating', 'Deleting', 'Succeeded',
@@ -307,8 +307,15 @@ class Domain(TrackedResource):
      which specified the info about mapping event payload.
     :type input_schema_mapping:
      ~azure.mgmt.eventgrid.models.InputSchemaMapping
-    :ivar metric_resource_id: Metric resource id for the domain.
-    :vartype metric_resource_id: str
+    :param metric_resource_id: Metric resource id for the domain.
+    :type metric_resource_id: str
+    :param allow_traffic_from_all_ips: This determines if IP filtering rules
+     ought to be evaluated or not. By default it will not evaluate and will
+     allow traffic from all IPs.
+    :type allow_traffic_from_all_ips: bool
+    :param inbound_ip_rules: This determines the IP filtering rules that ought
+     be applied when events are received on this domain.
+    :type inbound_ip_rules: list[~azure.mgmt.eventgrid.models.InboundIpRule]
     """
 
     _validation = {
@@ -318,7 +325,6 @@ class Domain(TrackedResource):
         'location': {'required': True},
         'provisioning_state': {'readonly': True},
         'endpoint': {'readonly': True},
-        'metric_resource_id': {'readonly': True},
     }
 
     _attribute_map = {
@@ -332,6 +338,8 @@ class Domain(TrackedResource):
         'input_schema': {'key': 'properties.inputSchema', 'type': 'str'},
         'input_schema_mapping': {'key': 'properties.inputSchemaMapping', 'type': 'InputSchemaMapping'},
         'metric_resource_id': {'key': 'properties.metricResourceId', 'type': 'str'},
+        'allow_traffic_from_all_ips': {'key': 'properties.allowTrafficFromAllIPs', 'type': 'bool'},
+        'inbound_ip_rules': {'key': 'properties.inboundIpRules', 'type': '[InboundIpRule]'},
     }
 
     def __init__(self, **kwargs):
@@ -340,7 +348,9 @@ def __init__(self, **kwargs):
         self.endpoint = None
         self.input_schema = kwargs.get('input_schema', "EventGridSchema")
         self.input_schema_mapping = kwargs.get('input_schema_mapping', None)
-        self.metric_resource_id = None
+        self.metric_resource_id = kwargs.get('metric_resource_id', None)
+        self.allow_traffic_from_all_ips = kwargs.get('allow_traffic_from_all_ips', None)
+        self.inbound_ip_rules = kwargs.get('inbound_ip_rules', None)
 
 
 class DomainRegenerateKeyRequest(Model):
@@ -348,7 +358,7 @@ class DomainRegenerateKeyRequest(Model):
 
     All required parameters must be populated in order to send to Azure.
 
-    :param key_name: Required. Key name to regenerate key1 or key2
+    :param key_name: Required. Key name to regenerate key1 or key2.
     :type key_name: str
     """
 
@@ -391,7 +401,7 @@ class DomainTopic(Resource):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar id: Fully qualified identifier of the resource
+    :ivar id: Fully qualified identifier of the resource.
     :vartype id: str
     :ivar name: Name of the resource
     :vartype name: str
@@ -471,7 +481,7 @@ class EventSubscription(Resource):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar id: Fully qualified identifier of the resource
+    :ivar id: Fully qualified identifier of the resource.
     :vartype id: str
     :ivar name: Name of the resource
     :vartype name: str
@@ -658,7 +668,7 @@ class EventType(Resource):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar id: Fully qualified identifier of the resource
+    :ivar id: Fully qualified identifier of the resource.
     :vartype id: str
     :ivar name: Name of the resource
     :vartype name: str
@@ -726,6 +736,27 @@ def __init__(self, **kwargs):
         self.endpoint_type = 'HybridConnection'
 
 
+class InboundIpRule(Model):
+    """InboundIpRule.
+
+    :param ip_mask: IP Address in CIDR notation e.g., 10.0.0.0/8.
+    :type ip_mask: str
+    :param action: Action to perform based on the match or no match of the
+     IpMask. Possible values include: 'Allow'
+    :type action: str or ~azure.mgmt.eventgrid.models.IpActionType
+    """
+
+    _attribute_map = {
+        'ip_mask': {'key': 'ipMask', 'type': 'str'},
+        'action': {'key': 'action', 'type': 'str'},
+    }
+
+    def __init__(self, **kwargs):
+        super(InboundIpRule, self).__init__(**kwargs)
+        self.ip_mask = kwargs.get('ip_mask', None)
+        self.action = kwargs.get('action', None)
+
+
 class InputSchemaMapping(Model):
     """By default, Event Grid expects events to be in the Event Grid event schema.
     Specifying an input schema mapping enables publishing to Event Grid using a
@@ -1397,15 +1428,15 @@ class Topic(TrackedResource):
 
     All required parameters must be populated in order to send to Azure.
 
-    :ivar id: Fully qualified identifier of the resource
+    :ivar id: Fully qualified identifier of the resource.
     :vartype id: str
     :ivar name: Name of the resource
     :vartype name: str
     :ivar type: Type of the resource
     :vartype type: str
-    :param location: Required. Location of the resource
+    :param location: Required. Location of the resource.
     :type location: str
-    :param tags: Tags of the resource
+    :param tags: Tags of the resource.
     :type tags: dict[str, str]
     :ivar provisioning_state: Provisioning state of the topic. Possible values
      include: 'Creating', 'Updating', 'Deleting', 'Succeeded', 'Canceled',
@@ -1425,8 +1456,15 @@ class Topic(TrackedResource):
      schema.
     :type input_schema_mapping:
      ~azure.mgmt.eventgrid.models.InputSchemaMapping
-    :ivar metric_resource_id: Metric resource id for the topic.
-    :vartype metric_resource_id: str
+    :param metric_resource_id: Metric resource id for the topic.
+    :type metric_resource_id: str
+    :param allow_traffic_from_all_ips: This determines if IP filtering rules
+     ought to be evaluated or not. By default it will not evaluate and will
+     allow traffic from all IPs.
+    :type allow_traffic_from_all_ips: bool
+    :param inbound_ip_rules: This determines the IP filtering rules that ought
+     to be applied when events are received on this topic.
+    :type inbound_ip_rules: list[~azure.mgmt.eventgrid.models.InboundIpRule]
     """
 
     _validation = {
@@ -1436,7 +1474,6 @@ class Topic(TrackedResource):
         'location': {'required': True},
         'provisioning_state': {'readonly': True},
         'endpoint': {'readonly': True},
-        'metric_resource_id': {'readonly': True},
     }
 
     _attribute_map = {
@@ -1450,6 +1487,8 @@ class Topic(TrackedResource):
         'input_schema': {'key': 'properties.inputSchema', 'type': 'str'},
         'input_schema_mapping': {'key': 'properties.inputSchemaMapping', 'type': 'InputSchemaMapping'},
         'metric_resource_id': {'key': 'properties.metricResourceId', 'type': 'str'},
+        'allow_traffic_from_all_ips': {'key': 'properties.allowTrafficFromAllIPs', 'type': 'bool'},
+        'inbound_ip_rules': {'key': 'properties.inboundIpRules', 'type': '[InboundIpRule]'},
     }
 
     def __init__(self, **kwargs):
@@ -1458,7 +1497,9 @@ def __init__(self, **kwargs):
         self.endpoint = None
         self.input_schema = kwargs.get('input_schema', "EventGridSchema")
         self.input_schema_mapping = kwargs.get('input_schema_mapping', None)
-        self.metric_resource_id = None
+        self.metric_resource_id = kwargs.get('metric_resource_id', None)
+        self.allow_traffic_from_all_ips = kwargs.get('allow_traffic_from_all_ips', None)
+        self.inbound_ip_rules = kwargs.get('inbound_ip_rules', None)
 
 
 class TopicRegenerateKeyRequest(Model):
@@ -1509,7 +1550,7 @@ class TopicTypeInfo(Resource):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar id: Fully qualified identifier of the resource
+    :ivar id: Fully qualified identifier of the resource.
     :vartype id: str
     :ivar name: Name of the resource
     :vartype name: str
@@ -1533,6 +1574,8 @@ class TopicTypeInfo(Resource):
     :param supported_locations: List of locations supported by this topic
      type.
     :type supported_locations: list[str]
+    :param source_resource_format: Source resource format.
+    :type source_resource_format: str
     """
 
     _validation = {
@@ -1551,6 +1594,7 @@ class TopicTypeInfo(Resource):
         'resource_region_type': {'key': 'properties.resourceRegionType', 'type': 'str'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
         'supported_locations': {'key': 'properties.supportedLocations', 'type': '[str]'},
+        'source_resource_format': {'key': 'properties.sourceResourceFormat', 'type': 'str'},
     }
 
     def __init__(self, **kwargs):
@@ -1561,12 +1605,13 @@ def __init__(self, **kwargs):
         self.resource_region_type = kwargs.get('resource_region_type', None)
         self.provisioning_state = kwargs.get('provisioning_state', None)
         self.supported_locations = kwargs.get('supported_locations', None)
+        self.source_resource_format = kwargs.get('source_resource_format', None)
 
 
 class TopicUpdateParameters(Model):
     """Properties of the Topic update.
 
-    :param tags: Tags of the resource
+    :param tags: Tags of the resource.
     :type tags: dict[str, str]
     """
 
diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_models_py3.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_models_py3.py
index 4b5b2d2cb210..63a61c89c4a5 100644
--- a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_models_py3.py
+++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/models/_models_py3.py
@@ -205,7 +205,7 @@ class Resource(Model):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar id: Fully qualified identifier of the resource
+    :ivar id: Fully qualified identifier of the resource.
     :vartype id: str
     :ivar name: Name of the resource
     :vartype name: str
@@ -240,15 +240,15 @@ class TrackedResource(Resource):
 
     All required parameters must be populated in order to send to Azure.
 
-    :ivar id: Fully qualified identifier of the resource
+    :ivar id: Fully qualified identifier of the resource.
     :vartype id: str
     :ivar name: Name of the resource
     :vartype name: str
     :ivar type: Type of the resource
     :vartype type: str
-    :param location: Required. Location of the resource
+    :param location: Required. Location of the resource.
     :type location: str
-    :param tags: Tags of the resource
+    :param tags: Tags of the resource.
     :type tags: dict[str, str]
     """
 
@@ -281,15 +281,15 @@ class Domain(TrackedResource):
 
     All required parameters must be populated in order to send to Azure.
 
-    :ivar id: Fully qualified identifier of the resource
+    :ivar id: Fully qualified identifier of the resource.
     :vartype id: str
     :ivar name: Name of the resource
     :vartype name: str
     :ivar type: Type of the resource
     :vartype type: str
-    :param location: Required. Location of the resource
+    :param location: Required. Location of the resource.
     :type location: str
-    :param tags: Tags of the resource
+    :param tags: Tags of the resource.
     :type tags: dict[str, str]
     :ivar provisioning_state: Provisioning state of the domain. Possible
      values include: 'Creating', 'Updating', 'Deleting', 'Succeeded',
@@ -307,8 +307,15 @@ class Domain(TrackedResource):
      which specified the info about mapping event payload.
     :type input_schema_mapping:
      ~azure.mgmt.eventgrid.models.InputSchemaMapping
-    :ivar metric_resource_id: Metric resource id for the domain.
-    :vartype metric_resource_id: str
+    :param metric_resource_id: Metric resource id for the domain.
+    :type metric_resource_id: str
+    :param allow_traffic_from_all_ips: This determines if IP filtering rules
+     ought to be evaluated or not. By default it will not evaluate and will
+     allow traffic from all IPs.
+    :type allow_traffic_from_all_ips: bool
+    :param inbound_ip_rules: This determines the IP filtering rules that ought
+     be applied when events are received on this domain.
+    :type inbound_ip_rules: list[~azure.mgmt.eventgrid.models.InboundIpRule]
     """
 
     _validation = {
@@ -318,7 +325,6 @@ class Domain(TrackedResource):
         'location': {'required': True},
         'provisioning_state': {'readonly': True},
         'endpoint': {'readonly': True},
-        'metric_resource_id': {'readonly': True},
     }
 
     _attribute_map = {
@@ -332,15 +338,19 @@ class Domain(TrackedResource):
         'input_schema': {'key': 'properties.inputSchema', 'type': 'str'},
         'input_schema_mapping': {'key': 'properties.inputSchemaMapping', 'type': 'InputSchemaMapping'},
         'metric_resource_id': {'key': 'properties.metricResourceId', 'type': 'str'},
+        'allow_traffic_from_all_ips': {'key': 'properties.allowTrafficFromAllIPs', 'type': 'bool'},
+        'inbound_ip_rules': {'key': 'properties.inboundIpRules', 'type': '[InboundIpRule]'},
     }
 
-    def __init__(self, *, location: str, tags=None, input_schema="EventGridSchema", input_schema_mapping=None, **kwargs) -> None:
+    def __init__(self, *, location: str, tags=None, input_schema="EventGridSchema", input_schema_mapping=None, metric_resource_id: str=None, allow_traffic_from_all_ips: bool=None, inbound_ip_rules=None, **kwargs) -> None:
         super(Domain, self).__init__(location=location, tags=tags, **kwargs)
         self.provisioning_state = None
         self.endpoint = None
         self.input_schema = input_schema
         self.input_schema_mapping = input_schema_mapping
-        self.metric_resource_id = None
+        self.metric_resource_id = metric_resource_id
+        self.allow_traffic_from_all_ips = allow_traffic_from_all_ips
+        self.inbound_ip_rules = inbound_ip_rules
 
 
 class DomainRegenerateKeyRequest(Model):
@@ -348,7 +358,7 @@ class DomainRegenerateKeyRequest(Model):
 
     All required parameters must be populated in order to send to Azure.
 
-    :param key_name: Required. Key name to regenerate key1 or key2
+    :param key_name: Required. Key name to regenerate key1 or key2.
     :type key_name: str
     """
 
@@ -391,7 +401,7 @@ class DomainTopic(Resource):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar id: Fully qualified identifier of the resource
+    :ivar id: Fully qualified identifier of the resource.
     :vartype id: str
     :ivar name: Name of the resource
     :vartype name: str
@@ -471,7 +481,7 @@ class EventSubscription(Resource):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar id: Fully qualified identifier of the resource
+    :ivar id: Fully qualified identifier of the resource.
     :vartype id: str
     :ivar name: Name of the resource
     :vartype name: str
@@ -658,7 +668,7 @@ class EventType(Resource):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar id: Fully qualified identifier of the resource
+    :ivar id: Fully qualified identifier of the resource.
     :vartype id: str
     :ivar name: Name of the resource
     :vartype name: str
@@ -726,6 +736,27 @@ def __init__(self, *, resource_id: str=None, **kwargs) -> None:
         self.endpoint_type = 'HybridConnection'
 
 
+class InboundIpRule(Model):
+    """InboundIpRule.
+
+    :param ip_mask: IP Address in CIDR notation e.g., 10.0.0.0/8.
+    :type ip_mask: str
+    :param action: Action to perform based on the match or no match of the
+     IpMask. Possible values include: 'Allow'
+    :type action: str or ~azure.mgmt.eventgrid.models.IpActionType
+    """
+
+    _attribute_map = {
+        'ip_mask': {'key': 'ipMask', 'type': 'str'},
+        'action': {'key': 'action', 'type': 'str'},
+    }
+
+    def __init__(self, *, ip_mask: str=None, action=None, **kwargs) -> None:
+        super(InboundIpRule, self).__init__(**kwargs)
+        self.ip_mask = ip_mask
+        self.action = action
+
+
 class InputSchemaMapping(Model):
     """By default, Event Grid expects events to be in the Event Grid event schema.
     Specifying an input schema mapping enables publishing to Event Grid using a
@@ -1397,15 +1428,15 @@ class Topic(TrackedResource):
 
     All required parameters must be populated in order to send to Azure.
 
-    :ivar id: Fully qualified identifier of the resource
+    :ivar id: Fully qualified identifier of the resource.
     :vartype id: str
     :ivar name: Name of the resource
     :vartype name: str
     :ivar type: Type of the resource
     :vartype type: str
-    :param location: Required. Location of the resource
+    :param location: Required. Location of the resource.
     :type location: str
-    :param tags: Tags of the resource
+    :param tags: Tags of the resource.
     :type tags: dict[str, str]
     :ivar provisioning_state: Provisioning state of the topic. Possible values
      include: 'Creating', 'Updating', 'Deleting', 'Succeeded', 'Canceled',
@@ -1425,8 +1456,15 @@ class Topic(TrackedResource):
      schema.
     :type input_schema_mapping:
      ~azure.mgmt.eventgrid.models.InputSchemaMapping
-    :ivar metric_resource_id: Metric resource id for the topic.
-    :vartype metric_resource_id: str
+    :param metric_resource_id: Metric resource id for the topic.
+    :type metric_resource_id: str
+    :param allow_traffic_from_all_ips: This determines if IP filtering rules
+     ought to be evaluated or not. By default it will not evaluate and will
+     allow traffic from all IPs.
+    :type allow_traffic_from_all_ips: bool
+    :param inbound_ip_rules: This determines the IP filtering rules that ought
+     to be applied when events are received on this topic.
+    :type inbound_ip_rules: list[~azure.mgmt.eventgrid.models.InboundIpRule]
     """
 
     _validation = {
@@ -1436,7 +1474,6 @@ class Topic(TrackedResource):
         'location': {'required': True},
         'provisioning_state': {'readonly': True},
         'endpoint': {'readonly': True},
-        'metric_resource_id': {'readonly': True},
     }
 
     _attribute_map = {
@@ -1450,15 +1487,19 @@ class Topic(TrackedResource):
         'input_schema': {'key': 'properties.inputSchema', 'type': 'str'},
         'input_schema_mapping': {'key': 'properties.inputSchemaMapping', 'type': 'InputSchemaMapping'},
         'metric_resource_id': {'key': 'properties.metricResourceId', 'type': 'str'},
+        'allow_traffic_from_all_ips': {'key': 'properties.allowTrafficFromAllIPs', 'type': 'bool'},
+        'inbound_ip_rules': {'key': 'properties.inboundIpRules', 'type': '[InboundIpRule]'},
     }
 
-    def __init__(self, *, location: str, tags=None, input_schema="EventGridSchema", input_schema_mapping=None, **kwargs) -> None:
+    def __init__(self, *, location: str, tags=None, input_schema="EventGridSchema", input_schema_mapping=None, metric_resource_id: str=None, allow_traffic_from_all_ips: bool=None, inbound_ip_rules=None, **kwargs) -> None:
         super(Topic, self).__init__(location=location, tags=tags, **kwargs)
         self.provisioning_state = None
         self.endpoint = None
         self.input_schema = input_schema
         self.input_schema_mapping = input_schema_mapping
-        self.metric_resource_id = None
+        self.metric_resource_id = metric_resource_id
+        self.allow_traffic_from_all_ips = allow_traffic_from_all_ips
+        self.inbound_ip_rules = inbound_ip_rules
 
 
 class TopicRegenerateKeyRequest(Model):
@@ -1509,7 +1550,7 @@ class TopicTypeInfo(Resource):
     Variables are only populated by the server, and will be ignored when
     sending a request.
 
-    :ivar id: Fully qualified identifier of the resource
+    :ivar id: Fully qualified identifier of the resource.
     :vartype id: str
     :ivar name: Name of the resource
     :vartype name: str
@@ -1533,6 +1574,8 @@ class TopicTypeInfo(Resource):
     :param supported_locations: List of locations supported by this topic
      type.
     :type supported_locations: list[str]
+    :param source_resource_format: Source resource format.
+    :type source_resource_format: str
     """
 
     _validation = {
@@ -1551,9 +1594,10 @@ class TopicTypeInfo(Resource):
         'resource_region_type': {'key': 'properties.resourceRegionType', 'type': 'str'},
         'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
         'supported_locations': {'key': 'properties.supportedLocations', 'type': '[str]'},
+        'source_resource_format': {'key': 'properties.sourceResourceFormat', 'type': 'str'},
     }
 
-    def __init__(self, *, provider: str=None, display_name: str=None, description: str=None, resource_region_type=None, provisioning_state=None, supported_locations=None, **kwargs) -> None:
+    def __init__(self, *, provider: str=None, display_name: str=None, description: str=None, resource_region_type=None, provisioning_state=None, supported_locations=None, source_resource_format: str=None, **kwargs) -> None:
         super(TopicTypeInfo, self).__init__(**kwargs)
         self.provider = provider
         self.display_name = display_name
@@ -1561,12 +1605,13 @@ def __init__(self, *, provider: str=None, display_name: str=None, description: s
         self.resource_region_type = resource_region_type
         self.provisioning_state = provisioning_state
         self.supported_locations = supported_locations
+        self.source_resource_format = source_resource_format
 
 
 class TopicUpdateParameters(Model):
     """Properties of the Topic update.
 
-    :param tags: Tags of the resource
+    :param tags: Tags of the resource.
     :type tags: dict[str, str]
     """
 
diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_domain_topics_operations.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_domain_topics_operations.py
index 496fb4dc5373..a070465d5fcf 100644
--- a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_domain_topics_operations.py
+++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_domain_topics_operations.py
@@ -27,7 +27,7 @@ class DomainTopicsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. Constant value: "2020-01-01-preview".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2020-04-01-preview".
     """
 
     models = models
@@ -37,7 +37,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2020-01-01-preview"
+        self.api_version = "2020-04-01-preview"
 
         self.config = config
 
@@ -50,9 +50,9 @@ def get(
         :param resource_group_name: The name of the resource group within the
          user's subscription.
         :type resource_group_name: str
-        :param domain_name: Name of the domain
+        :param domain_name: Name of the domain.
         :type domain_name: str
-        :param domain_topic_name: Name of the topic
+        :param domain_topic_name: Name of the topic.
         :type domain_topic_name: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
@@ -165,9 +165,9 @@ def create_or_update(
         :param resource_group_name: The name of the resource group within the
          user's subscription.
         :type resource_group_name: str
-        :param domain_name: Name of the domain
+        :param domain_name: Name of the domain.
         :type domain_name: str
-        :param domain_topic_name: Name of the domain topic
+        :param domain_topic_name: Name of the domain topic.
         :type domain_topic_name: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: The poller return type is ClientRawResponse, the
@@ -257,9 +257,9 @@ def delete(
         :param resource_group_name: The name of the resource group within the
          user's subscription.
         :type resource_group_name: str
-        :param domain_name: Name of the domain
+        :param domain_name: Name of the domain.
         :type domain_name: str
-        :param domain_topic_name: Name of the domain topic
+        :param domain_topic_name: Name of the domain topic.
         :type domain_topic_name: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: The poller return type is ClientRawResponse, the
diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_domains_operations.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_domains_operations.py
index b5ac4ce216d9..47346449d647 100644
--- a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_domains_operations.py
+++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_domains_operations.py
@@ -27,7 +27,7 @@ class DomainsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. Constant value: "2020-01-01-preview".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2020-04-01-preview".
     """
 
     models = models
@@ -37,7 +37,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2020-01-01-preview"
+        self.api_version = "2020-04-01-preview"
 
         self.config = config
 
@@ -50,7 +50,7 @@ def get(
         :param resource_group_name: The name of the resource group within the
          user's subscription.
         :type resource_group_name: str
-        :param domain_name: Name of the domain
+        :param domain_name: Name of the domain.
         :type domain_name: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
@@ -165,9 +165,9 @@ def create_or_update(
         :param resource_group_name: The name of the resource group within the
          user's subscription.
         :type resource_group_name: str
-        :param domain_name: Name of the domain
+        :param domain_name: Name of the domain.
         :type domain_name: str
-        :param domain_info: Domain information
+        :param domain_info: Domain information.
         :type domain_info: ~azure.mgmt.eventgrid.models.Domain
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: The poller return type is ClientRawResponse, the
@@ -256,7 +256,7 @@ def delete(
         :param resource_group_name: The name of the resource group within the
          user's subscription.
         :type resource_group_name: str
-        :param domain_name: Name of the domain
+        :param domain_name: Name of the domain.
         :type domain_name: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: The poller return type is ClientRawResponse, the
@@ -352,7 +352,7 @@ def update(
         :param resource_group_name: The name of the resource group within the
          user's subscription.
         :type resource_group_name: str
-        :param domain_name: Name of the domain
+        :param domain_name: Name of the domain.
         :type domain_name: str
         :param tags: Tags of the domains resource
         :type tags: dict[str, str]
@@ -581,7 +581,7 @@ def list_shared_access_keys(
         :param resource_group_name: The name of the resource group within the
          user's subscription.
         :type resource_group_name: str
-        :param domain_name: Name of the domain
+        :param domain_name: Name of the domain.
         :type domain_name: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
@@ -645,9 +645,9 @@ def regenerate_key(
         :param resource_group_name: The name of the resource group within the
          user's subscription.
         :type resource_group_name: str
-        :param domain_name: Name of the domain
+        :param domain_name: Name of the domain.
         :type domain_name: str
-        :param key_name: Key name to regenerate key1 or key2
+        :param key_name: Key name to regenerate key1 or key2.
         :type key_name: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_event_subscriptions_operations.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_event_subscriptions_operations.py
index 612be57adb2a..7e9d680ff5c6 100644
--- a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_event_subscriptions_operations.py
+++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_event_subscriptions_operations.py
@@ -27,7 +27,7 @@ class EventSubscriptionsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. Constant value: "2020-01-01-preview".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2020-04-01-preview".
     """
 
     models = models
@@ -37,7 +37,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2020-01-01-preview"
+        self.api_version = "2020-04-01-preview"
 
         self.config = config
 
@@ -58,7 +58,7 @@ def get(
          '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventGrid/topics/{topicName}'
          for an EventGrid topic.
         :type scope: str
-        :param event_subscription_name: Name of the event subscription
+        :param event_subscription_name: Name of the event subscription.
         :type event_subscription_name: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
@@ -185,7 +185,7 @@ def create_or_update(
          should use alphanumeric letters only.
         :type event_subscription_name: str
         :param event_subscription_info: Event subscription properties
-         containing the destination and filter information
+         containing the destination and filter information.
         :type event_subscription_info:
          ~azure.mgmt.eventgrid.models.EventSubscription
         :param dict custom_headers: headers that will be added to the request
@@ -282,7 +282,7 @@ def delete(
          '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventGrid/topics/{topicName}'
          for an EventGrid topic.
         :type scope: str
-        :param event_subscription_name: Name of the event subscription
+        :param event_subscription_name: Name of the event subscription.
         :type event_subscription_name: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: The poller return type is ClientRawResponse, the
@@ -384,10 +384,10 @@ def update(
          for an EventGrid topic.
         :type scope: str
         :param event_subscription_name: Name of the event subscription to be
-         updated
+         updated.
         :type event_subscription_name: str
         :param event_subscription_update_parameters: Updated event
-         subscription information
+         subscription information.
         :type event_subscription_update_parameters:
          ~azure.mgmt.eventgrid.models.EventSubscriptionUpdateParameters
         :param dict custom_headers: headers that will be added to the request
@@ -447,7 +447,7 @@ def get_full_url(
          '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.EventGrid/topics/{topicName}'
          for an EventGrid topic.
         :type scope: str
-        :param event_subscription_name: Name of the event subscription
+        :param event_subscription_name: Name of the event subscription.
         :type event_subscription_name: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
@@ -596,7 +596,7 @@ def list_global_by_subscription_for_topic_type(
         List all global event subscriptions under an Azure subscription for a
         topic type.
 
-        :param topic_type_name: Name of the topic type
+        :param topic_type_name: Name of the topic type.
         :type topic_type_name: str
         :param filter: The query used to filter the search results using OData
          syntax. Filtering is permitted on the 'name' property only and with
@@ -782,7 +782,7 @@ def list_global_by_resource_group_for_topic_type(
         :param resource_group_name: The name of the resource group within the
          user's subscription.
         :type resource_group_name: str
-        :param topic_type_name: Name of the topic type
+        :param topic_type_name: Name of the topic type.
         :type topic_type_name: str
         :param filter: The query used to filter the search results using OData
          syntax. Filtering is permitted on the 'name' property only and with
@@ -873,7 +873,7 @@ def list_regional_by_subscription(
         List all event subscriptions from the given location under a specific
         Azure subscription.
 
-        :param location: Name of the location
+        :param location: Name of the location.
         :type location: str
         :param filter: The query used to filter the search results using OData
          syntax. Filtering is permitted on the 'name' property only and with
@@ -967,7 +967,7 @@ def list_regional_by_resource_group(
         :param resource_group_name: The name of the resource group within the
          user's subscription.
         :type resource_group_name: str
-        :param location: Name of the location
+        :param location: Name of the location.
         :type location: str
         :param filter: The query used to filter the search results using OData
          syntax. Filtering is permitted on the 'name' property only and with
@@ -1059,9 +1059,9 @@ def list_regional_by_subscription_for_topic_type(
         List all event subscriptions from the given location under a specific
         Azure subscription and topic type.
 
-        :param location: Name of the location
+        :param location: Name of the location.
         :type location: str
-        :param topic_type_name: Name of the topic type
+        :param topic_type_name: Name of the topic type.
         :type topic_type_name: str
         :param filter: The query used to filter the search results using OData
          syntax. Filtering is permitted on the 'name' property only and with
@@ -1156,9 +1156,9 @@ def list_regional_by_resource_group_for_topic_type(
         :param resource_group_name: The name of the resource group within the
          user's subscription.
         :type resource_group_name: str
-        :param location: Name of the location
+        :param location: Name of the location.
         :type location: str
-        :param topic_type_name: Name of the topic type
+        :param topic_type_name: Name of the topic type.
         :type topic_type_name: str
         :param filter: The query used to filter the search results using OData
          syntax. Filtering is permitted on the 'name' property only and with
@@ -1253,11 +1253,11 @@ def list_by_resource(
         :param resource_group_name: The name of the resource group within the
          user's subscription.
         :type resource_group_name: str
-        :param provider_namespace: Namespace of the provider of the topic
+        :param provider_namespace: Namespace of the provider of the topic.
         :type provider_namespace: str
-        :param resource_type_name: Name of the resource type
+        :param resource_type_name: Name of the resource type.
         :type resource_type_name: str
-        :param resource_name: Name of the resource
+        :param resource_name: Name of the resource.
         :type resource_name: str
         :param filter: The query used to filter the search results using OData
          syntax. Filtering is permitted on the 'name' property only and with
@@ -1353,9 +1353,9 @@ def list_by_domain_topic(
         :param resource_group_name: The name of the resource group within the
          user's subscription.
         :type resource_group_name: str
-        :param domain_name: Name of the top level domain
+        :param domain_name: Name of the top level domain.
         :type domain_name: str
-        :param topic_name: Name of the domain topic
+        :param topic_name: Name of the domain topic.
         :type topic_name: str
         :param filter: The query used to filter the search results using OData
          syntax. Filtering is permitted on the 'name' property only and with
diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_operations.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_operations.py
index f67de8edcb64..476428ba25b3 100644
--- a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_operations.py
+++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_operations.py
@@ -25,7 +25,7 @@ class Operations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. Constant value: "2020-01-01-preview".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2020-04-01-preview".
     """
 
     models = models
@@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2020-01-01-preview"
+        self.api_version = "2020-04-01-preview"
 
         self.config = config
 
diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_topic_types_operations.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_topic_types_operations.py
index 3fa35631d390..dcb730f5a466 100644
--- a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_topic_types_operations.py
+++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_topic_types_operations.py
@@ -25,7 +25,7 @@ class TopicTypesOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. Constant value: "2020-01-01-preview".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2020-04-01-preview".
     """
 
     models = models
@@ -35,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2020-01-01-preview"
+        self.api_version = "2020-04-01-preview"
 
         self.config = config
 
@@ -109,7 +109,7 @@ def get(
 
         Get information about a topic type.
 
-        :param topic_type_name: Name of the topic type
+        :param topic_type_name: Name of the topic type.
         :type topic_type_name: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
diff --git a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_topics_operations.py b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_topics_operations.py
index 14cf854ba695..75237c439b62 100644
--- a/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_topics_operations.py
+++ b/sdk/eventgrid/azure-mgmt-eventgrid/azure/mgmt/eventgrid/operations/_topics_operations.py
@@ -27,7 +27,7 @@ class TopicsOperations(object):
     :param config: Configuration of service client.
     :param serializer: An object model serializer.
     :param deserializer: An object model deserializer.
-    :ivar api_version: Version of the API to be used with the client request. Constant value: "2020-01-01-preview".
+    :ivar api_version: Version of the API to be used with the client request. Constant value: "2020-04-01-preview".
     """
 
     models = models
@@ -37,7 +37,7 @@ def __init__(self, client, config, serializer, deserializer):
         self._client = client
         self._serialize = serializer
         self._deserialize = deserializer
-        self.api_version = "2020-01-01-preview"
+        self.api_version = "2020-04-01-preview"
 
         self.config = config
 
@@ -50,7 +50,7 @@ def get(
         :param resource_group_name: The name of the resource group within the
          user's subscription.
         :type resource_group_name: str
-        :param topic_name: Name of the topic
+        :param topic_name: Name of the topic.
         :type topic_name: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
@@ -164,9 +164,9 @@ def create_or_update(
         :param resource_group_name: The name of the resource group within the
          user's subscription.
         :type resource_group_name: str
-        :param topic_name: Name of the topic
+        :param topic_name: Name of the topic.
         :type topic_name: str
-        :param topic_info: Topic information
+        :param topic_info: Topic information.
         :type topic_info: ~azure.mgmt.eventgrid.models.Topic
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: The poller return type is ClientRawResponse, the
@@ -255,7 +255,7 @@ def delete(
         :param resource_group_name: The name of the resource group within the
          user's subscription.
         :type resource_group_name: str
-        :param topic_name: Name of the topic
+        :param topic_name: Name of the topic.
         :type topic_name: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: The poller return type is ClientRawResponse, the
@@ -351,9 +351,9 @@ def update(
         :param resource_group_name: The name of the resource group within the
          user's subscription.
         :type resource_group_name: str
-        :param topic_name: Name of the topic
+        :param topic_name: Name of the topic.
         :type topic_name: str
-        :param tags: Tags of the resource
+        :param tags: Tags of the resource.
         :type tags: dict[str, str]
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: The poller return type is ClientRawResponse, the
@@ -580,7 +580,7 @@ def list_shared_access_keys(
         :param resource_group_name: The name of the resource group within the
          user's subscription.
         :type resource_group_name: str
-        :param topic_name: Name of the topic
+        :param topic_name: Name of the topic.
         :type topic_name: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the
@@ -644,7 +644,7 @@ def regenerate_key(
         :param resource_group_name: The name of the resource group within the
          user's subscription.
         :type resource_group_name: str
-        :param topic_name: Name of the topic
+        :param topic_name: Name of the topic.
         :type topic_name: str
         :param key_name: Key name to regenerate key1 or key2
         :type key_name: str
@@ -716,11 +716,11 @@ def list_event_types(
         :param resource_group_name: The name of the resource group within the
          user's subscription.
         :type resource_group_name: str
-        :param provider_namespace: Namespace of the provider of the topic
+        :param provider_namespace: Namespace of the provider of the topic.
         :type provider_namespace: str
-        :param resource_type_name: Name of the topic type
+        :param resource_type_name: Name of the topic type.
         :type resource_type_name: str
-        :param resource_name: Name of the topic
+        :param resource_name: Name of the topic.
         :type resource_name: str
         :param dict custom_headers: headers that will be added to the request
         :param bool raw: returns the direct response alongside the