Merge pull request #4452 from xingwu1/master

Update batch to new API version 2018-12-01.8.0.

lib/services/batch/lib/batchServiceClient.d.ts

@@ -21,7 +21,7 @@ export default class BatchServiceClient extends AzureServiceClient {
    * @class
    * @param {credentials} credentials - Credentials needed for the client to connect to Azure.
    *
-   * @param {string} [baseUri] - The base URI of the service.
+   * @param {string} batchUrl - The base URL for all Azure Batch service requests.
    *
    * @param {object} [options] - The parameter options
    *
@@ -39,12 +39,14 @@ export default class BatchServiceClient extends AzureServiceClient {
    * @param {boolean} [options.generateClientRequestId] - Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
    *
    */
-  constructor(credentials: ServiceClientCredentials, baseUri?: string, options?: AzureServiceClientOptions);
+  constructor(credentials: ServiceClientCredentials, batchUrl: string, options?: AzureServiceClientOptions);
 
   credentials: ServiceClientCredentials;
 
   apiVersion: string;
 
+  batchUrl: string;
+
   acceptLanguage: string;
 
   longRunningOperationRetryTimeout: number;

lib/services/batch/lib/batchServiceClient.js

@@ -27,7 +27,7 @@ class BatchServiceClient extends ServiceClient {
   /**
    * Create a BatchServiceClient.
    * @param {credentials} credentials - Credentials needed for the client to connect to Azure.
-   * @param {string} [baseUri] - The base URI of the service.
+   * @param {string} batchUrl - The base URL for all Azure Batch service requests.
    * @param {object} [options] - The parameter options
    * @param {Array} [options.filters] - Filters to be added to the request pipeline
    * @param {object} [options.requestOptions] - Options for the underlying request object
@@ -37,24 +37,25 @@ class BatchServiceClient extends ServiceClient {
    * @param {number} [options.longRunningOperationRetryTimeout] - The retry timeout in seconds for Long Running Operations. Default value is 30.
    * @param {boolean} [options.generateClientRequestId] - Whether a unique x-ms-client-request-id should be generated. When set to true a unique x-ms-client-request-id value is generated and included in each request. Default is true.
    */
-  constructor(credentials, baseUri, options) {
+  constructor(credentials, batchUrl, options) {
     if (credentials === null || credentials === undefined) {
       throw new Error('\'credentials\' cannot be null.');
     }
+    if (batchUrl === null || batchUrl === undefined) {
+      throw new Error('\'batchUrl\' cannot be null.');
+    }
 
     if (!options) options = {};
 
     super(credentials, options);
 
-    this.apiVersion = '2018-08-01.7.0';
+    this.apiVersion = '2018-12-01.8.0';
     this.acceptLanguage = 'en-US';
     this.longRunningOperationRetryTimeout = 30;
     this.generateClientRequestId = true;
-    this.baseUri = baseUri;
-    if (!this.baseUri) {
-      this.baseUri = 'https://batch.core.windows.net';
-    }
+    this.baseUri = '{batchUrl}';
     this.credentials = credentials;
+    this.batchUrl = batchUrl;
 
     let packageInfo = this.getPackageJsonInfo(__dirname);
     this.addUserAgentInfo(`${packageInfo.name}/${packageInfo.version}`);

lib/services/batch/lib/models/accountListNodeAgentSkusNextOptions.js

@@ -17,14 +17,14 @@
 class AccountListNodeAgentSkusNextOptions {
   /**
    * Create a AccountListNodeAgentSkusNextOptions.
-   * @member {uuid} [clientRequestId] The caller-generated request identity, in
-   * the form of a GUID with no decoration such as curly braces, e.g.
+   * @property {uuid} [clientRequestId] The caller-generated request identity,
+   * in the form of a GUID with no decoration such as curly braces, e.g.
    * 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0.
-   * @member {boolean} [returnClientRequestId] Whether the server should return
-   * the client-request-id in the response. Default value: false .
-   * @member {date} [ocpDate] The time the request was issued. Client libraries
-   * typically set this to the current system clock time; set it explicitly if
-   * you are calling the REST API directly.
+   * @property {boolean} [returnClientRequestId] Whether the server should
+   * return the client-request-id in the response. Default value: false .
+   * @property {date} [ocpDate] The time the request was issued. Client
+   * libraries typically set this to the current system clock time; set it
+   * explicitly if you are calling the REST API directly.
    */
   constructor() {
   }

lib/services/batch/lib/models/accountListNodeAgentSkusOptions.js

@@ -17,23 +17,23 @@
 class AccountListNodeAgentSkusOptions {
   /**
    * Create a AccountListNodeAgentSkusOptions.
-   * @member {string} [filter] An OData $filter clause. For more information on
-   * constructing this filter, see
+   * @property {string} [filter] An OData $filter clause. For more information
+   * on constructing this filter, see
    * https://docs.microsoft.com/en-us/rest/api/batchservice/odata-filters-in-batch#list-node-agent-skus.
-   * @member {number} [maxResults] The maximum number of items to return in the
-   * response. A maximum of 1000 results will be returned. Default value: 1000
-   * .
-   * @member {number} [timeout] The maximum time that the server can spend
+   * @property {number} [maxResults] The maximum number of items to return in
+   * the response. A maximum of 1000 results will be returned. Default value:
+   * 1000 .
+   * @property {number} [timeout] The maximum time that the server can spend
    * processing the request, in seconds. The default is 30 seconds. Default
    * value: 30 .
-   * @member {uuid} [clientRequestId] The caller-generated request identity, in
-   * the form of a GUID with no decoration such as curly braces, e.g.
+   * @property {uuid} [clientRequestId] The caller-generated request identity,
+   * in the form of a GUID with no decoration such as curly braces, e.g.
    * 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0.
-   * @member {boolean} [returnClientRequestId] Whether the server should return
-   * the client-request-id in the response. Default value: false .
-   * @member {date} [ocpDate] The time the request was issued. Client libraries
-   * typically set this to the current system clock time; set it explicitly if
-   * you are calling the REST API directly.
+   * @property {boolean} [returnClientRequestId] Whether the server should
+   * return the client-request-id in the response. Default value: false .
+   * @property {date} [ocpDate] The time the request was issued. Client
+   * libraries typically set this to the current system clock time; set it
+   * explicitly if you are calling the REST API directly.
    */
   constructor() {
   }

lib/services/batch/lib/models/accountListNodeAgentSkusResult.js

@@ -16,7 +16,7 @@
 class AccountListNodeAgentSkusResult extends Array {
   /**
    * Create a AccountListNodeAgentSkusResult.
-   * @member {string} [odatanextLink]
+   * @property {string} [odatanextLink]
    */
   constructor() {
     super();

lib/services/batch/lib/models/accountListPoolNodeCountsNextOptions.js

@@ -17,14 +17,14 @@
 class AccountListPoolNodeCountsNextOptions {
   /**
    * Create a AccountListPoolNodeCountsNextOptions.
-   * @member {uuid} [clientRequestId] The caller-generated request identity, in
-   * the form of a GUID with no decoration such as curly braces, e.g.
+   * @property {uuid} [clientRequestId] The caller-generated request identity,
+   * in the form of a GUID with no decoration such as curly braces, e.g.
    * 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0.
-   * @member {boolean} [returnClientRequestId] Whether the server should return
-   * the client-request-id in the response. Default value: false .
-   * @member {date} [ocpDate] The time the request was issued. Client libraries
-   * typically set this to the current system clock time; set it explicitly if
-   * you are calling the REST API directly.
+   * @property {boolean} [returnClientRequestId] Whether the server should
+   * return the client-request-id in the response. Default value: false .
+   * @property {date} [ocpDate] The time the request was issued. Client
+   * libraries typically set this to the current system clock time; set it
+   * explicitly if you are calling the REST API directly.
    */
   constructor() {
   }

lib/services/batch/lib/models/accountListPoolNodeCountsOptions.js

@@ -17,22 +17,22 @@
 class AccountListPoolNodeCountsOptions {
   /**
    * Create a AccountListPoolNodeCountsOptions.
-   * @member {string} [filter] An OData $filter clause. For more information on
-   * constructing this filter, see
+   * @property {string} [filter] An OData $filter clause. For more information
+   * on constructing this filter, see
    * https://docs.microsoft.com/en-us/rest/api/batchservice/odata-filters-in-batch.
-   * @member {number} [maxResults] The maximum number of items to return in the
-   * response. Default value: 10 .
-   * @member {number} [timeout] The maximum time that the server can spend
+   * @property {number} [maxResults] The maximum number of items to return in
+   * the response. Default value: 10 .
+   * @property {number} [timeout] The maximum time that the server can spend
    * processing the request, in seconds. The default is 30 seconds. Default
    * value: 30 .
-   * @member {uuid} [clientRequestId] The caller-generated request identity, in
-   * the form of a GUID with no decoration such as curly braces, e.g.
+   * @property {uuid} [clientRequestId] The caller-generated request identity,
+   * in the form of a GUID with no decoration such as curly braces, e.g.
    * 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0.
-   * @member {boolean} [returnClientRequestId] Whether the server should return
-   * the client-request-id in the response. Default value: false .
-   * @member {date} [ocpDate] The time the request was issued. Client libraries
-   * typically set this to the current system clock time; set it explicitly if
-   * you are calling the REST API directly.
+   * @property {boolean} [returnClientRequestId] Whether the server should
+   * return the client-request-id in the response. Default value: false .
+   * @property {date} [ocpDate] The time the request was issued. Client
+   * libraries typically set this to the current system clock time; set it
+   * explicitly if you are calling the REST API directly.
    */
   constructor() {
   }

lib/services/batch/lib/models/affinityInformation.js

@@ -18,8 +18,8 @@
 class AffinityInformation {
   /**
    * Create a AffinityInformation.
-   * @member {string} affinityId An opaque string representing the location of
-   * a compute node or a task that has run previously. You can pass the
+   * @property {string} affinityId An opaque string representing the location
+   * of a compute node or a task that has run previously. You can pass the
    * affinityId of a compute node to indicate that this task needs to run on
    * that compute node. Note that this is just a soft affinity. If the target
    * node is busy or unavailable at the time the task is scheduled, then the

lib/services/batch/lib/models/applicationGetOptions.js

@@ -17,17 +17,17 @@
 class ApplicationGetOptions {
   /**
    * Create a ApplicationGetOptions.
-   * @member {number} [timeout] The maximum time that the server can spend
+   * @property {number} [timeout] The maximum time that the server can spend
    * processing the request, in seconds. The default is 30 seconds. Default
    * value: 30 .
-   * @member {uuid} [clientRequestId] The caller-generated request identity, in
-   * the form of a GUID with no decoration such as curly braces, e.g.
+   * @property {uuid} [clientRequestId] The caller-generated request identity,
+   * in the form of a GUID with no decoration such as curly braces, e.g.
    * 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0.
-   * @member {boolean} [returnClientRequestId] Whether the server should return
-   * the client-request-id in the response. Default value: false .
-   * @member {date} [ocpDate] The time the request was issued. Client libraries
-   * typically set this to the current system clock time; set it explicitly if
-   * you are calling the REST API directly.
+   * @property {boolean} [returnClientRequestId] Whether the server should
+   * return the client-request-id in the response. Default value: false .
+   * @property {date} [ocpDate] The time the request was issued. Client
+   * libraries typically set this to the current system clock time; set it
+   * explicitly if you are calling the REST API directly.
    */
   constructor() {
   }

lib/services/batch/lib/models/applicationListNextOptions.js

@@ -17,14 +17,14 @@
 class ApplicationListNextOptions {
   /**
    * Create a ApplicationListNextOptions.
-   * @member {uuid} [clientRequestId] The caller-generated request identity, in
-   * the form of a GUID with no decoration such as curly braces, e.g.
+   * @property {uuid} [clientRequestId] The caller-generated request identity,
+   * in the form of a GUID with no decoration such as curly braces, e.g.
    * 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0.
-   * @member {boolean} [returnClientRequestId] Whether the server should return
-   * the client-request-id in the response. Default value: false .
-   * @member {date} [ocpDate] The time the request was issued. Client libraries
-   * typically set this to the current system clock time; set it explicitly if
-   * you are calling the REST API directly.
+   * @property {boolean} [returnClientRequestId] Whether the server should
+   * return the client-request-id in the response. Default value: false .
+   * @property {date} [ocpDate] The time the request was issued. Client
+   * libraries typically set this to the current system clock time; set it
+   * explicitly if you are calling the REST API directly.
    */
   constructor() {
   }

lib/services/batch/lib/models/applicationListOptions.js

@@ -17,20 +17,20 @@
 class ApplicationListOptions {
   /**
    * Create a ApplicationListOptions.
-   * @member {number} [maxResults] The maximum number of items to return in the
-   * response. A maximum of 1000 applications can be returned. Default value:
-   * 1000 .
-   * @member {number} [timeout] The maximum time that the server can spend
+   * @property {number} [maxResults] The maximum number of items to return in
+   * the response. A maximum of 1000 applications can be returned. Default
+   * value: 1000 .
+   * @property {number} [timeout] The maximum time that the server can spend
    * processing the request, in seconds. The default is 30 seconds. Default
    * value: 30 .
-   * @member {uuid} [clientRequestId] The caller-generated request identity, in
-   * the form of a GUID with no decoration such as curly braces, e.g.
+   * @property {uuid} [clientRequestId] The caller-generated request identity,
+   * in the form of a GUID with no decoration such as curly braces, e.g.
    * 9C4D50EE-2D56-4CD3-8152-34347DC9F2B0.
-   * @member {boolean} [returnClientRequestId] Whether the server should return
-   * the client-request-id in the response. Default value: false .
-   * @member {date} [ocpDate] The time the request was issued. Client libraries
-   * typically set this to the current system clock time; set it explicitly if
-   * you are calling the REST API directly.
+   * @property {boolean} [returnClientRequestId] Whether the server should
+   * return the client-request-id in the response. Default value: false .
+   * @property {date} [ocpDate] The time the request was issued. Client
+   * libraries typically set this to the current system clock time; set it
+   * explicitly if you are calling the REST API directly.
    */
   constructor() {
   }

lib/services/batch/lib/models/applicationListResult.js

@@ -16,7 +16,7 @@
 class ApplicationListResult extends Array {
   /**
    * Create a ApplicationListResult.
-   * @member {string} [odatanextLink]
+   * @property {string} [odatanextLink]
    */
   constructor() {
     super();

lib/services/batch/lib/models/applicationPackageReference.js

@@ -18,8 +18,8 @@
 class ApplicationPackageReference {
   /**
    * Create a ApplicationPackageReference.
-   * @member {string} applicationId The ID of the application to deploy.
-   * @member {string} [version] The version of the application to deploy. If
+   * @property {string} applicationId The ID of the application to deploy.
+   * @property {string} [version] The version of the application to deploy. If
    * omitted, the default version is deployed. If this is omitted on a pool,
    * and no default version is specified for this application, the request
    * fails with the error code InvalidApplicationPackageReferences and HTTP

lib/services/batch/lib/models/applicationSummary.js

@@ -18,10 +18,10 @@
 class ApplicationSummary {
   /**
    * Create a ApplicationSummary.
-   * @member {string} id A string that uniquely identifies the application
+   * @property {string} id A string that uniquely identifies the application
    * within the account.
-   * @member {string} displayName The display name for the application.
-   * @member {array} versions The list of available versions of the
+   * @property {string} displayName The display name for the application.
+   * @property {array} versions The list of available versions of the
    * application.
    */
   constructor() {

lib/services/batch/lib/models/authenticationTokenSettings.js

@@ -18,7 +18,7 @@
 class AuthenticationTokenSettings {
   /**
    * Create a AuthenticationTokenSettings.
-   * @member {array} [access] The Batch resources to which the token grants
+   * @property {array} [access] The Batch resources to which the token grants
    * access. The authentication token grants access to a limited set of Batch
    * service operations. Currently the only supported value for the access
    * property is 'job', which grants access to all operations related to the