[AutoPR consumption/resource-manager] Adding swagger for new api-version consumption 2018-05-31, introducing new Forecast api swagger

azure-mgmt-consumption/azure/mgmt/consumption/consumption_management_client.py

@@ -13,16 +13,8 @@
 from msrest import Serializer, Deserializer
 from msrestazure import AzureConfiguration
 from .version import VERSION
-from .operations.usage_details_operations import UsageDetailsOperations
-from .operations.marketplaces_operations import MarketplacesOperations
-from .operations.reservations_summaries_operations import ReservationsSummariesOperations
-from .operations.reservations_details_operations import ReservationsDetailsOperations
-from .operations.reservation_recommendations_operations import ReservationRecommendationsOperations
-from .operations.budgets_operations import BudgetsOperations
+from .operations.forecasts_operations import ForecastsOperations
 from .operations.operations import Operations
-from .operations.price_sheet_operations import PriceSheetOperations
-from .operations.cost_tags_operations import CostTagsOperations
-from .operations.tags_operations import TagsOperations
 from . import models
 
 
@@ -64,26 +56,10 @@ class ConsumptionManagementClient(object):
     :ivar config: Configuration for client.
     :vartype config: ConsumptionManagementClientConfiguration
 
-    :ivar usage_details: UsageDetails operations
-    :vartype usage_details: azure.mgmt.consumption.operations.UsageDetailsOperations
-    :ivar marketplaces: Marketplaces operations
-    :vartype marketplaces: azure.mgmt.consumption.operations.MarketplacesOperations
-    :ivar reservations_summaries: ReservationsSummaries operations
-    :vartype reservations_summaries: azure.mgmt.consumption.operations.ReservationsSummariesOperations
-    :ivar reservations_details: ReservationsDetails operations
-    :vartype reservations_details: azure.mgmt.consumption.operations.ReservationsDetailsOperations
-    :ivar reservation_recommendations: ReservationRecommendations operations
-    :vartype reservation_recommendations: azure.mgmt.consumption.operations.ReservationRecommendationsOperations
-    :ivar budgets: Budgets operations
-    :vartype budgets: azure.mgmt.consumption.operations.BudgetsOperations
+    :ivar forecasts: Forecasts operations
+    :vartype forecasts: azure.mgmt.consumption.operations.ForecastsOperations
     :ivar operations: Operations operations
     :vartype operations: azure.mgmt.consumption.operations.Operations
-    :ivar price_sheet: PriceSheet operations
-    :vartype price_sheet: azure.mgmt.consumption.operations.PriceSheetOperations
-    :ivar cost_tags: CostTags operations
-    :vartype cost_tags: azure.mgmt.consumption.operations.CostTagsOperations
-    :ivar tags: Tags operations
-    :vartype tags: azure.mgmt.consumption.operations.TagsOperations
 
     :param credentials: Credentials needed for the client to connect to Azure.
     :type credentials: :mod:`A msrestazure Credentials
@@ -100,27 +76,11 @@ def __init__(
         self._client = ServiceClient(self.config.credentials, self.config)
 
         client_models = {k: v for k, v in models.__dict__.items() if isinstance(v, type)}
-        self.api_version = '2018-03-31'
+        self.api_version = '2018-05-31'
         self._serialize = Serializer(client_models)
         self._deserialize = Deserializer(client_models)
 
-        self.usage_details = UsageDetailsOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.marketplaces = MarketplacesOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.reservations_summaries = ReservationsSummariesOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.reservations_details = ReservationsDetailsOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.reservation_recommendations = ReservationRecommendationsOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.budgets = BudgetsOperations(
+        self.forecasts = ForecastsOperations(
             self._client, self.config, self._serialize, self._deserialize)
         self.operations = Operations(
             self._client, self.config, self._serialize, self._deserialize)
-        self.price_sheet = PriceSheetOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.cost_tags = CostTagsOperations(
-            self._client, self.config, self._serialize, self._deserialize)
-        self.tags = TagsOperations(
-            self._client, self.config, self._serialize, self._deserialize)

azure-mgmt-consumption/azure/mgmt/consumption/models/__init__.py

@@ -9,80 +9,32 @@
 # regenerated.
 # --------------------------------------------------------------------------
 
-from .meter_details import MeterDetails
-from .usage_detail import UsageDetail
-from .marketplace import Marketplace
-from .reservation_summaries import ReservationSummaries
-from .reservation_details import ReservationDetails
-from .reservation_recommendations import ReservationRecommendations
-from .tag import Tag
-from .tags import Tags
-from .budget_time_period import BudgetTimePeriod
-from .filters import Filters
-from .current_spend import CurrentSpend
-from .notification import Notification
-from .budget import Budget
-from .cost_tag import CostTag
-from .cost_tags import CostTags
 from .error_details import ErrorDetails
 from .error_response import ErrorResponse, ErrorResponseException
 from .operation_display import OperationDisplay
 from .operation import Operation
 from .resource import Resource
-from .resource_attributes import ResourceAttributes
-from .proxy_resource import ProxyResource
-from .price_sheet_properties import PriceSheetProperties
-from .price_sheet_result import PriceSheetResult
-from .query_options import QueryOptions
-from .usage_detail_paged import UsageDetailPaged
-from .marketplace_paged import MarketplacePaged
-from .reservation_summaries_paged import ReservationSummariesPaged
-from .reservation_details_paged import ReservationDetailsPaged
-from .reservation_recommendations_paged import ReservationRecommendationsPaged
-from .budget_paged import BudgetPaged
+from .forecast_properties_confidence_levels_item import ForecastPropertiesConfidenceLevelsItem
+from .forecast import Forecast
+from .forecast_paged import ForecastPaged
 from .operation_paged import OperationPaged
 from .consumption_management_client_enums import (
-    CategoryType,
-    TimeGrainType,
-    OperatorType,
-    Datagrain,
+    Grain,
+    ChargeType,
+    Bound,
 )
 
 __all__ = [
-    'MeterDetails',
-    'UsageDetail',
-    'Marketplace',
-    'ReservationSummaries',
-    'ReservationDetails',
-    'ReservationRecommendations',
-    'Tag',
-    'Tags',
-    'BudgetTimePeriod',
-    'Filters',
-    'CurrentSpend',
-    'Notification',
-    'Budget',
-    'CostTag',
-    'CostTags',
     'ErrorDetails',
     'ErrorResponse', 'ErrorResponseException',
     'OperationDisplay',
     'Operation',
     'Resource',
-    'ResourceAttributes',
-    'ProxyResource',
-    'PriceSheetProperties',
-    'PriceSheetResult',
-    'QueryOptions',
-    'UsageDetailPaged',
-    'MarketplacePaged',
-    'ReservationSummariesPaged',
-    'ReservationDetailsPaged',
-    'ReservationRecommendationsPaged',
-    'BudgetPaged',
+    'ForecastPropertiesConfidenceLevelsItem',
+    'Forecast',
+    'ForecastPaged',
     'OperationPaged',
-    'CategoryType',
-    'TimeGrainType',
-    'OperatorType',
-    'Datagrain',
+    'Grain',
+    'ChargeType',
+    'Bound',
 ]

azure-mgmt-consumption/azure/mgmt/consumption/models/consumption_management_client_enums.py

@@ -12,27 +12,20 @@
 from enum import Enum
 
 
-class CategoryType(Enum):
-
-    cost = "Cost"
-    usage = "Usage"
-
-
-class TimeGrainType(Enum):
+class Grain(Enum):
 
+    daily = "Daily"
     monthly = "Monthly"
-    quarterly = "Quarterly"
-    annually = "Annually"
+    yearly = "Yearly"
 
 
-class OperatorType(Enum):
+class ChargeType(Enum):
 
-    equal_to = "EqualTo"
-    greater_than = "GreaterThan"
-    greater_than_or_equal_to = "GreaterThanOrEqualTo"
+    actual = "Actual"
+    forecast = "Forecast"
 
 
-class Datagrain(Enum):
+class Bound(Enum):
 
-    daily_grain = "daily"
-    monthly_grain = "monthly"
+    upper = "Upper"
+    lower = "Lower"