diff --git a/azure-mgmt-search/MANIFEST.in b/azure-mgmt-search/MANIFEST.in
index 6ceb27f7a96e..e4884efef41b 100644
--- a/azure-mgmt-search/MANIFEST.in
+++ b/azure-mgmt-search/MANIFEST.in
@@ -1,3 +1,4 @@
+recursive-include tests *.py *.yaml
 include *.rst
 include azure/__init__.py
 include azure/mgmt/__init__.py
diff --git a/azure-mgmt-search/azure/mgmt/search/models/__init__.py b/azure-mgmt-search/azure/mgmt/search/models/__init__.py
index 1ce1f9f90117..d09b7141363d 100644
--- a/azure-mgmt-search/azure/mgmt/search/models/__init__.py
+++ b/azure-mgmt-search/azure/mgmt/search/models/__init__.py
@@ -42,6 +42,7 @@
     HostingMode,
     SearchServiceStatus,
     ProvisioningState,
+    IdentityType,
     AdminKeyKind,
 )
 
@@ -65,5 +66,6 @@
     'HostingMode',
     'SearchServiceStatus',
     'ProvisioningState',
+    'IdentityType',
     'AdminKeyKind',
 ]
diff --git a/azure-mgmt-search/azure/mgmt/search/models/identity.py b/azure-mgmt-search/azure/mgmt/search/models/identity.py
index f526b986fc70..5d6912d964ce 100644
--- a/azure-mgmt-search/azure/mgmt/search/models/identity.py
+++ b/azure-mgmt-search/azure/mgmt/search/models/identity.py
@@ -24,25 +24,25 @@ class Identity(Model):
     :vartype principal_id: str
     :ivar tenant_id: The tenant ID of resource.
     :vartype tenant_id: str
-    :ivar type: Required. The identity type. Default value: "SystemAssigned" .
-    :vartype type: str
+    :param type: Required. The identity type. Possible values include: 'None',
+     'SystemAssigned'
+    :type type: str or ~azure.mgmt.search.models.IdentityType
     """
 
     _validation = {
         'principal_id': {'readonly': True},
         'tenant_id': {'readonly': True},
-        'type': {'required': True, 'constant': True},
+        'type': {'required': True},
     }
 
     _attribute_map = {
         'principal_id': {'key': 'principalId', 'type': 'str'},
         'tenant_id': {'key': 'tenantId', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'IdentityType'},
     }
 
-    type = "SystemAssigned"
-
     def __init__(self, **kwargs):
         super(Identity, self).__init__(**kwargs)
         self.principal_id = None
         self.tenant_id = None
+        self.type = kwargs.get('type', None)
diff --git a/azure-mgmt-search/azure/mgmt/search/models/identity_py3.py b/azure-mgmt-search/azure/mgmt/search/models/identity_py3.py
index 22d25fdd85b7..61d3064568ae 100644
--- a/azure-mgmt-search/azure/mgmt/search/models/identity_py3.py
+++ b/azure-mgmt-search/azure/mgmt/search/models/identity_py3.py
@@ -24,25 +24,25 @@ class Identity(Model):
     :vartype principal_id: str
     :ivar tenant_id: The tenant ID of resource.
     :vartype tenant_id: str
-    :ivar type: Required. The identity type. Default value: "SystemAssigned" .
-    :vartype type: str
+    :param type: Required. The identity type. Possible values include: 'None',
+     'SystemAssigned'
+    :type type: str or ~azure.mgmt.search.models.IdentityType
     """
 
     _validation = {
         'principal_id': {'readonly': True},
         'tenant_id': {'readonly': True},
-        'type': {'required': True, 'constant': True},
+        'type': {'required': True},
     }
 
     _attribute_map = {
         'principal_id': {'key': 'principalId', 'type': 'str'},
         'tenant_id': {'key': 'tenantId', 'type': 'str'},
-        'type': {'key': 'type', 'type': 'str'},
+        'type': {'key': 'type', 'type': 'IdentityType'},
     }
 
-    type = "SystemAssigned"
-
-    def __init__(self, **kwargs) -> None:
+    def __init__(self, *, type, **kwargs) -> None:
         super(Identity, self).__init__(**kwargs)
         self.principal_id = None
         self.tenant_id = None
+        self.type = type
diff --git a/azure-mgmt-search/azure/mgmt/search/models/search_management_client_enums.py b/azure-mgmt-search/azure/mgmt/search/models/search_management_client_enums.py
index 8622b25c4ffb..5a7963c3ecb6 100644
--- a/azure-mgmt-search/azure/mgmt/search/models/search_management_client_enums.py
+++ b/azure-mgmt-search/azure/mgmt/search/models/search_management_client_enums.py
@@ -50,6 +50,12 @@ class ProvisioningState(str, Enum):
     failed = "failed"
 
 
+class IdentityType(str, Enum):
+
+    none = "None"
+    system_assigned = "SystemAssigned"
+
+
 class AdminKeyKind(str, Enum):
 
     primary = "primary"
diff --git a/azure-mgmt-search/azure/mgmt/search/version.py b/azure-mgmt-search/azure/mgmt/search/version.py
index 7ecf658ce13b..373526c862b8 100644
--- a/azure-mgmt-search/azure/mgmt/search/version.py
+++ b/azure-mgmt-search/azure/mgmt/search/version.py
@@ -9,4 +9,5 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-VERSION = "2.1.0"
+VERSION = "2015-08-19"
+