Skip to content

[AutoPR mediaservices/resource-manager] Adding Azure Media Services version 2018-06-01-preview version #2688

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
AutorestCI wants to merge 1 commit into from
Closed

[AutoPR mediaservices/resource-manager] Adding Azure Media Services version 2018-06-01-preview version #2688

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/azure_media_services.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)

Expand Down
3 changes: 0 additions & 3 deletions azure-mgmt-media/azure/mgmt/media/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -422,7 +420,6 @@
'CommonEncryptionCenc',
'CommonEncryptionCbcs',
'StreamingPolicy',
'StreamingLocatorUserDefinedContentKey',
'StreamingLocatorContentKey',
'StreamingPath',
'ListContentKeysResponse',
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/aac_audio_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# regenerated.
# --------------------------------------------------------------------------

from .audio import Audio
from .audio_py3 import Audio


class AacAudio(Audio):
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/api_error.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
"""

Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/api_error_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
"""

Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/asset_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# regenerated.
# --------------------------------------------------------------------------

from .proxy_resource import ProxyResource
from .proxy_resource_py3 import ProxyResource


class Asset(ProxyResource):
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/audio_analyzer_preset_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# regenerated.
# --------------------------------------------------------------------------

from .preset import Preset
from .preset_py3 import Preset


class AudioAnalyzerPreset(Preset):
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/audio_overlay_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# regenerated.
# --------------------------------------------------------------------------

from .overlay import Overlay
from .overlay_py3 import Overlay


class AudioOverlay(Overlay):
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/audio_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# regenerated.
# --------------------------------------------------------------------------

from .codec import Codec
from .codec_py3 import Codec


class Audio(Codec):
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/built_in_standard_encoder_preset_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# regenerated.
# --------------------------------------------------------------------------

from .preset import Preset
from .preset_py3 import Preset


class BuiltInStandardEncoderPreset(Preset):
Expand Down
4 changes: 2 additions & 2 deletions azure-mgmt-media/azure/mgmt/media/models/cbcs_drm_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions azure-mgmt-media/azure/mgmt/media/models/cbcs_drm_configuration_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/cenc_drm_configuration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/cenc_drm_configuration_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/content_key_policy_clear_key_configuration_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# regenerated.
# --------------------------------------------------------------------------

from .content_key_policy_configuration import ContentKeyPolicyConfiguration
from .content_key_policy_configuration_py3 import ContentKeyPolicyConfiguration


class ContentKeyPolicyClearKeyConfiguration(ContentKeyPolicyConfiguration):
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/content_key_policy_fair_play_configuration_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# regenerated.
# --------------------------------------------------------------------------

from .content_key_policy_configuration import ContentKeyPolicyConfiguration
from .content_key_policy_configuration_py3 import ContentKeyPolicyConfiguration


class ContentKeyPolicyFairPlayConfiguration(ContentKeyPolicyConfiguration):
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/content_key_policy_open_restriction_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# regenerated.
# --------------------------------------------------------------------------

from .content_key_policy_restriction import ContentKeyPolicyRestriction
from .content_key_policy_restriction_py3 import ContentKeyPolicyRestriction


class ContentKeyPolicyOpenRestriction(ContentKeyPolicyRestriction):
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/content_key_policy_play_ready_configuration_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# regenerated.
# --------------------------------------------------------------------------

from .content_key_policy_configuration import ContentKeyPolicyConfiguration
from .content_key_policy_configuration_py3 import ContentKeyPolicyConfiguration


class ContentKeyPolicyPlayReadyConfiguration(ContentKeyPolicyConfiguration):
Expand Down
2 changes: 1 addition & 1 deletion ...mgmt/media/models/content_key_policy_play_ready_content_encryption_key_from_header_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion ...ia/models/content_key_policy_play_ready_content_encryption_key_from_key_identifier_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/content_key_policy_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# regenerated.
# --------------------------------------------------------------------------

from .proxy_resource import ProxyResource
from .proxy_resource_py3 import ProxyResource


class ContentKeyPolicy(ProxyResource):
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/content_key_policy_rsa_token_key_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/content_key_policy_symmetric_token_key_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/content_key_policy_token_restriction_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# regenerated.
# --------------------------------------------------------------------------

from .content_key_policy_restriction import ContentKeyPolicyRestriction
from .content_key_policy_restriction_py3 import ContentKeyPolicyRestriction


class ContentKeyPolicyTokenRestriction(ContentKeyPolicyRestriction):
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/content_key_policy_unknown_configuration_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# regenerated.
# --------------------------------------------------------------------------

from .content_key_policy_configuration import ContentKeyPolicyConfiguration
from .content_key_policy_configuration_py3 import ContentKeyPolicyConfiguration


class ContentKeyPolicyUnknownConfiguration(ContentKeyPolicyConfiguration):
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/content_key_policy_unknown_restriction_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# regenerated.
# --------------------------------------------------------------------------

from .content_key_policy_restriction import ContentKeyPolicyRestriction
from .content_key_policy_restriction_py3 import ContentKeyPolicyRestriction


class ContentKeyPolicyUnknownRestriction(ContentKeyPolicyRestriction):
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/content_key_policy_widevine_configuration_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# regenerated.
# --------------------------------------------------------------------------

from .content_key_policy_configuration import ContentKeyPolicyConfiguration
from .content_key_policy_configuration_py3 import ContentKeyPolicyConfiguration


class ContentKeyPolicyWidevineConfiguration(ContentKeyPolicyConfiguration):
Expand Down
2 changes: 1 addition & 1 deletion ...e-mgmt-media/azure/mgmt/media/models/content_key_policy_x509_certificate_token_key_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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):
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/copy_audio_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# regenerated.
# --------------------------------------------------------------------------

from .codec import Codec
from .codec_py3 import Codec


class CopyAudio(Codec):
Expand Down
2 changes: 1 addition & 1 deletion azure-mgmt-media/azure/mgmt/media/models/copy_video_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
# regenerated.
# --------------------------------------------------------------------------

from .codec import Codec
from .codec_py3 import Codec


class CopyVideo(Codec):
Expand Down
4 changes: 2 additions & 2 deletions azure-mgmt-media/azure/mgmt/media/models/default_key.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions azure-mgmt-media/azure/mgmt/media/models/default_key_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions azure-mgmt-media/azure/mgmt/media/models/enabled_protocols.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions azure-mgmt-media/azure/mgmt/media/models/enabled_protocols_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
11 changes: 5 additions & 6 deletions azure-mgmt-media/azure/mgmt/media/models/envelope_encryption.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,21 @@ class EnvelopeEncryption(Model):
:param content_keys: Representing default content key for each encryption
scheme and separate content keys for specific tracks
:type content_keys: ~azure.mgmt.media.models.StreamingPolicyContentKeys
:param custom_license_acquisition_url_template:
LicenseAcquistionUrlTemplate is used to point to user speicified service
to delivery content keys
:type custom_license_acquisition_url_template: str
:param custom_key_acquisition_url_template: KeyAcquistionUrlTemplate is
used to point to user specified service to delivery content keys
:type custom_key_acquisition_url_template: str
"""

_attribute_map = {
'enabled_protocols': {'key': 'enabledProtocols', 'type': 'EnabledProtocols'},
'clear_tracks': {'key': 'clearTracks', 'type': '[TrackSelection]'},
'content_keys': {'key': 'contentKeys', 'type': 'StreamingPolicyContentKeys'},
'custom_license_acquisition_url_template': {'key': 'customLicenseAcquisitionUrlTemplate', 'type': 'str'},
'custom_key_acquisition_url_template': {'key': 'customKeyAcquisitionUrlTemplate', 'type': 'str'},
}

def __init__(self, **kwargs):
super(EnvelopeEncryption, self).__init__(**kwargs)
self.enabled_protocols = kwargs.get('enabled_protocols', None)
self.clear_tracks = kwargs.get('clear_tracks', None)
self.content_keys = kwargs.get('content_keys', None)
self.custom_license_acquisition_url_template = kwargs.get('custom_license_acquisition_url_template', None)
self.custom_key_acquisition_url_template = kwargs.get('custom_key_acquisition_url_template', None)
13 changes: 6 additions & 7 deletions azure-mgmt-media/azure/mgmt/media/models/envelope_encryption_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,22 +22,21 @@ class EnvelopeEncryption(Model):
:param content_keys: Representing default content key for each encryption
scheme and separate content keys for specific tracks
:type content_keys: ~azure.mgmt.media.models.StreamingPolicyContentKeys
:param custom_license_acquisition_url_template:
LicenseAcquistionUrlTemplate is used to point to user speicified service
to delivery content keys
:type custom_license_acquisition_url_template: str
:param custom_key_acquisition_url_template: KeyAcquistionUrlTemplate is
used to point to user specified service to delivery content keys
:type custom_key_acquisition_url_template: str
"""

_attribute_map = {
'enabled_protocols': {'key': 'enabledProtocols', 'type': 'EnabledProtocols'},
'clear_tracks': {'key': 'clearTracks', 'type': '[TrackSelection]'},
'content_keys': {'key': 'contentKeys', 'type': 'StreamingPolicyContentKeys'},
'custom_license_acquisition_url_template': {'key': 'customLicenseAcquisitionUrlTemplate', 'type': 'str'},
'custom_key_acquisition_url_template': {'key': 'customKeyAcquisitionUrlTemplate', 'type': 'str'},
}

def __init__(self, *, enabled_protocols=None, clear_tracks=None, content_keys=None, custom_license_acquisition_url_template: str=None, **kwargs) -> None:
def __init__(self, *, enabled_protocols=None, clear_tracks=None, content_keys=None, custom_key_acquisition_url_template: str=None, **kwargs) -> None:
super(EnvelopeEncryption, self).__init__(**kwargs)
self.enabled_protocols = enabled_protocols
self.clear_tracks = clear_tracks
self.content_keys = content_keys
self.custom_license_acquisition_url_template = custom_license_acquisition_url_template
self.custom_key_acquisition_url_template = custom_key_acquisition_url_template
Loading