Fix OrMetadata (Azure#21316)

* settings files

* OrMedata Fix

Author: tasherif-msft

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/models/_azure_blob_storage_enums.py

@@ -329,7 +329,7 @@ class StorageErrorCode(with_metaclass(_CaseInsensitiveEnumMeta, str, Enum)):
     SEQUENCE_NUMBER_CONDITION_NOT_MET = "SequenceNumberConditionNotMet"
     SEQUENCE_NUMBER_INCREMENT_TOO_LARGE = "SequenceNumberIncrementTooLarge"
     SNAPSHOT_COUNT_EXCEEDED = "SnapshotCountExceeded"
-    SNAPHOT_OPERATION_RATE_EXCEEDED = "SnaphotOperationRateExceeded"
+    SNAPSHOT_OPERATION_RATE_EXCEEDED = "SnapshotOperationRateExceeded"
     SNAPSHOTS_PRESENT = "SnapshotsPresent"
     SOURCE_CONDITION_NOT_MET = "SourceConditionNotMet"
     SYSTEM_IN_USE = "SystemInUse"

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/models/_models.py

@@ -259,10 +259,10 @@ class BlobItemInternal(msrest.serialization.Model):
     :type metadata: ~azure.storage.blob.models.BlobMetadata
     :param blob_tags: Blob tags.
     :type blob_tags: ~azure.storage.blob.models.BlobTags
-    :param object_replication_metadata: Dictionary of :code:`<string>`.
-    :type object_replication_metadata: dict[str, str]
     :param has_versions_only:
     :type has_versions_only: bool
+    :param object_replication_metadata: Dictionary of :code:`<string>`.
+    :type object_replication_metadata: dict[str, str]
     """
 
     _validation = {
@@ -281,8 +281,8 @@ class BlobItemInternal(msrest.serialization.Model):
         'properties': {'key': 'Properties', 'type': 'BlobPropertiesInternal'},
         'metadata': {'key': 'Metadata', 'type': 'BlobMetadata'},
         'blob_tags': {'key': 'BlobTags', 'type': 'BlobTags'},
-        'object_replication_metadata': {'key': 'OrMetadata', 'type': '{str}'},
         'has_versions_only': {'key': 'HasVersionsOnly', 'type': 'bool'},
+        'object_replication_metadata': {'key': 'OrMetadata', 'type': '{str}'},
     }
     _xml_map = {
         'name': 'Blob'
@@ -301,8 +301,8 @@ def __init__(
         self.properties = kwargs['properties']
         self.metadata = kwargs.get('metadata', None)
         self.blob_tags = kwargs.get('blob_tags', None)
-        self.object_replication_metadata = kwargs.get('object_replication_metadata', None)
         self.has_versions_only = kwargs.get('has_versions_only', None)
+        self.object_replication_metadata = kwargs.get('object_replication_metadata', None)
 
 
 class BlobMetadata(msrest.serialization.Model):

sdk/storage/azure-storage-blob/azure/storage/blob/_generated/models/_models_py3.py

@@ -290,10 +290,10 @@ class BlobItemInternal(msrest.serialization.Model):
     :type metadata: ~azure.storage.blob.models.BlobMetadata
     :param blob_tags: Blob tags.
     :type blob_tags: ~azure.storage.blob.models.BlobTags
-    :param object_replication_metadata: Dictionary of :code:`<string>`.
-    :type object_replication_metadata: dict[str, str]
     :param has_versions_only:
     :type has_versions_only: bool
+    :param object_replication_metadata: Dictionary of :code:`<string>`.
+    :type object_replication_metadata: dict[str, str]
     """
 
     _validation = {
@@ -312,8 +312,8 @@ class BlobItemInternal(msrest.serialization.Model):
         'properties': {'key': 'Properties', 'type': 'BlobPropertiesInternal'},
         'metadata': {'key': 'Metadata', 'type': 'BlobMetadata'},
         'blob_tags': {'key': 'BlobTags', 'type': 'BlobTags'},
-        'object_replication_metadata': {'key': 'OrMetadata', 'type': '{str}'},
         'has_versions_only': {'key': 'HasVersionsOnly', 'type': 'bool'},
+        'object_replication_metadata': {'key': 'OrMetadata', 'type': '{str}'},
     }
     _xml_map = {
         'name': 'Blob'
@@ -330,8 +330,8 @@ def __init__(
         is_current_version: Optional[bool] = None,
         metadata: Optional["BlobMetadata"] = None,
         blob_tags: Optional["BlobTags"] = None,
-        object_replication_metadata: Optional[Dict[str, str]] = None,
         has_versions_only: Optional[bool] = None,
+        object_replication_metadata: Optional[Dict[str, str]] = None,
         **kwargs
     ):
         super(BlobItemInternal, self).__init__(**kwargs)
@@ -343,8 +343,8 @@ def __init__(
         self.properties = properties
         self.metadata = metadata
         self.blob_tags = blob_tags
-        self.object_replication_metadata = object_replication_metadata
         self.has_versions_only = has_versions_only
+        self.object_replication_metadata = object_replication_metadata
 
 
 class BlobMetadata(msrest.serialization.Model):

sdk/storage/azure-storage-blob/swagger/README.md

@@ -136,8 +136,6 @@ directive:
 - from: swagger-document
   where: $.definitions.BlobItemInternal
   transform: |
-    $.discriminator = "OrMetadata";
-    $.required = [ "OrMetadata" ];
     $.properties.OrMetadata = $.properties.ObjectReplicationMetadata;
     $.properties.OrMetadata["x-ms-client-name"] = "ObjectReplicationMetadata";
     delete $.properties.ObjectReplicationMetadata;