diff --git a/outscale-c.yaml b/outscale-c.yaml index db22097..b67d9a7 100644 --- a/outscale-c.yaml +++ b/outscale-c.yaml @@ -650,6 +650,9 @@ components: time period, in the currency of the Region's catalog. format: double type: number + ResourceId: + description: The ID of the consumed resource. + type: string Service: description: The service of the API call (`TinaOS-FCU`, `TinaOS-LBU`, `TinaOS-DirectLink`, `TinaOS-OOS`, `TinaOS-OSU`, or `OKS`). @@ -8477,7 +8480,12 @@ components: ShowPrice: description: If true, the response also includes the unit price of the consumed resource (`UnitPrice`) and the total price of the consumed resource during - the specified time period (`Price`), in the currency of your account. + the specified time period (`Price`), in the currency of the Region's catalog. + type: boolean + ShowResourceDetails: + default: false + description: By default or if false, returns the consumption aggregated + by resource type. If true, the response returns the consumption per `ResourceId`. type: boolean ToDate: description: The end of the time period, in ISO 8601 date format (for example, @@ -13365,12 +13373,12 @@ info: url: https://opensource.org/licenses/BSD-3-Clause termsOfService: https://en.outscale.com/terms-of-service/ title: 3DS OUTSCALE API - version: 1.38.3 - x-osc-api-osc-billing: 1.37.1 + version: 1.39.1 + x-osc-api-osc-billing: 1.38.0 x-osc-api-osc-cloud-region: 1.36.1 x-osc-api-osc-cloud-vision: 1.36.0 x-osc-api-osc-core-iaas: 1.37.1 - x-osc-api-osc-iam: 1.37.3 + x-osc-api-osc-iam: 1.37.4 x-osc-api-type: external openapi: 3.0.0 paths: @@ -20110,10 +20118,17 @@ paths: "$ref": "#/components/schemas/ReadConsumptionAccountRequest" examples: ex1: + value: + FromDate: '2023-06-01' + ToDate: '2023-07-01' + ShowPrice: false + ShowResourceDetails: false + ex2: value: FromDate: '2023-06-01' ToDate: '2023-07-01' ShowPrice: true + ShowResourceDetails: true responses: '200': content: @@ -20122,6 +20137,8 @@ paths: "$ref": "#/components/schemas/ReadConsumptionAccountResponse" examples: ex1: + summary: ReadConsumptionAccount with ShowPrice and ShowResourceDetails + at false value: ResponseContext: RequestId: 0475ca1e-d0c5-441d-712a-da55a4175157 @@ -20139,6 +20156,45 @@ paths: AccountId: '123456789012' PayingAccountId: '123456789012' Operation: RunInstances-OD + Type: BoxUsage:tinav5.c4r8p2 + ex2: + summary: ReadConsumptionAccount with ShowPrice and ShowResourceDetails + at true + value: + ResponseContext: + RequestId: 0475ca1e-d0c5-441d-712a-da55a4175157 + Currency: EUR + ConsumptionEntries: + - FromDate: 2023-06-01 00:00:00.000000000 +00:00 + SubregionName: eu-west-2a + Value: 720 + Title: Instance - On demand - tinav5.c4r8 high performance - + par heure + Category: compute + ToDate: 2023-06-30 00:00:00.000000000 +00:00 + Service: TinaOS-FCU + AccountId: '123456789012' + PayingAccountId: '123456789012' + Operation: RunInstances-OD + Type: BoxUsage:tinav5.c4r8p2 + UnitPrice: 0.18 + Price: 267.84 + ResourceId: i-12345678 + - FromDate: 2023-06-01 00:00:00.000000000 +00:00 + SubregionName: eu-west-2a + Value: 1488 + Title: Instance - On demand - tinav5.c4r8p2 high performance + - par heure + Category: compute + ToDate: 2023-06-30 00:00:00.000000000 +00:00 + Service: TinaOS-FCU + AccountId: '123456789012' + PayingAccountId: '123456789012' + Operation: RunInstances-OD + Type: BoxUsage:tinav5.c4r8p2 + UnitPrice: 0.18 + Price: 267.84 + ResourceId: i-87654321 description: The HTTP 200 response (OK). tags: - Account diff --git a/outscale-go.yaml b/outscale-go.yaml index fcf716a..73eb13b 100644 --- a/outscale-go.yaml +++ b/outscale-go.yaml @@ -640,6 +640,9 @@ components: time period, in the currency of the Region's catalog. format: double type: number + ResourceId: + description: The ID of the consumed resource. + type: string Service: description: The service of the API call (`TinaOS-FCU`, `TinaOS-LBU`, `TinaOS-DirectLink`, `TinaOS-OOS`, `TinaOS-OSU`, or `OKS`). @@ -8424,7 +8427,12 @@ components: ShowPrice: description: If true, the response also includes the unit price of the consumed resource (`UnitPrice`) and the total price of the consumed resource during - the specified time period (`Price`), in the currency of your account. + the specified time period (`Price`), in the currency of the Region's catalog. + type: boolean + ShowResourceDetails: + default: false + description: By default or if false, returns the consumption aggregated + by resource type. If true, the response returns the consumption per `ResourceId`. type: boolean ToDate: description: The end of the time period, in ISO 8601 date format (for example, @@ -13291,12 +13299,12 @@ info: url: https://opensource.org/licenses/BSD-3-Clause termsOfService: https://en.outscale.com/terms-of-service/ title: 3DS OUTSCALE API - version: 1.38.3 - x-osc-api-osc-billing: 1.37.1 + version: 1.39.1 + x-osc-api-osc-billing: 1.38.0 x-osc-api-osc-cloud-region: 1.36.1 x-osc-api-osc-cloud-vision: 1.36.0 x-osc-api-osc-core-iaas: 1.37.1 - x-osc-api-osc-iam: 1.37.3 + x-osc-api-osc-iam: 1.37.4 x-osc-api-type: external openapi: 3.0.0 paths: @@ -20036,10 +20044,17 @@ paths: "$ref": "#/components/schemas/ReadConsumptionAccountRequest" examples: ex1: + value: + FromDate: '2023-06-01' + ToDate: '2023-07-01' + ShowPrice: false + ShowResourceDetails: false + ex2: value: FromDate: '2023-06-01' ToDate: '2023-07-01' ShowPrice: true + ShowResourceDetails: true responses: '200': content: @@ -20048,6 +20063,8 @@ paths: "$ref": "#/components/schemas/ReadConsumptionAccountResponse" examples: ex1: + summary: ReadConsumptionAccount with ShowPrice and ShowResourceDetails + at false value: ResponseContext: RequestId: 0475ca1e-d0c5-441d-712a-da55a4175157 @@ -20065,6 +20082,45 @@ paths: AccountId: '123456789012' PayingAccountId: '123456789012' Operation: RunInstances-OD + Type: BoxUsage:tinav5.c4r8p2 + ex2: + summary: ReadConsumptionAccount with ShowPrice and ShowResourceDetails + at true + value: + ResponseContext: + RequestId: 0475ca1e-d0c5-441d-712a-da55a4175157 + Currency: EUR + ConsumptionEntries: + - FromDate: 2023-06-01 00:00:00.000000000 +00:00 + SubregionName: eu-west-2a + Value: 720 + Title: Instance - On demand - tinav5.c4r8 high performance - + par heure + Category: compute + ToDate: 2023-06-30 00:00:00.000000000 +00:00 + Service: TinaOS-FCU + AccountId: '123456789012' + PayingAccountId: '123456789012' + Operation: RunInstances-OD + Type: BoxUsage:tinav5.c4r8p2 + UnitPrice: 0.18 + Price: 267.84 + ResourceId: i-12345678 + - FromDate: 2023-06-01 00:00:00.000000000 +00:00 + SubregionName: eu-west-2a + Value: 1488 + Title: Instance - On demand - tinav5.c4r8p2 high performance + - par heure + Category: compute + ToDate: 2023-06-30 00:00:00.000000000 +00:00 + Service: TinaOS-FCU + AccountId: '123456789012' + PayingAccountId: '123456789012' + Operation: RunInstances-OD + Type: BoxUsage:tinav5.c4r8p2 + UnitPrice: 0.18 + Price: 267.84 + ResourceId: i-87654321 description: The HTTP 200 response (OK). tags: - Account diff --git a/outscale.yaml b/outscale.yaml index c4afe8f..01130b6 100644 --- a/outscale.yaml +++ b/outscale.yaml @@ -650,6 +650,9 @@ components: time period, in the currency of the Region's catalog. format: double type: number + ResourceId: + description: The ID of the consumed resource. + type: string Service: description: The service of the API call (`TinaOS-FCU`, `TinaOS-LBU`, `TinaOS-DirectLink`, `TinaOS-OOS`, `TinaOS-OSU`, or `OKS`). @@ -8450,7 +8453,12 @@ components: ShowPrice: description: If true, the response also includes the unit price of the consumed resource (`UnitPrice`) and the total price of the consumed resource during - the specified time period (`Price`), in the currency of your account. + the specified time period (`Price`), in the currency of the Region's catalog. + type: boolean + ShowResourceDetails: + default: false + description: By default or if false, returns the consumption aggregated + by resource type. If true, the response returns the consumption per `ResourceId`. type: boolean ToDate: description: The end of the time period, in ISO 8601 date format (for example, @@ -13332,12 +13340,12 @@ info: url: https://opensource.org/licenses/BSD-3-Clause termsOfService: https://en.outscale.com/terms-of-service/ title: 3DS OUTSCALE API - version: 1.38.3 - x-osc-api-osc-billing: 1.37.1 + version: 1.39.1 + x-osc-api-osc-billing: 1.38.0 x-osc-api-osc-cloud-region: 1.36.1 x-osc-api-osc-cloud-vision: 1.36.0 x-osc-api-osc-core-iaas: 1.37.1 - x-osc-api-osc-iam: 1.37.3 + x-osc-api-osc-iam: 1.37.4 x-osc-api-type: external openapi: 3.0.0 paths: @@ -20077,10 +20085,17 @@ paths: "$ref": "#/components/schemas/ReadConsumptionAccountRequest" examples: ex1: + value: + FromDate: '2023-06-01' + ToDate: '2023-07-01' + ShowPrice: false + ShowResourceDetails: false + ex2: value: FromDate: '2023-06-01' ToDate: '2023-07-01' ShowPrice: true + ShowResourceDetails: true responses: '200': content: @@ -20089,6 +20104,8 @@ paths: "$ref": "#/components/schemas/ReadConsumptionAccountResponse" examples: ex1: + summary: ReadConsumptionAccount with ShowPrice and ShowResourceDetails + at false value: ResponseContext: RequestId: 0475ca1e-d0c5-441d-712a-da55a4175157 @@ -20106,6 +20123,45 @@ paths: AccountId: '123456789012' PayingAccountId: '123456789012' Operation: RunInstances-OD + Type: BoxUsage:tinav5.c4r8p2 + ex2: + summary: ReadConsumptionAccount with ShowPrice and ShowResourceDetails + at true + value: + ResponseContext: + RequestId: 0475ca1e-d0c5-441d-712a-da55a4175157 + Currency: EUR + ConsumptionEntries: + - FromDate: 2023-06-01 00:00:00.000000000 +00:00 + SubregionName: eu-west-2a + Value: 720 + Title: Instance - On demand - tinav5.c4r8 high performance - + par heure + Category: compute + ToDate: 2023-06-30 00:00:00.000000000 +00:00 + Service: TinaOS-FCU + AccountId: '123456789012' + PayingAccountId: '123456789012' + Operation: RunInstances-OD + Type: BoxUsage:tinav5.c4r8p2 + UnitPrice: 0.18 + Price: 267.84 + ResourceId: i-12345678 + - FromDate: 2023-06-01 00:00:00.000000000 +00:00 + SubregionName: eu-west-2a + Value: 1488 + Title: Instance - On demand - tinav5.c4r8p2 high performance + - par heure + Category: compute + ToDate: 2023-06-30 00:00:00.000000000 +00:00 + Service: TinaOS-FCU + AccountId: '123456789012' + PayingAccountId: '123456789012' + Operation: RunInstances-OD + Type: BoxUsage:tinav5.c4r8p2 + UnitPrice: 0.18 + Price: 267.84 + ResourceId: i-87654321 description: The HTTP 200 response (OK). tags: - Account