Skip to content

Commit 2f8627c

Browse files
author
SDKAuto
committed
CodeGen from PR 14881 in Azure/azure-rest-api-specs
Merge b04d506b5d73be9ea97ae9a4c52cb7164d42e010 into 86408a8
1 parent f3aa604 commit 2f8627c

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+2085
-1464
lines changed

‎sdk/managedservices/azure-mgmt-managedservices/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/managedservices/azure-mgmt-managedservices/_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": "8d08cbe220dd09160458e573cd1461ab95a4933f",
5+
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
6+
"autorest_command": "autorest specification/managedservices/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 --use=@microsoft.azure/autorest.python@~4.0.71 --version=V2",
7+
"readme": "specification/managedservices/resource-manager/readme.md"
8+
}

‎sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/__init__.py‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,11 @@
99
# regenerated.
1010
# --------------------------------------------------------------------------
1111

12-
from .managed_services_client import ManagedServicesClient
13-
from .version import VERSION
12+
from ._configuration import ManagedServicesClientConfiguration
13+
from ._managed_services_client import ManagedServicesClient
14+
__all__ = ['ManagedServicesClient', 'ManagedServicesClientConfiguration']
1415

15-
__all__ = ['ManagedServicesClient']
16+
from .version import VERSION
1617

1718
__version__ = VERSION
1819

‎sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/_configuration.py‎

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# coding=utf-8
2+
# --------------------------------------------------------------------------
3+
# Copyright (c) Microsoft Corporation. All rights reserved.
4+
# Licensed under the MIT License. See License.txt in the project root for
5+
# license information.
6+
#
7+
# Code generated by Microsoft (R) AutoRest Code Generator.
8+
# Changes may cause incorrect behavior and will be lost if the code is
9+
# regenerated.
10+
# --------------------------------------------------------------------------
11+
from msrestazure import AzureConfiguration
12+
13+
from .version import VERSION
14+
15+
16+
class ManagedServicesClientConfiguration(AzureConfiguration):
17+
"""Configuration for ManagedServicesClient
18+
Note that all parameters used to create this instance are saved as instance
19+
attributes.
20+
21+
:param credentials: Credentials needed for the client to connect to Azure.
22+
:type credentials: :mod:`A msrestazure Credentials
23+
object<msrestazure.azure_active_directory>`
24+
:param str base_url: Service URL
25+
"""
26+
27+
def __init__(
28+
self, credentials, base_url=None):
29+
30+
if credentials is None:
31+
raise ValueError("Parameter 'credentials' must not be None.")
32+
if not base_url:
33+
base_url = 'https://management.azure.com'
34+
35+
super(ManagedServicesClientConfiguration, self).__init__(base_url)
36+
37+
# Starting Autorest.Python 4.0.64, make connection pool activated by default
38+
self.keep_alive = True
39+
40+
self.add_user_agent('azure-mgmt-managedservices/{}'.format(VERSION))
41+
self.add_user_agent('Azure-SDK-For-Python')
42+
43+
self.credentials = credentials

sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/managed_services_client.py renamed to sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/_managed_services_client.py

Lines changed: 17 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -11,43 +11,18 @@
1111

1212
from msrest.service_client import SDKClient
1313
from msrest import Serializer, Deserializer
14-
from msrestazure import AzureConfiguration
15-
from .version import VERSION
16-
from .operations.registration_definitions_operations import RegistrationDefinitionsOperations
17-
from .operations.registration_assignments_operations import RegistrationAssignmentsOperations
18-
from .operations.operations import Operations
19-
from . import models
20-
21-
22-
class ManagedServicesClientConfiguration(AzureConfiguration):
23-
"""Configuration for ManagedServicesClient
24-
Note that all parameters used to create this instance are saved as instance
25-
attributes.
26-
27-
:param credentials: Credentials needed for the client to connect to Azure.
28-
:type credentials: :mod:`A msrestazure Credentials
29-
object<msrestazure.azure_active_directory>`
30-
:param str base_url: Service URL
31-
"""
3214

33-
def __init__(
34-
self, credentials, base_url=None):
35-
36-
if credentials is None:
37-
raise ValueError("Parameter 'credentials' must not be None.")
38-
if not base_url:
39-
base_url = 'https://management.azure.com'
40-
41-
super(ManagedServicesClientConfiguration, self).__init__(base_url)
42-
43-
self.add_user_agent('azure-mgmt-managedservices/{}'.format(VERSION))
44-
self.add_user_agent('Azure-SDK-For-Python')
45-
46-
self.credentials = credentials
15+
from ._configuration import ManagedServicesClientConfiguration
16+
from .operations import RegistrationDefinitionsOperations
17+
from .operations import RegistrationAssignmentsOperations
18+
from .operations import MarketplaceRegistrationDefinitionsOperations
19+
from .operations import MarketplaceRegistrationDefinitionsWithoutScopeOperations
20+
from .operations import Operations
21+
from . import models
4722

4823

4924
class ManagedServicesClient(SDKClient):
50-
"""Specification for ManagedServices.
25+
"""The specification for ManagedServices.
5126
5227
:ivar config: Configuration for client.
5328
:vartype config: ManagedServicesClientConfiguration
@@ -56,6 +31,10 @@ class ManagedServicesClient(SDKClient):
5631
:vartype registration_definitions: azure.mgmt.managedservices.operations.RegistrationDefinitionsOperations
5732
:ivar registration_assignments: RegistrationAssignments operations
5833
:vartype registration_assignments: azure.mgmt.managedservices.operations.RegistrationAssignmentsOperations
34+
:ivar marketplace_registration_definitions: MarketplaceRegistrationDefinitions operations
35+
:vartype marketplace_registration_definitions: azure.mgmt.managedservices.operations.MarketplaceRegistrationDefinitionsOperations
36+
:ivar marketplace_registration_definitions_without_scope: MarketplaceRegistrationDefinitionsWithoutScope operations
37+
:vartype marketplace_registration_definitions_without_scope: azure.mgmt.managedservices.operations.MarketplaceRegistrationDefinitionsWithoutScopeOperations
5938
:ivar operations: Operations operations
6039
:vartype operations: azure.mgmt.managedservices.operations.Operations
6140
@@ -72,13 +51,17 @@ def __init__(
7251
super(ManagedServicesClient, self).__init__(self.config.credentials, self.config)
7352

7453
client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
75-
self.api_version = '2019-06-01'
54+
self.api_version = '2020-02-01-preview'
7655
self._serialize = Serializer(client_models)
7756
self._deserialize = Deserializer(client_models)
7857

7958
self.registration_definitions = RegistrationDefinitionsOperations(
8059
self._client, self.config, self._serialize, self._deserialize)
8160
self.registration_assignments = RegistrationAssignmentsOperations(
8261
self._client, self.config, self._serialize, self._deserialize)
62+
self.marketplace_registration_definitions = MarketplaceRegistrationDefinitionsOperations(
63+
self._client, self.config, self._serialize, self._deserialize)
64+
self.marketplace_registration_definitions_without_scope = MarketplaceRegistrationDefinitionsWithoutScopeOperations(
65+
self._client, self.config, self._serialize, self._deserialize)
8366
self.operations = Operations(
8467
self._client, self.config, self._serialize, self._deserialize)

‎sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/__init__.py‎

Lines changed: 58 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -10,54 +10,73 @@
1010
# --------------------------------------------------------------------------
1111

1212
try:
13-
from .authorization_py3 import Authorization
14-
from .registration_definition_properties_py3 import RegistrationDefinitionProperties
15-
from .plan_py3 import Plan
16-
from .registration_definition_py3 import RegistrationDefinition
17-
from .registration_assignment_properties_registration_definition_properties_py3 import RegistrationAssignmentPropertiesRegistrationDefinitionProperties
18-
from .registration_assignment_properties_registration_definition_py3 import RegistrationAssignmentPropertiesRegistrationDefinition
19-
from .registration_assignment_properties_py3 import RegistrationAssignmentProperties
20-
from .registration_assignment_py3 import RegistrationAssignment
21-
from .operation_display_py3 import OperationDisplay
22-
from .operation_py3 import Operation
23-
from .operation_list_py3 import OperationList
24-
from .error_response_error_py3 import ErrorResponseError
25-
from .error_response_py3 import ErrorResponse, ErrorResponseException
13+
from ._models_py3 import Authorization
14+
from ._models_py3 import EligibleApprover
15+
from ._models_py3 import EligibleAuthorization
16+
from ._models_py3 import ErrorDefinition
17+
from ._models_py3 import ErrorResponse, ErrorResponseException
18+
from ._models_py3 import JustInTimeAccessPolicy
19+
from ._models_py3 import MarketplaceRegistrationDefinition
20+
from ._models_py3 import MarketplaceRegistrationDefinitionProperties
21+
from ._models_py3 import Operation
22+
from ._models_py3 import OperationDisplay
23+
from ._models_py3 import OperationList
24+
from ._models_py3 import Plan
25+
from ._models_py3 import RegistrationAssignment
26+
from ._models_py3 import RegistrationAssignmentProperties
27+
from ._models_py3 import RegistrationAssignmentPropertiesRegistrationDefinition
28+
from ._models_py3 import RegistrationAssignmentPropertiesRegistrationDefinitionProperties
29+
from ._models_py3 import RegistrationDefinition
30+
from ._models_py3 import RegistrationDefinitionProperties
2631
except (SyntaxError, ImportError):
27-
from .authorization import Authorization
28-
from .registration_definition_properties import RegistrationDefinitionProperties
29-
from .plan import Plan
30-
from .registration_definition import RegistrationDefinition
31-
from .registration_assignment_properties_registration_definition_properties import RegistrationAssignmentPropertiesRegistrationDefinitionProperties
32-
from .registration_assignment_properties_registration_definition import RegistrationAssignmentPropertiesRegistrationDefinition
33-
from .registration_assignment_properties import RegistrationAssignmentProperties
34-
from .registration_assignment import RegistrationAssignment
35-
from .operation_display import OperationDisplay
36-
from .operation import Operation
37-
from .operation_list import OperationList
38-
from .error_response_error import ErrorResponseError
39-
from .error_response import ErrorResponse, ErrorResponseException
40-
from .registration_definition_paged import RegistrationDefinitionPaged
41-
from .registration_assignment_paged import RegistrationAssignmentPaged
42-
from .managed_services_client_enums import (
32+
from ._models import Authorization
33+
from ._models import EligibleApprover
34+
from ._models import EligibleAuthorization
35+
from ._models import ErrorDefinition
36+
from ._models import ErrorResponse, ErrorResponseException
37+
from ._models import JustInTimeAccessPolicy
38+
from ._models import MarketplaceRegistrationDefinition
39+
from ._models import MarketplaceRegistrationDefinitionProperties
40+
from ._models import Operation
41+
from ._models import OperationDisplay
42+
from ._models import OperationList
43+
from ._models import Plan
44+
from ._models import RegistrationAssignment
45+
from ._models import RegistrationAssignmentProperties
46+
from ._models import RegistrationAssignmentPropertiesRegistrationDefinition
47+
from ._models import RegistrationAssignmentPropertiesRegistrationDefinitionProperties
48+
from ._models import RegistrationDefinition
49+
from ._models import RegistrationDefinitionProperties
50+
from ._paged_models import MarketplaceRegistrationDefinitionPaged
51+
from ._paged_models import RegistrationAssignmentPaged
52+
from ._paged_models import RegistrationDefinitionPaged
53+
from ._managed_services_client_enums import (
54+
MultiFactorAuthProvider,
4355
ProvisioningState,
4456
)
4557

4658
__all__ = [
4759
'Authorization',
48-
'RegistrationDefinitionProperties',
49-
'Plan',
50-
'RegistrationDefinition',
51-
'RegistrationAssignmentPropertiesRegistrationDefinitionProperties',
52-
'RegistrationAssignmentPropertiesRegistrationDefinition',
53-
'RegistrationAssignmentProperties',
54-
'RegistrationAssignment',
55-
'OperationDisplay',
60+
'EligibleApprover',
61+
'EligibleAuthorization',
62+
'ErrorDefinition',
63+
'ErrorResponse', 'ErrorResponseException',
64+
'JustInTimeAccessPolicy',
65+
'MarketplaceRegistrationDefinition',
66+
'MarketplaceRegistrationDefinitionProperties',
5667
'Operation',
68+
'OperationDisplay',
5769
'OperationList',
58-
'ErrorResponseError',
59-
'ErrorResponse', 'ErrorResponseException',
70+
'Plan',
71+
'RegistrationAssignment',
72+
'RegistrationAssignmentProperties',
73+
'RegistrationAssignmentPropertiesRegistrationDefinition',
74+
'RegistrationAssignmentPropertiesRegistrationDefinitionProperties',
75+
'RegistrationDefinition',
76+
'RegistrationDefinitionProperties',
6077
'RegistrationDefinitionPaged',
6178
'RegistrationAssignmentPaged',
79+
'MarketplaceRegistrationDefinitionPaged',
80+
'MultiFactorAuthProvider',
6281
'ProvisioningState',
6382
]

sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/managed_services_client_enums.py renamed to sdk/managedservices/azure-mgmt-managedservices/azure/mgmt/managedservices/models/_managed_services_client_enums.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@
1212
from enum import Enum
1313

1414

15+
class MultiFactorAuthProvider(str, Enum):
16+
17+
azure = "Azure"
18+
none = "None"
19+
20+
1521
class ProvisioningState(str, Enum):
1622

1723
not_specified = "NotSpecified"

0 commit comments

Comments
 (0)