Update from master

AzureSDKAutomation · Jul 9, 2020 · 88aca66 · 88aca66
1 parent 9361802
commit 88aca66
Show file tree

Hide file tree

Showing 7 changed files with 331 additions and 65 deletions.
diff --git a/sdk/network/mgmt-v2020_04_01/pom.xml b/sdk/network/mgmt-v2020_04_01/pom.xml
@@ -11,11 +11,11 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.3.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-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>

diff --git a/...04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRouteTable.java b/...04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/HubRouteTable.java
@@ -18,7 +18,6 @@
 import com.microsoft.azure.arm.resources.models.HasManager;
 import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkManager;
 import java.util.List;
-import com.microsoft.azure.SubResource;
 
 /**
  * Type representing HubRouteTable.
@@ -27,7 +26,7 @@ public interface HubRouteTable extends HasInner<HubRouteTableInner>, Indexable,
     /**
      * @return the associatedConnections value.
      */
-    List<SubResource> associatedConnections();
+    List<String> associatedConnections();
 
     /**
      * @return the etag value.
@@ -52,7 +51,7 @@ public interface HubRouteTable extends HasInner<HubRouteTableInner>, Indexable,
     /**
      * @return the propagatingConnections value.
      */
-    List<SubResource> propagatingConnections();
+    List<String> propagatingConnections();
 
     /**
      * @return the provisioningState value.

diff --git a/...n/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerBackendAddress.java b/...n/java/com/microsoft/azure/management/network/v2020_04_01/LoadBalancerBackendAddress.java
@@ -8,8 +8,7 @@
 
 package com.microsoft.azure.management.network.v2020_04_01;
 
-import com.microsoft.azure.management.network.v2020_04_01.implementation.VirtualNetworkInner;
-import com.microsoft.azure.management.network.v2020_04_01.implementation.NetworkInterfaceIPConfigurationInner;
+import com.microsoft.azure.SubResource;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.microsoft.rest.serializer.JsonFlatten;
 
@@ -22,7 +21,7 @@ public class LoadBalancerBackendAddress {
      * Reference to an existing virtual network.
      */
     @JsonProperty(value = "properties.virtualNetwork")
-    private VirtualNetworkInner virtualNetwork;
+    private SubResource virtualNetwork;
 
     /**
      * IP Address belonging to the referenced virtual network.
@@ -33,8 +32,8 @@ public class LoadBalancerBackendAddress {
     /**
      * Reference to IP address defined in network interfaces.
      */
-    @JsonProperty(value = "properties.networkInterfaceIPConfiguration")
-    private NetworkInterfaceIPConfigurationInner networkInterfaceIPConfiguration;
+    @JsonProperty(value = "properties.networkInterfaceIPConfiguration", access = JsonProperty.Access.WRITE_ONLY)
+    private SubResource networkInterfaceIPConfiguration;
 
     /**
      * Name of the backend address.
@@ -47,7 +46,7 @@ public class LoadBalancerBackendAddress {
      *
      * @return the virtualNetwork value
      */
-    public VirtualNetworkInner virtualNetwork() {
+    public SubResource virtualNetwork() {
         return this.virtualNetwork;
     }
 
@@ -57,7 +56,7 @@ public VirtualNetworkInner virtualNetwork() {
      * @param virtualNetwork the virtualNetwork value to set
      * @return the LoadBalancerBackendAddress object itself.
      */
-    public LoadBalancerBackendAddress withVirtualNetwork(VirtualNetworkInner virtualNetwork) {
+    public LoadBalancerBackendAddress withVirtualNetwork(SubResource virtualNetwork) {
         this.virtualNetwork = virtualNetwork;
         return this;
     }
@@ -87,21 +86,10 @@ public LoadBalancerBackendAddress withIpAddress(String ipAddress) {
      *
      * @return the networkInterfaceIPConfiguration value
      */
-    public NetworkInterfaceIPConfigurationInner networkInterfaceIPConfiguration() {
+    public SubResource networkInterfaceIPConfiguration() {
         return this.networkInterfaceIPConfiguration;
     }
 
-    /**
-     * Set reference to IP address defined in network interfaces.
-     *
-     * @param networkInterfaceIPConfiguration the networkInterfaceIPConfiguration value to set
-     * @return the LoadBalancerBackendAddress object itself.
-     */
-    public LoadBalancerBackendAddress withNetworkInterfaceIPConfiguration(NetworkInterfaceIPConfigurationInner networkInterfaceIPConfiguration) {
-        this.networkInterfaceIPConfiguration = networkInterfaceIPConfiguration;
-        return this;
-    }
-
     /**
      * Get name of the backend address.
      *

diff --git a/...-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Subnet.java b/...-v2020_04_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/Subnet.java
@@ -9,8 +9,6 @@
 package com.microsoft.azure.management.network.v2020_04_01;
 
 import com.microsoft.azure.arm.model.HasInner;
-import com.microsoft.azure.management.network.v2020_04_01.implementation.ResourceNavigationLinkInner;
-import com.microsoft.azure.management.network.v2020_04_01.implementation.ServiceAssociationLinkInner;
 import com.microsoft.azure.management.network.v2020_04_01.implementation.SubnetInner;
 import com.microsoft.azure.arm.model.Indexable;
 import com.microsoft.azure.arm.model.Refreshable;

diff --git a/.../com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableImpl.java b/.../com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableImpl.java
@@ -13,7 +13,6 @@
 import rx.Observable;
 import java.util.List;
 import com.microsoft.azure.management.network.v2020_04_01.HubRoute;
-import com.microsoft.azure.SubResource;
 import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
 
 class HubRouteTableImpl extends CreatableUpdatableImpl<HubRouteTable, HubRouteTableInner, HubRouteTableImpl> implements HubRouteTable, HubRouteTable.Definition, HubRouteTable.Update {
@@ -74,7 +73,7 @@ public boolean isInCreateMode() {
 
 
     @Override
-    public List<SubResource> associatedConnections() {
+    public List<String> associatedConnections() {
         return this.inner().associatedConnections();
     }
 
@@ -99,7 +98,7 @@ public String name() {
     }
 
     @Override
-    public List<SubResource> propagatingConnections() {
+    public List<String> propagatingConnections() {
         return this.inner().propagatingConnections();
     }
 

diff --git a/...com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableInner.java b/...com/microsoft/azure/management/network/v2020_04_01/implementation/HubRouteTableInner.java
@@ -10,10 +10,10 @@
 
 import java.util.List;
 import com.microsoft.azure.management.network.v2020_04_01.HubRoute;
-import com.microsoft.azure.SubResource;
 import com.microsoft.azure.management.network.v2020_04_01.ProvisioningState;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.microsoft.rest.serializer.JsonFlatten;
+import com.microsoft.azure.SubResource;
 
 /**
  * RouteTable resource in a virtual hub.
@@ -36,13 +36,13 @@ public class HubRouteTableInner extends SubResource {
      * List of all connections associated with this route table.
      */
     @JsonProperty(value = "properties.associatedConnections", access = JsonProperty.Access.WRITE_ONLY)
-    private List<SubResource> associatedConnections;
+    private List<String> associatedConnections;
 
     /**
      * List of all connections that advertise to this route table.
      */
     @JsonProperty(value = "properties.propagatingConnections", access = JsonProperty.Access.WRITE_ONLY)
-    private List<SubResource> propagatingConnections;
+    private List<String> propagatingConnections;
 
     /**
      * The provisioning state of the RouteTable resource. Possible values
@@ -115,7 +115,7 @@ public HubRouteTableInner withLabels(List<String> labels) {
      *
      * @return the associatedConnections value
      */
-    public List<SubResource> associatedConnections() {
+    public List<String> associatedConnections() {
         return this.associatedConnections;
     }
 
@@ -124,7 +124,7 @@ public List<SubResource> associatedConnections() {
      *
      * @return the propagatingConnections value
      */
-    public List<SubResource> propagatingConnections() {
+    public List<String> propagatingConnections() {
         return this.propagatingConnections;
     }