[AutoPR network/resource-manager] Merging July branch, resolved conflicts

lib/services/networkManagement2/lib/models/index.d.ts

@@ -6823,7 +6823,7 @@ export interface VirtualHub extends Resource {
  * include: 'Unknown', 'Connecting', 'Connected', 'NotConnected'
  * @member {number} [ingressBytesTransferred] Ingress bytes transferred.
  * @member {number} [egressBytesTransferred] Egress bytes transferred.
- * @member {number} [connectionBandwidth] Expected bandwidth in MBPS.
+ * @member {number} [connectionBandwidthInMbps] Expected bandwidth in MBPS.
  * @member {string} [sharedKey] SharedKey for the vpn connection.
  * @member {boolean} [enableBgp] EnableBgp flag
  * @member {array} [ipsecPolicies] The IPSec Policies to be considered by this
@@ -6839,7 +6839,7 @@ export interface VpnConnection extends Resource {
   connectionStatus?: string;
   readonly ingressBytesTransferred?: number;
   readonly egressBytesTransferred?: number;
-  readonly connectionBandwidth?: number;
+  readonly connectionBandwidthInMbps?: number;
   sharedKey?: string;
   enableBgp?: boolean;
   ipsecPolicies?: IpsecPolicy[];

lib/services/networkManagement2/lib/models/vpnConnection.js

@@ -27,7 +27,7 @@ class VpnConnection extends models['Resource'] {
    * include: 'Unknown', 'Connecting', 'Connected', 'NotConnected'
    * @member {number} [ingressBytesTransferred] Ingress bytes transferred.
    * @member {number} [egressBytesTransferred] Egress bytes transferred.
-   * @member {number} [connectionBandwidth] Expected bandwidth in MBPS.
+   * @member {number} [connectionBandwidthInMbps] Expected bandwidth in MBPS.
    * @member {string} [sharedKey] SharedKey for the vpn connection.
    * @member {boolean} [enableBgp] EnableBgp flag
    * @member {array} [ipsecPolicies] The IPSec Policies to be considered by
@@ -138,10 +138,10 @@ class VpnConnection extends models['Resource'] {
               name: 'Number'
             }
           },
-          connectionBandwidth: {
+          connectionBandwidthInMbps: {
             required: false,
             readOnly: true,
-            serializedName: 'properties.connectionBandwidth',
+            serializedName: 'properties.connectionBandwidthInMbps',
             type: {
               name: 'Number'
             }

lib/services/networkManagement2/lib/networkManagementClient.js

@@ -61,7 +61,7 @@ function _checkDnsNameAvailability(location, domainNameLabel, options, callback)
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (location === null || location === undefined || typeof location.valueOf() !== 'string') {

lib/services/networkManagement2/lib/operations/applicationGateways.js

@@ -112,7 +112,7 @@ function _get(resourceGroupName, applicationGatewayName, options, callback) {
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
@@ -551,7 +551,7 @@ function _list(resourceGroupName, options, callback) {
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
@@ -687,7 +687,7 @@ function _listAll(options, callback) {
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') {
@@ -1029,7 +1029,7 @@ function _listAvailableWafRuleSets(options, callback) {
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') {
@@ -1161,7 +1161,7 @@ function _listAvailableSslOptions(options, callback) {
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') {
@@ -1294,7 +1294,7 @@ function _listAvailableSslPredefinedPolicies(options, callback) {
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') {
@@ -1428,7 +1428,7 @@ function _getSslPredefinedPolicy(predefinedPolicyName, options, callback) {
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') {
@@ -1566,7 +1566,7 @@ function _beginDeleteMethod(resourceGroupName, applicationGatewayName, options,
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
@@ -1828,7 +1828,7 @@ function _beginCreateOrUpdate(resourceGroupName, applicationGatewayName, paramet
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
@@ -2010,7 +2010,7 @@ function _beginUpdateTags(resourceGroupName, applicationGatewayName, parameters,
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
@@ -2169,7 +2169,7 @@ function _beginStart(resourceGroupName, applicationGatewayName, options, callbac
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
@@ -2294,7 +2294,7 @@ function _beginStop(resourceGroupName, applicationGatewayName, options, callback
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
@@ -2426,7 +2426,7 @@ function _beginBackendHealth(resourceGroupName, applicationGatewayName, options,
     throw new Error('callback cannot be null.');
   }
   let expand = (options && options.expand !== undefined) ? options.expand : undefined;
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {

lib/services/networkManagement2/lib/operations/applicationSecurityGroups.js

@@ -115,7 +115,7 @@ function _get(resourceGroupName, applicationSecurityGroupName, options, callback
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
@@ -344,7 +344,7 @@ function _listAll(options, callback) {
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') {
@@ -478,7 +478,7 @@ function _list(resourceGroupName, options, callback) {
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
@@ -617,7 +617,7 @@ function _beginDeleteMethod(resourceGroupName, applicationSecurityGroupName, opt
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
@@ -754,7 +754,7 @@ function _beginCreateOrUpdate(resourceGroupName, applicationSecurityGroupName, p
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {

lib/services/networkManagement2/lib/operations/availableEndpointServices.js

@@ -48,7 +48,7 @@ function _list(location, options, callback) {
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (location === null || location === undefined || typeof location.valueOf() !== 'string') {

lib/services/networkManagement2/lib/operations/azureFirewalls.js

@@ -112,7 +112,7 @@ function _get(resourceGroupName, azureFirewallName, options, callback) {
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
@@ -354,7 +354,7 @@ function _list(resourceGroupName, options, callback) {
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
@@ -490,7 +490,7 @@ function _listAll(options, callback) {
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') {
@@ -624,7 +624,7 @@ function _beginDeleteMethod(resourceGroupName, azureFirewallName, options, callb
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
@@ -772,7 +772,7 @@ function _beginCreateOrUpdate(resourceGroupName, azureFirewallName, parameters,
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {

lib/services/networkManagement2/lib/operations/bgpServiceCommunities.js

@@ -46,7 +46,7 @@ function _list(options, callback) {
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') {

lib/services/networkManagement2/lib/operations/connectionMonitors.js

@@ -167,7 +167,7 @@ function _get(resourceGroupName, networkWatcherName, connectionMonitorName, opti
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
@@ -597,7 +597,7 @@ function _list(resourceGroupName, networkWatcherName, options, callback) {
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
@@ -776,7 +776,7 @@ function _beginCreateOrUpdate(resourceGroupName, networkWatcherName, connectionM
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
@@ -959,7 +959,7 @@ function _beginDeleteMethod(resourceGroupName, networkWatcherName, connectionMon
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
@@ -1091,7 +1091,7 @@ function _beginStop(resourceGroupName, networkWatcherName, connectionMonitorName
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
@@ -1223,7 +1223,7 @@ function _beginStart(resourceGroupName, networkWatcherName, connectionMonitorNam
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
@@ -1358,7 +1358,7 @@ function _beginQuery(resourceGroupName, networkWatcherName, connectionMonitorNam
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {

lib/services/networkManagement2/lib/operations/ddosProtectionPlans.js

@@ -112,7 +112,7 @@ function _get(resourceGroupName, ddosProtectionPlanName, options, callback) {
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
@@ -337,7 +337,7 @@ function _list(options, callback) {
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (this.client.subscriptionId === null || this.client.subscriptionId === undefined || typeof this.client.subscriptionId.valueOf() !== 'string') {
@@ -471,7 +471,7 @@ function _listByResourceGroup(resourceGroupName, options, callback) {
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
@@ -609,7 +609,7 @@ function _beginDeleteMethod(resourceGroupName, ddosProtectionPlanName, options,
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
@@ -742,7 +742,7 @@ function _beginCreateOrUpdate(resourceGroupName, ddosProtectionPlanName, paramet
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {

lib/services/networkManagement2/lib/operations/defaultSecurityRules.js

@@ -51,7 +51,7 @@ function _list(resourceGroupName, networkSecurityGroupName, options, callback) {
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {
@@ -198,7 +198,7 @@ function _get(resourceGroupName, networkSecurityGroupName, defaultSecurityRuleNa
   if (!callback) {
     throw new Error('callback cannot be null.');
   }
-  let apiVersion = '2018-04-01';
+  let apiVersion = '2018-06-01';
   // Validate
   try {
     if (resourceGroupName === null || resourceGroupName === undefined || typeof resourceGroupName.valueOf() !== 'string') {