Skip to content
Closed
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
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,10 @@
# regenerated.
# --------------------------------------------------------------------------

from msrest.service_client import ServiceClient
from msrest.service_client import SDKClient
from msrest import Serializer, Deserializer
from msrestazure import AzureConfiguration
from .version import VERSION
from .operations.configurations_operations import ConfigurationsOperations
from .operations.recommendations_operations import RecommendationsOperations
from .operations.operations import Operations
from .operations.suppressions_operations import SuppressionsOperations
Expand Down Expand Up @@ -52,14 +51,12 @@ def __init__(
self.subscription_id = subscription_id


class AdvisorManagementClient(object):
class AdvisorManagementClient(SDKClient):
"""REST APIs for Azure Advisor

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

:ivar configurations: Configurations operations
:vartype configurations: azure.mgmt.advisor.operations.ConfigurationsOperations
:ivar recommendations: Recommendations operations
:vartype recommendations: azure.mgmt.advisor.operations.RecommendationsOperations
:ivar operations: Operations operations
Expand All @@ -79,15 +76,13 @@ def __init__(
self, credentials, subscription_id, base_url=None):

self.config = AdvisorManagementClientConfiguration(credentials, subscription_id, base_url)
self._client = ServiceClient(self.config.credentials, self.config)
super(AdvisorManagementClient, 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-04-19'
self.api_version = '2018-01-02-preview'
self._serialize = Serializer(client_models)
self._deserialize = Deserializer(client_models)

self.configurations = ConfigurationsOperations(
self._client, self.config, self._serialize, self._deserialize)
self.recommendations = RecommendationsOperations(
self._client, self.config, self._serialize, self._deserialize)
self.operations = Operations(
Expand Down
30 changes: 14 additions & 16 deletions azure-mgmt-advisor/azure/mgmt/advisor/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,39 +9,37 @@
# regenerated.
# --------------------------------------------------------------------------

from .config_data_properties import ConfigDataProperties
from .config_data import ConfigData
from .arm_error_response_body import ARMErrorResponseBody
from .short_description import ShortDescription
from .resource_recommendation_base import ResourceRecommendationBase
from .resource import Resource
from .operation_display_info import OperationDisplayInfo
from .operation_entity import OperationEntity
from .suppression_contract import SuppressionContract
from .config_data_paged import ConfigDataPaged
try:
from .short_description_py3 import ShortDescription
from .resource_recommendation_base_py3 import ResourceRecommendationBase
from .resource_py3 import Resource
from .operation_display_info_py3 import OperationDisplayInfo
from .operation_entity_py3 import OperationEntity
from .suppression_contract_py3 import SuppressionContract
except (SyntaxError, ImportError):
from .short_description import ShortDescription
from .resource_recommendation_base import ResourceRecommendationBase
from .resource import Resource
from .operation_display_info import OperationDisplayInfo
from .operation_entity import OperationEntity
from .suppression_contract import SuppressionContract
from .resource_recommendation_base_paged import ResourceRecommendationBasePaged
from .operation_entity_paged import OperationEntityPaged
from .suppression_contract_paged import SuppressionContractPaged
from .advisor_management_client_enums import (
Category,
Impact,
Risk,
)

__all__ = [
'ConfigDataProperties',
'ConfigData',
'ARMErrorResponseBody',
'ShortDescription',
'ResourceRecommendationBase',
'Resource',
'OperationDisplayInfo',
'OperationEntity',
'SuppressionContract',
'ConfigDataPaged',
'ResourceRecommendationBasePaged',
'OperationEntityPaged',
'SuppressionContractPaged',
'Category',
'Impact',
'Risk',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,22 +12,22 @@
from enum import Enum


class Category(Enum):
class Category(str, Enum):

high_availability = "HighAvailability"
security = "Security"
performance = "Performance"
cost = "Cost"


class Impact(Enum):
class Impact(str, Enum):

high = "High"
medium = "Medium"
low = "Low"


class Risk(Enum):
class Risk(str, Enum):

error = "Error"
warning = "Warning"
Expand Down

This file was deleted.

40 changes: 0 additions & 40 deletions azure-mgmt-advisor/azure/mgmt/advisor/models/config_data.py

This file was deleted.

27 changes: 0 additions & 27 deletions azure-mgmt-advisor/azure/mgmt/advisor/models/config_data_paged.py

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ class OperationDisplayInfo(Model):
'resource': {'key': 'resource', 'type': 'str'},
}

def __init__(self, description=None, operation=None, provider=None, resource=None):
super(OperationDisplayInfo, self).__init__()
self.description = description
self.operation = operation
self.provider = provider
self.resource = resource
def __init__(self, **kwargs):
super(OperationDisplayInfo, self).__init__(**kwargs)
self.description = kwargs.get('description', None)
self.operation = kwargs.get('operation', None)
self.provider = kwargs.get('provider', None)
self.resource = kwargs.get('resource', None)
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
# 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.serialization import Model


class OperationDisplayInfo(Model):
"""The operation supported by Advisor.

:param description: The description of the operation.
:type description: str
:param operation: The action that users can perform, based on their
permission level.
:type operation: str
:param provider: Service provider: Microsoft Advisor.
:type provider: str
:param resource: Resource on which the operation is performed.
:type resource: str
"""

_attribute_map = {
'description': {'key': 'description', 'type': 'str'},
'operation': {'key': 'operation', 'type': 'str'},
'provider': {'key': 'provider', 'type': 'str'},
'resource': {'key': 'resource', 'type': 'str'},
}

def __init__(self, *, description: str=None, operation: str=None, provider: str=None, resource: str=None, **kwargs) -> None:
super(OperationDisplayInfo, self).__init__(**kwargs)
self.description = description
self.operation = operation
self.provider = provider
self.resource = resource
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ class OperationEntity(Model):
'display': {'key': 'display', 'type': 'OperationDisplayInfo'},
}

def __init__(self, name=None, display=None):
super(OperationEntity, self).__init__()
self.name = name
self.display = display
def __init__(self, **kwargs):
super(OperationEntity, self).__init__(**kwargs)
self.name = kwargs.get('name', None)
self.display = kwargs.get('display', None)
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
# 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.serialization import Model


class OperationEntity(Model):
"""The operation supported by Advisor.

:param name: Operation name: {provider}/{resource}/{operation}.
:type name: str
:param display: The operation supported by Advisor.
:type display: ~azure.mgmt.advisor.models.OperationDisplayInfo
"""

_attribute_map = {
'name': {'key': 'name', 'type': 'str'},
'display': {'key': 'display', 'type': 'OperationDisplayInfo'},
}

def __init__(self, *, name: str=None, display=None, **kwargs) -> None:
super(OperationEntity, self).__init__(**kwargs)
self.name = name
self.display = display
Loading