Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
14 changes: 14 additions & 0 deletions sdk/resources/azure-mgmt-resource/HISTORY.rst
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,20 @@
Release History
===============

5.0.0 (2019-09-22)
++++++++++++++++++

**Features**

- Model Subscription has a new parameter managed_by_tenants

**Breaking changes**

- Model Application no longer has parameter ui_definition_uri
- Model ApplicationPatchable no longer has parameter ui_definition_uri
- Model TenantIdDescription no longer has parameter display_name
- Model TenantIdDescription no longer has parameter domains

4.0.0 (2019-09-03)
++++++++++++++++++

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ def __init__(
super(ApplicationClient, 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 = '2017-09-01'
self.api_version = '2018-06-01'
self._serialize = Serializer(client_models)
self._deserialize = Deserializer(client_models)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,6 @@ class Application(GenericResource):
'Updating'
:vartype provisioning_state: str or
~azure.mgmt.resource.managedapplications.models.ProvisioningState
:param ui_definition_uri: The blob URI where the UI definition file is
located.
:type ui_definition_uri: str
:param plan: The plan information.
:type plan: ~azure.mgmt.resource.managedapplications.models.Plan
:param kind: Required. The kind of the managed application. Allowed values
Expand Down Expand Up @@ -177,7 +174,6 @@ class Application(GenericResource):
'parameters': {'key': 'properties.parameters', 'type': 'object'},
'outputs': {'key': 'properties.outputs', 'type': 'object'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'ui_definition_uri': {'key': 'properties.uiDefinitionUri', 'type': 'str'},
'plan': {'key': 'plan', 'type': 'Plan'},
'kind': {'key': 'kind', 'type': 'str'},
}
Expand All @@ -189,7 +185,6 @@ def __init__(self, **kwargs):
self.parameters = kwargs.get('parameters', None)
self.outputs = None
self.provisioning_state = None
self.ui_definition_uri = kwargs.get('ui_definition_uri', None)
self.plan = kwargs.get('plan', None)
self.kind = kwargs.get('kind', None)

Expand Down Expand Up @@ -357,9 +352,6 @@ class ApplicationPatchable(GenericResource):
'Updating'
:vartype provisioning_state: str or
~azure.mgmt.resource.managedapplications.models.ProvisioningState
:param ui_definition_uri: The blob URI where the UI definition file is
located.
:type ui_definition_uri: str
:param plan: The plan information.
:type plan: ~azure.mgmt.resource.managedapplications.models.PlanPatchable
:param kind: The kind of the managed application. Allowed values are
Expand Down Expand Up @@ -390,7 +382,6 @@ class ApplicationPatchable(GenericResource):
'parameters': {'key': 'properties.parameters', 'type': 'object'},
'outputs': {'key': 'properties.outputs', 'type': 'object'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'ui_definition_uri': {'key': 'properties.uiDefinitionUri', 'type': 'str'},
'plan': {'key': 'plan', 'type': 'PlanPatchable'},
'kind': {'key': 'kind', 'type': 'str'},
}
Expand All @@ -402,7 +393,6 @@ def __init__(self, **kwargs):
self.parameters = kwargs.get('parameters', None)
self.outputs = None
self.provisioning_state = None
self.ui_definition_uri = kwargs.get('ui_definition_uri', None)
self.plan = kwargs.get('plan', None)
self.kind = kwargs.get('kind', None)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -143,9 +143,6 @@ class Application(GenericResource):
'Updating'
:vartype provisioning_state: str or
~azure.mgmt.resource.managedapplications.models.ProvisioningState
:param ui_definition_uri: The blob URI where the UI definition file is
located.
:type ui_definition_uri: str
:param plan: The plan information.
:type plan: ~azure.mgmt.resource.managedapplications.models.Plan
:param kind: Required. The kind of the managed application. Allowed values
Expand Down Expand Up @@ -177,19 +174,17 @@ class Application(GenericResource):
'parameters': {'key': 'properties.parameters', 'type': 'object'},
'outputs': {'key': 'properties.outputs', 'type': 'object'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'ui_definition_uri': {'key': 'properties.uiDefinitionUri', 'type': 'str'},
'plan': {'key': 'plan', 'type': 'Plan'},
'kind': {'key': 'kind', 'type': 'str'},
}

def __init__(self, *, managed_resource_group_id: str, kind: str, location: str=None, tags=None, managed_by: str=None, sku=None, identity=None, application_definition_id: str=None, parameters=None, ui_definition_uri: str=None, plan=None, **kwargs) -> None:
def __init__(self, *, managed_resource_group_id: str, kind: str, location: str=None, tags=None, managed_by: str=None, sku=None, identity=None, application_definition_id: str=None, parameters=None, plan=None, **kwargs) -> None:
super(Application, self).__init__(location=location, tags=tags, managed_by=managed_by, sku=sku, identity=identity, **kwargs)
self.managed_resource_group_id = managed_resource_group_id
self.application_definition_id = application_definition_id
self.parameters = parameters
self.outputs = None
self.provisioning_state = None
self.ui_definition_uri = ui_definition_uri
self.plan = plan
self.kind = kind

Expand Down Expand Up @@ -357,9 +352,6 @@ class ApplicationPatchable(GenericResource):
'Updating'
:vartype provisioning_state: str or
~azure.mgmt.resource.managedapplications.models.ProvisioningState
:param ui_definition_uri: The blob URI where the UI definition file is
located.
:type ui_definition_uri: str
:param plan: The plan information.
:type plan: ~azure.mgmt.resource.managedapplications.models.PlanPatchable
:param kind: The kind of the managed application. Allowed values are
Expand Down Expand Up @@ -390,19 +382,17 @@ class ApplicationPatchable(GenericResource):
'parameters': {'key': 'properties.parameters', 'type': 'object'},
'outputs': {'key': 'properties.outputs', 'type': 'object'},
'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'},
'ui_definition_uri': {'key': 'properties.uiDefinitionUri', 'type': 'str'},
'plan': {'key': 'plan', 'type': 'PlanPatchable'},
'kind': {'key': 'kind', 'type': 'str'},
}

def __init__(self, *, location: str=None, tags=None, managed_by: str=None, sku=None, identity=None, managed_resource_group_id: str=None, application_definition_id: str=None, parameters=None, ui_definition_uri: str=None, plan=None, kind: str=None, **kwargs) -> None:
def __init__(self, *, location: str=None, tags=None, managed_by: str=None, sku=None, identity=None, managed_resource_group_id: str=None, application_definition_id: str=None, parameters=None, plan=None, kind: str=None, **kwargs) -> None:
super(ApplicationPatchable, self).__init__(location=location, tags=tags, managed_by=managed_by, sku=sku, identity=identity, **kwargs)
self.managed_resource_group_id = managed_resource_group_id
self.application_definition_id = application_definition_id
self.parameters = parameters
self.outputs = None
self.provisioning_state = None
self.ui_definition_uri = ui_definition_uri
self.plan = plan
self.kind = kind

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ApplicationDefinitionsOperations(object):
:param config: Configuration of service client.
:param serializer: An object model serializer.
:param deserializer: An object model deserializer.
:ivar api_version: The API version to use for this operation. Constant value: "2017-09-01".
:ivar api_version: The API version to use for this operation. Constant value: "2018-06-01".
"""

models = models
Expand All @@ -36,7 +36,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
self.api_version = "2017-09-01"
self.api_version = "2018-06-01"

self.config = config

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class ApplicationsOperations(object):
:param config: Configuration of service client.
:param serializer: An object model serializer.
:param deserializer: An object model deserializer.
:ivar api_version: The API version to use for this operation. Constant value: "2017-09-01".
:ivar api_version: The API version to use for this operation. Constant value: "2018-06-01".
"""

models = models
Expand All @@ -36,7 +36,7 @@ def __init__(self, client, config, serializer, deserializer):
self._client = client
self._serialize = serializer
self._deserialize = deserializer
self.api_version = "2017-09-01"
self.api_version = "2018-06-01"

self.config = config

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ class SubscriptionClient(MultiApiClientMixin, SDKClient):
:type profile: azure.profiles.KnownProfiles
"""

DEFAULT_API_VERSION = '2018-06-01'
DEFAULT_API_VERSION = '2019-06-01'
_PROFILE_TAG = "azure.mgmt.resource.subscriptions.SubscriptionClient"
LATEST_PROFILE = ProfileDefinition({
_PROFILE_TAG: {
Expand Down Expand Up @@ -70,13 +70,17 @@ def models(cls, api_version=DEFAULT_API_VERSION):

* 2016-06-01: :mod:`v2016_06_01.models<azure.mgmt.resource.subscriptions.v2016_06_01.models>`
* 2018-06-01: :mod:`v2018_06_01.models<azure.mgmt.resource.subscriptions.v2018_06_01.models>`
* 2019-06-01: :mod:`v2019_06_01.models<azure.mgmt.resource.subscriptions.v2019_06_01.models>`
"""
if api_version == '2016-06-01':
from .v2016_06_01 import models
return models
elif api_version == '2018-06-01':
from .v2018_06_01 import models
return models
elif api_version == '2019-06-01':
from .v2019_06_01 import models
return models
raise NotImplementedError("APIVersion {} is not available".format(api_version))

@property
Expand All @@ -85,12 +89,15 @@ def operations(self):

* 2016-06-01: :class:`Operations<azure.mgmt.resource.subscriptions.v2016_06_01.operations.Operations>`
* 2018-06-01: :class:`Operations<azure.mgmt.resource.subscriptions.v2018_06_01.operations.Operations>`
* 2019-06-01: :class:`Operations<azure.mgmt.resource.subscriptions.v2019_06_01.operations.Operations>`
"""
api_version = self._get_api_version('operations')
if api_version == '2016-06-01':
from .v2016_06_01.operations import Operations as OperationClass
elif api_version == '2018-06-01':
from .v2018_06_01.operations import Operations as OperationClass
elif api_version == '2019-06-01':
from .v2019_06_01.operations import Operations as OperationClass
else:
raise NotImplementedError("APIVersion {} is not available".format(api_version))
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
Expand All @@ -101,12 +108,15 @@ def subscriptions(self):

* 2016-06-01: :class:`SubscriptionsOperations<azure.mgmt.resource.subscriptions.v2016_06_01.operations.SubscriptionsOperations>`
* 2018-06-01: :class:`SubscriptionsOperations<azure.mgmt.resource.subscriptions.v2018_06_01.operations.SubscriptionsOperations>`
* 2019-06-01: :class:`SubscriptionsOperations<azure.mgmt.resource.subscriptions.v2019_06_01.operations.SubscriptionsOperations>`
"""
api_version = self._get_api_version('subscriptions')
if api_version == '2016-06-01':
from .v2016_06_01.operations import SubscriptionsOperations as OperationClass
elif api_version == '2018-06-01':
from .v2018_06_01.operations import SubscriptionsOperations as OperationClass
elif api_version == '2019-06-01':
from .v2019_06_01.operations import SubscriptionsOperations as OperationClass
else:
raise NotImplementedError("APIVersion {} is not available".format(api_version))
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
Expand All @@ -117,12 +127,15 @@ def tenants(self):

* 2016-06-01: :class:`TenantsOperations<azure.mgmt.resource.subscriptions.v2016_06_01.operations.TenantsOperations>`
* 2018-06-01: :class:`TenantsOperations<azure.mgmt.resource.subscriptions.v2018_06_01.operations.TenantsOperations>`
* 2019-06-01: :class:`TenantsOperations<azure.mgmt.resource.subscriptions.v2019_06_01.operations.TenantsOperations>`
"""
api_version = self._get_api_version('tenants')
if api_version == '2016-06-01':
from .v2016_06_01.operations import TenantsOperations as OperationClass
elif api_version == '2018-06-01':
from .v2018_06_01.operations import TenantsOperations as OperationClass
elif api_version == '2019-06-01':
from .v2019_06_01.operations import TenantsOperations as OperationClass
else:
raise NotImplementedError("APIVersion {} is not available".format(api_version))
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,4 @@
# Licensed under the MIT License. See License.txt in the project root for
# license information.
# --------------------------------------------------------------------------
from .v2018_06_01.models import *
from .v2019_06_01.models import *
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
# license information.
#
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------

from ._configuration import SubscriptionClientConfiguration
from ._subscription_client import SubscriptionClient
__all__ = ['SubscriptionClient', 'SubscriptionClientConfiguration']

from .version import VERSION

__version__ = VERSION

Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
# license information.
#
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------
from msrestazure import AzureConfiguration

from .version import VERSION


class SubscriptionClientConfiguration(AzureConfiguration):
"""Configuration for SubscriptionClient
Note that all parameters used to create this instance are saved as instance
attributes.

:param credentials: Credentials needed for the client to connect to Azure.
:type credentials: :mod:`A msrestazure Credentials
object<msrestazure.azure_active_directory>`
:param str base_url: Service URL
"""

def __init__(
self, credentials, base_url=None):

if credentials is None:
raise ValueError("Parameter 'credentials' must not be None.")
if not base_url:
base_url = 'https://management.azure.com'

super(SubscriptionClientConfiguration, self).__init__(base_url)

# Starting Autorest.Python 4.0.64, make connection pool activated by default
self.keep_alive = True

self.add_user_agent('azure-mgmt-resource/{}'.format(VERSION))
self.add_user_agent('Azure-SDK-For-Python')

self.credentials = credentials
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
# coding=utf-8
# --------------------------------------------------------------------------
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License. See License.txt in the project root for
# license information.
#
# Code generated by Microsoft (R) AutoRest Code Generator.
# Changes may cause incorrect behavior and will be lost if the code is
# regenerated.
# --------------------------------------------------------------------------

from msrest.service_client import SDKClient
from msrest import Serializer, Deserializer

from ._configuration import SubscriptionClientConfiguration
from .operations import Operations
from .operations import SubscriptionsOperations
from .operations import TenantsOperations
from . import models


class SubscriptionClient(SDKClient):
"""All resource groups and resources exist within subscriptions. These operation enable you get information about your subscriptions and tenants. A tenant is a dedicated instance of Azure Active Directory (Azure AD) for your organization.

:ivar config: Configuration for client.
:vartype config: SubscriptionClientConfiguration

:ivar operations: Operations operations
:vartype operations: azure.mgmt.resource.subscriptions.v2019_06_01.operations.Operations
:ivar subscriptions: Subscriptions operations
:vartype subscriptions: azure.mgmt.resource.subscriptions.v2019_06_01.operations.SubscriptionsOperations
:ivar tenants: Tenants operations
:vartype tenants: azure.mgmt.resource.subscriptions.v2019_06_01.operations.TenantsOperations

:param credentials: Credentials needed for the client to connect to Azure.
:type credentials: :mod:`A msrestazure Credentials
object<msrestazure.azure_active_directory>`
:param str base_url: Service URL
"""

def __init__(
self, credentials, base_url=None):

self.config = SubscriptionClientConfiguration(credentials, base_url)
super(SubscriptionClient, 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 = '2019-06-01'
self._serialize = Serializer(client_models)
self._deserialize = Deserializer(client_models)

self.operations = Operations(
self._client, self.config, self._serialize, self._deserialize)
self.subscriptions = SubscriptionsOperations(
self._client, self.config, self._serialize, self._deserialize)
self.tenants = TenantsOperations(
self._client, self.config, self._serialize, self._deserialize)
Loading