Update from master

AzureSDKAutomation · Aug 4, 2020 · 3f3fe12 · 3f3fe12
1 parent a085458
commit 3f3fe12
Show file tree

Hide file tree

Showing 13 changed files with 348 additions and 339 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/...ain/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationRuleCondition.java b/...ain/java/com/microsoft/azure/management/network/v2020_04_01/ApplicationRuleCondition.java
@@ -37,12 +37,6 @@ public class ApplicationRuleCondition extends FirewallPolicyRuleCondition {
     @JsonProperty(value = "protocols")
     private List<FirewallPolicyRuleConditionApplicationProtocol> protocols;
 
-    /**
-     * List of Urls for this rule condition.
-     */
-    @JsonProperty(value = "targetUrls")
-    private List<String> targetUrls;
-
     /**
      * List of FQDNs for this rule condition.
      */
@@ -121,26 +115,6 @@ public ApplicationRuleCondition withProtocols(List<FirewallPolicyRuleConditionAp
         return this;
     }
 
-    /**
-     * Get list of Urls for this rule condition.
-     *
-     * @return the targetUrls value
-     */
-    public List<String> targetUrls() {
-        return this.targetUrls;
-    }
-
-    /**
-     * Set list of Urls for this rule condition.
-     *
-     * @param targetUrls the targetUrls value to set
-     * @return the ApplicationRuleCondition object itself.
-     */
-    public ApplicationRuleCondition withTargetUrls(List<String> targetUrls) {
-        this.targetUrls = targetUrls;
-        return this;
-    }
-
     /**
      * Get list of FQDNs for this rule condition.
      *

diff --git a/...4_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicy.java b/...4_01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/FirewallPolicy.java
@@ -46,16 +46,6 @@ public interface FirewallPolicy extends HasInner<FirewallPolicyInner>, Resource,
      */
     List<SubResource> firewalls();
 
-    /**
-     * @return the identity value.
-     */
-    ManagedServiceIdentity identity();
-
-    /**
-     * @return the intrusionSystemMode value.
-     */
-    FirewallPolicyIntrusionSystemMode intrusionSystemMode();
-
     /**
      * @return the provisioningState value.
      */
@@ -76,11 +66,6 @@ public interface FirewallPolicy extends HasInner<FirewallPolicyInner>, Resource,
      */
     FirewallPolicyThreatIntelWhitelist threatIntelWhitelist();
 
-    /**
-     * @return the transportSecurity value.
-     */
-    FirewallPolicyTransportSecurity transportSecurity();
-
     /**
      * The entirety of the FirewallPolicy definition.
      */
@@ -115,30 +100,6 @@ interface WithBasePolicy {
             WithCreate withBasePolicy(SubResource basePolicy);
         }
 
-        /**
-         * The stage of the firewallpolicy definition allowing to specify Identity.
-         */
-        interface WithIdentity {
-            /**
-             * Specifies identity.
-             * @param identity The identity of the firewall policy
-             * @return the next definition stage
-             */
-            WithCreate withIdentity(ManagedServiceIdentity identity);
-        }
-
-        /**
-         * The stage of the firewallpolicy definition allowing to specify IntrusionSystemMode.
-         */
-        interface WithIntrusionSystemMode {
-            /**
-             * Specifies intrusionSystemMode.
-             * @param intrusionSystemMode The operation mode for Intrusion system. Possible values include: 'Enabled', 'Disabled'
-             * @return the next definition stage
-             */
-            WithCreate withIntrusionSystemMode(FirewallPolicyIntrusionSystemMode intrusionSystemMode);
-        }
-
         /**
          * The stage of the firewallpolicy definition allowing to specify ThreatIntelMode.
          */
@@ -163,30 +124,18 @@ interface WithThreatIntelWhitelist {
             WithCreate withThreatIntelWhitelist(FirewallPolicyThreatIntelWhitelist threatIntelWhitelist);
         }
 
-        /**
-         * The stage of the firewallpolicy definition allowing to specify TransportSecurity.
-         */
-        interface WithTransportSecurity {
-            /**
-             * Specifies transportSecurity.
-             * @param transportSecurity TLS Configuration definition
-             * @return the next definition stage
-             */
-            WithCreate withTransportSecurity(FirewallPolicyTransportSecurity transportSecurity);
-        }
-
         /**
          * The stage of the definition which contains all the minimum required inputs for
          * the resource to be created (via {@link WithCreate#create()}), but also allows
          * for any other optional settings to be specified.
          */
-        interface WithCreate extends Creatable<FirewallPolicy>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithBasePolicy, DefinitionStages.WithIdentity, DefinitionStages.WithIntrusionSystemMode, DefinitionStages.WithThreatIntelMode, DefinitionStages.WithThreatIntelWhitelist, DefinitionStages.WithTransportSecurity {
+        interface WithCreate extends Creatable<FirewallPolicy>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithBasePolicy, DefinitionStages.WithThreatIntelMode, DefinitionStages.WithThreatIntelWhitelist {
         }
     }
     /**
      * The template for a FirewallPolicy update operation, containing all the settings that can be modified.
      */
-    interface Update extends Appliable<FirewallPolicy>, Resource.UpdateWithTags<Update>, UpdateStages.WithBasePolicy, UpdateStages.WithIdentity, UpdateStages.WithIntrusionSystemMode, UpdateStages.WithThreatIntelMode, UpdateStages.WithThreatIntelWhitelist, UpdateStages.WithTransportSecurity {
+    interface Update extends Appliable<FirewallPolicy>, Resource.UpdateWithTags<Update>, UpdateStages.WithBasePolicy, UpdateStages.WithThreatIntelMode, UpdateStages.WithThreatIntelWhitelist {
     }
 
     /**
@@ -205,30 +154,6 @@ interface WithBasePolicy {
             Update withBasePolicy(SubResource basePolicy);
         }
 
-        /**
-         * The stage of the firewallpolicy update allowing to specify Identity.
-         */
-        interface WithIdentity {
-            /**
-             * Specifies identity.
-             * @param identity The identity of the firewall policy
-             * @return the next update stage
-             */
-            Update withIdentity(ManagedServiceIdentity identity);
-        }
-
-        /**
-         * The stage of the firewallpolicy update allowing to specify IntrusionSystemMode.
-         */
-        interface WithIntrusionSystemMode {
-            /**
-             * Specifies intrusionSystemMode.
-             * @param intrusionSystemMode The operation mode for Intrusion system. Possible values include: 'Enabled', 'Disabled'
-             * @return the next update stage
-             */
-            Update withIntrusionSystemMode(FirewallPolicyIntrusionSystemMode intrusionSystemMode);
-        }
-
         /**
          * The stage of the firewallpolicy update allowing to specify ThreatIntelMode.
          */
@@ -253,17 +178,5 @@ interface WithThreatIntelWhitelist {
             Update withThreatIntelWhitelist(FirewallPolicyThreatIntelWhitelist threatIntelWhitelist);
         }
 
-        /**
-         * The stage of the firewallpolicy update allowing to specify TransportSecurity.
-         */
-        interface WithTransportSecurity {
-            /**
-             * Specifies transportSecurity.
-             * @param transportSecurity TLS Configuration definition
-             * @return the next update stage
-             */
-            Update withTransportSecurity(FirewallPolicyTransportSecurity transportSecurity);
-        }
-
     }
 }
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/...01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatRuleCondition.java b/...01/src/main/java/com/microsoft/azure/management/network/v2020_04_01/NatRuleCondition.java
@@ -49,12 +49,6 @@ public class NatRuleCondition extends FirewallPolicyRuleCondition {
     @JsonProperty(value = "sourceIpGroups")
     private List<String> sourceIpGroups;
 
-    /**
-     * Terminate TLS connections for this rule.
-     */
-    @JsonProperty(value = "terminateTLS")
-    private Boolean terminateTLS;
-
     /**
      * Get array of FirewallPolicyRuleConditionNetworkProtocols.
      *
@@ -155,24 +149,4 @@ public NatRuleCondition withSourceIpGroups(List<String> sourceIpGroups) {
         return this;
     }
 
-    /**
-     * Get terminate TLS connections for this rule.
-     *
-     * @return the terminateTLS value
-     */
-    public Boolean terminateTLS() {
-        return this.terminateTLS;
-    }
-
-    /**
-     * Set terminate TLS connections for this rule.
-     *
-     * @param terminateTLS the terminateTLS value to set
-     * @return the NatRuleCondition object itself.
-     */
-    public NatRuleCondition withTerminateTLS(Boolean terminateTLS) {
-        this.terminateTLS = terminateTLS;
-        return this;
-    }
-
 }
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/...icrosoft/azure/management/network/v2020_04_01/implementation/BackendAddressPoolInner.java b/...icrosoft/azure/management/network/v2020_04_01/implementation/BackendAddressPoolInner.java
@@ -20,18 +20,18 @@
  */
 @JsonFlatten
 public class BackendAddressPoolInner extends SubResource {
-    /**
-     * An array of references to IP addresses defined in network interfaces.
-     */
-    @JsonProperty(value = "properties.backendIPConfigurations", access = JsonProperty.Access.WRITE_ONLY)
-    private List<NetworkInterfaceIPConfigurationInner> backendIPConfigurations;
-
     /**
      * An array of backend addresses.
      */
     @JsonProperty(value = "properties.loadBalancerBackendAddresses")
     private List<LoadBalancerBackendAddress> loadBalancerBackendAddresses;
 
+    /**
+     * An array of references to IP addresses defined in network interfaces.
+     */
+    @JsonProperty(value = "properties.backendIPConfigurations", access = JsonProperty.Access.WRITE_ONLY)
+    private List<NetworkInterfaceIPConfigurationInner> backendIPConfigurations;
+
     /**
      * An array of references to load balancing rules that use this backend
      * address pool.
@@ -79,15 +79,6 @@ public class BackendAddressPoolInner extends SubResource {
     @JsonProperty(value = "type", access = JsonProperty.Access.WRITE_ONLY)
     private String type;
 
-    /**
-     * Get an array of references to IP addresses defined in network interfaces.
-     *
-     * @return the backendIPConfigurations value
-     */
-    public List<NetworkInterfaceIPConfigurationInner> backendIPConfigurations() {
-        return this.backendIPConfigurations;
-    }
-
     /**
      * Get an array of backend addresses.
      *
@@ -108,6 +99,15 @@ public BackendAddressPoolInner withLoadBalancerBackendAddresses(List<LoadBalance
         return this;
     }
 
+    /**
+     * Get an array of references to IP addresses defined in network interfaces.
+     *
+     * @return the backendIPConfigurations value
+     */
+    public List<NetworkInterfaceIPConfigurationInner> backendIPConfigurations() {
+        return this.backendIPConfigurations;
+    }
+
     /**
      * Get an array of references to load balancing rules that use this backend address pool.
      *