diff --git a/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/preview/2019-11-01-preview/account.json b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/preview/2019-11-01-preview/account.json index 93a060967259..4103e94d293d 100644 --- a/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/preview/2019-11-01-preview/account.json +++ b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/preview/2019-11-01-preview/account.json @@ -1747,6 +1747,102 @@ } } } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeAnalytics/accounts/{accountName}/transferAnalyticsUnits": { + "post": { + "tags": [ + "Accounts_TransferAnalyticsUnits" + ], + "operationId": "Accounts_TransferAnalyticsUnits", + "description": "Transfer Guarantee Analytics Units between allowed Data Lake Analytics accounts.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/AccountNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/TransferAnalyticsUnitsParameters" + }, + "description": "Parameters supplied to transfer Guarantee Analytics Units between allowed accounts." + } + ], + "responses": { + "200": { + "description": "Successfully transferred Guarantee analytics units between accounts." + }, + "default": { + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + }, + "description": "" + } + }, + "x-ms-examples": { + "Transfer Guarantee Analytics Units between allowed Data Lake Analytics accounts. This supplies the user with computation services for Data Lake Analytics workloads.": { + "$ref": "./examples/Accounts_TransferAnalyticsUnits.json" + } + } + } + }, + "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeAnalytics/accounts/{accountName}/transferEcoAnalyticsUnits": { + "post": { + "tags": [ + "Accounts_TransferEcoAnalyticsUnits" + ], + "operationId": "Accounts_TransferEcoAnalyticsUnits", + "description": "Transfer Eco-Analytics Units between allowed Data Lake Analytics accounts.", + "parameters": [ + { + "$ref": "#/parameters/SubscriptionIdParameter" + }, + { + "$ref": "#/parameters/ResourceGroupNameParameter" + }, + { + "$ref": "#/parameters/AccountNameParameter" + }, + { + "$ref": "#/parameters/ApiVersionParameter" + }, + { + "name": "parameters", + "in": "body", + "required": true, + "schema": { + "$ref": "#/definitions/TransferAnalyticsUnitsParameters" + }, + "description": "Parameters supplied to transfer Eco-Analytics Units between allowed accounts." + } + ], + "responses": { + "200": { + "description": "Successfully transferred Eco-Analytics units between accounts." + }, + "default": { + "schema": { + "$ref": "../../../../../common-types/resource-management/v2/types.json#/definitions/ErrorResponse" + }, + "description": "" + } + }, + "x-ms-examples": { + "Transfer Eco-Analytics Units between allowed Data Lake Analytics accounts. This supplies the user with computation services for Data Lake Analytics workloads.": { + "$ref": "./examples/Accounts_TransferEcoAnalyticsUnits.json" + } + } + } } }, "definitions": { @@ -1933,6 +2029,18 @@ }, "description": "The current state of allowing or disallowing IPs originating within Azure through the firewall. If the firewall is disabled, this is not enforced." }, + "mixedTokensMode": { + "type": "string", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "MixedTokensMode", + "modelAsString": false + }, + "description": "The current state of allowing or disallowing to use both Guarantee Analytics Unit and Eco Analytics Unit together during Job execution." + }, "newTier": { "type": "string", "enum": [ @@ -2908,6 +3016,18 @@ }, "description": "The current state of allowing or disallowing IPs originating within Azure through the firewall. If the firewall is disabled, this is not enforced." }, + "mixedTokensMode": { + "type": "string", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "MixedTokensMode", + "modelAsString": false + }, + "description": "The current state of allowing or disallowing to use both Guarantee Analytics Unit and Eco Analytics Unit together during Job execution." + }, "newTier": { "type": "string", "enum": [ @@ -3048,6 +3168,18 @@ }, "description": "The current state of allowing or disallowing IPs originating within Azure through the firewall. If the firewall is disabled, this is not enforced." }, + "mixedTokensMode": { + "type": "string", + "enum": [ + "Enabled", + "Disabled" + ], + "x-ms-enum": { + "name": "MixedTokensMode", + "modelAsString": false + }, + "description": "The current state of allowing or disallowing to use both Guarantee Analytics Unit and Eco Analytics Unit together during Job execution." + }, "newTier": { "type": "string", "enum": [ @@ -3490,6 +3622,48 @@ } }, "description": "Data Lake Analytics account name availability check parameters." + }, + "TransferAnalyticsUnitsParameters": { + "type": "object", + "description": "The parameters used to transfer Analytics Units from one account to another.", + "properties": { + "newSystemMax": { + "type": "integer", + "format": "int32", + "description": "Current Account's updated Analytics Units" + }, + "participants": { + "type": "array", + "description": "The list of Accounts provides its Analytics Units except the current Account", + "items": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/AnalyticsUnitsParameters" + } + }, + "recipients": { + "type": "array", + "description": "The list of Accounts to receive the Analytics Units except the current Account", + "items": { + "x-ms-client-flatten": true, + "$ref": "#/definitions/AnalyticsUnitsParameters" + } + } + } + }, + "AnalyticsUnitsParameters": { + "type": "object", + "description": "The Analytics Units", + "properties": { + "id": { + "type": "string", + "description": "The Account Id - Format: /subscriptions/{subscriptionId}/resourcegroups/{resourceGroupName}/providers/Microsoft.DataLakeAnalytics/accounts/{accountName}" + }, + "newSystemMax": { + "type": "integer", + "format": "int32", + "description": "The updated Analytics Units" + } + } } }, "parameters": { diff --git a/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/preview/2019-11-01-preview/examples/Accounts_Create.json b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/preview/2019-11-01-preview/examples/Accounts_Create.json index 0e5d635764e4..9c0b2c1521f9 100644 --- a/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/preview/2019-11-01-preview/examples/Accounts_Create.json +++ b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/preview/2019-11-01-preview/examples/Accounts_Create.json @@ -50,6 +50,7 @@ ], "firewallState": "Enabled", "firewallAllowAzureIps": "Enabled", + "mixedTokensMode": "Enabled", "newTier": "Consumption", "maxJobCount": 3, "maxDegreeOfParallelism": 30, @@ -119,6 +120,7 @@ ], "firewallState": "Enabled", "firewallAllowAzureIps": "Enabled", + "mixedTokensMode": "Enabled", "newTier": "Consumption", "currentTier": "Consumption", "maxJobCount": 3, @@ -190,6 +192,7 @@ ], "firewallState": "Enabled", "firewallAllowAzureIps": "Enabled", + "mixedTokensMode": "Enabled", "newTier": "Consumption", "currentTier": "Consumption", "maxJobCount": 3, diff --git a/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/preview/2019-11-01-preview/examples/Accounts_Get.json b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/preview/2019-11-01-preview/examples/Accounts_Get.json index a1fdde2e2151..a435a0fb8a07 100644 --- a/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/preview/2019-11-01-preview/examples/Accounts_Get.json +++ b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/preview/2019-11-01-preview/examples/Accounts_Get.json @@ -75,6 +75,7 @@ ], "firewallState": "Enabled", "firewallAllowAzureIps": "Enabled", + "mixedTokensMode": "Enabled", "newTier": "Consumption", "currentTier": "Consumption", "maxJobCount": 3, diff --git a/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/preview/2019-11-01-preview/examples/Accounts_TransferAnalyticsUnits.json b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/preview/2019-11-01-preview/examples/Accounts_TransferAnalyticsUnits.json new file mode 100644 index 000000000000..940c354e8aa7 --- /dev/null +++ b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/preview/2019-11-01-preview/examples/Accounts_TransferAnalyticsUnits.json @@ -0,0 +1,30 @@ +{ + "parameters": { + "api-version": "2019-11-01-preview", + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroupName": "contosorg", + "accountName": "contosoadla", + "parameters": { + "newSystemMax": 17, + "participants": [ + { + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/contosorg/providers/Microsoft.DataLakeAnalytics/accounts/contosoadla_1", + "newSystemMax": 26 + }, + { + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/contosorg/providers/Microsoft.DataLakeAnalytics/accounts/contosoadla_3", + "newSystemMax": 12 + } + ], + "recipients": [ + { + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/contosorg/providers/Microsoft.DataLakeAnalytics/accounts/contosoadla_2", + "newSystemMax": 18 + } + ] + } + }, + "responses": { + "200": {} + } +} diff --git a/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/preview/2019-11-01-preview/examples/Accounts_TransferEcoAnalyticsUnits.json b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/preview/2019-11-01-preview/examples/Accounts_TransferEcoAnalyticsUnits.json new file mode 100644 index 000000000000..940c354e8aa7 --- /dev/null +++ b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/preview/2019-11-01-preview/examples/Accounts_TransferEcoAnalyticsUnits.json @@ -0,0 +1,30 @@ +{ + "parameters": { + "api-version": "2019-11-01-preview", + "subscriptionId": "34adfa4f-cedf-4dc0-ba29-b6d1a69ab345", + "resourceGroupName": "contosorg", + "accountName": "contosoadla", + "parameters": { + "newSystemMax": 17, + "participants": [ + { + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/contosorg/providers/Microsoft.DataLakeAnalytics/accounts/contosoadla_1", + "newSystemMax": 26 + }, + { + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/contosorg/providers/Microsoft.DataLakeAnalytics/accounts/contosoadla_3", + "newSystemMax": 12 + } + ], + "recipients": [ + { + "id": "/subscriptions/34adfa4f-cedf-4dc0-ba29-b6d1a69ab345/resourceGroups/contosorg/providers/Microsoft.DataLakeAnalytics/accounts/contosoadla_2", + "newSystemMax": 18 + } + ] + } + }, + "responses": { + "200": {} + } +} diff --git a/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/preview/2019-11-01-preview/examples/Accounts_Update.json b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/preview/2019-11-01-preview/examples/Accounts_Update.json index 302f46bd150b..5a4910055135 100644 --- a/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/preview/2019-11-01-preview/examples/Accounts_Update.json +++ b/specification/datalake-analytics/resource-manager/Microsoft.DataLakeAnalytics/preview/2019-11-01-preview/examples/Accounts_Update.json @@ -31,6 +31,7 @@ ], "firewallState": "Enabled", "firewallAllowAzureIps": "Enabled", + "mixedTokensMode": "Enabled", "newTier": "Consumption", "maxJobCount": 1, "maxDegreeOfParallelism": 1, @@ -100,6 +101,7 @@ ], "firewallState": "Enabled", "firewallAllowAzureIps": "Enabled", + "mixedTokensMode": "Enabled", "newTier": "Consumption", "currentTier": "Consumption", "maxJobCount": 3, @@ -171,6 +173,7 @@ ], "firewallState": "Enabled", "firewallAllowAzureIps": "Enabled", + "mixedTokensMode": "Enabled", "newTier": "Consumption", "currentTier": "Consumption", "maxJobCount": 3, @@ -242,6 +245,7 @@ ], "firewallState": "Enabled", "firewallAllowAzureIps": "Enabled", + "mixedTokensMode": "Enabled", "newTier": "Consumption", "currentTier": "Consumption", "maxJobCount": 3,