Merge pull request #4535 from xingwu1/master

Update Batch management SDK to latest API version.

lib/services/batch/package.json

@@ -4,7 +4,7 @@
   "contributors": [
     "Wu, Xing <xingwu@microsoft.com>"
   ],
-  "version": "5.0.0",
+  "version": "6.0.0",
   "description": "Microsoft Azure Batch Service Client Library for node",
   "tags": [
     "azure",

lib/services/batchManagement/LICENSE.txt

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2018 Microsoft
+Copyright (c) 2019 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

lib/services/batchManagement/lib/batchManagementClient.js

@@ -50,7 +50,7 @@ class BatchManagementClient extends ServiceClient {
 
     super(credentials, options);
 
-    this.apiVersion = '2017-09-01';
+    this.apiVersion = '2018-12-01';
     this.acceptLanguage = 'en-US';
     this.longRunningOperationRetryTimeout = 30;
     this.generateClientRequestId = true;

lib/services/batchManagement/lib/models/activateApplicationPackageParameters.js

@@ -17,7 +17,8 @@
 class ActivateApplicationPackageParameters {
   /**
    * Create a ActivateApplicationPackageParameters.
-   * @member {string} format The format of the application package binary file.
+   * @property {string} format The format of the application package binary
+   * file.
    */
   constructor() {
   }

lib/services/batchManagement/lib/models/application.js

@@ -10,23 +10,25 @@
 
 'use strict';
 
+const models = require('./index');
+
 /**
  * Contains information about an application in a Batch account.
  *
+ * @extends models['ProxyResource']
  */
-class Application {
+class Application extends models['ProxyResource'] {
   /**
    * Create a Application.
-   * @member {string} [id] A string that uniquely identifies the application
-   * within the account.
-   * @member {string} [displayName] The display name for the application.
-   * @member {array} [packages] The list of packages under this application.
-   * @member {boolean} [allowUpdates] A value indicating whether packages
+   * @property {string} [displayName] The display name for the application.
+   * @property {boolean} [allowUpdates] A value indicating whether packages
    * within the application may be overwritten using the same version string.
-   * @member {string} [defaultVersion] The package to use if a client requests
-   * the application but does not specify a version.
+   * @property {string} [defaultVersion] The package to use if a client
+   * requests the application but does not specify a version. This property can
+   * only be set to the name of an existing package.
    */
   constructor() {
+    super();
   }
 
   /**
@@ -45,43 +47,53 @@ class Application {
         modelProperties: {
           id: {
             required: false,
+            readOnly: true,
             serializedName: 'id',
             type: {
               name: 'String'
             }
           },
-          displayName: {
+          name: {
+            required: false,
+            readOnly: true,
+            serializedName: 'name',
+            type: {
+              name: 'String'
+            }
+          },
+          type: {
             required: false,
-            serializedName: 'displayName',
+            readOnly: true,
+            serializedName: 'type',
             type: {
               name: 'String'
             }
           },
-          packages: {
+          etag: {
             required: false,
-            serializedName: 'packages',
+            readOnly: true,
+            serializedName: 'etag',
             type: {
-              name: 'Sequence',
-              element: {
-                  required: false,
-                  serializedName: 'ApplicationPackageElementType',
-                  type: {
-                    name: 'Composite',
-                    className: 'ApplicationPackage'
-                  }
-              }
+              name: 'String'
+            }
+          },
+          displayName: {
+            required: false,
+            serializedName: 'properties.displayName',
+            type: {
+              name: 'String'
             }
           },
           allowUpdates: {
             required: false,
-            serializedName: 'allowUpdates',
+            serializedName: 'properties.allowUpdates',
             type: {
               name: 'Boolean'
             }
           },
           defaultVersion: {
             required: false,
-            serializedName: 'defaultVersion',
+            serializedName: 'properties.defaultVersion',
             type: {
               name: 'String'
             }

lib/services/batchManagement/lib/models/applicationPackage.js

@@ -10,28 +10,30 @@
 
 'use strict';
 
+const models = require('./index');
+
 /**
  * An application package which represents a particular version of an
  * application.
  *
+ * @extends models['ProxyResource']
  */
-class ApplicationPackage {
+class ApplicationPackage extends models['ProxyResource'] {
   /**
    * Create a ApplicationPackage.
-   * @member {string} [id] The ID of the application.
-   * @member {string} [version] The version of the application package.
-   * @member {string} [state] The current state of the application package.
-   * Possible values include: 'Pending', 'Active', 'Unmapped'
-   * @member {string} [format] The format of the application package, if the
+   * @property {string} [state] The current state of the application package.
+   * Possible values include: 'Pending', 'Active'
+   * @property {string} [format] The format of the application package, if the
    * package is active.
-   * @member {string} [storageUrl] The URL for the application package in Azure
-   * Storage.
-   * @member {date} [storageUrlExpiry] The UTC time at which the Azure Storage
-   * URL will expire.
-   * @member {date} [lastActivationTime] The time at which the package was last
-   * activated, if the package is active.
+   * @property {string} [storageUrl] The URL for the application package in
+   * Azure Storage.
+   * @property {date} [storageUrlExpiry] The UTC time at which the Azure
+   * Storage URL will expire.
+   * @property {date} [lastActivationTime] The time at which the package was
+   * last activated, if the package is active.
    */
   constructor() {
+    super();
   }
 
   /**
@@ -56,51 +58,67 @@ class ApplicationPackage {
               name: 'String'
             }
           },
-          version: {
+          name: {
+            required: false,
+            readOnly: true,
+            serializedName: 'name',
+            type: {
+              name: 'String'
+            }
+          },
+          type: {
+            required: false,
+            readOnly: true,
+            serializedName: 'type',
+            type: {
+              name: 'String'
+            }
+          },
+          etag: {
             required: false,
             readOnly: true,
-            serializedName: 'version',
+            serializedName: 'etag',
             type: {
               name: 'String'
             }
           },
           state: {
             required: false,
             readOnly: true,
-            serializedName: 'state',
+            serializedName: 'properties.state',
             type: {
               name: 'Enum',
-              allowedValues: [ 'Pending', 'Active', 'Unmapped' ]
+              allowedValues: [ 'Pending', 'Active' ]
             }
           },
           format: {
             required: false,
             readOnly: true,
-            serializedName: 'format',
+            serializedName: 'properties.format',
             type: {
               name: 'String'
             }
           },
           storageUrl: {
             required: false,
             readOnly: true,
-            serializedName: 'storageUrl',
+            serializedName: 'properties.storageUrl',
             type: {
               name: 'String'
             }
           },
           storageUrlExpiry: {
             required: false,
             readOnly: true,
-            serializedName: 'storageUrlExpiry',
+            serializedName: 'properties.storageUrlExpiry',
             type: {
               name: 'DateTime'
             }
           },
           lastActivationTime: {
             required: false,
             readOnly: true,
-            serializedName: 'lastActivationTime',
+            serializedName: 'properties.lastActivationTime',
             type: {
               name: 'DateTime'
             }

lib/services/batchManagement/lib/models/applicationPackageReference.js

@@ -17,10 +17,10 @@
 class ApplicationPackageReference {
   /**
    * Create a ApplicationPackageReference.
-   * @member {string} id The ID of the application package to install. This
+   * @property {string} id The ID of the application package to install. This
    * must be inside the same batch account as the pool. This can either be a
    * reference to a specific version or the default version if one exists.
-   * @member {string} [version] The version of the application to deploy. If
+   * @property {string} [version] The version of the application to deploy. If
    * omitted, the default version is deployed. If this is omitted, and no
    * default version is specified for this application, the request fails with
    * the error code InvalidApplicationPackageReferences. If you are calling the