Skip to content

Commit fd411ac

Browse files
Azure CLI BotSDKAuto
andauthored
[AutoRelease] t1-media-2021-06-03-99773 (Azure#19066)
* CodeGen from PR 14161 in Azure/azure-rest-api-specs add tags for go SDK release v54.0.0 (Azure#14161) * add tags for go SDK release v54.0.0 * add a new tag * version,CHANGELOG Co-authored-by: SDKAuto <[email protected]> Co-authored-by: PythonSdkPipelines <PythonSdkPipelines>
1 parent 50275cb commit fd411ac

14 files changed

+312
-75
lines changed

sdk/media/azure-mgmt-media/CHANGELOG.md

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
# Release History
22

3+
## 4.0.0 (2021-06-03)
4+
5+
**Features**
6+
7+
- Model Operation has a new parameter is_data_action
8+
- Model Operation has a new parameter action_type
9+
- Model MediaService has a new parameter key_delivery
10+
- Model MetricSpecification has a new parameter supported_time_grain_types
11+
- Model MetricSpecification has a new parameter source_mdm_namespace
12+
- Model MetricSpecification has a new parameter source_mdm_account
13+
- Model MetricSpecification has a new parameter enable_regional_mdm_account
14+
15+
**Breaking changes**
16+
17+
- Removed operation MediaservicesOperations.get_by_subscription
18+
319
## 3.1.0 (2021-02-24)
420

521
**Features**

sdk/media/azure-mgmt-media/MANIFEST.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
include _meta.json
12
recursive-include tests *.py *.yaml
23
include *.md
34
include azure/__init__.py

sdk/media/azure-mgmt-media/_meta.json

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
{
2+
"autorest": "V2",
3+
"use": "@microsoft.azure/autorest.python@~4.0.71",
4+
"commit": "d78e99bbaa8170a72c38d8a6dad8a896f9a5c636",
5+
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
6+
"autorest_command": "autorest specification/mediaservices/resource-manager/readme.md --keep-version-file --multiapi --no-async --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk [email protected]/autorest.python@~4.0.71 --version=V2",
7+
"readme": "specification/mediaservices/resource-manager/readme.md"
8+
}

sdk/media/azure-mgmt-media/azure/mgmt/media/_azure_media_services.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ def __init__(
8787
super(AzureMediaServices, self).__init__(self.config.credentials, self.config)
8888

8989
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
90-
self.api_version = '2020-05-01'
9190
self._serialize = Serializer(client_models)
9291
self._deserialize = Deserializer(client_models)
9392

sdk/media/azure-mgmt-media/azure/mgmt/media/models/__init__.py

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@
1212
try:
1313
from ._models_py3 import AacAudio
1414
from ._models_py3 import AbsoluteClipTime
15+
from ._models_py3 import AccessControl
1516
from ._models_py3 import AccountEncryption
1617
from ._models_py3 import AccountFilter
1718
from ._models_py3 import AkamaiAccessControl
@@ -105,6 +106,7 @@
105106
from ._models_py3 import JpgFormat
106107
from ._models_py3 import JpgImage
107108
from ._models_py3 import JpgLayer
109+
from ._models_py3 import KeyDelivery
108110
from ._models_py3 import KeyVaultProperties
109111
from ._models_py3 import Layer
110112
from ._models_py3 import ListContainerSasInput
@@ -128,6 +130,7 @@
128130
from ._models_py3 import LogSpecification
129131
from ._models_py3 import MediaService
130132
from ._models_py3 import MediaServiceIdentity
133+
from ._models_py3 import MediaServiceUpdate
131134
from ._models_py3 import MetricDimension
132135
from ._models_py3 import MetricSpecification
133136
from ._models_py3 import Mp4Format
@@ -192,6 +195,7 @@
192195
except (SyntaxError, ImportError):
193196
from ._models import AacAudio
194197
from ._models import AbsoluteClipTime
198+
from ._models import AccessControl
195199
from ._models import AccountEncryption
196200
from ._models import AccountFilter
197201
from ._models import AkamaiAccessControl
@@ -285,6 +289,7 @@
285289
from ._models import JpgFormat
286290
from ._models import JpgImage
287291
from ._models import JpgLayer
292+
from ._models import KeyDelivery
288293
from ._models import KeyVaultProperties
289294
from ._models import Layer
290295
from ._models import ListContainerSasInput
@@ -308,6 +313,7 @@
308313
from ._models import LogSpecification
309314
from ._models import MediaService
310315
from ._models import MediaServiceIdentity
316+
from ._models import MediaServiceUpdate
311317
from ._models import MetricDimension
312318
from ._models import MetricSpecification
313319
from ._models import Mp4Format
@@ -388,9 +394,11 @@
388394
CreatedByType,
389395
MetricUnit,
390396
MetricAggregationType,
397+
ActionType,
391398
StorageAccountType,
392399
StorageAuthentication,
393400
AccountEncryptionKeyType,
401+
DefaultAction,
394402
ManagedIdentityType,
395403
PrivateEndpointConnectionProvisioningState,
396404
PrivateEndpointServiceConnectionStatus,
@@ -443,6 +451,7 @@
443451
__all__ = [
444452
'AacAudio',
445453
'AbsoluteClipTime',
454+
'AccessControl',
446455
'AccountEncryption',
447456
'AccountFilter',
448457
'AkamaiAccessControl',
@@ -536,6 +545,7 @@
536545
'JpgFormat',
537546
'JpgImage',
538547
'JpgLayer',
548+
'KeyDelivery',
539549
'KeyVaultProperties',
540550
'Layer',
541551
'ListContainerSasInput',
@@ -559,6 +569,7 @@
559569
'LogSpecification',
560570
'MediaService',
561571
'MediaServiceIdentity',
572+
'MediaServiceUpdate',
562573
'MetricDimension',
563574
'MetricSpecification',
564575
'Mp4Format',
@@ -638,9 +649,11 @@
638649
'CreatedByType',
639650
'MetricUnit',
640651
'MetricAggregationType',
652+
'ActionType',
641653
'StorageAccountType',
642654
'StorageAuthentication',
643655
'AccountEncryptionKeyType',
656+
'DefaultAction',
644657
'ManagedIdentityType',
645658
'PrivateEndpointConnectionProvisioningState',
646659
'PrivateEndpointServiceConnectionStatus',

sdk/media/azure-mgmt-media/azure/mgmt/media/models/_azure_media_services_enums.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,11 @@ class MetricAggregationType(str, Enum):
5050
total = "Total" #: The sum.
5151

5252

53+
class ActionType(str, Enum):
54+
55+
internal = "Internal" #: An internal action.
56+
57+
5358
class StorageAccountType(str, Enum):
5459

5560
primary = "Primary" #: The primary storage account for the Media Services account.
@@ -68,6 +73,12 @@ class AccountEncryptionKeyType(str, Enum):
6873
customer_key = "CustomerKey" #: The Account Key is encrypted with a Customer Key.
6974

7075

76+
class DefaultAction(str, Enum):
77+
78+
allow = "Allow" #: All public IP addresses are allowed.
79+
deny = "Deny" #: Public IP addresses are blocked.
80+
81+
7182
class ManagedIdentityType(str, Enum):
7283

7384
system_assigned = "SystemAssigned" #: A system-assigned managed identity.

sdk/media/azure-mgmt-media/azure/mgmt/media/models/_models.py

Lines changed: 124 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -195,6 +195,29 @@ def __init__(self, **kwargs):
195195
self.odatatype = '#Microsoft.Media.AbsoluteClipTime'
196196

197197

198+
class AccessControl(Model):
199+
"""AccessControl.
200+
201+
:param default_action: The behavior for IP access control in Key Delivery.
202+
Possible values include: 'Allow', 'Deny'
203+
:type default_action: str or ~azure.mgmt.media.models.DefaultAction
204+
:param ip_allow_list: The IP allow list for access control in Key
205+
Delivery. If the default action is set to 'Allow', the IP allow list must
206+
be empty.
207+
:type ip_allow_list: list[str]
208+
"""
209+
210+
_attribute_map = {
211+
'default_action': {'key': 'defaultAction', 'type': 'str'},
212+
'ip_allow_list': {'key': 'ipAllowList', 'type': '[str]'},
213+
}
214+
215+
def __init__(self, **kwargs):
216+
super(AccessControl, self).__init__(**kwargs)
217+
self.default_action = kwargs.get('default_action', None)
218+
self.ip_allow_list = kwargs.get('ip_allow_list', None)
219+
220+
198221
class AccountEncryption(Model):
199222
"""AccountEncryption.
200223
@@ -4255,6 +4278,22 @@ def __init__(self, **kwargs):
42554278
self.odatatype = '#Microsoft.Media.JpgLayer'
42564279

42574280

4281+
class KeyDelivery(Model):
4282+
"""KeyDelivery.
4283+
4284+
:param access_control: The access control properties for Key Delivery.
4285+
:type access_control: ~azure.mgmt.media.models.AccessControl
4286+
"""
4287+
4288+
_attribute_map = {
4289+
'access_control': {'key': 'accessControl', 'type': 'AccessControl'},
4290+
}
4291+
4292+
def __init__(self, **kwargs):
4293+
super(KeyDelivery, self).__init__(**kwargs)
4294+
self.access_control = kwargs.get('access_control', None)
4295+
4296+
42584297
class KeyVaultProperties(Model):
42594298
"""KeyVaultProperties.
42604299
@@ -5031,6 +5070,9 @@ class MediaService(TrackedResource):
50315070
~azure.mgmt.media.models.StorageAuthentication
50325071
:param encryption: The account encryption properties.
50335072
:type encryption: ~azure.mgmt.media.models.AccountEncryption
5073+
:param key_delivery: The Key Delivery properties for Media Services
5074+
account.
5075+
:type key_delivery: ~azure.mgmt.media.models.KeyDelivery
50345076
:param identity: The Managed Identity for the Media Services account.
50355077
:type identity: ~azure.mgmt.media.models.MediaServiceIdentity
50365078
:ivar system_data: The system metadata relating to this resource.
@@ -5056,6 +5098,7 @@ class MediaService(TrackedResource):
50565098
'storage_accounts': {'key': 'properties.storageAccounts', 'type': '[StorageAccount]'},
50575099
'storage_authentication': {'key': 'properties.storageAuthentication', 'type': 'str'},
50585100
'encryption': {'key': 'properties.encryption', 'type': 'AccountEncryption'},
5101+
'key_delivery': {'key': 'properties.keyDelivery', 'type': 'KeyDelivery'},
50595102
'identity': {'key': 'identity', 'type': 'MediaServiceIdentity'},
50605103
'system_data': {'key': 'systemData', 'type': 'SystemData'},
50615104
}
@@ -5066,6 +5109,7 @@ def __init__(self, **kwargs):
50665109
self.storage_accounts = kwargs.get('storage_accounts', None)
50675110
self.storage_authentication = kwargs.get('storage_authentication', None)
50685111
self.encryption = kwargs.get('encryption', None)
5112+
self.key_delivery = kwargs.get('key_delivery', None)
50695113
self.identity = kwargs.get('identity', None)
50705114
self.system_data = None
50715115

@@ -5106,6 +5150,56 @@ def __init__(self, **kwargs):
51065150
self.tenant_id = None
51075151

51085152

5153+
class MediaServiceUpdate(Model):
5154+
"""A Media Services account update.
5155+
5156+
Variables are only populated by the server, and will be ignored when
5157+
sending a request.
5158+
5159+
:param tags: Resource tags.
5160+
:type tags: dict[str, str]
5161+
:ivar media_service_id: The Media Services account ID.
5162+
:vartype media_service_id: str
5163+
:param storage_accounts: The storage accounts for this resource.
5164+
:type storage_accounts: list[~azure.mgmt.media.models.StorageAccount]
5165+
:param storage_authentication: Possible values include: 'System',
5166+
'ManagedIdentity'
5167+
:type storage_authentication: str or
5168+
~azure.mgmt.media.models.StorageAuthentication
5169+
:param encryption: The account encryption properties.
5170+
:type encryption: ~azure.mgmt.media.models.AccountEncryption
5171+
:param key_delivery: The Key Delivery properties for Media Services
5172+
account.
5173+
:type key_delivery: ~azure.mgmt.media.models.KeyDelivery
5174+
:param identity: The Managed Identity for the Media Services account.
5175+
:type identity: ~azure.mgmt.media.models.MediaServiceIdentity
5176+
"""
5177+
5178+
_validation = {
5179+
'media_service_id': {'readonly': True},
5180+
}
5181+
5182+
_attribute_map = {
5183+
'tags': {'key': 'tags', 'type': '{str}'},
5184+
'media_service_id': {'key': 'properties.mediaServiceId', 'type': 'str'},
5185+
'storage_accounts': {'key': 'properties.storageAccounts', 'type': '[StorageAccount]'},
5186+
'storage_authentication': {'key': 'properties.storageAuthentication', 'type': 'str'},
5187+
'encryption': {'key': 'properties.encryption', 'type': 'AccountEncryption'},
5188+
'key_delivery': {'key': 'properties.keyDelivery', 'type': 'KeyDelivery'},
5189+
'identity': {'key': 'identity', 'type': 'MediaServiceIdentity'},
5190+
}
5191+
5192+
def __init__(self, **kwargs):
5193+
super(MediaServiceUpdate, self).__init__(**kwargs)
5194+
self.tags = kwargs.get('tags', None)
5195+
self.media_service_id = None
5196+
self.storage_accounts = kwargs.get('storage_accounts', None)
5197+
self.storage_authentication = kwargs.get('storage_authentication', None)
5198+
self.encryption = kwargs.get('encryption', None)
5199+
self.key_delivery = kwargs.get('key_delivery', None)
5200+
self.identity = kwargs.get('identity', None)
5201+
5202+
51095203
class MetricDimension(Model):
51105204
"""A metric dimension.
51115205
@@ -5166,6 +5260,15 @@ class MetricSpecification(Model):
51665260
:type supported_aggregation_types: list[str]
51675261
:ivar dimensions: The metric dimensions.
51685262
:vartype dimensions: list[~azure.mgmt.media.models.MetricDimension]
5263+
:ivar enable_regional_mdm_account: Indicates whether regional MDM account
5264+
is enabled.
5265+
:vartype enable_regional_mdm_account: bool
5266+
:ivar source_mdm_account: The source MDM account.
5267+
:vartype source_mdm_account: str
5268+
:ivar source_mdm_namespace: The source MDM namespace.
5269+
:vartype source_mdm_namespace: str
5270+
:ivar supported_time_grain_types: The supported time grain types.
5271+
:vartype supported_time_grain_types: list[str]
51695272
"""
51705273

51715274
_validation = {
@@ -5176,6 +5279,10 @@ class MetricSpecification(Model):
51765279
'aggregation_type': {'readonly': True},
51775280
'lock_aggregation_type': {'readonly': True},
51785281
'dimensions': {'readonly': True},
5282+
'enable_regional_mdm_account': {'readonly': True},
5283+
'source_mdm_account': {'readonly': True},
5284+
'source_mdm_namespace': {'readonly': True},
5285+
'supported_time_grain_types': {'readonly': True},
51795286
}
51805287

51815288
_attribute_map = {
@@ -5187,6 +5294,10 @@ class MetricSpecification(Model):
51875294
'lock_aggregation_type': {'key': 'lockAggregationType', 'type': 'str'},
51885295
'supported_aggregation_types': {'key': 'supportedAggregationTypes', 'type': '[str]'},
51895296
'dimensions': {'key': 'dimensions', 'type': '[MetricDimension]'},
5297+
'enable_regional_mdm_account': {'key': 'enableRegionalMdmAccount', 'type': 'bool'},
5298+
'source_mdm_account': {'key': 'sourceMdmAccount', 'type': 'str'},
5299+
'source_mdm_namespace': {'key': 'sourceMdmNamespace', 'type': 'str'},
5300+
'supported_time_grain_types': {'key': 'supportedTimeGrainTypes', 'type': '[str]'},
51905301
}
51915302

51925303
def __init__(self, **kwargs):
@@ -5199,6 +5310,10 @@ def __init__(self, **kwargs):
51995310
self.lock_aggregation_type = None
52005311
self.supported_aggregation_types = kwargs.get('supported_aggregation_types', None)
52015312
self.dimensions = None
5313+
self.enable_regional_mdm_account = None
5314+
self.source_mdm_account = None
5315+
self.source_mdm_namespace = None
5316+
self.supported_time_grain_types = None
52025317

52035318

52045319
class MultiBitrateFormat(Format):
@@ -5355,6 +5470,11 @@ class Operation(Model):
53555470
:type origin: str
53565471
:param properties: Operation properties format.
53575472
:type properties: ~azure.mgmt.media.models.Properties
5473+
:param is_data_action: Whether the operation applies to data-plane.
5474+
:type is_data_action: bool
5475+
:param action_type: Indicates the action type. Possible values include:
5476+
'Internal'
5477+
:type action_type: str or ~azure.mgmt.media.models.ActionType
53585478
"""
53595479

53605480
_validation = {
@@ -5366,6 +5486,8 @@ class Operation(Model):
53665486
'display': {'key': 'display', 'type': 'OperationDisplay'},
53675487
'origin': {'key': 'origin', 'type': 'str'},
53685488
'properties': {'key': 'properties', 'type': 'Properties'},
5489+
'is_data_action': {'key': 'isDataAction', 'type': 'bool'},
5490+
'action_type': {'key': 'actionType', 'type': 'str'},
53695491
}
53705492

53715493
def __init__(self, **kwargs):
@@ -5374,6 +5496,8 @@ def __init__(self, **kwargs):
53745496
self.display = kwargs.get('display', None)
53755497
self.origin = kwargs.get('origin', None)
53765498
self.properties = kwargs.get('properties', None)
5499+
self.is_data_action = kwargs.get('is_data_action', None)
5500+
self.action_type = kwargs.get('action_type', None)
53775501

53785502

53795503
class OperationDisplay(Model):

0 commit comments

Comments
 (0)