CodeGen from PR 14554 in Azure/azure-rest-api-specs

[MFE] Discriminator definitions have "additionalProperties" (Azure#14554) * Enabling java client (#1) * Revert "Enabling java client (#1)" (#2) This reverts commit 26873d33199c64732735a5c0f92fe90f4044453e. * discriminators have additionalProperties * Revert "Revert "Enabling java client (#1)" (#2)" This reverts commit 41d5801adebc54d36fba114398c84848e4b4b112. * Revert "Enabling java client (#1)" This reverts commit 7537c824c3620b67e18acdfe5ea650fe9c18d962. Co-authored-by: Harneet Virk <[email protected]>
AzureSDKAutomation · May 27, 2021 · e7f9ec0 · e7f9ec0
1 parent 0e39419
commit e7f9ec0
Show file tree

Hide file tree

Showing 28 changed files with 7,589 additions and 1,060 deletions.
diff --git a/sdk/machinelearningservices/arm-machinelearningservices/LICENSE.txt b/sdk/machinelearningservices/arm-machinelearningservices/LICENSE.txt
@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2020 Microsoft
+Copyright (c) 2021 Microsoft
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/...machinelearningservices/arm-machinelearningservices/src/azureMachineLearningWorkspaces.ts b/...machinelearningservices/arm-machinelearningservices/src/azureMachineLearningWorkspaces.ts
@@ -10,7 +10,6 @@
 import * as msRest from "@azure/ms-rest-js";
 import * as Models from "./models";
 import * as Mappers from "./models/mappers";
-import * as Parameters from "./models/parameters";
 import * as operations from "./operations";
 import { AzureMachineLearningWorkspacesContext } from "./azureMachineLearningWorkspacesContext";
 
@@ -20,14 +19,17 @@ class AzureMachineLearningWorkspaces extends AzureMachineLearningWorkspacesConte
   operations: operations.Operations;
   workspaces: operations.Workspaces;
   workspaceFeatures: operations.WorkspaceFeatures;
-  notebooks: operations.Notebooks;
   usages: operations.Usages;
   virtualMachineSizes: operations.VirtualMachineSizes;
   quotas: operations.Quotas;
-  workspaceConnections: operations.WorkspaceConnections;
   machineLearningCompute: operations.MachineLearningCompute;
+  workspace: operations.WorkspaceOperations;
   privateEndpointConnections: operations.PrivateEndpointConnections;
   privateLinkResources: operations.PrivateLinkResources;
+  machineLearningService: operations.MachineLearningService;
+  notebooks: operations.Notebooks;
+  storageAccount: operations.StorageAccount;
+  workspaceConnections: operations.WorkspaceConnections;
 
   /**
    * Initializes a new instance of the AzureMachineLearningWorkspaces class.
@@ -40,117 +42,21 @@ class AzureMachineLearningWorkspaces extends AzureMachineLearningWorkspacesConte
     this.operations = new operations.Operations(this);
     this.workspaces = new operations.Workspaces(this);
     this.workspaceFeatures = new operations.WorkspaceFeatures(this);
-    this.notebooks = new operations.Notebooks(this);
     this.usages = new operations.Usages(this);
     this.virtualMachineSizes = new operations.VirtualMachineSizes(this);
     this.quotas = new operations.Quotas(this);
-    this.workspaceConnections = new operations.WorkspaceConnections(this);
     this.machineLearningCompute = new operations.MachineLearningCompute(this);
+    this.workspace = new operations.WorkspaceOperations(this);
     this.privateEndpointConnections = new operations.PrivateEndpointConnections(this);
     this.privateLinkResources = new operations.PrivateLinkResources(this);
-  }
-
-  /**
-   * Lists all skus with associated features
-   * @param [options] The optional parameters
-   * @returns Promise<Models.ListSkusResponse>
-   */
-  listSkus(options?: msRest.RequestOptionsBase): Promise<Models.ListSkusResponse>;
-  /**
-   * @param callback The callback
-   */
-  listSkus(callback: msRest.ServiceCallback<Models.SkuListResult>): void;
-  /**
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  listSkus(options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SkuListResult>): void;
-  listSkus(options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SkuListResult>, callback?: msRest.ServiceCallback<Models.SkuListResult>): Promise<Models.ListSkusResponse> {
-    return this.sendOperationRequest(
-      {
-        options
-      },
-      listSkusOperationSpec,
-      callback) as Promise<Models.ListSkusResponse>;
-  }
-
-  /**
-   * Lists all skus with associated features
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param [options] The optional parameters
-   * @returns Promise<Models.ListSkusNextResponse>
-   */
-  listSkusNext(nextPageLink: string, options?: msRest.RequestOptionsBase): Promise<Models.ListSkusNextResponse>;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param callback The callback
-   */
-  listSkusNext(nextPageLink: string, callback: msRest.ServiceCallback<Models.SkuListResult>): void;
-  /**
-   * @param nextPageLink The NextLink from the previous successful call to List operation.
-   * @param options The optional parameters
-   * @param callback The callback
-   */
-  listSkusNext(nextPageLink: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback<Models.SkuListResult>): void;
-  listSkusNext(nextPageLink: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback<Models.SkuListResult>, callback?: msRest.ServiceCallback<Models.SkuListResult>): Promise<Models.ListSkusNextResponse> {
-    return this.sendOperationRequest(
-      {
-        nextPageLink,
-        options
-      },
-      listSkusNextOperationSpec,
-      callback) as Promise<Models.ListSkusNextResponse>;
+    this.machineLearningService = new operations.MachineLearningService(this);
+    this.notebooks = new operations.Notebooks(this);
+    this.storageAccount = new operations.StorageAccount(this);
+    this.workspaceConnections = new operations.WorkspaceConnections(this);
   }
 }
 
 // Operation Specifications
-const serializer = new msRest.Serializer(Mappers);
-const listSkusOperationSpec: msRest.OperationSpec = {
-  httpMethod: "GET",
-  path: "subscriptions/{subscriptionId}/providers/Microsoft.MachineLearningServices/workspaces/skus",
-  urlParameters: [
-    Parameters.subscriptionId
-  ],
-  queryParameters: [
-    Parameters.apiVersion
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
-  responses: {
-    200: {
-      bodyMapper: Mappers.SkuListResult
-    },
-    default: {
-      bodyMapper: Mappers.MachineLearningServiceError
-    }
-  },
-  serializer
-};
-
-const listSkusNextOperationSpec: msRest.OperationSpec = {
-  httpMethod: "GET",
-  baseUrl: "https://management.azure.com",
-  path: "{nextLink}",
-  urlParameters: [
-    Parameters.nextPageLink
-  ],
-  queryParameters: [
-    Parameters.apiVersion
-  ],
-  headerParameters: [
-    Parameters.acceptLanguage
-  ],
-  responses: {
-    200: {
-      bodyMapper: Mappers.SkuListResult
-    },
-    default: {
-      bodyMapper: Mappers.MachineLearningServiceError
-    }
-  },
-  serializer
-};
 
 export {
   AzureMachineLearningWorkspaces,

diff --git a/...learningservices/arm-machinelearningservices/src/azureMachineLearningWorkspacesContext.ts b/...learningservices/arm-machinelearningservices/src/azureMachineLearningWorkspacesContext.ts
@@ -43,7 +43,7 @@ export class AzureMachineLearningWorkspacesContext extends msRestAzure.AzureServ
 
     super(credentials, options);
 
-    this.apiVersion = '2020-08-01';
+    this.apiVersion = '2021-04-01';
     this.acceptLanguage = 'en-US';
     this.longRunningOperationRetryTimeout = 30;
     this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";