Generated from 30ecc6996595e8e8fea4215fb88141aa787e4ebd (#2864)

Merge branch 'master' into Network-2018-05-01

# Conflicts:
#	specification/network/resource-manager/readme.md

lib/services/networkManagement2/lib/models/applicationGatewayAuthenticationCertificate.js

@@ -24,8 +24,8 @@ class ApplicationGatewayAuthenticationCertificate extends models['SubResource']
    * @member {string} [provisioningState] Provisioning state of the
    * authentication certificate resource. Possible values are: 'Updating',
    * 'Deleting', and 'Failed'.
-   * @member {string} [name] Name of the resource that is unique within a
-   * resource group. This name can be used to access the resource.
+   * @member {string} [name] Name of the authentication certificate that is
+   * unique within an Application Gateway.
    * @member {string} [etag] A unique read-only string that changes whenever
    * the resource is updated.
    * @member {string} [type] Type of the resource.

lib/services/networkManagement2/lib/models/applicationGatewayBackendAddressPool.js

@@ -26,8 +26,8 @@ class ApplicationGatewayBackendAddressPool extends models['SubResource'] {
    * @member {string} [provisioningState] Provisioning state of the backend
    * address pool resource. Possible values are: 'Updating', 'Deleting', and
    * 'Failed'.
-   * @member {string} [name] Resource that is unique within a resource group.
-   * This name can be used to access the resource.
+   * @member {string} [name] Name of the backend address pool that is unique
+   * within an Application Gateway.
    * @member {string} [etag] A unique read-only string that changes whenever
    * the resource is updated.
    * @member {string} [type] Type of the resource.

lib/services/networkManagement2/lib/models/applicationGatewayBackendHealthHttpSettings.js

@@ -21,9 +21,11 @@ class ApplicationGatewayBackendHealthHttpSettings {
    * Create a ApplicationGatewayBackendHealthHttpSettings.
    * @member {object} [backendHttpSettings] Reference of an
    * ApplicationGatewayBackendHttpSettings resource.
-   * @member {number} [backendHttpSettings.port] Port
-   * @member {string} [backendHttpSettings.protocol] Protocol. Possible values
-   * include: 'Http', 'Https'
+   * @member {number} [backendHttpSettings.port] The destination port on the
+   * backend.
+   * @member {string} [backendHttpSettings.protocol] The protocol used to
+   * communicate with the backend. Possible values are 'Http' and 'Https'.
+   * Possible values include: 'Http', 'Https'
    * @member {string} [backendHttpSettings.cookieBasedAffinity] Cookie based
    * affinity. Possible values include: 'Enabled', 'Disabled'
    * @member {number} [backendHttpSettings.requestTimeout] Request timeout in
@@ -58,9 +60,8 @@ class ApplicationGatewayBackendHealthHttpSettings {
    * @member {string} [backendHttpSettings.provisioningState] Provisioning
    * state of the backend http settings resource. Possible values are:
    * 'Updating', 'Deleting', and 'Failed'.
-   * @member {string} [backendHttpSettings.name] Name of the resource that is
-   * unique within a resource group. This name can be used to access the
-   * resource.
+   * @member {string} [backendHttpSettings.name] Name of the backend http
+   * settings that is unique within an Application Gateway.
    * @member {string} [backendHttpSettings.etag] A unique read-only string that
    * changes whenever the resource is updated.
    * @member {string} [backendHttpSettings.type] Type of the resource.

lib/services/networkManagement2/lib/models/applicationGatewayBackendHealthPool.js

@@ -27,8 +27,8 @@ class ApplicationGatewayBackendHealthPool {
    * @member {string} [backendAddressPool.provisioningState] Provisioning state
    * of the backend address pool resource. Possible values are: 'Updating',
    * 'Deleting', and 'Failed'.
-   * @member {string} [backendAddressPool.name] Resource that is unique within
-   * a resource group. This name can be used to access the resource.
+   * @member {string} [backendAddressPool.name] Name of the backend address
+   * pool that is unique within an Application Gateway.
    * @member {string} [backendAddressPool.etag] A unique read-only string that
    * changes whenever the resource is updated.
    * @member {string} [backendAddressPool.type] Type of the resource.

lib/services/networkManagement2/lib/models/applicationGatewayBackendHttpSettings.js

@@ -20,9 +20,10 @@ const models = require('./index');
 class ApplicationGatewayBackendHttpSettings extends models['SubResource'] {
   /**
    * Create a ApplicationGatewayBackendHttpSettings.
-   * @member {number} [port] Port
-   * @member {string} [protocol] Protocol. Possible values include: 'Http',
-   * 'Https'
+   * @member {number} [port] The destination port on the backend.
+   * @member {string} [protocol] The protocol used to communicate with the
+   * backend. Possible values are 'Http' and 'Https'. Possible values include:
+   * 'Http', 'Https'
    * @member {string} [cookieBasedAffinity] Cookie based affinity. Possible
    * values include: 'Enabled', 'Disabled'
    * @member {number} [requestTimeout] Request timeout in seconds. Application
@@ -52,8 +53,8 @@ class ApplicationGatewayBackendHttpSettings extends models['SubResource'] {
    * @member {string} [provisioningState] Provisioning state of the backend
    * http settings resource. Possible values are: 'Updating', 'Deleting', and
    * 'Failed'.
-   * @member {string} [name] Name of the resource that is unique within a
-   * resource group. This name can be used to access the resource.
+   * @member {string} [name] Name of the backend http settings that is unique
+   * within an Application Gateway.
    * @member {string} [etag] A unique read-only string that changes whenever
    * the resource is updated.
    * @member {string} [type] Type of the resource.

lib/services/networkManagement2/lib/models/applicationGatewayFrontendIPConfiguration.js

@@ -30,8 +30,8 @@ class ApplicationGatewayFrontendIPConfiguration extends models['SubResource'] {
    * @member {string} [publicIPAddress.id] Resource ID.
    * @member {string} [provisioningState] Provisioning state of the public IP
    * resource. Possible values are: 'Updating', 'Deleting', and 'Failed'.
-   * @member {string} [name] Name of the resource that is unique within a
-   * resource group. This name can be used to access the resource.
+   * @member {string} [name] Name of the frontend IP configuration that is
+   * unique within an Application Gateway.
    * @member {string} [etag] A unique read-only string that changes whenever
    * the resource is updated.
    * @member {string} [type] Type of the resource.

lib/services/networkManagement2/lib/models/applicationGatewayFrontendPort.js

@@ -23,8 +23,8 @@ class ApplicationGatewayFrontendPort extends models['SubResource'] {
    * @member {number} [port] Frontend port
    * @member {string} [provisioningState] Provisioning state of the frontend
    * port resource. Possible values are: 'Updating', 'Deleting', and 'Failed'.
-   * @member {string} [name] Name of the resource that is unique within a
-   * resource group. This name can be used to access the resource.
+   * @member {string} [name] Name of the frontend port that is unique within an
+   * Application Gateway
    * @member {string} [etag] A unique read-only string that changes whenever
    * the resource is updated.
    * @member {string} [type] Type of the resource.

lib/services/networkManagement2/lib/models/applicationGatewayHttpListener.js

@@ -26,8 +26,8 @@ class ApplicationGatewayHttpListener extends models['SubResource'] {
    * @member {object} [frontendPort] Frontend port resource of an application
    * gateway.
    * @member {string} [frontendPort.id] Resource ID.
-   * @member {string} [protocol] Protocol. Possible values include: 'Http',
-   * 'Https'
+   * @member {string} [protocol] Protocol of the HTTP listener. Possible values
+   * are 'Http' and 'Https'. Possible values include: 'Http', 'Https'
    * @member {string} [hostName] Host name of HTTP listener.
    * @member {object} [sslCertificate] SSL certificate resource of an
    * application gateway.
@@ -37,8 +37,8 @@ class ApplicationGatewayHttpListener extends models['SubResource'] {
    * @member {string} [provisioningState] Provisioning state of the HTTP
    * listener resource. Possible values are: 'Updating', 'Deleting', and
    * 'Failed'.
-   * @member {string} [name] Name of the resource that is unique within a
-   * resource group. This name can be used to access the resource.
+   * @member {string} [name] Name of the HTTP listener that is unique within an
+   * Application Gateway.
    * @member {string} [etag] A unique read-only string that changes whenever
    * the resource is updated.
    * @member {string} [type] Type of the resource.

lib/services/networkManagement2/lib/models/applicationGatewayIPConfiguration.js

@@ -27,8 +27,8 @@ class ApplicationGatewayIPConfiguration extends models['SubResource'] {
    * @member {string} [provisioningState] Provisioning state of the application
    * gateway subnet resource. Possible values are: 'Updating', 'Deleting', and
    * 'Failed'.
-   * @member {string} [name] Name of the resource that is unique within a
-   * resource group. This name can be used to access the resource.
+   * @member {string} [name] Name of the IP configuration that is unique within
+   * an Application Gateway.
    * @member {string} [etag] A unique read-only string that changes whenever
    * the resource is updated.
    * @member {string} [type] Type of the resource.

lib/services/networkManagement2/lib/models/applicationGatewayPathRule.js

@@ -32,8 +32,8 @@ class ApplicationGatewayPathRule extends models['SubResource'] {
    * @member {string} [redirectConfiguration.id] Resource ID.
    * @member {string} [provisioningState] Path rule of URL path map resource.
    * Possible values are: 'Updating', 'Deleting', and 'Failed'.
-   * @member {string} [name] Name of the resource that is unique within a
-   * resource group. This name can be used to access the resource.
+   * @member {string} [name] Name of the path rule that is unique within an
+   * Application Gateway.
    * @member {string} [etag] A unique read-only string that changes whenever
    * the resource is updated.
    * @member {string} [type] Type of the resource.

lib/services/networkManagement2/lib/models/applicationGatewayProbe.js

@@ -20,8 +20,8 @@ const models = require('./index');
 class ApplicationGatewayProbe extends models['SubResource'] {
   /**
    * Create a ApplicationGatewayProbe.
-   * @member {string} [protocol] Protocol. Possible values include: 'Http',
-   * 'Https'
+   * @member {string} [protocol] The protocol used for the probe. Possible
+   * values are 'Http' and 'Https'. Possible values include: 'Http', 'Https'
    * @member {string} [host] Host name to send the probe to.
    * @member {string} [path] Relative path of probe. Valid path starts from
    * '/'. Probe is sent to <Protocol>://<host>:<port><path>
@@ -48,8 +48,8 @@ class ApplicationGatewayProbe extends models['SubResource'] {
    * @member {string} [provisioningState] Provisioning state of the backend
    * http settings resource. Possible values are: 'Updating', 'Deleting', and
    * 'Failed'.
-   * @member {string} [name] Name of the resource that is unique within a
-   * resource group. This name can be used to access the resource.
+   * @member {string} [name] Name of the probe that is unique within an
+   * Application Gateway.
    * @member {string} [etag] A unique read-only string that changes whenever
    * the resource is updated.
    * @member {string} [type] Type of the resource.

lib/services/networkManagement2/lib/models/applicationGatewayRedirectConfiguration.js

@@ -35,8 +35,8 @@ class ApplicationGatewayRedirectConfiguration extends models['SubResource'] {
    * @member {array} [urlPathMaps] Url path maps specifying default redirect
    * configuration.
    * @member {array} [pathRules] Path rules specifying redirect configuration.
-   * @member {string} [name] Name of the resource that is unique within a
-   * resource group. This name can be used to access the resource.
+   * @member {string} [name] Name of the redirect configuration that is unique
+   * within an Application Gateway.
    * @member {string} [etag] A unique read-only string that changes whenever
    * the resource is updated.
    * @member {string} [type] Type of the resource.

lib/services/networkManagement2/lib/models/applicationGatewayRequestRoutingRule.js

@@ -25,8 +25,8 @@ class ApplicationGatewayRequestRoutingRule extends models['SubResource'] {
    * @member {object} [backendAddressPool] Backend address pool resource of the
    * application gateway.
    * @member {string} [backendAddressPool.id] Resource ID.
-   * @member {object} [backendHttpSettings] Frontend port resource of the
-   * application gateway.
+   * @member {object} [backendHttpSettings] Backend http settings resource of
+   * the application gateway.
    * @member {string} [backendHttpSettings.id] Resource ID.
    * @member {object} [httpListener] Http listener resource of the application
    * gateway.
@@ -40,8 +40,8 @@ class ApplicationGatewayRequestRoutingRule extends models['SubResource'] {
    * @member {string} [provisioningState] Provisioning state of the request
    * routing rule resource. Possible values are: 'Updating', 'Deleting', and
    * 'Failed'.
-   * @member {string} [name] Name of the resource that is unique within a
-   * resource group. This name can be used to access the resource.
+   * @member {string} [name] Name of the request routing rule that is unique
+   * within an Application Gateway.
    * @member {string} [etag] A unique read-only string that changes whenever
    * the resource is updated.
    * @member {string} [type] Type of the resource.

lib/services/networkManagement2/lib/models/applicationGatewaySslCertificate.js

@@ -29,8 +29,8 @@ class ApplicationGatewaySslCertificate extends models['SubResource'] {
    * @member {string} [provisioningState] Provisioning state of the SSL
    * certificate resource Possible values are: 'Updating', 'Deleting', and
    * 'Failed'.
-   * @member {string} [name] Name of the resource that is unique within a
-   * resource group. This name can be used to access the resource.
+   * @member {string} [name] Name of the SSL certificate that is unique within
+   * an Application Gateway.
    * @member {string} [etag] A unique read-only string that changes whenever
    * the resource is updated.
    * @member {string} [type] Type of the resource.

lib/services/networkManagement2/lib/models/applicationGatewaySslPredefinedPolicy.js

@@ -20,7 +20,7 @@ const models = require('./index');
 class ApplicationGatewaySslPredefinedPolicy extends models['SubResource'] {
   /**
    * Create a ApplicationGatewaySslPredefinedPolicy.
-   * @member {string} [name] Name of Ssl predefined policy.
+   * @member {string} [name] Name of the Ssl predefined policy.
    * @member {array} [cipherSuites] Ssl cipher suites to be enabled in the
    * specified order for application gateway.
    * @member {string} [minProtocolVersion] Minimum version of Ssl protocol to

lib/services/networkManagement2/lib/models/applicationGatewayUrlPathMap.js

@@ -34,8 +34,8 @@ class ApplicationGatewayUrlPathMap extends models['SubResource'] {
    * @member {string} [provisioningState] Provisioning state of the backend
    * http settings resource. Possible values are: 'Updating', 'Deleting', and
    * 'Failed'.
-   * @member {string} [name] Name of the resource that is unique within a
-   * resource group. This name can be used to access the resource.
+   * @member {string} [name] Name of the URL path map that is unique within an
+   * Application Gateway.
    * @member {string} [etag] A unique read-only string that changes whenever
    * the resource is updated.
    * @member {string} [type] Type of the resource.

lib/services/networkManagement2/lib/models/ddosProtectionPlan.js

@@ -15,11 +15,16 @@ const models = require('./index');
 /**
  * A DDoS protection plan in a resource group.
  *
- * @extends models['Resource']
+ * @extends models['BaseResource']
  */
-class DdosProtectionPlan extends models['Resource'] {
+class DdosProtectionPlan extends models['BaseResource'] {
   /**
    * Create a DdosProtectionPlan.
+   * @member {string} [id] Resource ID.
+   * @member {string} [name] Resource name.
+   * @member {string} [type] Resource type.
+   * @member {string} [location] Resource location.
+   * @member {object} [tags] Resource tags.
    * @member {string} [resourceGuid] The resource GUID property of the DDoS
    * protection plan resource. It uniquely identifies the resource, even if the
    * user changes its name or migrate the resource across subscriptions or
@@ -52,6 +57,7 @@ class DdosProtectionPlan extends models['Resource'] {
         modelProperties: {
           id: {
             required: false,
+            readOnly: true,
             serializedName: 'id',
             type: {
               name: 'String'

lib/services/networkManagement2/lib/models/expressRouteCircuitArpTable.js

@@ -17,8 +17,8 @@
 class ExpressRouteCircuitArpTable {
   /**
    * Create a ExpressRouteCircuitArpTable.
-   * @member {number} [age] Age
-   * @member {string} [interfaceProperty] Interface
+   * @member {number} [age] Entry age in minutes
+   * @member {string} [interfaceProperty] Interface address
    * @member {string} [ipAddress] The IP address.
    * @member {string} [macAddress] The MAC address.
    */

lib/services/networkManagement2/lib/models/expressRouteCircuitRoutesTable.js

@@ -17,11 +17,13 @@
 class ExpressRouteCircuitRoutesTable {
   /**
    * Create a ExpressRouteCircuitRoutesTable.
-   * @member {string} [network] network
-   * @member {string} [nextHop] nextHop
-   * @member {string} [locPrf] locPrf
-   * @member {number} [weight] weight.
-   * @member {string} [path] path
+   * @member {string} [network] IP address of a network entity
+   * @member {string} [nextHop] NextHop address
+   * @member {string} [locPrf] Local preference value as set with the set
+   * local-preference route-map configuration command
+   * @member {number} [weight] Route Weight.
+   * @member {string} [path] Autonomous system paths to the destination
+   * network.
    */
   constructor() {
   }

lib/services/networkManagement2/lib/models/expressRouteCircuitRoutesTableSummary.js

@@ -17,7 +17,7 @@
 class ExpressRouteCircuitRoutesTableSummary {
   /**
    * Create a ExpressRouteCircuitRoutesTableSummary.
-   * @member {string} [neighbor] Neighbor
+   * @member {string} [neighbor] IP address of the neighbor.
    * @member {number} [v] BGP version number spoken to the neighbor.
    * @member {number} [as] Autonomous system number.
    * @member {string} [upDown] The length of time that the BGP session has been

lib/services/networkManagement2/lib/models/flowLogInformation.js

@@ -13,14 +13,15 @@
 const models = require('./index');
 
 /**
- * Information on the configuration of flow log.
+ * Information on the configuration of flow log and traffic analytics
+ * (optional) .
  *
  */
 class FlowLogInformation {
   /**
    * Create a FlowLogInformation.
    * @member {string} targetResourceId The ID of the resource to configure for
-   * flow logging.
+   * flow log and traffic analytics (optional) .
    * @member {string} storageId ID of the storage account which is used to
    * store the flow log.
    * @member {boolean} enabled Flag to enable/disable flow logging.
@@ -29,6 +30,21 @@ class FlowLogInformation {
    * records.
    * @member {boolean} [retentionPolicy.enabled] Flag to enable/disable
    * retention.
+   * @member {object} [flowAnalyticsConfiguration]
+   * @member {object}
+   * [flowAnalyticsConfiguration.networkWatcherFlowAnalyticsConfiguration]
+   * @member {boolean}
+   * [flowAnalyticsConfiguration.networkWatcherFlowAnalyticsConfiguration.enabled]
+   * Flag to enable/disable traffic analytics.
+   * @member {string}
+   * [flowAnalyticsConfiguration.networkWatcherFlowAnalyticsConfiguration.workspaceId]
+   * The resource guid of the attached workspace
+   * @member {string}
+   * [flowAnalyticsConfiguration.networkWatcherFlowAnalyticsConfiguration.workspaceRegion]
+   * The location of the attached workspace
+   * @member {string}
+   * [flowAnalyticsConfiguration.networkWatcherFlowAnalyticsConfiguration.workspaceResourceId]
+   * Resource Id of the attached workspace
    */
   constructor() {
   }
@@ -75,6 +91,14 @@ class FlowLogInformation {
               name: 'Composite',
               className: 'RetentionPolicyParameters'
             }
+          },
+          flowAnalyticsConfiguration: {
+            required: false,
+            serializedName: 'flowAnalyticsConfiguration',
+            type: {
+              name: 'Composite',
+              className: 'TrafficAnalyticsProperties'
+            }
           }
         }
       }

lib/services/networkManagement2/lib/models/flowLogStatusParameters.js

@@ -11,14 +11,15 @@
 'use strict';
 
 /**
- * Parameters that define a resource to query flow log status.
+ * Parameters that define a resource to query flow log and traffic analytics
+ * (optional) status.
  *
  */
 class FlowLogStatusParameters {
   /**
    * Create a FlowLogStatusParameters.
    * @member {string} targetResourceId The target resource where getting the
-   * flow logging status.
+   * flow log and traffic analytics (optional) status.
    */
   constructor() {
   }