Update from master

sdk/network/mgmt-v2019_09_01/pom.xml

@@ -11,11 +11,11 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.2.0</version>
+        <version>1.1.0</version>
         <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-network</artifactId>
-    <version>1.0.0-beta-1</version>
+    <version>1.0.0-beta</version>
     <packaging>jar</packaging>
     <name>Microsoft Azure SDK for Network Management</name>
     <description>This package contains Microsoft Network Management SDK.</description>

sdk/network/mgmt-v2019_09_01/src/main/java/com/microsoft/azure/management/network/v2019_09_01/BastionConnectProtocol.java

@@ -0,0 +1,41 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.network.v2019_09_01;
+
+import java.util.Collection;
+import com.fasterxml.jackson.annotation.JsonCreator;
+import com.microsoft.rest.ExpandableStringEnum;
+
+/**
+ * Defines values for BastionConnectProtocol.
+ */
+public final class BastionConnectProtocol extends ExpandableStringEnum<BastionConnectProtocol> {
+    /** Static value SSH for BastionConnectProtocol. */
+    public static final BastionConnectProtocol SSH = fromString("SSH");
+
+    /** Static value RDP for BastionConnectProtocol. */
+    public static final BastionConnectProtocol RDP = fromString("RDP");
+
+    /**
+     * Creates or finds a BastionConnectProtocol from its string representation.
+     * @param name a name to look for
+     * @return the corresponding BastionConnectProtocol
+     */
+    @JsonCreator
+    public static BastionConnectProtocol fromString(String name) {
+        return fromString(name, BastionConnectProtocol.class);
+    }
+
+    /**
+     * @return known BastionConnectProtocol values
+     */
+    public static Collection<BastionConnectProtocol> values() {
+        return values(BastionConnectProtocol.class);
+    }
+}

sdk/network/mgmt-v2019_09_01/src/main/java/com/microsoft/azure/management/network/v2019_09_01/BastionShareableLinkListRequest.java

@@ -0,0 +1,45 @@
+/**
+ * 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.
+ */
+
+package com.microsoft.azure.management.network.v2019_09_01;
+
+import java.util.List;
+import com.microsoft.azure.management.network.v2019_09_01.implementation.BastionShareableLinkInner;
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Post request for all the Bastion Shareable Link endpoints.
+ */
+public class BastionShareableLinkListRequest {
+    /**
+     * List of VM references.
+     */
+    @JsonProperty(value = "vms")
+    private List<BastionShareableLinkInner> vms;
+
+    /**
+     * Get list of VM references.
+     *
+     * @return the vms value
+     */
+    public List<BastionShareableLinkInner> vms() {
+        return this.vms;
+    }
+
+    /**
+     * Set list of VM references.
+     *
+     * @param vms the vms value to set
+     * @return the BastionShareableLinkListRequest object itself.
+     */
+    public BastionShareableLinkListRequest withVms(List<BastionShareableLinkInner> vms) {
+        this.vms = vms;
+        return this;
+    }
+
+}

sdk/network/mgmt-v2019_09_01/src/main/java/com/microsoft/azure/management/network/v2019_09_01/ConnectivityParameters.java

@@ -39,6 +39,13 @@ public class ConnectivityParameters {
     @JsonProperty(value = "protocolConfiguration")
     private ProtocolConfiguration protocolConfiguration;
 
+    /**
+     * Preferred IP version of the connection. Possible values include: 'IPv4',
+     * 'IPv6'.
+     */
+    @JsonProperty(value = "preferredIPVersion")
+    private IPVersion preferredIPVersion;
+
     /**
      * Get describes the source of the connection.
      *
@@ -119,4 +126,24 @@ public ConnectivityParameters withProtocolConfiguration(ProtocolConfiguration pr
         return this;
     }
 
+    /**
+     * Get preferred IP version of the connection. Possible values include: 'IPv4', 'IPv6'.
+     *
+     * @return the preferredIPVersion value
+     */
+    public IPVersion preferredIPVersion() {
+        return this.preferredIPVersion;
+    }
+
+    /**
+     * Set preferred IP version of the connection. Possible values include: 'IPv4', 'IPv6'.
+     *
+     * @param preferredIPVersion the preferredIPVersion value to set
+     * @return the ConnectivityParameters object itself.
+     */
+    public ConnectivityParameters withPreferredIPVersion(IPVersion preferredIPVersion) {
+        this.preferredIPVersion = preferredIPVersion;
+        return this;
+    }
+
 }

sdk/network/mgmt-v2019_09_01/src/main/java/com/microsoft/azure/management/network/v2019_09_01/ExpressRouteCircuit.java

@@ -166,6 +166,18 @@ interface WithBandwidthInGbps {
             WithCreate withBandwidthInGbps(Double bandwidthInGbps);
         }
 
+        /**
+         * The stage of the expressroutecircuit definition allowing to specify CircuitProvisioningState.
+         */
+        interface WithCircuitProvisioningState {
+            /**
+             * Specifies circuitProvisioningState.
+             * @param circuitProvisioningState The CircuitProvisioningState state of the resource
+             * @return the next definition stage
+             */
+            WithCreate withCircuitProvisioningState(String circuitProvisioningState);
+        }
+
         /**
          * The stage of the expressroutecircuit definition allowing to specify ExpressRoutePort.
          */
@@ -190,6 +202,18 @@ interface WithGatewayManagerEtag {
             WithCreate withGatewayManagerEtag(String gatewayManagerEtag);
         }
 
+        /**
+         * The stage of the expressroutecircuit definition allowing to specify GlobalReachEnabled.
+         */
+        interface WithGlobalReachEnabled {
+            /**
+             * Specifies globalReachEnabled.
+             * @param globalReachEnabled Flag denoting Global reach status
+             * @return the next definition stage
+             */
+            WithCreate withGlobalReachEnabled(Boolean globalReachEnabled);
+        }
+
         /**
          * The stage of the expressroutecircuit definition allowing to specify Peerings.
          */
@@ -202,6 +226,18 @@ interface WithPeerings {
             WithCreate withPeerings(List<ExpressRouteCircuitPeeringInner> peerings);
         }
 
+        /**
+         * The stage of the expressroutecircuit definition allowing to specify ServiceKey.
+         */
+        interface WithServiceKey {
+            /**
+             * Specifies serviceKey.
+             * @param serviceKey The ServiceKey
+             * @return the next definition stage
+             */
+            WithCreate withServiceKey(String serviceKey);
+        }
+
         /**
          * The stage of the expressroutecircuit definition allowing to specify ServiceProviderNotes.
          */
@@ -226,6 +262,18 @@ interface WithServiceProviderProperties {
             WithCreate withServiceProviderProperties(ExpressRouteCircuitServiceProviderProperties serviceProviderProperties);
         }
 
+        /**
+         * The stage of the expressroutecircuit definition allowing to specify ServiceProviderProvisioningState.
+         */
+        interface WithServiceProviderProvisioningState {
+            /**
+             * Specifies serviceProviderProvisioningState.
+             * @param serviceProviderProvisioningState The ServiceProviderProvisioningState state of the resource. Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning'
+             * @return the next definition stage
+             */
+            WithCreate withServiceProviderProvisioningState(ServiceProviderProvisioningState serviceProviderProvisioningState);
+        }
+
         /**
          * The stage of the expressroutecircuit definition allowing to specify Sku.
          */
@@ -243,13 +291,13 @@ interface WithSku {
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<ExpressRouteCircuit>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAllowClassicOperations, DefinitionStages.WithAuthorizations, DefinitionStages.WithBandwidthInGbps, DefinitionStages.WithExpressRoutePort, DefinitionStages.WithGatewayManagerEtag, DefinitionStages.WithPeerings, DefinitionStages.WithServiceProviderNotes, DefinitionStages.WithServiceProviderProperties, DefinitionStages.WithSku {
+        interface WithCreate extends Creatable<ExpressRouteCircuit>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithAllowClassicOperations, DefinitionStages.WithAuthorizations, DefinitionStages.WithBandwidthInGbps, DefinitionStages.WithCircuitProvisioningState, DefinitionStages.WithExpressRoutePort, DefinitionStages.WithGatewayManagerEtag, DefinitionStages.WithGlobalReachEnabled, DefinitionStages.WithPeerings, DefinitionStages.WithServiceKey, DefinitionStages.WithServiceProviderNotes, DefinitionStages.WithServiceProviderProperties, DefinitionStages.WithServiceProviderProvisioningState, DefinitionStages.WithSku {
         }
     }
     /**
      * The template for a ExpressRouteCircuit update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<ExpressRouteCircuit>, Resource.UpdateWithTags<Update>, UpdateStages.WithAllowClassicOperations, UpdateStages.WithAuthorizations, UpdateStages.WithBandwidthInGbps, UpdateStages.WithExpressRoutePort, UpdateStages.WithGatewayManagerEtag, UpdateStages.WithPeerings, UpdateStages.WithServiceProviderNotes, UpdateStages.WithServiceProviderProperties, UpdateStages.WithSku {
+    interface Update extends Appliable<ExpressRouteCircuit>, Resource.UpdateWithTags<Update>, UpdateStages.WithAllowClassicOperations, UpdateStages.WithAuthorizations, UpdateStages.WithBandwidthInGbps, UpdateStages.WithCircuitProvisioningState, UpdateStages.WithExpressRoutePort, UpdateStages.WithGatewayManagerEtag, UpdateStages.WithGlobalReachEnabled, UpdateStages.WithPeerings, UpdateStages.WithServiceKey, UpdateStages.WithServiceProviderNotes, UpdateStages.WithServiceProviderProperties, UpdateStages.WithServiceProviderProvisioningState, UpdateStages.WithSku {
     }
 
     /**
@@ -292,6 +340,18 @@ interface WithBandwidthInGbps {
             Update withBandwidthInGbps(Double bandwidthInGbps);
         }
 
+        /**
+         * The stage of the expressroutecircuit update allowing to specify CircuitProvisioningState.
+         */
+        interface WithCircuitProvisioningState {
+            /**
+             * Specifies circuitProvisioningState.
+             * @param circuitProvisioningState The CircuitProvisioningState state of the resource
+             * @return the next update stage
+             */
+            Update withCircuitProvisioningState(String circuitProvisioningState);
+        }
+
         /**
          * The stage of the expressroutecircuit update allowing to specify ExpressRoutePort.
          */
@@ -316,6 +376,18 @@ interface WithGatewayManagerEtag {
             Update withGatewayManagerEtag(String gatewayManagerEtag);
         }
 
+        /**
+         * The stage of the expressroutecircuit update allowing to specify GlobalReachEnabled.
+         */
+        interface WithGlobalReachEnabled {
+            /**
+             * Specifies globalReachEnabled.
+             * @param globalReachEnabled Flag denoting Global reach status
+             * @return the next update stage
+             */
+            Update withGlobalReachEnabled(Boolean globalReachEnabled);
+        }
+
         /**
          * The stage of the expressroutecircuit update allowing to specify Peerings.
          */
@@ -328,6 +400,18 @@ interface WithPeerings {
             Update withPeerings(List<ExpressRouteCircuitPeeringInner> peerings);
         }
 
+        /**
+         * The stage of the expressroutecircuit update allowing to specify ServiceKey.
+         */
+        interface WithServiceKey {
+            /**
+             * Specifies serviceKey.
+             * @param serviceKey The ServiceKey
+             * @return the next update stage
+             */
+            Update withServiceKey(String serviceKey);
+        }
+
         /**
          * The stage of the expressroutecircuit update allowing to specify ServiceProviderNotes.
          */
@@ -352,6 +436,18 @@ interface WithServiceProviderProperties {
             Update withServiceProviderProperties(ExpressRouteCircuitServiceProviderProperties serviceProviderProperties);
         }
 
+        /**
+         * The stage of the expressroutecircuit update allowing to specify ServiceProviderProvisioningState.
+         */
+        interface WithServiceProviderProvisioningState {
+            /**
+             * Specifies serviceProviderProvisioningState.
+             * @param serviceProviderProvisioningState The ServiceProviderProvisioningState state of the resource. Possible values include: 'NotProvisioned', 'Provisioning', 'Provisioned', 'Deprovisioning'
+             * @return the next update stage
+             */
+            Update withServiceProviderProvisioningState(ServiceProviderProvisioningState serviceProviderProvisioningState);
+        }
+
         /**
          * The stage of the expressroutecircuit update allowing to specify Sku.
          */

sdk/network/mgmt-v2019_09_01/src/main/java/com/microsoft/azure/management/network/v2019_09_01/ExpressRouteCircuitAuthorization.java

@@ -86,6 +86,30 @@ interface WithExpressRouteCircuit {
             WithCreate withExistingExpressRouteCircuit(String resourceGroupName, String circuitName);
         }
 
+        /**
+         * The stage of the expressroutecircuitauthorization definition allowing to specify AuthorizationKey.
+         */
+        interface WithAuthorizationKey {
+            /**
+             * Specifies authorizationKey.
+             * @param authorizationKey The authorization key
+             * @return the next definition stage
+             */
+            WithCreate withAuthorizationKey(String authorizationKey);
+        }
+
+        /**
+         * The stage of the expressroutecircuitauthorization definition allowing to specify AuthorizationUseStatus.
+         */
+        interface WithAuthorizationUseStatus {
+            /**
+             * Specifies authorizationUseStatus.
+             * @param authorizationUseStatus The authorization use status. Possible values include: 'Available', 'InUse'
+             * @return the next definition stage
+             */
+            WithCreate withAuthorizationUseStatus(AuthorizationUseStatus authorizationUseStatus);
+        }
+
         /**
          * The stage of the expressroutecircuitauthorization definition allowing to specify Id.
          */
@@ -115,19 +139,43 @@ interface WithName {
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<ExpressRouteCircuitAuthorization>, DefinitionStages.WithId, DefinitionStages.WithName {
+        interface WithCreate extends Creatable<ExpressRouteCircuitAuthorization>, DefinitionStages.WithAuthorizationKey, DefinitionStages.WithAuthorizationUseStatus, DefinitionStages.WithId, DefinitionStages.WithName {
         }
     }
     /**
      * The template for a ExpressRouteCircuitAuthorization update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<ExpressRouteCircuitAuthorization>, UpdateStages.WithId, UpdateStages.WithName {
+    interface Update extends Appliable<ExpressRouteCircuitAuthorization>, UpdateStages.WithAuthorizationKey, UpdateStages.WithAuthorizationUseStatus, UpdateStages.WithId, UpdateStages.WithName {
     }
 
     /**
      * Grouping of ExpressRouteCircuitAuthorization update stages.
      */
     interface UpdateStages {
+        /**
+         * The stage of the expressroutecircuitauthorization update allowing to specify AuthorizationKey.
+         */
+        interface WithAuthorizationKey {
+            /**
+             * Specifies authorizationKey.
+             * @param authorizationKey The authorization key
+             * @return the next update stage
+             */
+            Update withAuthorizationKey(String authorizationKey);
+        }
+
+        /**
+         * The stage of the expressroutecircuitauthorization update allowing to specify AuthorizationUseStatus.
+         */
+        interface WithAuthorizationUseStatus {
+            /**
+             * Specifies authorizationUseStatus.
+             * @param authorizationUseStatus The authorization use status. Possible values include: 'Available', 'InUse'
+             * @return the next update stage
+             */
+            Update withAuthorizationUseStatus(AuthorizationUseStatus authorizationUseStatus);
+        }
+
         /**
          * The stage of the expressroutecircuitauthorization update allowing to specify Id.
          */