diff --git a/arm-datalake-analytics/account/2016-11-01/swagger/account.json b/arm-datalake-analytics/account/2016-11-01/swagger/account.json
index e2031f3bca6e..d15c03860b7c 100644
--- a/arm-datalake-analytics/account/2016-11-01/swagger/account.json
+++ b/arm-datalake-analytics/account/2016-11-01/swagger/account.json
@@ -37,6 +37,244 @@
     }
   },
   "paths": {
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeAnalytics/accounts/{accountName}/firewallRules/{firewallRuleName}": {
+      "put": {
+        "tags": [
+          "FirewallRules"
+        ],
+        "operationId": "FirewallRules_CreateOrUpdate",
+        "description": "Creates or updates the specified firewall rule. During update, the firewall rule with the specified name will be replaced with this new firewall rule.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the Azure resource group that contains the Data Lake Analytics account."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the Data Lake Analytics account to add or replace the firewall rule."
+          },
+          {
+            "name": "firewallRuleName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the firewall rule to create or update."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": true,
+            "schema": {
+              "$ref": "#/definitions/FirewallRule"
+            },
+            "description": "Parameters supplied to create or update the firewall rule."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully created or updated the specified firewall rule",
+            "schema": {
+              "$ref": "#/definitions/FirewallRule"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "FirewallRules"
+        ],
+        "operationId": "FirewallRules_Update",
+        "description": "Updates the specified firewall rule.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the Azure resource group that contains the Data Lake Analytics account."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the Data Lake Analytics account to which to update the firewall rule."
+          },
+          {
+            "name": "firewallRuleName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the firewall rule to update."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/UpdateFirewallRuleParameters"
+            },
+            "description": "Parameters supplied to update the firewall rule."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully updated the specified firewall rule",
+            "schema": {
+              "$ref": "#/definitions/FirewallRule"
+            }
+          }
+        }
+      },
+      "delete": {
+        "tags": [
+          "FirewallRules"
+        ],
+        "operationId": "FirewallRules_Delete",
+        "description": "Deletes the specified firewall rule from the specified Data Lake Analytics account",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the Azure resource group that contains the Data Lake Analytics account."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the Data Lake Analytics account from which to delete the firewall rule."
+          },
+          {
+            "name": "firewallRuleName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the firewall rule to delete."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully deleted the specified firewall rule"
+          },
+          "204": {
+            "description": "The specified firewall rule does not exist or was already deleted."
+          }
+        }
+      },
+      "get": {
+        "tags": [
+          "FirewallRules"
+        ],
+        "operationId": "FirewallRules_Get",
+        "description": "Gets the specified Data Lake Analytics firewall rule.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the Azure resource group that contains the Data Lake Analytics account."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the Data Lake Analytics account from which to get the firewall rule."
+          },
+          {
+            "name": "firewallRuleName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the firewall rule to retrieve."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully retrieved the list of firewall rules.",
+            "schema": {
+              "$ref": "#/definitions/FirewallRule"
+            }
+          }
+        }
+      }
+    },
+    "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeAnalytics/accounts/{accountName}/firewallRules": {
+      "get": {
+        "tags": [
+          "FirewallRules"
+        ],
+        "operationId": "FirewallRules_ListByAccount",
+        "description": "Lists the Data Lake Analytics firewall rules within the specified Data Lake Analytics account.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the Azure resource group that contains the Data Lake Analytics account."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the Data Lake Analytics account from which to get the firewall rules."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully created the firewall rule.",
+            "schema": {
+              "$ref": "#/definitions/DataLakeAnalyticsFirewallRuleListResult"
+            }
+          }
+        },
+        "x-ms-pageable": {
+          "nextLinkName": "nextLink"
+        }
+      }
+    },
     "/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.DataLakeAnalytics/accounts/{accountName}/StorageAccounts/{storageAccountName}": {
       "get": {
         "tags": [
@@ -1376,6 +1614,37 @@
             "modelAsString": false
           },
           "description": "the commitment tier in use for the current month."
+        },
+        "firewallState": {
+          "type": "string",
+          "description": "The current state of the IP address firewall for this Data Lake Analytics account.",
+          "enum": [
+            "Enabled",
+            "Disabled"
+          ],
+          "x-ms-enum": {
+            "name": "FirewallState",
+            "modelAsString": false
+          }
+        },
+        "firewallAllowAzureIps": {
+          "type": "string",
+          "description": "The current state of allowing or disallowing IPs originating within Azure through the firewall. If the firewall is disabled, this is not enforced.",
+          "enum": [
+            "Enabled",
+            "Disabled"
+          ],
+          "x-ms-enum": {
+            "name": "FirewallAllowAzureIpsState",
+            "modelAsString": false
+          }
+        },
+        "firewallRules": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/FirewallRule"
+          },
+          "description": "The list of firewall rules associated with this Data Lake Analytics account."
         }
       },
       "description": "The account specific properties that are associated with an underlying Data Lake Analytics account."
@@ -1419,6 +1688,37 @@
             "modelAsString": false
           },
           "description": "the commitment tier to use for next month."
+        },
+        "firewallState": {
+          "type": "string",
+          "description": "The current state of the IP address firewall for this Data Lake Analytics account.",
+          "enum": [
+            "Enabled",
+            "Disabled"
+          ],
+          "x-ms-enum": {
+            "name": "FirewallState",
+            "modelAsString": false
+          }
+        },
+        "firewallAllowAzureIps": {
+          "type": "string",
+          "description": "The current state of allowing or disallowing IPs originating within Azure through the firewall. If the firewall is disabled, this is not enforced.",
+          "enum": [
+            "Enabled",
+            "Disabled"
+          ],
+          "x-ms-enum": {
+            "name": "FirewallAllowAzureIpsState",
+            "modelAsString": false
+          }
+        },
+        "firewallRules": {
+          "type": "array",
+          "items": {
+            "$ref": "#/definitions/FirewallRule"
+          },
+          "description": "The list of firewall rules associated with this Data Lake Analytics account."
         }
       },
       "description": "The properties to update that are associated with an underlying Data Lake Analytics account to."
@@ -1509,25 +1809,81 @@
       },
       "description": "DataLakeAnalytics Account list information."
     },
-    "ErrorDetails": {
+    "DataLakeAnalyticsFirewallRuleListResult": {
       "properties": {
-        "code": {
-          "type": "string",
+        "value": {
+          "type": "array",
           "readOnly": true,
-          "description": "the HTTP status code or error code associated with this error"
+          "items": {
+            "$ref": "#/definitions/FirewallRule"
+          },
+          "description": "the results of the list operation"
         },
-        "message": {
+        "nextLink": {
           "type": "string",
           "readOnly": true,
-          "description": "the error message localized based on Accept-Language"
+          "description": "the link (url) to the next page of results."
+        }
+      },
+      "description": "Data Lake Analytics firewall rule list information."
+    },
+    "FirewallRuleProperties": {
+      "required": [
+        "startIpAddress",
+        "endIpAddress"
+      ],
+      "properties": {
+        "startIpAddress": {
+          "type": "string",
+          "description": "the start IP address for the firewall rule. This can be either ipv4 or ipv6. Start and End should be in the same protocol."
         },
-        "target": {
+        "endIpAddress": {
           "type": "string",
-          "readOnly": true,
-          "description": "the target of the particular error (for example, the name of the property in error)."
+          "description": "the end IP address for the firewall rule. This can be either ipv4 or ipv6. Start and End should be in the same protocol."
+        }
+      },
+      "description": "Data Lake Analytics firewall rule properties information"
+    },
+    "FirewallRule": {
+      "required": [
+        "properties"
+      ],
+      "allOf": [
+        {
+          "$ref": "#/definitions/OptionalSubResource"
+        }
+      ],
+      "properties": {
+        "properties": {
+          "$ref": "#/definitions/FirewallRuleProperties",
+          "description": "the properties of the firewall rule.",
+          "x-ms-client-flatten": true
+        }
+      },
+      "description": "Data Lake Analytics firewall rule information"
+    },
+    "UpdateFirewallRuleProperties": {
+      "properties": {
+        "startIpAddress": {
+          "type": "string",
+          "description": "the start IP address for the firewall rule. This can be either ipv4 or ipv6. Start and End should be in the same protocol."
+        },
+        "endIpAddress": {
+          "type": "string",
+          "description": "the end IP address for the firewall rule. This can be either ipv4 or ipv6. Start and End should be in the same protocol."
+        }
+      },
+      "description": "Data Lake Analytics firewall rule properties information"
+    },
+    "UpdateFirewallRuleParameters": {
+      "properties": {
+        "properties": {
+          "$ref": "#/definitions/UpdateFirewallRuleProperties",
+          "description": "the properties of the firewall rule to update.",
+          "x-ms-client-flatten": true
         }
       },
-      "description": "Generic resource error details information."
+      "description": "Data Lake Analytics firewall rule update parameters"
     },
     "Resource": {
       "description": "The Resource model definition.",
@@ -1564,6 +1920,25 @@
       ],
       "x-ms-azure-resource": true
     },
+    "OptionalSubResource": {
+      "description": "The Resource model definition for a nested resource with no required properties.",
+      "properties": {
+        "id": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource Id"
+        },
+        "name": {
+          "type": "string",
+          "description": "Resource name"
+        },
+        "type": {
+          "readOnly": true,
+          "type": "string",
+          "description": "Resource type"
+        }
+      }
+    },
     "SubResource": {
       "description": "The Sub Resource model definition.",
       "properties": {
diff --git a/arm-datalake-store/account/2016-11-01/swagger/account.json b/arm-datalake-store/account/2016-11-01/swagger/account.json
index e17115a94e70..4617a96ef585 100644
--- a/arm-datalake-store/account/2016-11-01/swagger/account.json
+++ b/arm-datalake-store/account/2016-11-01/swagger/account.json
@@ -57,7 +57,7 @@
             "in": "path",
             "required": true,
             "type": "string",
-            "description": "The name of the Data Lake Store account to which to add the firewall rule."
+            "description": "The name of the Data Lake Store account to add or replace the firewall rule."
           },
           {
             "name": "firewallRuleName",
@@ -91,6 +91,59 @@
           }
         }
       },
+      "patch": {
+        "tags": [
+          "FirewallRules"
+        ],
+        "operationId": "FirewallRules_Update",
+        "description": "Updates the specified firewall rule.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the Azure resource group that contains the Data Lake Store account."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the Data Lake Store account to which to update the firewall rule."
+          },
+          {
+            "name": "firewallRuleName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the firewall rule to update."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/UpdateFirewallRuleParameters"
+            },
+            "description": "Parameters supplied to update the firewall rule."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully updated the specified firewall rule",
+            "schema": {
+              "$ref": "#/definitions/FirewallRule"
+            }
+          }
+        }
+      },
       "delete": {
         "tags": [
           "FirewallRules"
@@ -242,7 +295,7 @@
             "in": "path",
             "required": true,
             "type": "string",
-            "description": "The name of the Data Lake Store account to which to add the trusted identity provider."
+            "description": "The name of the Data Lake Store account to add or replace the trusted identity provider."
           },
           {
             "name": "trustedIdProviderName",
@@ -258,7 +311,60 @@
             "schema": {
               "$ref": "#/definitions/TrustedIdProvider"
             },
-            "description": "Parameters supplied to create the create the trusted identity provider."
+            "description": "Parameters supplied to create or replace the trusted identity provider."
+          },
+          {
+            "$ref": "#/parameters/ApiVersionParameter"
+          },
+          {
+            "$ref": "#/parameters/SubscriptionIdParameter"
+          }
+        ],
+        "responses": {
+          "200": {
+            "description": "Successfully added the trusted identity provider.",
+            "schema": {
+              "$ref": "#/definitions/TrustedIdProvider"
+            }
+          }
+        }
+      },
+      "patch": {
+        "tags": [
+          "TrustedIdProviders"
+        ],
+        "operationId": "TrustedIdProviders_Update",
+        "description": "Updates the specified trusted identity provider.",
+        "parameters": [
+          {
+            "name": "resourceGroupName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the Azure resource group that contains the Data Lake Store account."
+          },
+          {
+            "name": "accountName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the Data Lake Store account to which to update the trusted identity provider."
+          },
+          {
+            "name": "trustedIdProviderName",
+            "in": "path",
+            "required": true,
+            "type": "string",
+            "description": "The name of the trusted identity provider. This is used for differentiation of providers in the account."
+          },
+          {
+            "name": "parameters",
+            "in": "body",
+            "required": false,
+            "schema": {
+              "$ref": "#/definitions/UpdateTrustedIdProviderParameters"
+            },
+            "description": "Parameters supplied to update the trusted identity provider."
           },
           {
             "$ref": "#/parameters/ApiVersionParameter"
@@ -788,6 +894,29 @@
     }
   },
   "definitions": {
+    "UpdateFirewallRuleProperties": {
+      "properties": {
+        "startIpAddress": {
+          "type": "string",
+          "description": "the start IP address for the firewall rule. This can be either ipv4 or ipv6. Start and End should be in the same protocol."
+        },
+        "endIpAddress": {
+          "type": "string",
+          "description": "the end IP address for the firewall rule. This can be either ipv4 or ipv6. Start and End should be in the same protocol."
+        }
+      },
+      "description": "Data Lake Analytics firewall rule properties information"
+    },
+    "UpdateFirewallRuleParameters": {
+      "properties": {
+        "properties": {
+          "$ref": "#/definitions/UpdateFirewallRuleProperties",
+          "description": "the properties of the firewall rule to update.",
+          "x-ms-client-flatten": true
+        }
+      },
+      "description": "Data Lake Analytics firewall rule update parameters"
+    },
     "FirewallRuleProperties": {
       "required": [
         "startIpAddress",
@@ -796,11 +925,11 @@
       "properties": {
         "startIpAddress": {
           "type": "string",
-          "description": "the start IP address for the firewall rule."
+          "description": "the start IP address for the firewall rule. This can be either ipv4 or ipv6. Start and End should be in the same protocol."
         },
         "endIpAddress": {
           "type": "string",
-          "description": "the end IP address for the firewall rule."
+          "description": "the end IP address for the firewall rule. This can be either ipv4 or ipv6. Start and End should be in the same protocol."
         }
       },
       "description": "Data Lake Store firewall rule properties information"
@@ -823,6 +952,25 @@
       },
       "description": "Data Lake Store firewall rule information"
     },
+    "UpdateTrustedIdProviderProperties": {
+      "properties": {
+        "idProvider": {
+          "type": "string",
+          "description": "The URL of this trusted identity provider"
+        }
+      },
+      "description": "Data Lake Store trusted identity provider property update information"
+    },
+    "UpdateTrustedIdProviderParameters": {
+      "properties": {
+        "properties": {
+          "$ref": "#/definitions/UpdateTrustedIdProviderProperties",
+          "description": "the properties of the trusted identity provider to update.",
+          "x-ms-client-flatten": true
+        }
+      },
+      "description": "Data Lake Store Trusted Identity Provider update parameters"
+    },
     "TrustedIdProviderProperties": {
       "required": [
         "idProvider"
@@ -851,7 +999,7 @@
           "x-ms-client-flatten": true
         }
       },
-      "description": "Data Lake Store firewall rule information"
+      "description": "Data Lake Store Trusted Identity Provider information"
     },
     "DataLakeStoreTrustedIdProviderListResult": {
       "properties": {
@@ -1048,6 +1196,18 @@
             "modelAsString": false
           }
         },
+        "firewallAllowAzureIps": {
+          "type": "string",
+          "description": "The current state of allowing or disallowing IPs originating within Azure through the firewall. If the firewall is disabled, this is not enforced.",
+          "enum": [
+            "Enabled",
+            "Disabled"
+          ],
+          "x-ms-enum": {
+            "name": "FirewallAllowAzureIpsState",
+            "modelAsString": false
+          }
+        },
         "firewallRules": {
           "type": "array",
           "items": {
@@ -1141,6 +1301,18 @@
             "modelAsString": false
           }
         },
+        "firewallAllowAzureIps": {
+          "type": "string",
+          "description": "The current state of allowing or disallowing IPs originating within Azure through the firewall. If the firewall is disabled, this is not enforced.",
+          "enum": [
+            "Enabled",
+            "Disabled"
+          ],
+          "x-ms-enum": {
+            "name": "FirewallAllowAzureIpsState",
+            "modelAsString": false
+          }
+        },
         "trustedIdProviderState": {
           "type": "string",
           "description": "The current state of the trusted identity provider feature for this Data Lake store account. Disabling trusted identity provider functionality does not remove the providers, they will just be ignored until this feature is re-enabled.",
diff --git a/arm-datalake-store/filesystem/2016-11-01/swagger/filesystem.json b/arm-datalake-store/filesystem/2016-11-01/swagger/filesystem.json
index 54c5cf93d6fd..695aaa28c0b2 100644
--- a/arm-datalake-store/filesystem/2016-11-01/swagger/filesystem.json
+++ b/arm-datalake-store/filesystem/2016-11-01/swagger/filesystem.json
@@ -476,7 +476,7 @@
         }
       }
     },
-    "/webhdfs/va/{getContentSummaryFilePath}": {
+    "/webhdfs/v1/{getContentSummaryFilePath}": {
       "get": {
         "tags": [
           "FileSystem"