Azure · lmazuel · Jul 19, 2018 · Jun 21, 2018 · Jul 19, 2018 · Jul 19, 2018
diff --git a/azure-mgmt-media/HISTORY.rst b/azure-mgmt-media/HISTORY.rst
@@ -3,6 +3,22 @@
 Release History
 ===============
 
+1.0.0rc2 (2018-07-19)
++++++++++++++++++++++
+
+**Features**
+
+- Model LiveEventPreview has a new parameter alternative_media_id
+- Model StreamingLocator has a new parameter alternative_media_id
+- Model EnvelopeEncryption has a new parameter custom_key_acquisition_url_template
+- Model Job has a new parameter correlation_data
+
+**Breaking changes**
+
+- Model EnvelopeEncryption no longer has parameter custom_license_acquisition_url_template
+
+API version endpoint is now 2018-06-01-preview
+
 1.0.0rc1 (2018-04-23)
 +++++++++++++++++++++
 
@@ -11,6 +27,8 @@ Release History
 This is a complete rewriting of the package and a completly new RestAPI,
 and no compatibility at all is possible.
 
+API version endpoint is now 2018-03-30-preview
+
 0.2.0 (2017-09-14)
 ++++++++++++++++++
 

diff --git a/azure-mgmt-media/README.rst b/azure-mgmt-media/README.rst
@@ -6,7 +6,7 @@ This is the Microsoft Azure Media Services Client Library.
 Azure Resource Manager (ARM) is the next generation of management APIs that
 replace the old Azure Service Management (ASM).
 
-This package has been tested with Python 2.7, 3.4, 3.5 and 3.6.
+This package has been tested with Python 2.7, 3.4, 3.5, 3.6 and 3.7.
 
 For the older Azure Service Management (ASM) libraries, see
 `azure-servicemanagement-legacy <https://pypi.python.org/pypi/azure-servicemanagement-legacy>`__ library.

diff --git a/azure-mgmt-media/azure/mgmt/media/azure_media_services.py b/azure-mgmt-media/azure/mgmt/media/azure_media_services.py
@@ -108,7 +108,7 @@ def __init__(
         super(AzureMediaServices, 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 = '2018-03-30-preview'
+        self.api_version = '2018-06-01-preview'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 

diff --git a/azure-mgmt-media/azure/mgmt/media/models/__init__.py b/azure-mgmt-media/azure/mgmt/media/models/__init__.py
@@ -115,7 +115,6 @@
     from .common_encryption_cenc_py3 import CommonEncryptionCenc
     from .common_encryption_cbcs_py3 import CommonEncryptionCbcs
     from .streaming_policy_py3 import StreamingPolicy
-    from .streaming_locator_user_defined_content_key_py3 import StreamingLocatorUserDefinedContentKey
     from .streaming_locator_content_key_py3 import StreamingLocatorContentKey
     from .streaming_path_py3 import StreamingPath
     from .list_content_keys_response_py3 import ListContentKeysResponse
@@ -244,7 +243,6 @@
     from .common_encryption_cenc import CommonEncryptionCenc
     from .common_encryption_cbcs import CommonEncryptionCbcs
     from .streaming_policy import StreamingPolicy
-    from .streaming_locator_user_defined_content_key import StreamingLocatorUserDefinedContentKey
     from .streaming_locator_content_key import StreamingLocatorContentKey
     from .streaming_path import StreamingPath
     from .list_content_keys_response import ListContentKeysResponse
@@ -422,7 +420,6 @@
     'CommonEncryptionCenc',
     'CommonEncryptionCbcs',
     'StreamingPolicy',
-    'StreamingLocatorUserDefinedContentKey',
     'StreamingLocatorContentKey',
     'StreamingPath',
     'ListContentKeysResponse',

diff --git a/azure-mgmt-media/azure/mgmt/media/models/aac_audio_py3.py b/azure-mgmt-media/azure/mgmt/media/models/aac_audio_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .audio import Audio
+from .audio_py3 import Audio
 
 
 class AacAudio(Audio):

diff --git a/azure-mgmt-media/azure/mgmt/media/models/api_error.py b/azure-mgmt-media/azure/mgmt/media/models/api_error.py
@@ -16,7 +16,7 @@
 class ApiError(Model):
     """The API error.
 
-    :param error: ApiError. The error properties.
+    :param error: The error properties.
     :type error: ~azure.mgmt.media.models.ODataError
     """
 

diff --git a/azure-mgmt-media/azure/mgmt/media/models/api_error_py3.py b/azure-mgmt-media/azure/mgmt/media/models/api_error_py3.py
@@ -16,7 +16,7 @@
 class ApiError(Model):
     """The API error.
 
-    :param error: ApiError. The error properties.
+    :param error: The error properties.
     :type error: ~azure.mgmt.media.models.ODataError
     """
 

diff --git a/azure-mgmt-media/azure/mgmt/media/models/asset_py3.py b/azure-mgmt-media/azure/mgmt/media/models/asset_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .proxy_resource import ProxyResource
+from .proxy_resource_py3 import ProxyResource
 
 
 class Asset(ProxyResource):

diff --git a/azure-mgmt-media/azure/mgmt/media/models/audio_analyzer_preset_py3.py b/azure-mgmt-media/azure/mgmt/media/models/audio_analyzer_preset_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .preset import Preset
+from .preset_py3 import Preset
 
 
 class AudioAnalyzerPreset(Preset):

diff --git a/azure-mgmt-media/azure/mgmt/media/models/audio_overlay_py3.py b/azure-mgmt-media/azure/mgmt/media/models/audio_overlay_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .overlay import Overlay
+from .overlay_py3 import Overlay
 
 
 class AudioOverlay(Overlay):

diff --git a/azure-mgmt-media/azure/mgmt/media/models/audio_py3.py b/azure-mgmt-media/azure/mgmt/media/models/audio_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .codec import Codec
+from .codec_py3 import Codec
 
 
 class Audio(Codec):

diff --git a/azure-mgmt-media/azure/mgmt/media/models/built_in_standard_encoder_preset_py3.py b/azure-mgmt-media/azure/mgmt/media/models/built_in_standard_encoder_preset_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .preset import Preset
+from .preset_py3 import Preset
 
 
 class BuiltInStandardEncoderPreset(Preset):

diff --git a/azure-mgmt-media/azure/mgmt/media/models/cbcs_drm_configuration.py b/azure-mgmt-media/azure/mgmt/media/models/cbcs_drm_configuration.py
@@ -13,10 +13,10 @@
 
 
 class CbcsDrmConfiguration(Model):
-    """Class to specify drm configurations of CommonEncryptionCbcs scheme in
+    """Class to specify DRM configurations of CommonEncryptionCbcs scheme in
     Streaming Policy.
 
-    :param fair_play: Fairplay configurations
+    :param fair_play: FairPlay configurations
     :type fair_play:
      ~azure.mgmt.media.models.StreamingPolicyFairPlayConfiguration
     :param play_ready: PlayReady configurations

diff --git a/azure-mgmt-media/azure/mgmt/media/models/cbcs_drm_configuration_py3.py b/azure-mgmt-media/azure/mgmt/media/models/cbcs_drm_configuration_py3.py
@@ -13,10 +13,10 @@
 
 
 class CbcsDrmConfiguration(Model):
-    """Class to specify drm configurations of CommonEncryptionCbcs scheme in
+    """Class to specify DRM configurations of CommonEncryptionCbcs scheme in
     Streaming Policy.
 
-    :param fair_play: Fairplay configurations
+    :param fair_play: FairPlay configurations
     :type fair_play:
      ~azure.mgmt.media.models.StreamingPolicyFairPlayConfiguration
     :param play_ready: PlayReady configurations

diff --git a/azure-mgmt-media/azure/mgmt/media/models/cenc_drm_configuration.py b/azure-mgmt-media/azure/mgmt/media/models/cenc_drm_configuration.py
@@ -13,7 +13,7 @@
 
 
 class CencDrmConfiguration(Model):
-    """Class to specify drm configurations of CommonEncryptionCenc scheme in
+    """Class to specify DRM configurations of CommonEncryptionCenc scheme in
     Streaming Policy.
 
     :param play_ready: PlayReady configurations

diff --git a/azure-mgmt-media/azure/mgmt/media/models/cenc_drm_configuration_py3.py b/azure-mgmt-media/azure/mgmt/media/models/cenc_drm_configuration_py3.py
@@ -13,7 +13,7 @@
 
 
 class CencDrmConfiguration(Model):
-    """Class to specify drm configurations of CommonEncryptionCenc scheme in
+    """Class to specify DRM configurations of CommonEncryptionCenc scheme in
     Streaming Policy.
 
     :param play_ready: PlayReady configurations

diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_clear_key_configuration_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_clear_key_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_configuration import ContentKeyPolicyConfiguration
+from .content_key_policy_configuration_py3 import ContentKeyPolicyConfiguration
 
 
 class ContentKeyPolicyClearKeyConfiguration(ContentKeyPolicyConfiguration):

diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_fair_play_configuration_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_fair_play_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_configuration import ContentKeyPolicyConfiguration
+from .content_key_policy_configuration_py3 import ContentKeyPolicyConfiguration
 
 
 class ContentKeyPolicyFairPlayConfiguration(ContentKeyPolicyConfiguration):

diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_open_restriction_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_open_restriction_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_restriction import ContentKeyPolicyRestriction
+from .content_key_policy_restriction_py3 import ContentKeyPolicyRestriction
 
 
 class ContentKeyPolicyOpenRestriction(ContentKeyPolicyRestriction):

diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_play_ready_configuration_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_play_ready_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_configuration import ContentKeyPolicyConfiguration
+from .content_key_policy_configuration_py3 import ContentKeyPolicyConfiguration
 
 
 class ContentKeyPolicyPlayReadyConfiguration(ContentKeyPolicyConfiguration):

diff --git a/...mgmt/media/models/content_key_policy_play_ready_content_encryption_key_from_header_py3.py b/...mgmt/media/models/content_key_policy_play_ready_content_encryption_key_from_header_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_play_ready_content_key_location import ContentKeyPolicyPlayReadyContentKeyLocation
+from .content_key_policy_play_ready_content_key_location_py3 import ContentKeyPolicyPlayReadyContentKeyLocation
 
 
 class ContentKeyPolicyPlayReadyContentEncryptionKeyFromHeader(ContentKeyPolicyPlayReadyContentKeyLocation):

diff --git a/...ia/models/content_key_policy_play_ready_content_encryption_key_from_key_identifier_py3.py b/...ia/models/content_key_policy_play_ready_content_encryption_key_from_key_identifier_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_play_ready_content_key_location import ContentKeyPolicyPlayReadyContentKeyLocation
+from .content_key_policy_play_ready_content_key_location_py3 import ContentKeyPolicyPlayReadyContentKeyLocation
 
 
 class ContentKeyPolicyPlayReadyContentEncryptionKeyFromKeyIdentifier(ContentKeyPolicyPlayReadyContentKeyLocation):

diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .proxy_resource import ProxyResource
+from .proxy_resource_py3 import ProxyResource
 
 
 class ContentKeyPolicy(ProxyResource):

diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_rsa_token_key_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_rsa_token_key_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_restriction_token_key import ContentKeyPolicyRestrictionTokenKey
+from .content_key_policy_restriction_token_key_py3 import ContentKeyPolicyRestrictionTokenKey
 
 
 class ContentKeyPolicyRsaTokenKey(ContentKeyPolicyRestrictionTokenKey):

diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_symmetric_token_key_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_symmetric_token_key_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_restriction_token_key import ContentKeyPolicyRestrictionTokenKey
+from .content_key_policy_restriction_token_key_py3 import ContentKeyPolicyRestrictionTokenKey
 
 
 class ContentKeyPolicySymmetricTokenKey(ContentKeyPolicyRestrictionTokenKey):

diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_token_restriction_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_token_restriction_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_restriction import ContentKeyPolicyRestriction
+from .content_key_policy_restriction_py3 import ContentKeyPolicyRestriction
 
 
 class ContentKeyPolicyTokenRestriction(ContentKeyPolicyRestriction):

diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_unknown_configuration_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_unknown_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_configuration import ContentKeyPolicyConfiguration
+from .content_key_policy_configuration_py3 import ContentKeyPolicyConfiguration
 
 
 class ContentKeyPolicyUnknownConfiguration(ContentKeyPolicyConfiguration):

diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_unknown_restriction_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_unknown_restriction_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_restriction import ContentKeyPolicyRestriction
+from .content_key_policy_restriction_py3 import ContentKeyPolicyRestriction
 
 
 class ContentKeyPolicyUnknownRestriction(ContentKeyPolicyRestriction):

diff --git a/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_widevine_configuration_py3.py b/azure-mgmt-media/azure/mgmt/media/models/content_key_policy_widevine_configuration_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_configuration import ContentKeyPolicyConfiguration
+from .content_key_policy_configuration_py3 import ContentKeyPolicyConfiguration
 
 
 class ContentKeyPolicyWidevineConfiguration(ContentKeyPolicyConfiguration):

diff --git a/...e-mgmt-media/azure/mgmt/media/models/content_key_policy_x509_certificate_token_key_py3.py b/...e-mgmt-media/azure/mgmt/media/models/content_key_policy_x509_certificate_token_key_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .content_key_policy_restriction_token_key import ContentKeyPolicyRestrictionTokenKey
+from .content_key_policy_restriction_token_key_py3 import ContentKeyPolicyRestrictionTokenKey
 
 
 class ContentKeyPolicyX509CertificateTokenKey(ContentKeyPolicyRestrictionTokenKey):

diff --git a/azure-mgmt-media/azure/mgmt/media/models/copy_audio_py3.py b/azure-mgmt-media/azure/mgmt/media/models/copy_audio_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .codec import Codec
+from .codec_py3 import Codec
 
 
 class CopyAudio(Codec):

diff --git a/azure-mgmt-media/azure/mgmt/media/models/copy_video_py3.py b/azure-mgmt-media/azure/mgmt/media/models/copy_video_py3.py
@@ -9,7 +9,7 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .codec import Codec
+from .codec_py3 import Codec
 
 
 class CopyVideo(Codec):

diff --git a/azure-mgmt-media/azure/mgmt/media/models/default_key.py b/azure-mgmt-media/azure/mgmt/media/models/default_key.py
@@ -16,8 +16,8 @@ class DefaultKey(Model):
     """Class to specify properties of default content key for each encryption
     scheme.
 
-    :param label: Label can be used to specify Content Key when creating
-     Stremaing Locator
+    :param label: Label can be used to specify Content Key when creating a
+     Streaming Locator
     :type label: str
     :param policy_name: Policy used by Default Key
     :type policy_name: str

diff --git a/azure-mgmt-media/azure/mgmt/media/models/default_key_py3.py b/azure-mgmt-media/azure/mgmt/media/models/default_key_py3.py
@@ -16,8 +16,8 @@ class DefaultKey(Model):
     """Class to specify properties of default content key for each encryption
     scheme.
 
-    :param label: Label can be used to specify Content Key when creating
-     Stremaing Locator
+    :param label: Label can be used to specify Content Key when creating a
+     Streaming Locator
     :type label: str
     :param policy_name: Policy used by Default Key
     :type policy_name: str

diff --git a/azure-mgmt-media/azure/mgmt/media/models/enabled_protocols.py b/azure-mgmt-media/azure/mgmt/media/models/enabled_protocols.py
@@ -19,9 +19,9 @@ class EnabledProtocols(Model):
 
     :param download: Required. Enable Download protocol or not
     :type download: bool
-    :param dash: Required. Enable Dash protocol or not
+    :param dash: Required. Enable DASH protocol or not
     :type dash: bool
-    :param hls: Required. Enable Hls protocol or not
+    :param hls: Required. Enable HLS protocol or not
     :type hls: bool
     :param smooth_streaming: Required. Enable SmoothStreaming protocol or not
     :type smooth_streaming: bool

diff --git a/azure-mgmt-media/azure/mgmt/media/models/enabled_protocols_py3.py b/azure-mgmt-media/azure/mgmt/media/models/enabled_protocols_py3.py
@@ -19,9 +19,9 @@ class EnabledProtocols(Model):
 
     :param download: Required. Enable Download protocol or not
     :type download: bool
-    :param dash: Required. Enable Dash protocol or not
+    :param dash: Required. Enable DASH protocol or not
     :type dash: bool
-    :param hls: Required. Enable Hls protocol or not
+    :param hls: Required. Enable HLS protocol or not
     :type hls: bool
     :param smooth_streaming: Required. Enable SmoothStreaming protocol or not
     :type smooth_streaming: bool