Update from master

sdk/network/mgmt-v2019_04_01/pom.xml

@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.2.0</version>
-        <relativePath>../../parents/azure-arm-parent</relativePath>
+        <version>1.1.0</version>
+        <relativePath>../../../pom.management.xml</relativePath>
     </parent>
     <artifactId>azure-mgmt-network</artifactId>
     <version>1.0.0-beta</version>
@@ -71,6 +71,8 @@
             <artifactId>azure-arm-client-runtime</artifactId>
             <type>test-jar</type>
             <scope>test</scope>
+            <!--Below version for test jar needs to be removed, this will be done as part of v1-runtime 1.6.7-->
+            <version>1.6.5</version>
         </dependency>
     </dependencies>
     <build>

sdk/network/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/network/v2019_04_01/ApplicationGatewayOnDemandProbe.java

@@ -8,6 +8,7 @@
 
 package com.microsoft.azure.management.network.v2019_04_01;
 
+import com.microsoft.azure.SubResource;
 import com.fasterxml.jackson.annotation.JsonProperty;
 
 /**
@@ -56,18 +57,18 @@ public class ApplicationGatewayOnDemandProbe {
     private ApplicationGatewayProbeHealthResponseMatch match;
 
     /**
-     * Name of backend pool of application gateway to which probe request will
-     * be sent.
+     * Reference of backend pool of application gateway to which probe request
+     * will be sent.
      */
-    @JsonProperty(value = "backendPoolName")
-    private String backendPoolName;
+    @JsonProperty(value = "backendAddressPool")
+    private SubResource backendAddressPool;
 
     /**
-     * Name of backend http setting of application gateway to be used for test
-     * probe.
+     * Reference of backend http setting of application gateway to be used for
+     * test probe.
      */
-    @JsonProperty(value = "backendHttpSettingName")
-    private String backendHttpSettingName;
+    @JsonProperty(value = "backendHttpSettings")
+    private SubResource backendHttpSettings;
 
     /**
      * Get the protocol used for the probe. Possible values include: 'Http', 'Https'.
@@ -190,42 +191,42 @@ public ApplicationGatewayOnDemandProbe withMatch(ApplicationGatewayProbeHealthRe
     }
 
     /**
-     * Get name of backend pool of application gateway to which probe request will be sent.
+     * Get reference of backend pool of application gateway to which probe request will be sent.
      *
-     * @return the backendPoolName value
+     * @return the backendAddressPool value
      */
-    public String backendPoolName() {
-        return this.backendPoolName;
+    public SubResource backendAddressPool() {
+        return this.backendAddressPool;
     }
 
     /**
-     * Set name of backend pool of application gateway to which probe request will be sent.
+     * Set reference of backend pool of application gateway to which probe request will be sent.
      *
-     * @param backendPoolName the backendPoolName value to set
+     * @param backendAddressPool the backendAddressPool value to set
      * @return the ApplicationGatewayOnDemandProbe object itself.
      */
-    public ApplicationGatewayOnDemandProbe withBackendPoolName(String backendPoolName) {
-        this.backendPoolName = backendPoolName;
+    public ApplicationGatewayOnDemandProbe withBackendAddressPool(SubResource backendAddressPool) {
+        this.backendAddressPool = backendAddressPool;
         return this;
     }
 
     /**
-     * Get name of backend http setting of application gateway to be used for test probe.
+     * Get reference of backend http setting of application gateway to be used for test probe.
      *
-     * @return the backendHttpSettingName value
+     * @return the backendHttpSettings value
      */
-    public String backendHttpSettingName() {
-        return this.backendHttpSettingName;
+    public SubResource backendHttpSettings() {
+        return this.backendHttpSettings;
     }
 
     /**
-     * Set name of backend http setting of application gateway to be used for test probe.
+     * Set reference of backend http setting of application gateway to be used for test probe.
      *
-     * @param backendHttpSettingName the backendHttpSettingName value to set
+     * @param backendHttpSettings the backendHttpSettings value to set
      * @return the ApplicationGatewayOnDemandProbe object itself.
      */
-    public ApplicationGatewayOnDemandProbe withBackendHttpSettingName(String backendHttpSettingName) {
-        this.backendHttpSettingName = backendHttpSettingName;
+    public ApplicationGatewayOnDemandProbe withBackendHttpSettings(SubResource backendHttpSettings) {
+        this.backendHttpSettings = backendHttpSettings;
         return this;
     }
 

sdk/network/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/network/v2019_04_01/ApplicationGatewaySslCipherSuite.java

@@ -91,6 +91,15 @@ public final class ApplicationGatewaySslCipherSuite extends ExpandableStringEnum
     /** Static value TLS_RSA_WITH_3DES_EDE_CBC_SHA for ApplicationGatewaySslCipherSuite. */
     public static final ApplicationGatewaySslCipherSuite TLS_RSA_WITH_3DES_EDE_CBC_SHA = fromString("TLS_RSA_WITH_3DES_EDE_CBC_SHA");
 
+    /** Static value TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA = fromString("TLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA");
+
+    /** Static value TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256 = fromString("TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256");
+
+    /** Static value TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 for ApplicationGatewaySslCipherSuite. */
+    public static final ApplicationGatewaySslCipherSuite TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 = fromString("TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384");
+
     /**
      * Creates or finds a ApplicationGatewaySslCipherSuite from its string representation.
      * @param name a name to look for

sdk/network/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/network/v2019_04_01/AutoApprovedPrivateLinkService.java

@@ -0,0 +1,25 @@
+/**
+ * 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_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2019_04_01.implementation.AutoApprovedPrivateLinkServiceInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2019_04_01.implementation.NetworkManager;
+
+/**
+ * Type representing AutoApprovedPrivateLinkService.
+ */
+public interface AutoApprovedPrivateLinkService extends HasInner<AutoApprovedPrivateLinkServiceInner>, HasManager<NetworkManager> {
+    /**
+     * @return the privateLinkService value.
+     */
+    String privateLinkService();
+
+}

sdk/network/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/network/v2019_04_01/AvailableEndpointServices.java

@@ -9,12 +9,13 @@
 package com.microsoft.azure.management.network.v2019_04_01;
 
 import rx.Observable;
-import com.microsoft.azure.management.network.v2019_04_01.EndpointServiceResult;
+import com.microsoft.azure.management.network.v2019_04_01.implementation.AvailableEndpointServicesInner;
+import com.microsoft.azure.arm.model.HasInner;
 
 /**
  * Type representing AvailableEndpointServices.
  */
-public interface AvailableEndpointServices {
+public interface AvailableEndpointServices extends HasInner<AvailableEndpointServicesInner> {
     /**
      * List what values of endpoint services are available for use.
      *

sdk/network/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/network/v2019_04_01/AvailablePrivateEndpointType.java

@@ -0,0 +1,40 @@
+/**
+ * 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_04_01;
+
+import com.microsoft.azure.arm.model.HasInner;
+import com.microsoft.azure.management.network.v2019_04_01.implementation.AvailablePrivateEndpointTypeInner;
+import com.microsoft.azure.arm.resources.models.HasManager;
+import com.microsoft.azure.management.network.v2019_04_01.implementation.NetworkManager;
+
+/**
+ * Type representing AvailablePrivateEndpointType.
+ */
+public interface AvailablePrivateEndpointType extends HasInner<AvailablePrivateEndpointTypeInner>, HasManager<NetworkManager> {
+    /**
+     * @return the id value.
+     */
+    String id();
+
+    /**
+     * @return the name value.
+     */
+    String name();
+
+    /**
+     * @return the resourceName value.
+     */
+    String resourceName();
+
+    /**
+     * @return the type value.
+     */
+    String type();
+
+}

sdk/network/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/network/v2019_04_01/AvailablePrivateEndpointTypes.java

@@ -20,9 +20,19 @@ public interface AvailablePrivateEndpointTypes extends HasInner<AvailablePrivate
      * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
      *
      * @param location The location of the domain name.
+     * @param resourceGroupName The name of the resource group.
      * @throws IllegalArgumentException thrown if parameters fail the validation
      * @return the observable for the request
      */
-    Observable<LocationAvailablePrivateEndpointType> listAsync(final String location);
+    Observable<AvailablePrivateEndpointType> listByResourceGroupAsync(final String location, final String resourceGroupName);
+
+    /**
+     * Returns all of the resource types that can be linked to a Private Endpoint in this subscription in this region.
+     *
+     * @param location The location of the domain name.
+     * @throws IllegalArgumentException thrown if parameters fail the validation
+     * @return the observable for the request
+     */
+    Observable<AvailablePrivateEndpointType> listAsync(final String location);
 
 }

sdk/network/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/network/v2019_04_01/AvailableResourceGroupDelegations.java

@@ -9,12 +9,13 @@
 package com.microsoft.azure.management.network.v2019_04_01;
 
 import rx.Observable;
-import com.microsoft.azure.management.network.v2019_04_01.LocationAvailableDelegationModel;
+import com.microsoft.azure.management.network.v2019_04_01.implementation.AvailableResourceGroupDelegationsInner;
+import com.microsoft.azure.arm.model.HasInner;
 
 /**
  * Type representing AvailableResourceGroupDelegations.
  */
-public interface AvailableResourceGroupDelegations {
+public interface AvailableResourceGroupDelegations extends HasInner<AvailableResourceGroupDelegationsInner> {
     /**
      * Gets all of the available subnet delegations for this resource group in this region.
      *

sdk/network/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/network/v2019_04_01/BackendAddressPool.java

@@ -51,6 +51,11 @@ public interface BackendAddressPool extends HasInner<BackendAddressPoolInner>, I
      */
     SubResource outboundRule();
 
+    /**
+     * @return the outboundRules value.
+     */
+    List<SubResource> outboundRules();
+
     /**
      * @return the provisioningState value.
      */

sdk/network/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/network/v2019_04_01/BastionHostIPConfiguration.java

@@ -47,7 +47,7 @@ public class BastionHostIPConfiguration extends SubResource {
      * Name of the resource that is unique within a resource group. This name
      * can be used to access the resource.
      */
-    @JsonProperty(value = "name", access = JsonProperty.Access.WRITE_ONLY)
+    @JsonProperty(value = "name")
     private String name;
 
     /**
@@ -151,6 +151,17 @@ public String name() {
         return this.name;
     }
 
+    /**
+     * Set name of the resource that is unique within a resource group. This name can be used to access the resource.
+     *
+     * @param name the name value to set
+     * @return the BastionHostIPConfiguration object itself.
+     */
+    public BastionHostIPConfiguration withName(String name) {
+        this.name = name;
+        return this;
+    }
+
     /**
      * Get a unique read-only string that changes whenever the resource is updated.
      *

sdk/network/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/network/v2019_04_01/CheckPrivateLinkServiceVisibilityRequest.java

@@ -0,0 +1,43 @@
+/**
+ * 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_04_01;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+/**
+ * Request body of the CheckPrivateLinkServiceVisibility API service call.
+ */
+public class CheckPrivateLinkServiceVisibilityRequest {
+    /**
+     * The alias of the private link service.
+     */
+    @JsonProperty(value = "privateLinkServiceAlias")
+    private String privateLinkServiceAlias;
+
+    /**
+     * Get the alias of the private link service.
+     *
+     * @return the privateLinkServiceAlias value
+     */
+    public String privateLinkServiceAlias() {
+        return this.privateLinkServiceAlias;
+    }
+
+    /**
+     * Set the alias of the private link service.
+     *
+     * @param privateLinkServiceAlias the privateLinkServiceAlias value to set
+     * @return the CheckPrivateLinkServiceVisibilityRequest object itself.
+     */
+    public CheckPrivateLinkServiceVisibilityRequest withPrivateLinkServiceAlias(String privateLinkServiceAlias) {
+        this.privateLinkServiceAlias = privateLinkServiceAlias;
+        return this;
+    }
+
+}

sdk/network/mgmt-v2019_04_01/src/main/java/com/microsoft/azure/management/network/v2019_04_01/PrivateEndpoint.java

@@ -49,7 +49,7 @@ public interface PrivateEndpoint extends HasInner<PrivateEndpointInner>, Resourc
     /**
      * @return the provisioningState value.
      */
-    String provisioningState();
+    ProvisioningState provisioningState();
 
     /**
      * @return the subnet value.
@@ -84,7 +84,7 @@ interface WithGroup extends GroupableResourceCore.DefinitionStages.WithGroup<Wit
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
+             * @param etag A unique read-only string that changes whenever the resource is updated
              * @return the next definition stage
              */
             WithCreate withEtag(String etag);
@@ -150,7 +150,7 @@ interface UpdateStages {
         interface WithEtag {
             /**
              * Specifies etag.
-             * @param etag Gets a unique read-only string that changes whenever the resource is updated
+             * @param etag A unique read-only string that changes whenever the resource is updated
              * @return the next update stage
              */
             Update withEtag(String etag);