Skip to content

Commit db6a301

Browse files
author
SDK Automation
committed
Generated from 497f37d011e45d90e7a5f190b1326ec89e2719c8
Merge pull request #6 from Khushboo-Baheti/master merge
1 parent a25a803 commit db6a301

22 files changed

+6860
-24
lines changed

‎sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/_container_registry_management_client.py‎

Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -83,6 +83,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
8383
* 2019-05-01: :mod:`v2019_05_01.models<azure.mgmt.containerregistry.v2019_05_01.models>`
8484
* 2019-05-01-preview: :mod:`v2019_05_01_preview.models<azure.mgmt.containerregistry.v2019_05_01_preview.models>`
8585
* 2019-06-01-preview: :mod:`v2019_06_01_preview.models<azure.mgmt.containerregistry.v2019_06_01_preview.models>`
86+
* 2019-12-01-preview: :mod:`v2019_12_01_preview.models<azure.mgmt.containerregistry.v2019_12_01_preview.models>`
8687
"""
8788
if api_version == '2017-03-01':
8889
from .v2017_03_01 import models
@@ -108,6 +109,9 @@ def models(cls, api_version=DEFAULT_API_VERSION):
108109
elif api_version == '2019-06-01-preview':
109110
from .v2019_06_01_preview import models
110111
return models
112+
elif api_version == '2019-12-01-preview':
113+
from .v2019_12_01_preview import models
114+
return models
111115
raise NotImplementedError("APIVersion {} is not available".format(api_version))
112116

113117
@property
@@ -161,6 +165,7 @@ def operations(self):
161165
* 2019-05-01: :class:`Operations<azure.mgmt.containerregistry.v2019_05_01.operations.Operations>`
162166
* 2019-05-01-preview: :class:`Operations<azure.mgmt.containerregistry.v2019_05_01_preview.operations.Operations>`
163167
* 2019-06-01-preview: :class:`Operations<azure.mgmt.containerregistry.v2019_06_01_preview.operations.Operations>`
168+
* 2019-12-01-preview: :class:`Operations<azure.mgmt.containerregistry.v2019_12_01_preview.operations.Operations>`
164169
"""
165170
api_version = self._get_api_version('operations')
166171
if api_version == '2017-03-01':
@@ -179,6 +184,21 @@ def operations(self):
179184
from .v2019_05_01_preview.operations import Operations as OperationClass
180185
elif api_version == '2019-06-01-preview':
181186
from .v2019_06_01_preview.operations import Operations as OperationClass
187+
elif api_version == '2019-12-01-preview':
188+
from .v2019_12_01_preview.operations import Operations as OperationClass
189+
else:
190+
raise NotImplementedError("APIVersion {} is not available".format(api_version))
191+
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
192+
193+
@property
194+
def private_endpoint_connections(self):
195+
"""Instance depends on the API version:
196+
197+
* 2019-12-01-preview: :class:`PrivateEndpointConnectionsOperations<azure.mgmt.containerregistry.v2019_12_01_preview.operations.PrivateEndpointConnectionsOperations>`
198+
"""
199+
api_version = self._get_api_version('private_endpoint_connections')
200+
if api_version == '2019-12-01-preview':
201+
from .v2019_12_01_preview.operations import PrivateEndpointConnectionsOperations as OperationClass
182202
else:
183203
raise NotImplementedError("APIVersion {} is not available".format(api_version))
184204
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -195,6 +215,7 @@ def registries(self):
195215
* 2019-05-01: :class:`RegistriesOperations<azure.mgmt.containerregistry.v2019_05_01.operations.RegistriesOperations>`
196216
* 2019-05-01-preview: :class:`RegistriesOperations<azure.mgmt.containerregistry.v2019_05_01_preview.operations.RegistriesOperations>`
197217
* 2019-06-01-preview: :class:`RegistriesOperations<azure.mgmt.containerregistry.v2019_06_01_preview.operations.RegistriesOperations>`
218+
* 2019-12-01-preview: :class:`RegistriesOperations<azure.mgmt.containerregistry.v2019_12_01_preview.operations.RegistriesOperations>`
198219
"""
199220
api_version = self._get_api_version('registries')
200221
if api_version == '2017-03-01':
@@ -213,6 +234,8 @@ def registries(self):
213234
from .v2019_05_01_preview.operations import RegistriesOperations as OperationClass
214235
elif api_version == '2019-06-01-preview':
215236
from .v2019_06_01_preview.operations import RegistriesOperations as OperationClass
237+
elif api_version == '2019-12-01-preview':
238+
from .v2019_12_01_preview.operations import RegistriesOperations as OperationClass
216239
else:
217240
raise NotImplementedError("APIVersion {} is not available".format(api_version))
218241
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -228,6 +251,7 @@ def replications(self):
228251
* 2019-05-01: :class:`ReplicationsOperations<azure.mgmt.containerregistry.v2019_05_01.operations.ReplicationsOperations>`
229252
* 2019-05-01-preview: :class:`ReplicationsOperations<azure.mgmt.containerregistry.v2019_05_01_preview.operations.ReplicationsOperations>`
230253
* 2019-06-01-preview: :class:`ReplicationsOperations<azure.mgmt.containerregistry.v2019_06_01_preview.operations.ReplicationsOperations>`
254+
* 2019-12-01-preview: :class:`ReplicationsOperations<azure.mgmt.containerregistry.v2019_12_01_preview.operations.ReplicationsOperations>`
231255
"""
232256
api_version = self._get_api_version('replications')
233257
if api_version == '2017-10-01':
@@ -244,6 +268,8 @@ def replications(self):
244268
from .v2019_05_01_preview.operations import ReplicationsOperations as OperationClass
245269
elif api_version == '2019-06-01-preview':
246270
from .v2019_06_01_preview.operations import ReplicationsOperations as OperationClass
271+
elif api_version == '2019-12-01-preview':
272+
from .v2019_12_01_preview.operations import ReplicationsOperations as OperationClass
247273
else:
248274
raise NotImplementedError("APIVersion {} is not available".format(api_version))
249275
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
@@ -348,6 +374,7 @@ def webhooks(self):
348374
* 2019-05-01: :class:`WebhooksOperations<azure.mgmt.containerregistry.v2019_05_01.operations.WebhooksOperations>`
349375
* 2019-05-01-preview: :class:`WebhooksOperations<azure.mgmt.containerregistry.v2019_05_01_preview.operations.WebhooksOperations>`
350376
* 2019-06-01-preview: :class:`WebhooksOperations<azure.mgmt.containerregistry.v2019_06_01_preview.operations.WebhooksOperations>`
377+
* 2019-12-01-preview: :class:`WebhooksOperations<azure.mgmt.containerregistry.v2019_12_01_preview.operations.WebhooksOperations>`
351378
"""
352379
api_version = self._get_api_version('webhooks')
353380
if api_version == '2017-10-01':
@@ -364,6 +391,8 @@ def webhooks(self):
364391
from .v2019_05_01_preview.operations import WebhooksOperations as OperationClass
365392
elif api_version == '2019-06-01-preview':
366393
from .v2019_06_01_preview.operations import WebhooksOperations as OperationClass
394+
elif api_version == '2019-12-01-preview':
395+
from .v2019_12_01_preview.operations import WebhooksOperations as OperationClass
367396
else:
368397
raise NotImplementedError("APIVersion {} is not available".format(api_version))
369398
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))

‎sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_05_01_preview/models/__init__.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
# --------------------------------------------------------------------------
1111

1212
try:
13+
from ._models_py3 import ActiveDirectoryObject
1314
from ._models_py3 import Actor
1415
from ._models_py3 import CallbackConfig
1516
from ._models_py3 import Event
@@ -62,6 +63,7 @@
6263
from ._models_py3 import WebhookCreateParameters
6364
from ._models_py3 import WebhookUpdateParameters
6465
except (SyntaxError, ImportError):
66+
from ._models import ActiveDirectoryObject
6567
from ._models import Actor
6668
from ._models import CallbackConfig
6769
from ._models import Event
@@ -139,6 +141,7 @@
139141
)
140142

141143
__all__ = [
144+
'ActiveDirectoryObject',
142145
'Actor',
143146
'CallbackConfig',
144147
'Event',

‎sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_05_01_preview/models/_models.py‎

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,31 @@
1212
from msrest.serialization import Model
1313

1414

15+
class ActiveDirectoryObject(Model):
16+
"""The Active Directory Object that will be used for authenticating the token
17+
of a container registry.
18+
19+
:param object_id: The user/group/application object ID for Active
20+
Directory Object that will be used for authenticating the token of a
21+
container registry.
22+
:type object_id: str
23+
:param tenant_id: The tenant ID of user/group/application object Active
24+
Directory Object that will be used for authenticating the token of a
25+
container registry.
26+
:type tenant_id: str
27+
"""
28+
29+
_attribute_map = {
30+
'object_id': {'key': 'objectId', 'type': 'str'},
31+
'tenant_id': {'key': 'tenantId', 'type': 'str'},
32+
}
33+
34+
def __init__(self, **kwargs):
35+
super(ActiveDirectoryObject, self).__init__(**kwargs)
36+
self.object_id = kwargs.get('object_id', None)
37+
self.tenant_id = kwargs.get('tenant_id', None)
38+
39+
1540
class Actor(Model):
1641
"""The agent that initiated the event. For most situations, this could be from
1742
the authorization context of the request.
@@ -1359,9 +1384,6 @@ class Token(ProxyResource):
13591384
:param scope_map_id: The resource ID of the scope map to which the token
13601385
will be associated with.
13611386
:type scope_map_id: str
1362-
:param object_id: The user/group/application object ID for which the token
1363-
has to be created.
1364-
:type object_id: str
13651387
:param credentials: The credentials that can be used for authenticating
13661388
the token.
13671389
:type credentials:
@@ -1387,7 +1409,6 @@ class Token(ProxyResource):
13871409
'creation_date': {'key': 'properties.creationDate', 'type': 'iso-8601'},
13881410
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
13891411
'scope_map_id': {'key': 'properties.scopeMapId', 'type': 'str'},
1390-
'object_id': {'key': 'properties.objectId', 'type': 'str'},
13911412
'credentials': {'key': 'properties.credentials', 'type': 'TokenCredentialsProperties'},
13921413
'status': {'key': 'properties.status', 'type': 'str'},
13931414
}
@@ -1397,7 +1418,6 @@ def __init__(self, **kwargs):
13971418
self.creation_date = None
13981419
self.provisioning_state = None
13991420
self.scope_map_id = kwargs.get('scope_map_id', None)
1400-
self.object_id = kwargs.get('object_id', None)
14011421
self.credentials = kwargs.get('credentials', None)
14021422
self.status = kwargs.get('status', None)
14031423

@@ -1436,6 +1456,9 @@ class TokenCredentialsProperties(Model):
14361456
"""The properties of the credentials that can be used for authenticating the
14371457
token.
14381458
1459+
:param active_directory_object:
1460+
:type active_directory_object:
1461+
~azure.mgmt.containerregistry.v2019_05_01_preview.models.ActiveDirectoryObject
14391462
:param certificates:
14401463
:type certificates:
14411464
list[~azure.mgmt.containerregistry.v2019_05_01_preview.models.TokenCertificate]
@@ -1445,12 +1468,14 @@ class TokenCredentialsProperties(Model):
14451468
"""
14461469

14471470
_attribute_map = {
1471+
'active_directory_object': {'key': 'activeDirectoryObject', 'type': 'ActiveDirectoryObject'},
14481472
'certificates': {'key': 'certificates', 'type': '[TokenCertificate]'},
14491473
'passwords': {'key': 'passwords', 'type': '[TokenPassword]'},
14501474
}
14511475

14521476
def __init__(self, **kwargs):
14531477
super(TokenCredentialsProperties, self).__init__(**kwargs)
1478+
self.active_directory_object = kwargs.get('active_directory_object', None)
14541479
self.certificates = kwargs.get('certificates', None)
14551480
self.passwords = kwargs.get('passwords', None)
14561481

‎sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_05_01_preview/models/_models_py3.py‎

Lines changed: 32 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,31 @@
1212
from msrest.serialization import Model
1313

1414

15+
class ActiveDirectoryObject(Model):
16+
"""The Active Directory Object that will be used for authenticating the token
17+
of a container registry.
18+
19+
:param object_id: The user/group/application object ID for Active
20+
Directory Object that will be used for authenticating the token of a
21+
container registry.
22+
:type object_id: str
23+
:param tenant_id: The tenant ID of user/group/application object Active
24+
Directory Object that will be used for authenticating the token of a
25+
container registry.
26+
:type tenant_id: str
27+
"""
28+
29+
_attribute_map = {
30+
'object_id': {'key': 'objectId', 'type': 'str'},
31+
'tenant_id': {'key': 'tenantId', 'type': 'str'},
32+
}
33+
34+
def __init__(self, *, object_id: str=None, tenant_id: str=None, **kwargs) -> None:
35+
super(ActiveDirectoryObject, self).__init__(**kwargs)
36+
self.object_id = object_id
37+
self.tenant_id = tenant_id
38+
39+
1540
class Actor(Model):
1641
"""The agent that initiated the event. For most situations, this could be from
1742
the authorization context of the request.
@@ -1359,9 +1384,6 @@ class Token(ProxyResource):
13591384
:param scope_map_id: The resource ID of the scope map to which the token
13601385
will be associated with.
13611386
:type scope_map_id: str
1362-
:param object_id: The user/group/application object ID for which the token
1363-
has to be created.
1364-
:type object_id: str
13651387
:param credentials: The credentials that can be used for authenticating
13661388
the token.
13671389
:type credentials:
@@ -1387,17 +1409,15 @@ class Token(ProxyResource):
13871409
'creation_date': {'key': 'properties.creationDate', 'type': 'iso-8601'},
13881410
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
13891411
'scope_map_id': {'key': 'properties.scopeMapId', 'type': 'str'},
1390-
'object_id': {'key': 'properties.objectId', 'type': 'str'},
13911412
'credentials': {'key': 'properties.credentials', 'type': 'TokenCredentialsProperties'},
13921413
'status': {'key': 'properties.status', 'type': 'str'},
13931414
}
13941415

1395-
def __init__(self, *, scope_map_id: str=None, object_id: str=None, credentials=None, status=None, **kwargs) -> None:
1416+
def __init__(self, *, scope_map_id: str=None, credentials=None, status=None, **kwargs) -> None:
13961417
super(Token, self).__init__(**kwargs)
13971418
self.creation_date = None
13981419
self.provisioning_state = None
13991420
self.scope_map_id = scope_map_id
1400-
self.object_id = object_id
14011421
self.credentials = credentials
14021422
self.status = status
14031423

@@ -1436,6 +1456,9 @@ class TokenCredentialsProperties(Model):
14361456
"""The properties of the credentials that can be used for authenticating the
14371457
token.
14381458
1459+
:param active_directory_object:
1460+
:type active_directory_object:
1461+
~azure.mgmt.containerregistry.v2019_05_01_preview.models.ActiveDirectoryObject
14391462
:param certificates:
14401463
:type certificates:
14411464
list[~azure.mgmt.containerregistry.v2019_05_01_preview.models.TokenCertificate]
@@ -1445,12 +1468,14 @@ class TokenCredentialsProperties(Model):
14451468
"""
14461469

14471470
_attribute_map = {
1471+
'active_directory_object': {'key': 'activeDirectoryObject', 'type': 'ActiveDirectoryObject'},
14481472
'certificates': {'key': 'certificates', 'type': '[TokenCertificate]'},
14491473
'passwords': {'key': 'passwords', 'type': '[TokenPassword]'},
14501474
}
14511475

1452-
def __init__(self, *, certificates=None, passwords=None, **kwargs) -> None:
1476+
def __init__(self, *, active_directory_object=None, certificates=None, passwords=None, **kwargs) -> None:
14531477
super(TokenCredentialsProperties, self).__init__(**kwargs)
1478+
self.active_directory_object = active_directory_object
14541479
self.certificates = certificates
14551480
self.passwords = passwords
14561481

‎sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_06_01_preview/models/__init__.py‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
# --------------------------------------------------------------------------
1111

1212
try:
13+
from ._models_py3 import ActiveDirectoryObject
1314
from ._models_py3 import Actor
1415
from ._models_py3 import AgentProperties
1516
from ._models_py3 import Argument
@@ -116,6 +117,7 @@
116117
from ._models_py3 import WebhookCreateParameters
117118
from ._models_py3 import WebhookUpdateParameters
118119
except (SyntaxError, ImportError):
120+
from ._models import ActiveDirectoryObject
119121
from ._models import Actor
120122
from ._models import AgentProperties
121123
from ._models import Argument
@@ -266,6 +268,7 @@
266268
)
267269

268270
__all__ = [
271+
'ActiveDirectoryObject',
269272
'Actor',
270273
'AgentProperties',
271274
'Argument',

‎sdk/containerregistry/azure-mgmt-containerregistry/azure/mgmt/containerregistry/v2019_06_01_preview/models/_models.py‎

Lines changed: 30 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,31 @@
1313
from msrest.exceptions import HttpOperationError
1414

1515

16+
class ActiveDirectoryObject(Model):
17+
"""The Active Directory Object that will be used for authenticating the token
18+
of a container registry.
19+
20+
:param object_id: The user/group/application object ID for Active
21+
Directory Object that will be used for authenticating the token of a
22+
container registry.
23+
:type object_id: str
24+
:param tenant_id: The tenant ID of user/group/application object Active
25+
Directory Object that will be used for authenticating the token of a
26+
container registry.
27+
:type tenant_id: str
28+
"""
29+
30+
_attribute_map = {
31+
'object_id': {'key': 'objectId', 'type': 'str'},
32+
'tenant_id': {'key': 'tenantId', 'type': 'str'},
33+
}
34+
35+
def __init__(self, **kwargs):
36+
super(ActiveDirectoryObject, self).__init__(**kwargs)
37+
self.object_id = kwargs.get('object_id', None)
38+
self.tenant_id = kwargs.get('tenant_id', None)
39+
40+
1641
class Actor(Model):
1742
"""The agent that initiated the event. For most situations, this could be from
1843
the authorization context of the request.
@@ -3554,9 +3579,6 @@ class Token(ProxyResource):
35543579
:param scope_map_id: The resource ID of the scope map to which the token
35553580
will be associated with.
35563581
:type scope_map_id: str
3557-
:param object_id: The user/group/application object ID for which the token
3558-
has to be created.
3559-
:type object_id: str
35603582
:param credentials: The credentials that can be used for authenticating
35613583
the token.
35623584
:type credentials:
@@ -3582,7 +3604,6 @@ class Token(ProxyResource):
35823604
'creation_date': {'key': 'properties.creationDate', 'type': 'iso-8601'},
35833605
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
35843606
'scope_map_id': {'key': 'properties.scopeMapId', 'type': 'str'},
3585-
'object_id': {'key': 'properties.objectId', 'type': 'str'},
35863607
'credentials': {'key': 'properties.credentials', 'type': 'TokenCredentialsProperties'},
35873608
'status': {'key': 'properties.status', 'type': 'str'},
35883609
}
@@ -3592,7 +3613,6 @@ def __init__(self, **kwargs):
35923613
self.creation_date = None
35933614
self.provisioning_state = None
35943615
self.scope_map_id = kwargs.get('scope_map_id', None)
3595-
self.object_id = kwargs.get('object_id', None)
35963616
self.credentials = kwargs.get('credentials', None)
35973617
self.status = kwargs.get('status', None)
35983618

@@ -3631,6 +3651,9 @@ class TokenCredentialsProperties(Model):
36313651
"""The properties of the credentials that can be used for authenticating the
36323652
token.
36333653
3654+
:param active_directory_object:
3655+
:type active_directory_object:
3656+
~azure.mgmt.containerregistry.v2019_06_01_preview.models.ActiveDirectoryObject
36343657
:param certificates:
36353658
:type certificates:
36363659
list[~azure.mgmt.containerregistry.v2019_06_01_preview.models.TokenCertificate]
@@ -3640,12 +3663,14 @@ class TokenCredentialsProperties(Model):
36403663
"""
36413664

36423665
_attribute_map = {
3666+
'active_directory_object': {'key': 'activeDirectoryObject', 'type': 'ActiveDirectoryObject'},
36433667
'certificates': {'key': 'certificates', 'type': '[TokenCertificate]'},
36443668
'passwords': {'key': 'passwords', 'type': '[TokenPassword]'},
36453669
}
36463670

36473671
def __init__(self, **kwargs):
36483672
super(TokenCredentialsProperties, self).__init__(**kwargs)
3673+
self.active_directory_object = kwargs.get('active_directory_object', None)
36493674
self.certificates = kwargs.get('certificates', None)
36503675
self.passwords = kwargs.get('passwords', None)
36513676

0 commit comments

Comments
 (0)