Update from master

AzureSDKAutomation · Jul 24, 2020 · b3d04bf · b3d04bf
1 parent 03119b5
commit b3d04bf
Show file tree

Hide file tree

Showing 6 changed files with 316 additions and 105 deletions.
diff --git a/sdk/network/mgmt-v2020_03_01/pom.xml b/sdk/network/mgmt-v2020_03_01/pom.xml
@@ -11,8 +11,8 @@
     <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</version>

diff --git a/...3_01/src/main/java/com/microsoft/azure/management/network/v2020_03_01/FirewallPolicy.java b/...3_01/src/main/java/com/microsoft/azure/management/network/v2020_03_01/FirewallPolicy.java
@@ -46,11 +46,6 @@ public interface FirewallPolicy extends HasInner<FirewallPolicyInner>, Resource,
      */
     List<SubResource> firewalls();
 
-    /**
-     * @return the intrusionSystemMode value.
-     */
-    FirewallPolicyIntrusionSystemMode intrusionSystemMode();
-
     /**
      * @return the provisioningState value.
      */
@@ -100,18 +95,6 @@ interface WithBasePolicy {
             WithCreate withBasePolicy(SubResource basePolicy);
         }
 
-        /**
-         * 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.
          */
@@ -129,13 +112,13 @@ interface WithThreatIntelMode {
          * 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.WithIntrusionSystemMode, DefinitionStages.WithThreatIntelMode {
+        interface WithCreate extends Creatable<FirewallPolicy>, Resource.DefinitionWithTags<WithCreate>, DefinitionStages.WithBasePolicy, DefinitionStages.WithThreatIntelMode {
         }
     }
     /**
      * 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.WithIntrusionSystemMode, UpdateStages.WithThreatIntelMode {
+    interface Update extends Appliable<FirewallPolicy>, Resource.UpdateWithTags<Update>, UpdateStages.WithBasePolicy, UpdateStages.WithThreatIntelMode {
     }
 
     /**
@@ -154,18 +137,6 @@ interface WithBasePolicy {
             Update withBasePolicy(SubResource basePolicy);
         }
 
-        /**
-         * 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.
          */

diff --git a/...-v2020_03_01/src/main/java/com/microsoft/azure/management/network/v2020_03_01/Subnet.java b/...-v2020_03_01/src/main/java/com/microsoft/azure/management/network/v2020_03_01/Subnet.java
@@ -9,8 +9,6 @@
 package com.microsoft.azure.management.network.v2020_03_01;
 
 import com.microsoft.azure.arm.model.HasInner;
-import com.microsoft.azure.management.network.v2020_03_01.implementation.ResourceNavigationLinkInner;
-import com.microsoft.azure.management.network.v2020_03_01.implementation.ServiceAssociationLinkInner;
 import com.microsoft.azure.management.network.v2020_03_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_03_01/implementation/FirewallPolicyImpl.java b/...com/microsoft/azure/management/network/v2020_03_01/implementation/FirewallPolicyImpl.java
@@ -15,7 +15,6 @@
 import com.microsoft.azure.SubResource;
 import com.microsoft.azure.management.network.v2020_03_01.ProvisioningState;
 import com.microsoft.azure.management.network.v2020_03_01.AzureFirewallThreatIntelMode;
-import com.microsoft.azure.management.network.v2020_03_01.FirewallPolicyIntrusionSystemMode;
 
 class FirewallPolicyImpl extends GroupableResourceCoreImpl<FirewallPolicy, FirewallPolicyInner, FirewallPolicyImpl, NetworkManager> implements FirewallPolicy, FirewallPolicy.Definition, FirewallPolicy.Update {
     FirewallPolicyImpl(String name, FirewallPolicyInner inner, NetworkManager manager) {
@@ -68,11 +67,6 @@ public List<SubResource> firewalls() {
         return this.inner().firewalls();
     }
 
-    @Override
-    public FirewallPolicyIntrusionSystemMode intrusionSystemMode() {
-        return this.inner().intrusionSystemMode();
-    }
-
     @Override
     public ProvisioningState provisioningState() {
         return this.inner().provisioningState();
@@ -94,12 +88,6 @@ public FirewallPolicyImpl withBasePolicy(SubResource basePolicy) {
         return this;
     }
 
-    @Override
-    public FirewallPolicyImpl withIntrusionSystemMode(FirewallPolicyIntrusionSystemMode intrusionSystemMode) {
-        this.inner().withIntrusionSystemMode(intrusionSystemMode);
-        return this;
-    }
-
     @Override
     public FirewallPolicyImpl withThreatIntelMode(AzureFirewallThreatIntelMode threatIntelMode) {
         this.inner().withThreatIntelMode(threatIntelMode);

diff --git a/...om/microsoft/azure/management/network/v2020_03_01/implementation/FirewallPolicyInner.java b/...om/microsoft/azure/management/network/v2020_03_01/implementation/FirewallPolicyInner.java
@@ -12,7 +12,6 @@
 import com.microsoft.azure.SubResource;
 import com.microsoft.azure.management.network.v2020_03_01.ProvisioningState;
 import com.microsoft.azure.management.network.v2020_03_01.AzureFirewallThreatIntelMode;
-import com.microsoft.azure.management.network.v2020_03_01.FirewallPolicyIntrusionSystemMode;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.microsoft.rest.serializer.JsonFlatten;
 import com.microsoft.rest.SkipParentValidation;
@@ -63,13 +62,6 @@ public class FirewallPolicyInner extends Resource {
     @JsonProperty(value = "properties.threatIntelMode")
     private AzureFirewallThreatIntelMode threatIntelMode;
 
-    /**
-     * The operation mode for Intrusion system. Possible values include:
-     * 'Enabled', 'Disabled'.
-     */
-    @JsonProperty(value = "properties.intrusionSystemMode")
-    private FirewallPolicyIntrusionSystemMode intrusionSystemMode;
-
     /**
      * A unique read-only string that changes whenever the resource is updated.
      */
@@ -158,26 +150,6 @@ public FirewallPolicyInner withThreatIntelMode(AzureFirewallThreatIntelMode thre
         return this;
     }
 
-    /**
-     * Get the operation mode for Intrusion system. Possible values include: 'Enabled', 'Disabled'.
-     *
-     * @return the intrusionSystemMode value
-     */
-    public FirewallPolicyIntrusionSystemMode intrusionSystemMode() {
-        return this.intrusionSystemMode;
-    }
-
-    /**
-     * Set the operation mode for Intrusion system. Possible values include: 'Enabled', 'Disabled'.
-     *
-     * @param intrusionSystemMode the intrusionSystemMode value to set
-     * @return the FirewallPolicyInner object itself.
-     */
-    public FirewallPolicyInner withIntrusionSystemMode(FirewallPolicyIntrusionSystemMode intrusionSystemMode) {
-        this.intrusionSystemMode = intrusionSystemMode;
-        return this;
-    }
-
     /**
      * Get a unique read-only string that changes whenever the resource is updated.
      *