Automatic PR from RestAPI-PR897

lib/services/dataLake.Analytics/lib/account/dataLakeAnalyticsAccountManagementClient.d.ts

@@ -56,9 +56,10 @@ declare class DataLakeAnalyticsAccountManagementClient {
     generateClientRequestId: boolean;
 
     // Operation groups
+    firewallRules: operations.FirewallRules;
     storageAccounts: operations.StorageAccounts;
     dataLakeStoreAccounts: operations.DataLakeStoreAccounts;
-    account: operations.Account;
+    accountOperations: operations.AccountOperations;
     }
 
 export = DataLakeAnalyticsAccountManagementClient;

lib/services/dataLake.Analytics/lib/account/dataLakeAnalyticsAccountManagementClient.js

@@ -85,9 +85,10 @@ function DataLakeAnalyticsAccountManagementClient(credentials, subscriptionId, b
   if(options.generateClientRequestId !== null && options.generateClientRequestId !== undefined) {
     this.generateClientRequestId = options.generateClientRequestId;
   }
+  this.firewallRules = new operations.FirewallRules(this);
   this.storageAccounts = new operations.StorageAccounts(this);
   this.dataLakeStoreAccounts = new operations.DataLakeStoreAccounts(this);
-  this.account = new operations.Account(this);
+  this.accountOperations = new operations.AccountOperations(this);
   this.models = models;
   msRest.addSerializationMixin(this);
 }

lib/services/dataLake.Analytics/lib/account/models/dataLakeAnalyticsAccount.js

@@ -61,6 +61,30 @@ var util = require('util');
  *
  * @member {string} [endpoint] the full CName endpoint for this account.
  *
+ * @member {string} [newTier] the commitment tier for the next month. Possible
+ * values include: 'Consumption', 'Commitment_100AUHours',
+ * 'Commitment_500AUHours', 'Commitment_1000AUHours', 'Commitment_5000AUHours',
+ * 'Commitment_10000AUHours', 'Commitment_50000AUHours',
+ * 'Commitment_100000AUHours', 'Commitment_500000AUHours'
+ *
+ * @member {string} [currentTier] the commitment tier in use for the current
+ * month. Possible values include: 'Consumption', 'Commitment_100AUHours',
+ * 'Commitment_500AUHours', 'Commitment_1000AUHours', 'Commitment_5000AUHours',
+ * 'Commitment_10000AUHours', 'Commitment_50000AUHours',
+ * 'Commitment_100000AUHours', 'Commitment_500000AUHours'
+ *
+ * @member {string} [firewallState] The current state of the IP address
+ * firewall for this Data Lake Analytics account. Possible values include:
+ * 'Enabled', 'Disabled'
+ *
+ * @member {string} [firewallAllowAzureIps] The current state of allowing or
+ * disallowing IPs originating within Azure through the firewall. If the
+ * firewall is disabled, this is not enforced. Possible values include:
+ * 'Enabled', 'Disabled'
+ *
+ * @member {array} [firewallRules] The list of firewall rules associated with
+ * this Data Lake Analytics account.
+ *
  */
 function DataLakeAnalyticsAccount() {
   DataLakeAnalyticsAccount['super_'].call(this);
@@ -255,6 +279,54 @@ DataLakeAnalyticsAccount.prototype.mapper = function () {
           type: {
             name: 'String'
           }
+        },
+        newTier: {
+          required: false,
+          serializedName: 'properties.newTier',
+          type: {
+            name: 'Enum',
+            allowedValues: [ 'Consumption', 'Commitment_100AUHours', 'Commitment_500AUHours', 'Commitment_1000AUHours', 'Commitment_5000AUHours', 'Commitment_10000AUHours', 'Commitment_50000AUHours', 'Commitment_100000AUHours', 'Commitment_500000AUHours' ]
+          }
+        },
+        currentTier: {
+          required: false,
+          readOnly: true,
+          serializedName: 'properties.currentTier',
+          type: {
+            name: 'Enum',
+            allowedValues: [ 'Consumption', 'Commitment_100AUHours', 'Commitment_500AUHours', 'Commitment_1000AUHours', 'Commitment_5000AUHours', 'Commitment_10000AUHours', 'Commitment_50000AUHours', 'Commitment_100000AUHours', 'Commitment_500000AUHours' ]
+          }
+        },
+        firewallState: {
+          required: false,
+          serializedName: 'properties.firewallState',
+          type: {
+            name: 'Enum',
+            allowedValues: [ 'Enabled', 'Disabled' ]
+          }
+        },
+        firewallAllowAzureIps: {
+          required: false,
+          serializedName: 'properties.firewallAllowAzureIps',
+          type: {
+            name: 'Enum',
+            allowedValues: [ 'Enabled', 'Disabled' ]
+          }
+        },
+        firewallRules: {
+          required: false,
+          serializedName: 'properties.firewallRules',
+          type: {
+            name: 'Sequence',
+            element: {
+                required: false,
+                serializedName: 'FirewallRuleElementType',
+                type: {
+                  name: 'Composite',
+                  className: 'FirewallRule'
+                }
+            }
+          }
         }
       }
     }

lib/services/dataLake.Analytics/lib/account/models/dataLakeAnalyticsAccountUpdateParameters.js

@@ -10,6 +10,10 @@
 
 'use strict';
 
+var models = require('./index');
+
+var util = require('util');
+
 /**
  * @class
  * Initializes a new instance of the DataLakeAnalyticsAccountUpdateParameters class.
@@ -28,6 +32,24 @@
  * @member {number} [maxJobCount] the maximum supported jobs running under the
  * account at the same time.
  *
+ * @member {string} [newTier] the commitment tier to use for next month.
+ * Possible values include: 'Consumption', 'Commitment_100AUHours',
+ * 'Commitment_500AUHours', 'Commitment_1000AUHours', 'Commitment_5000AUHours',
+ * 'Commitment_10000AUHours', 'Commitment_50000AUHours',
+ * 'Commitment_100000AUHours', 'Commitment_500000AUHours'
+ *
+ * @member {string} [firewallState] The current state of the IP address
+ * firewall for this Data Lake Analytics account. Possible values include:
+ * 'Enabled', 'Disabled'
+ *
+ * @member {string} [firewallAllowAzureIps] The current state of allowing or
+ * disallowing IPs originating within Azure through the firewall. If the
+ * firewall is disabled, this is not enforced. Possible values include:
+ * 'Enabled', 'Disabled'
+ *
+ * @member {array} [firewallRules] The list of firewall rules associated with
+ * this Data Lake Analytics account.
+ *
  */
 function DataLakeAnalyticsAccountUpdateParameters() {
 }
@@ -90,6 +112,45 @@ DataLakeAnalyticsAccountUpdateParameters.prototype.mapper = function () {
           type: {
             name: 'Number'
           }
+        },
+        newTier: {
+          required: false,
+          serializedName: 'properties.newTier',
+          type: {
+            name: 'Enum',
+            allowedValues: [ 'Consumption', 'Commitment_100AUHours', 'Commitment_500AUHours', 'Commitment_1000AUHours', 'Commitment_5000AUHours', 'Commitment_10000AUHours', 'Commitment_50000AUHours', 'Commitment_100000AUHours', 'Commitment_500000AUHours' ]
+          }
+        },
+        firewallState: {
+          required: false,
+          serializedName: 'properties.firewallState',
+          type: {
+            name: 'Enum',
+            allowedValues: [ 'Enabled', 'Disabled' ]
+          }
+        },
+        firewallAllowAzureIps: {
+          required: false,
+          serializedName: 'properties.firewallAllowAzureIps',
+          type: {
+            name: 'Enum',
+            allowedValues: [ 'Enabled', 'Disabled' ]
+          }
+        },
+        firewallRules: {
+          required: false,
+          serializedName: 'properties.firewallRules',
+          type: {
+            name: 'Sequence',
+            element: {
+                required: false,
+                serializedName: 'FirewallRuleElementType',
+                type: {
+                  name: 'Composite',
+                  className: 'FirewallRule'
+                }
+            }
+          }
         }
       }
     }

lib/services/dataLake.Analytics/lib/account/models/dataLakeAnalyticsFirewallRuleListResult.js

@@ -0,0 +1,72 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+var util = require('util');
+
+/**
+ * @class
+ * Initializes a new instance of the DataLakeAnalyticsFirewallRuleListResult class.
+ * @constructor
+ * Data Lake Analytics firewall rule list information.
+ *
+ * @member {string} [nextLink] the link (url) to the next page of results.
+ *
+ */
+function DataLakeAnalyticsFirewallRuleListResult() {
+}
+
+util.inherits(DataLakeAnalyticsFirewallRuleListResult, Array);
+
+/**
+ * Defines the metadata of DataLakeAnalyticsFirewallRuleListResult
+ *
+ * @returns {object} metadata of DataLakeAnalyticsFirewallRuleListResult
+ *
+ */
+DataLakeAnalyticsFirewallRuleListResult.prototype.mapper = function () {
+  return {
+    required: false,
+    serializedName: 'DataLakeAnalyticsFirewallRuleListResult',
+    type: {
+      name: 'Composite',
+      className: 'DataLakeAnalyticsFirewallRuleListResult',
+      modelProperties: {
+        value: {
+          required: false,
+          readOnly: true,
+          serializedName: '',
+          type: {
+            name: 'Sequence',
+            element: {
+                required: false,
+                serializedName: 'FirewallRuleElementType',
+                type: {
+                  name: 'Composite',
+                  className: 'FirewallRule'
+                }
+            }
+          }
+        },
+        nextLink: {
+          required: false,
+          readOnly: true,
+          serializedName: 'nextLink',
+          type: {
+            name: 'String'
+          }
+        }
+      }
+    }
+  };
+};
+
+module.exports = DataLakeAnalyticsFirewallRuleListResult;

lib/services/dataLake.Analytics/lib/account/models/firewallRule.js

@@ -0,0 +1,93 @@
+/*
+ * Copyright (c) Microsoft Corporation. All rights reserved.
+ * Licensed under the MIT License. See License.txt in the project root for
+ * license information.
+ *
+ * Code generated by Microsoft (R) AutoRest Code Generator.
+ * Changes may cause incorrect behavior and will be lost if the code is
+ * regenerated.
+ */
+
+'use strict';
+
+var models = require('./index');
+
+var util = require('util');
+
+/**
+ * @class
+ * Initializes a new instance of the FirewallRule class.
+ * @constructor
+ * Data Lake Analytics firewall rule information
+ *
+ * @member {string} startIpAddress the start IP address for the firewall rule.
+ * This can be either ipv4 or ipv6. Start and End should be in the same
+ * protocol.
+ *
+ * @member {string} endIpAddress the end IP address for the firewall rule. This
+ * can be either ipv4 or ipv6. Start and End should be in the same protocol.
+ *
+ */
+function FirewallRule() {
+  FirewallRule['super_'].call(this);
+}
+
+util.inherits(FirewallRule, models['OptionalSubResource']);
+
+/**
+ * Defines the metadata of FirewallRule
+ *
+ * @returns {object} metadata of FirewallRule
+ *
+ */
+FirewallRule.prototype.mapper = function () {
+  return {
+    required: false,
+    serializedName: 'FirewallRule',
+    type: {
+      name: 'Composite',
+      className: 'FirewallRule',
+      modelProperties: {
+        id: {
+          required: false,
+          readOnly: true,
+          serializedName: 'id',
+          type: {
+            name: 'String'
+          }
+        },
+        name: {
+          required: false,
+          serializedName: 'name',
+          type: {
+            name: 'String'
+          }
+        },
+        type: {
+          required: false,
+          readOnly: true,
+          serializedName: 'type',
+          type: {
+            name: 'String'
+          }
+        },
+        startIpAddress: {
+          required: true,
+          serializedName: 'properties.startIpAddress',
+          type: {
+            name: 'String'
+          }
+        },
+        endIpAddress: {
+          required: true,
+          serializedName: 'properties.endIpAddress',
+          type: {
+            name: 'String'
+          }
+        }
+      }
+    }
+  };
+};
+
+module.exports = FirewallRule;