diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/HardwareProfile.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/HardwareProfile.java index 40533907956ee..a8d6d4cef3956 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/HardwareProfile.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/HardwareProfile.java @@ -33,14 +33,14 @@ public class HardwareProfile { * 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2', * 'Standard_GS3', 'Standard_GS4', 'Standard_GS5'. */ - private String vmSize; + private VirtualMachineSizeTypes vmSize; /** * Get the vmSize value. * * @return the vmSize value */ - public String vmSize() { + public VirtualMachineSizeTypes vmSize() { return this.vmSize; } @@ -50,7 +50,7 @@ public String vmSize() { * @param vmSize the vmSize value to set * @return the HardwareProfile object itself. */ - public HardwareProfile withVmSize(String vmSize) { + public HardwareProfile withVmSize(VirtualMachineSizeTypes vmSize) { this.vmSize = vmSize; return this; } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java index 13a1e570254e0..bb0ebec7e2c2b 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachine.java @@ -133,7 +133,7 @@ public interface VirtualMachine extends /** * @return the virtual machine size */ - String size(); + VirtualMachineSizeTypes size(); /** * @return the operating system of this virtual machine diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSizeTypes.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSizeTypes.java index 5fc6800870d72..321e0f37bbc52 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSizeTypes.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/VirtualMachineSizeTypes.java @@ -8,199 +8,235 @@ package com.microsoft.azure.management.compute; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Defines values for VirtualMachineSizeTypes. */ public final class VirtualMachineSizeTypes { /** Static value Basic_A0 for VirtualMachineSizeTypes. */ - public static final String BASIC_A0 = "Basic_A0"; + public static final VirtualMachineSizeTypes BASIC_A0 = new VirtualMachineSizeTypes("Basic_A0"); /** Static value Basic_A1 for VirtualMachineSizeTypes. */ - public static final String BASIC_A1 = "Basic_A1"; + public static final VirtualMachineSizeTypes BASIC_A1 = new VirtualMachineSizeTypes("Basic_A1"); /** Static value Basic_A2 for VirtualMachineSizeTypes. */ - public static final String BASIC_A2 = "Basic_A2"; + public static final VirtualMachineSizeTypes BASIC_A2 = new VirtualMachineSizeTypes("Basic_A2"); /** Static value Basic_A3 for VirtualMachineSizeTypes. */ - public static final String BASIC_A3 = "Basic_A3"; + public static final VirtualMachineSizeTypes BASIC_A3 = new VirtualMachineSizeTypes("Basic_A3"); /** Static value Basic_A4 for VirtualMachineSizeTypes. */ - public static final String BASIC_A4 = "Basic_A4"; + public static final VirtualMachineSizeTypes BASIC_A4 = new VirtualMachineSizeTypes("Basic_A4"); /** Static value Standard_A0 for VirtualMachineSizeTypes. */ - public static final String STANDARD_A0 = "Standard_A0"; + public static final VirtualMachineSizeTypes STANDARD_A0 = new VirtualMachineSizeTypes("Standard_A0"); /** Static value Standard_A1 for VirtualMachineSizeTypes. */ - public static final String STANDARD_A1 = "Standard_A1"; + public static final VirtualMachineSizeTypes STANDARD_A1 = new VirtualMachineSizeTypes("Standard_A1"); /** Static value Standard_A2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_A2 = "Standard_A2"; + public static final VirtualMachineSizeTypes STANDARD_A2 = new VirtualMachineSizeTypes("Standard_A2"); /** Static value Standard_A3 for VirtualMachineSizeTypes. */ - public static final String STANDARD_A3 = "Standard_A3"; + public static final VirtualMachineSizeTypes STANDARD_A3 = new VirtualMachineSizeTypes("Standard_A3"); /** Static value Standard_A4 for VirtualMachineSizeTypes. */ - public static final String STANDARD_A4 = "Standard_A4"; + public static final VirtualMachineSizeTypes STANDARD_A4 = new VirtualMachineSizeTypes("Standard_A4"); /** Static value Standard_A5 for VirtualMachineSizeTypes. */ - public static final String STANDARD_A5 = "Standard_A5"; + public static final VirtualMachineSizeTypes STANDARD_A5 = new VirtualMachineSizeTypes("Standard_A5"); /** Static value Standard_A6 for VirtualMachineSizeTypes. */ - public static final String STANDARD_A6 = "Standard_A6"; + public static final VirtualMachineSizeTypes STANDARD_A6 = new VirtualMachineSizeTypes("Standard_A6"); /** Static value Standard_A7 for VirtualMachineSizeTypes. */ - public static final String STANDARD_A7 = "Standard_A7"; + public static final VirtualMachineSizeTypes STANDARD_A7 = new VirtualMachineSizeTypes("Standard_A7"); /** Static value Standard_A8 for VirtualMachineSizeTypes. */ - public static final String STANDARD_A8 = "Standard_A8"; + public static final VirtualMachineSizeTypes STANDARD_A8 = new VirtualMachineSizeTypes("Standard_A8"); /** Static value Standard_A9 for VirtualMachineSizeTypes. */ - public static final String STANDARD_A9 = "Standard_A9"; + public static final VirtualMachineSizeTypes STANDARD_A9 = new VirtualMachineSizeTypes("Standard_A9"); /** Static value Standard_A10 for VirtualMachineSizeTypes. */ - public static final String STANDARD_A10 = "Standard_A10"; + public static final VirtualMachineSizeTypes STANDARD_A10 = new VirtualMachineSizeTypes("Standard_A10"); /** Static value Standard_A11 for VirtualMachineSizeTypes. */ - public static final String STANDARD_A11 = "Standard_A11"; + public static final VirtualMachineSizeTypes STANDARD_A11 = new VirtualMachineSizeTypes("Standard_A11"); /** Static value Standard_D1 for VirtualMachineSizeTypes. */ - public static final String STANDARD_D1 = "Standard_D1"; + public static final VirtualMachineSizeTypes STANDARD_D1 = new VirtualMachineSizeTypes("Standard_D1"); /** Static value Standard_D2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_D2 = "Standard_D2"; + public static final VirtualMachineSizeTypes STANDARD_D2 = new VirtualMachineSizeTypes("Standard_D2"); /** Static value Standard_D3 for VirtualMachineSizeTypes. */ - public static final String STANDARD_D3 = "Standard_D3"; + public static final VirtualMachineSizeTypes STANDARD_D3 = new VirtualMachineSizeTypes("Standard_D3"); /** Static value Standard_D4 for VirtualMachineSizeTypes. */ - public static final String STANDARD_D4 = "Standard_D4"; + public static final VirtualMachineSizeTypes STANDARD_D4 = new VirtualMachineSizeTypes("Standard_D4"); /** Static value Standard_D11 for VirtualMachineSizeTypes. */ - public static final String STANDARD_D11 = "Standard_D11"; + public static final VirtualMachineSizeTypes STANDARD_D11 = new VirtualMachineSizeTypes("Standard_D11"); /** Static value Standard_D12 for VirtualMachineSizeTypes. */ - public static final String STANDARD_D12 = "Standard_D12"; + public static final VirtualMachineSizeTypes STANDARD_D12 = new VirtualMachineSizeTypes("Standard_D12"); /** Static value Standard_D13 for VirtualMachineSizeTypes. */ - public static final String STANDARD_D13 = "Standard_D13"; + public static final VirtualMachineSizeTypes STANDARD_D13 = new VirtualMachineSizeTypes("Standard_D13"); /** Static value Standard_D14 for VirtualMachineSizeTypes. */ - public static final String STANDARD_D14 = "Standard_D14"; + public static final VirtualMachineSizeTypes STANDARD_D14 = new VirtualMachineSizeTypes("Standard_D14"); /** Static value Standard_D1_v2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_D1_V2 = "Standard_D1_v2"; + public static final VirtualMachineSizeTypes STANDARD_D1_V2 = new VirtualMachineSizeTypes("Standard_D1_v2"); /** Static value Standard_D2_v2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_D2_V2 = "Standard_D2_v2"; + public static final VirtualMachineSizeTypes STANDARD_D2_V2 = new VirtualMachineSizeTypes("Standard_D2_v2"); /** Static value Standard_D3_v2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_D3_V2 = "Standard_D3_v2"; + public static final VirtualMachineSizeTypes STANDARD_D3_V2 = new VirtualMachineSizeTypes("Standard_D3_v2"); /** Static value Standard_D4_v2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_D4_V2 = "Standard_D4_v2"; + public static final VirtualMachineSizeTypes STANDARD_D4_V2 = new VirtualMachineSizeTypes("Standard_D4_v2"); /** Static value Standard_D5_v2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_D5_V2 = "Standard_D5_v2"; + public static final VirtualMachineSizeTypes STANDARD_D5_V2 = new VirtualMachineSizeTypes("Standard_D5_v2"); /** Static value Standard_D11_v2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_D11_V2 = "Standard_D11_v2"; + public static final VirtualMachineSizeTypes STANDARD_D11_V2 = new VirtualMachineSizeTypes("Standard_D11_v2"); /** Static value Standard_D12_v2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_D12_V2 = "Standard_D12_v2"; + public static final VirtualMachineSizeTypes STANDARD_D12_V2 = new VirtualMachineSizeTypes("Standard_D12_v2"); /** Static value Standard_D13_v2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_D13_V2 = "Standard_D13_v2"; + public static final VirtualMachineSizeTypes STANDARD_D13_V2 = new VirtualMachineSizeTypes("Standard_D13_v2"); /** Static value Standard_D14_v2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_D14_V2 = "Standard_D14_v2"; + public static final VirtualMachineSizeTypes STANDARD_D14_V2 = new VirtualMachineSizeTypes("Standard_D14_v2"); /** Static value Standard_D15_v2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_D15_V2 = "Standard_D15_v2"; + public static final VirtualMachineSizeTypes STANDARD_D15_V2 = new VirtualMachineSizeTypes("Standard_D15_v2"); /** Static value Standard_DS1 for VirtualMachineSizeTypes. */ - public static final String STANDARD_DS1 = "Standard_DS1"; + public static final VirtualMachineSizeTypes STANDARD_DS1 = new VirtualMachineSizeTypes("Standard_DS1"); /** Static value Standard_DS2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_DS2 = "Standard_DS2"; + public static final VirtualMachineSizeTypes STANDARD_DS2 = new VirtualMachineSizeTypes("Standard_DS2"); /** Static value Standard_DS3 for VirtualMachineSizeTypes. */ - public static final String STANDARD_DS3 = "Standard_DS3"; + public static final VirtualMachineSizeTypes STANDARD_DS3 = new VirtualMachineSizeTypes("Standard_DS3"); /** Static value Standard_DS4 for VirtualMachineSizeTypes. */ - public static final String STANDARD_DS4 = "Standard_DS4"; + public static final VirtualMachineSizeTypes STANDARD_DS4 = new VirtualMachineSizeTypes("Standard_DS4"); /** Static value Standard_DS11 for VirtualMachineSizeTypes. */ - public static final String STANDARD_DS11 = "Standard_DS11"; + public static final VirtualMachineSizeTypes STANDARD_DS11 = new VirtualMachineSizeTypes("Standard_DS11"); /** Static value Standard_DS12 for VirtualMachineSizeTypes. */ - public static final String STANDARD_DS12 = "Standard_DS12"; + public static final VirtualMachineSizeTypes STANDARD_DS12 = new VirtualMachineSizeTypes("Standard_DS12"); /** Static value Standard_DS13 for VirtualMachineSizeTypes. */ - public static final String STANDARD_DS13 = "Standard_DS13"; + public static final VirtualMachineSizeTypes STANDARD_DS13 = new VirtualMachineSizeTypes("Standard_DS13"); /** Static value Standard_DS14 for VirtualMachineSizeTypes. */ - public static final String STANDARD_DS14 = "Standard_DS14"; + public static final VirtualMachineSizeTypes STANDARD_DS14 = new VirtualMachineSizeTypes("Standard_DS14"); /** Static value Standard_DS1_v2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_DS1_V2 = "Standard_DS1_v2"; + public static final VirtualMachineSizeTypes STANDARD_DS1_V2 = new VirtualMachineSizeTypes("Standard_DS1_v2"); /** Static value Standard_DS2_v2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_DS2_V2 = "Standard_DS2_v2"; + public static final VirtualMachineSizeTypes STANDARD_DS2_V2 = new VirtualMachineSizeTypes("Standard_DS2_v2"); /** Static value Standard_DS3_v2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_DS3_V2 = "Standard_DS3_v2"; + public static final VirtualMachineSizeTypes STANDARD_DS3_V2 = new VirtualMachineSizeTypes("Standard_DS3_v2"); /** Static value Standard_DS4_v2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_DS4_V2 = "Standard_DS4_v2"; + public static final VirtualMachineSizeTypes STANDARD_DS4_V2 = new VirtualMachineSizeTypes("Standard_DS4_v2"); /** Static value Standard_DS5_v2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_DS5_V2 = "Standard_DS5_v2"; + public static final VirtualMachineSizeTypes STANDARD_DS5_V2 = new VirtualMachineSizeTypes("Standard_DS5_v2"); /** Static value Standard_DS11_v2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_DS11_V2 = "Standard_DS11_v2"; + public static final VirtualMachineSizeTypes STANDARD_DS11_V2 = new VirtualMachineSizeTypes("Standard_DS11_v2"); /** Static value Standard_DS12_v2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_DS12_V2 = "Standard_DS12_v2"; + public static final VirtualMachineSizeTypes STANDARD_DS12_V2 = new VirtualMachineSizeTypes("Standard_DS12_v2"); /** Static value Standard_DS13_v2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_DS13_V2 = "Standard_DS13_v2"; + public static final VirtualMachineSizeTypes STANDARD_DS13_V2 = new VirtualMachineSizeTypes("Standard_DS13_v2"); /** Static value Standard_DS14_v2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_DS14_V2 = "Standard_DS14_v2"; + public static final VirtualMachineSizeTypes STANDARD_DS14_V2 = new VirtualMachineSizeTypes("Standard_DS14_v2"); /** Static value Standard_DS15_v2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_DS15_V2 = "Standard_DS15_v2"; + public static final VirtualMachineSizeTypes STANDARD_DS15_V2 = new VirtualMachineSizeTypes("Standard_DS15_v2"); /** Static value Standard_G1 for VirtualMachineSizeTypes. */ - public static final String STANDARD_G1 = "Standard_G1"; + public static final VirtualMachineSizeTypes STANDARD_G1 = new VirtualMachineSizeTypes("Standard_G1"); /** Static value Standard_G2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_G2 = "Standard_G2"; + public static final VirtualMachineSizeTypes STANDARD_G2 = new VirtualMachineSizeTypes("Standard_G2"); /** Static value Standard_G3 for VirtualMachineSizeTypes. */ - public static final String STANDARD_G3 = "Standard_G3"; + public static final VirtualMachineSizeTypes STANDARD_G3 = new VirtualMachineSizeTypes("Standard_G3"); /** Static value Standard_G4 for VirtualMachineSizeTypes. */ - public static final String STANDARD_G4 = "Standard_G4"; + public static final VirtualMachineSizeTypes STANDARD_G4 = new VirtualMachineSizeTypes("Standard_G4"); /** Static value Standard_G5 for VirtualMachineSizeTypes. */ - public static final String STANDARD_G5 = "Standard_G5"; + public static final VirtualMachineSizeTypes STANDARD_G5 = new VirtualMachineSizeTypes("Standard_G5"); /** Static value Standard_GS1 for VirtualMachineSizeTypes. */ - public static final String STANDARD_GS1 = "Standard_GS1"; + public static final VirtualMachineSizeTypes STANDARD_GS1 = new VirtualMachineSizeTypes("Standard_GS1"); /** Static value Standard_GS2 for VirtualMachineSizeTypes. */ - public static final String STANDARD_GS2 = "Standard_GS2"; + public static final VirtualMachineSizeTypes STANDARD_GS2 = new VirtualMachineSizeTypes("Standard_GS2"); /** Static value Standard_GS3 for VirtualMachineSizeTypes. */ - public static final String STANDARD_GS3 = "Standard_GS3"; + public static final VirtualMachineSizeTypes STANDARD_GS3 = new VirtualMachineSizeTypes("Standard_GS3"); /** Static value Standard_GS4 for VirtualMachineSizeTypes. */ - public static final String STANDARD_GS4 = "Standard_GS4"; + public static final VirtualMachineSizeTypes STANDARD_GS4 = new VirtualMachineSizeTypes("Standard_GS4"); /** Static value Standard_GS5 for VirtualMachineSizeTypes. */ - public static final String STANDARD_GS5 = "Standard_GS5"; + public static final VirtualMachineSizeTypes STANDARD_GS5 = new VirtualMachineSizeTypes("Standard_GS5"); + + private String value; + + /** + * Creates a custom value for VirtualMachineSizeTypes. + * @param value the custom value + */ + public VirtualMachineSizeTypes(String value) { + this.value = value; + } + + @JsonValue + @Override + public String toString() { + return value; + } + + @Override + public int hashCode() { + return value.hashCode(); + } - private VirtualMachineSizeTypes() { + @Override + public boolean equals(Object obj) { + if (!(obj instanceof VirtualMachineSizeTypes)) { + return false; + } + if (obj == this) { + return true; + } + VirtualMachineSizeTypes rhs = (VirtualMachineSizeTypes) obj; + if (value == null) { + return rhs.value == null; + } else { + return value.equals(rhs.value); + } } } diff --git a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java index 7f6191cba0fdc..513b9b8596165 100644 --- a/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java +++ b/azure-mgmt-compute/src/main/java/com/microsoft/azure/management/compute/implementation/VirtualMachineImpl.java @@ -492,13 +492,13 @@ public VirtualMachineImpl withPassword(String password) { @Override public VirtualMachineImpl withSize(String sizeName) { - this.inner().hardwareProfile().withVmSize(sizeName); + this.inner().hardwareProfile().withVmSize(new VirtualMachineSizeTypes(sizeName)); return this; } @Override public VirtualMachineImpl withSize(VirtualMachineSizeTypes size) { - this.inner().hardwareProfile().withVmSize(size.toString()); + this.inner().hardwareProfile().withVmSize(size); return this; } @@ -699,7 +699,7 @@ public String computerName() { } @Override - public String size() { + public VirtualMachineSizeTypes size() { return inner().hardwareProfile().vmSize(); } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayCookieBasedAffinity.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayCookieBasedAffinity.java index d99a1bae0aa6b..23ff1003902c9 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayCookieBasedAffinity.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayCookieBasedAffinity.java @@ -8,16 +8,52 @@ package com.microsoft.azure.management.network; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Defines values for ApplicationGatewayCookieBasedAffinity. */ public final class ApplicationGatewayCookieBasedAffinity { /** Static value Enabled for ApplicationGatewayCookieBasedAffinity. */ - public static final String ENABLED = "Enabled"; + public static final ApplicationGatewayCookieBasedAffinity ENABLED = new ApplicationGatewayCookieBasedAffinity("Enabled"); /** Static value Disabled for ApplicationGatewayCookieBasedAffinity. */ - public static final String DISABLED = "Disabled"; + public static final ApplicationGatewayCookieBasedAffinity DISABLED = new ApplicationGatewayCookieBasedAffinity("Disabled"); + + private String value; + + /** + * Creates a custom value for ApplicationGatewayCookieBasedAffinity. + * @param value the custom value + */ + public ApplicationGatewayCookieBasedAffinity(String value) { + this.value = value; + } + + @JsonValue + @Override + public String toString() { + return value; + } + + @Override + public int hashCode() { + return value.hashCode(); + } - private ApplicationGatewayCookieBasedAffinity() { + @Override + public boolean equals(Object obj) { + if (!(obj instanceof ApplicationGatewayCookieBasedAffinity)) { + return false; + } + if (obj == this) { + return true; + } + ApplicationGatewayCookieBasedAffinity rhs = (ApplicationGatewayCookieBasedAffinity) obj; + if (value == null) { + return rhs.value == null; + } else { + return value.equals(rhs.value); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayOperationalState.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayOperationalState.java index da16c5743174e..3150d26f00590 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayOperationalState.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayOperationalState.java @@ -8,22 +8,58 @@ package com.microsoft.azure.management.network; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Defines values for ApplicationGatewayOperationalState. */ public final class ApplicationGatewayOperationalState { /** Static value Stopped for ApplicationGatewayOperationalState. */ - public static final String STOPPED = "Stopped"; + public static final ApplicationGatewayOperationalState STOPPED = new ApplicationGatewayOperationalState("Stopped"); /** Static value Starting for ApplicationGatewayOperationalState. */ - public static final String STARTING = "Starting"; + public static final ApplicationGatewayOperationalState STARTING = new ApplicationGatewayOperationalState("Starting"); /** Static value Running for ApplicationGatewayOperationalState. */ - public static final String RUNNING = "Running"; + public static final ApplicationGatewayOperationalState RUNNING = new ApplicationGatewayOperationalState("Running"); /** Static value Stopping for ApplicationGatewayOperationalState. */ - public static final String STOPPING = "Stopping"; + public static final ApplicationGatewayOperationalState STOPPING = new ApplicationGatewayOperationalState("Stopping"); + + private String value; + + /** + * Creates a custom value for ApplicationGatewayOperationalState. + * @param value the custom value + */ + public ApplicationGatewayOperationalState(String value) { + this.value = value; + } + + @JsonValue + @Override + public String toString() { + return value; + } + + @Override + public int hashCode() { + return value.hashCode(); + } - private ApplicationGatewayOperationalState() { + @Override + public boolean equals(Object obj) { + if (!(obj instanceof ApplicationGatewayOperationalState)) { + return false; + } + if (obj == this) { + return true; + } + ApplicationGatewayOperationalState rhs = (ApplicationGatewayOperationalState) obj; + if (value == null) { + return rhs.value == null; + } else { + return value.equals(rhs.value); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayProtocol.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayProtocol.java index eb222a7529a66..a06b960129ed8 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayProtocol.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayProtocol.java @@ -8,16 +8,52 @@ package com.microsoft.azure.management.network; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Defines values for ApplicationGatewayProtocol. */ public final class ApplicationGatewayProtocol { /** Static value Http for ApplicationGatewayProtocol. */ - public static final String HTTP = "Http"; + public static final ApplicationGatewayProtocol HTTP = new ApplicationGatewayProtocol("Http"); /** Static value Https for ApplicationGatewayProtocol. */ - public static final String HTTPS = "Https"; + public static final ApplicationGatewayProtocol HTTPS = new ApplicationGatewayProtocol("Https"); + + private String value; + + /** + * Creates a custom value for ApplicationGatewayProtocol. + * @param value the custom value + */ + public ApplicationGatewayProtocol(String value) { + this.value = value; + } + + @JsonValue + @Override + public String toString() { + return value; + } + + @Override + public int hashCode() { + return value.hashCode(); + } - private ApplicationGatewayProtocol() { + @Override + public boolean equals(Object obj) { + if (!(obj instanceof ApplicationGatewayProtocol)) { + return false; + } + if (obj == this) { + return true; + } + ApplicationGatewayProtocol rhs = (ApplicationGatewayProtocol) obj; + if (value == null) { + return rhs.value == null; + } else { + return value.equals(rhs.value); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayRequestRoutingRuleType.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayRequestRoutingRuleType.java index 2e34588a9f3a6..304f48e17372d 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayRequestRoutingRuleType.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayRequestRoutingRuleType.java @@ -8,16 +8,52 @@ package com.microsoft.azure.management.network; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Defines values for ApplicationGatewayRequestRoutingRuleType. */ public final class ApplicationGatewayRequestRoutingRuleType { /** Static value Basic for ApplicationGatewayRequestRoutingRuleType. */ - public static final String BASIC = "Basic"; + public static final ApplicationGatewayRequestRoutingRuleType BASIC = new ApplicationGatewayRequestRoutingRuleType("Basic"); /** Static value PathBasedRouting for ApplicationGatewayRequestRoutingRuleType. */ - public static final String PATH_BASED_ROUTING = "PathBasedRouting"; + public static final ApplicationGatewayRequestRoutingRuleType PATH_BASED_ROUTING = new ApplicationGatewayRequestRoutingRuleType("PathBasedRouting"); + + private String value; + + /** + * Creates a custom value for ApplicationGatewayRequestRoutingRuleType. + * @param value the custom value + */ + public ApplicationGatewayRequestRoutingRuleType(String value) { + this.value = value; + } + + @JsonValue + @Override + public String toString() { + return value; + } + + @Override + public int hashCode() { + return value.hashCode(); + } - private ApplicationGatewayRequestRoutingRuleType() { + @Override + public boolean equals(Object obj) { + if (!(obj instanceof ApplicationGatewayRequestRoutingRuleType)) { + return false; + } + if (obj == this) { + return true; + } + ApplicationGatewayRequestRoutingRuleType rhs = (ApplicationGatewayRequestRoutingRuleType) obj; + if (value == null) { + return rhs.value == null; + } else { + return value.equals(rhs.value); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewaySku.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewaySku.java index f59966c1b9a09..2fa0e2d282b3c 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewaySku.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewaySku.java @@ -17,13 +17,13 @@ public class ApplicationGatewaySku { * Gets or sets name of application gateway SKU. Possible values include: * 'Standard_Small', 'Standard_Medium', 'Standard_Large'. */ - private String name; + private ApplicationGatewaySkuName name; /** * Gets or sets tier of application gateway. Possible values include: * 'Standard'. */ - private String tier; + private ApplicationGatewayTier tier; /** * Gets or sets capacity (instance count) of application gateway. @@ -35,7 +35,7 @@ public class ApplicationGatewaySku { * * @return the name value */ - public String name() { + public ApplicationGatewaySkuName name() { return this.name; } @@ -45,7 +45,7 @@ public String name() { * @param name the name value to set * @return the ApplicationGatewaySku object itself. */ - public ApplicationGatewaySku withName(String name) { + public ApplicationGatewaySku withName(ApplicationGatewaySkuName name) { this.name = name; return this; } @@ -55,7 +55,7 @@ public ApplicationGatewaySku withName(String name) { * * @return the tier value */ - public String tier() { + public ApplicationGatewayTier tier() { return this.tier; } @@ -65,7 +65,7 @@ public String tier() { * @param tier the tier value to set * @return the ApplicationGatewaySku object itself. */ - public ApplicationGatewaySku withTier(String tier) { + public ApplicationGatewaySku withTier(ApplicationGatewayTier tier) { this.tier = tier; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewaySkuName.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewaySkuName.java index 1d66b07e77daf..056301a9a8434 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewaySkuName.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewaySkuName.java @@ -8,19 +8,55 @@ package com.microsoft.azure.management.network; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Defines values for ApplicationGatewaySkuName. */ public final class ApplicationGatewaySkuName { /** Static value Standard_Small for ApplicationGatewaySkuName. */ - public static final String STANDARD_SMALL = "Standard_Small"; + public static final ApplicationGatewaySkuName STANDARD_SMALL = new ApplicationGatewaySkuName("Standard_Small"); /** Static value Standard_Medium for ApplicationGatewaySkuName. */ - public static final String STANDARD_MEDIUM = "Standard_Medium"; + public static final ApplicationGatewaySkuName STANDARD_MEDIUM = new ApplicationGatewaySkuName("Standard_Medium"); /** Static value Standard_Large for ApplicationGatewaySkuName. */ - public static final String STANDARD_LARGE = "Standard_Large"; + public static final ApplicationGatewaySkuName STANDARD_LARGE = new ApplicationGatewaySkuName("Standard_Large"); + + private String value; + + /** + * Creates a custom value for ApplicationGatewaySkuName. + * @param value the custom value + */ + public ApplicationGatewaySkuName(String value) { + this.value = value; + } + + @JsonValue + @Override + public String toString() { + return value; + } + + @Override + public int hashCode() { + return value.hashCode(); + } - private ApplicationGatewaySkuName() { + @Override + public boolean equals(Object obj) { + if (!(obj instanceof ApplicationGatewaySkuName)) { + return false; + } + if (obj == this) { + return true; + } + ApplicationGatewaySkuName rhs = (ApplicationGatewaySkuName) obj; + if (value == null) { + return rhs.value == null; + } else { + return value.equals(rhs.value); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayTier.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayTier.java index 62889599e0461..c819127afe263 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayTier.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ApplicationGatewayTier.java @@ -8,13 +8,49 @@ package com.microsoft.azure.management.network; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Defines values for ApplicationGatewayTier. */ public final class ApplicationGatewayTier { /** Static value Standard for ApplicationGatewayTier. */ - public static final String STANDARD = "Standard"; + public static final ApplicationGatewayTier STANDARD = new ApplicationGatewayTier("Standard"); + + private String value; + + /** + * Creates a custom value for ApplicationGatewayTier. + * @param value the custom value + */ + public ApplicationGatewayTier(String value) { + this.value = value; + } + + @JsonValue + @Override + public String toString() { + return value; + } + + @Override + public int hashCode() { + return value.hashCode(); + } - private ApplicationGatewayTier() { + @Override + public boolean equals(Object obj) { + if (!(obj instanceof ApplicationGatewayTier)) { + return false; + } + if (obj == this) { + return true; + } + ApplicationGatewayTier rhs = (ApplicationGatewayTier) obj; + if (value == null) { + return rhs.value == null; + } else { + return value.equals(rhs.value); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/AuthorizationUseStatus.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/AuthorizationUseStatus.java index eed6d97b00195..8b9ace9e7ab29 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/AuthorizationUseStatus.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/AuthorizationUseStatus.java @@ -8,16 +8,52 @@ package com.microsoft.azure.management.network; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Defines values for AuthorizationUseStatus. */ public final class AuthorizationUseStatus { /** Static value Available for AuthorizationUseStatus. */ - public static final String AVAILABLE = "Available"; + public static final AuthorizationUseStatus AVAILABLE = new AuthorizationUseStatus("Available"); /** Static value InUse for AuthorizationUseStatus. */ - public static final String IN_USE = "InUse"; + public static final AuthorizationUseStatus IN_USE = new AuthorizationUseStatus("InUse"); + + private String value; + + /** + * Creates a custom value for AuthorizationUseStatus. + * @param value the custom value + */ + public AuthorizationUseStatus(String value) { + this.value = value; + } + + @JsonValue + @Override + public String toString() { + return value; + } + + @Override + public int hashCode() { + return value.hashCode(); + } - private AuthorizationUseStatus() { + @Override + public boolean equals(Object obj) { + if (!(obj instanceof AuthorizationUseStatus)) { + return false; + } + if (obj == this) { + return true; + } + AuthorizationUseStatus rhs = (AuthorizationUseStatus) obj; + if (value == null) { + return rhs.value == null; + } else { + return value.equals(rhs.value); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/AzureAsyncOperationResult.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/AzureAsyncOperationResult.java index e40380de0ac8d..035bb4d8dada6 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/AzureAsyncOperationResult.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/AzureAsyncOperationResult.java @@ -24,7 +24,7 @@ public class AzureAsyncOperationResult { * Status of the AzureAsuncOperation. Possible values include: * 'InProgress', 'Succeeded', 'Failed'. */ - private String status; + private NetworkOperationStatus status; /** * The error property. @@ -36,7 +36,7 @@ public class AzureAsyncOperationResult { * * @return the status value */ - public String status() { + public NetworkOperationStatus status() { return this.status; } @@ -46,7 +46,7 @@ public String status() { * @param status the status value to set * @return the AzureAsyncOperationResult object itself. */ - public AzureAsyncOperationResult withStatus(String status) { + public AzureAsyncOperationResult withStatus(NetworkOperationStatus status) { this.status = status; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/EffectiveNetworkSecurityRules.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/EffectiveNetworkSecurityRules.java index e206d18bb0040..f77af20dc0696 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/EffectiveNetworkSecurityRules.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/EffectiveNetworkSecurityRules.java @@ -24,7 +24,7 @@ public class EffectiveNetworkSecurityRules { * Gets Network protocol this rule applies to. Possible values include: * 'Tcp', 'Udp', '*'. */ - private String protocol; + private SecurityRuleProtocol protocol; /** * Gets source port or range. @@ -60,7 +60,7 @@ public class EffectiveNetworkSecurityRules { * Gets network traffic is allowed or denied. Possible values include: * 'Allow', 'Deny'. */ - private String access; + private SecurityRuleAccess access; /** * Gets the priority of the rule. @@ -71,7 +71,7 @@ public class EffectiveNetworkSecurityRules { * Gets the direction of the rule. Possible values include: 'Inbound', * 'Outbound'. */ - private String direction; + private SecurityRuleDirection direction; /** * Get the name value. @@ -98,7 +98,7 @@ public EffectiveNetworkSecurityRules withName(String name) { * * @return the protocol value */ - public String protocol() { + public SecurityRuleProtocol protocol() { return this.protocol; } @@ -108,7 +108,7 @@ public String protocol() { * @param protocol the protocol value to set * @return the EffectiveNetworkSecurityRules object itself. */ - public EffectiveNetworkSecurityRules withProtocol(String protocol) { + public EffectiveNetworkSecurityRules withProtocol(SecurityRuleProtocol protocol) { this.protocol = protocol; return this; } @@ -238,7 +238,7 @@ public EffectiveNetworkSecurityRules withExpandedDestinationAddressPrefix(List, ChildResource { - /** - * The possible directions of the network traffic supported by a network security rule. - */ - enum Direction { - INBOUND(SecurityRuleDirection.INBOUND), - OUTBOUND(SecurityRuleDirection.OUTBOUND); - - private final String name; - Direction(String name) { - this.name = name; - } - - @Override - public String toString() { - return this.name; - } - - /** - * Converts the string used by Azure into the corresponding constant, if any. - * @param s the string used by Azure to convert to a constant - * @return the identified constant, or null if not supported - */ - public static Direction fromString(String s) { - for (Direction e : Direction.values()) { - if (e.name.equalsIgnoreCase(s)) { - return e; - } - } - return null; - } - } - - /** - * The possible access types supported by a network security rule. - */ - enum Access { - ALLOW(SecurityRuleAccess.ALLOW), - DENY(SecurityRuleAccess.DENY); - - private final String name; - Access(String name) { - this.name = name; - } - - @Override - public String toString() { - return this.name; - } - - /** - * Converts the string used by Azure into the corresponding constant, if any. - * @param s the string used by Azure to convert to a constant - * @return the identified constant, or null if not supported - */ - public static Access fromString(String s) { - for (Access e : Access.values()) { - if (e.name.equalsIgnoreCase(s)) { - return e; - } - } - return null; - } - } - - /** - * The possible Azure network protocols supported by a network security rule. - */ - enum Protocol { - TCP(SecurityRuleProtocol.TCP), - UDP(SecurityRuleProtocol.UDP), - ANY(SecurityRuleProtocol.ASTERISK); - - public final String name; - Protocol(String name) { - this.name = name; - } - - @Override - public String toString() { - return this.name; - } - - /** - * Converts the string used by Azure into the corresponding constant, if any. - * @param s the string used by Azure to convert to a constant - * @return the identified constant, or null if not supported - */ - public static Protocol fromString(String s) { - for (Protocol protocol : Protocol.values()) { - if (protocol.name.equalsIgnoreCase(s)) { - return protocol; - } - } - return null; - } - } - /** * @return the network traffic direction the rule applies to */ - Direction direction(); + SecurityRuleDirection direction(); /** * @return the network protocol the rule applies to */ - Protocol protocol(); + SecurityRuleProtocol protocol(); /** * @return the user-defined description of the security rule @@ -133,7 +36,7 @@ public static Protocol fromString(String s) { /** * @return the type of access the rule enforces */ - Access access(); + SecurityRuleAccess access(); /** * @return the source address prefix the rule applies to, expressed using the CIDR notation in the format: "###.###.###.###/##", @@ -199,7 +102,7 @@ interface WithProtocol { * @param protocol one of the supported protocols * @return the next stage of the security rule definition */ - WithAttach withProtocol(Protocol protocol); + WithAttach withProtocol(SecurityRuleProtocol protocol); /** * Makes this rule apply to any supported protocol. @@ -528,7 +431,7 @@ interface WithProtocol { * @param protocol one of the supported protocols * @return the next stage of the security rule definition */ - WithAttach withProtocol(Protocol protocol); + WithAttach withProtocol(SecurityRuleProtocol protocol); /** * Makes this rule apply to any supported protocol. @@ -721,7 +624,7 @@ interface WithProtocol { * @param protocol one of the supported protocols * @return the next stage of the security rule definition */ - Update withProtocol(Protocol protocol); + Update withProtocol(SecurityRuleProtocol protocol); /** * Makes this rule apply to any supported protocol. diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NicIpConfiguration.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NicIpConfiguration.java index 946a0bdf6af06..a8a388bea570c 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NicIpConfiguration.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/NicIpConfiguration.java @@ -64,7 +64,7 @@ public interface NicIpConfiguration extends /** * @return the private IP allocation method (Dynamic, Static) */ - String privateIpAllocationMethod(); + IPAllocationMethod privateIpAllocationMethod(); // Setters (fluent) diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ProbeProtocol.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ProbeProtocol.java index e3fc6f6f4efb6..014f172460757 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ProbeProtocol.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ProbeProtocol.java @@ -8,16 +8,52 @@ package com.microsoft.azure.management.network; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Defines values for ProbeProtocol. */ public final class ProbeProtocol { /** Static value Http for ProbeProtocol. */ - public static final String HTTP = "Http"; + public static final ProbeProtocol HTTP = new ProbeProtocol("Http"); /** Static value Tcp for ProbeProtocol. */ - public static final String TCP = "Tcp"; + public static final ProbeProtocol TCP = new ProbeProtocol("Tcp"); + + private String value; + + /** + * Creates a custom value for ProbeProtocol. + * @param value the custom value + */ + public ProbeProtocol(String value) { + this.value = value; + } + + @JsonValue + @Override + public String toString() { + return value; + } + + @Override + public int hashCode() { + return value.hashCode(); + } - private ProbeProtocol() { + @Override + public boolean equals(Object obj) { + if (!(obj instanceof ProbeProtocol)) { + return false; + } + if (obj == this) { + return true; + } + ProbeProtocol rhs = (ProbeProtocol) obj; + if (value == null) { + return rhs.value == null; + } else { + return value.equals(rhs.value); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ProcessorArchitecture.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ProcessorArchitecture.java index 0c8a87a5e063f..b79db0cc738bf 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ProcessorArchitecture.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ProcessorArchitecture.java @@ -8,16 +8,52 @@ package com.microsoft.azure.management.network; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Defines values for ProcessorArchitecture. */ public final class ProcessorArchitecture { /** Static value Amd64 for ProcessorArchitecture. */ - public static final String AMD64 = "Amd64"; + public static final ProcessorArchitecture AMD64 = new ProcessorArchitecture("Amd64"); /** Static value X86 for ProcessorArchitecture. */ - public static final String X86 = "X86"; + public static final ProcessorArchitecture X86 = new ProcessorArchitecture("X86"); + + private String value; + + /** + * Creates a custom value for ProcessorArchitecture. + * @param value the custom value + */ + public ProcessorArchitecture(String value) { + this.value = value; + } + + @JsonValue + @Override + public String toString() { + return value; + } + + @Override + public int hashCode() { + return value.hashCode(); + } - private ProcessorArchitecture() { + @Override + public boolean equals(Object obj) { + if (!(obj instanceof ProcessorArchitecture)) { + return false; + } + if (obj == this) { + return true; + } + ProcessorArchitecture rhs = (ProcessorArchitecture) obj; + if (value == null) { + return rhs.value == null; + } else { + return value.equals(rhs.value); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddress.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddress.java index 493b2481e6fc8..cbb5b12a46412 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddress.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/PublicIpAddress.java @@ -23,39 +23,6 @@ public interface PublicIpAddress extends Wrapper, Updatable { - /** - * IP allocation methods. - */ - enum IpAllocationMethod { - STATIC(IPAllocationMethod.STATIC), - DYNAMIC(IPAllocationMethod.DYNAMIC); - - private final String name; - IpAllocationMethod(String name) { - this.name = name; - } - - public String toString() { - return this.name; - } - - /** - * Converts a string value returned by Azure into a constant. - * @param value the value to convert - * @return the matching enum constant, or null if no match - */ - public static IpAllocationMethod fromString(String value) { - for (IpAllocationMethod i : IpAllocationMethod.values()) { - if (i.name.equalsIgnoreCase(value)) { - return i; - } - } - - return null; - } - } - - /*********************************************************** * Getters ***********************************************************/ @@ -83,7 +50,7 @@ public static IpAllocationMethod fromString(String value) { /** * @return the IP address allocation method (Static/Dynamic) */ - IpAllocationMethod ipAllocationMethod(); + IPAllocationMethod ipAllocationMethod(); /** * @return the idle connection timeout setting (in minutes) diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/RouteNextHopType.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/RouteNextHopType.java index 13cd16393b0b8..9516bcebc2f7d 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/RouteNextHopType.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/RouteNextHopType.java @@ -8,25 +8,61 @@ package com.microsoft.azure.management.network; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Defines values for RouteNextHopType. */ public final class RouteNextHopType { /** Static value VirtualNetworkGateway for RouteNextHopType. */ - public static final String VIRTUAL_NETWORK_GATEWAY = "VirtualNetworkGateway"; + public static final RouteNextHopType VIRTUAL_NETWORK_GATEWAY = new RouteNextHopType("VirtualNetworkGateway"); /** Static value VnetLocal for RouteNextHopType. */ - public static final String VNET_LOCAL = "VnetLocal"; + public static final RouteNextHopType VNET_LOCAL = new RouteNextHopType("VnetLocal"); /** Static value Internet for RouteNextHopType. */ - public static final String INTERNET = "Internet"; + public static final RouteNextHopType INTERNET = new RouteNextHopType("Internet"); /** Static value VirtualAppliance for RouteNextHopType. */ - public static final String VIRTUAL_APPLIANCE = "VirtualAppliance"; + public static final RouteNextHopType VIRTUAL_APPLIANCE = new RouteNextHopType("VirtualAppliance"); /** Static value None for RouteNextHopType. */ - public static final String NONE = "None"; + public static final RouteNextHopType NONE = new RouteNextHopType("None"); + + private String value; + + /** + * Creates a custom value for RouteNextHopType. + * @param value the custom value + */ + public RouteNextHopType(String value) { + this.value = value; + } + + @JsonValue + @Override + public String toString() { + return value; + } + + @Override + public int hashCode() { + return value.hashCode(); + } - private RouteNextHopType() { + @Override + public boolean equals(Object obj) { + if (!(obj instanceof RouteNextHopType)) { + return false; + } + if (obj == this) { + return true; + } + RouteNextHopType rhs = (RouteNextHopType) obj; + if (value == null) { + return rhs.value == null; + } else { + return value.equals(rhs.value); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/SecurityRuleAccess.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/SecurityRuleAccess.java index 333d21c7c6ad1..bcf540e056b54 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/SecurityRuleAccess.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/SecurityRuleAccess.java @@ -8,16 +8,52 @@ package com.microsoft.azure.management.network; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Defines values for SecurityRuleAccess. */ public final class SecurityRuleAccess { /** Static value Allow for SecurityRuleAccess. */ - public static final String ALLOW = "Allow"; + public static final SecurityRuleAccess ALLOW = new SecurityRuleAccess("Allow"); /** Static value Deny for SecurityRuleAccess. */ - public static final String DENY = "Deny"; + public static final SecurityRuleAccess DENY = new SecurityRuleAccess("Deny"); + + private String value; + + /** + * Creates a custom value for SecurityRuleAccess. + * @param value the custom value + */ + public SecurityRuleAccess(String value) { + this.value = value; + } + + @JsonValue + @Override + public String toString() { + return value; + } + + @Override + public int hashCode() { + return value.hashCode(); + } - private SecurityRuleAccess() { + @Override + public boolean equals(Object obj) { + if (!(obj instanceof SecurityRuleAccess)) { + return false; + } + if (obj == this) { + return true; + } + SecurityRuleAccess rhs = (SecurityRuleAccess) obj; + if (value == null) { + return rhs.value == null; + } else { + return value.equals(rhs.value); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/SecurityRuleDirection.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/SecurityRuleDirection.java index 4cd08f51ade09..ef85548cde5fc 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/SecurityRuleDirection.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/SecurityRuleDirection.java @@ -8,16 +8,52 @@ package com.microsoft.azure.management.network; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Defines values for SecurityRuleDirection. */ public final class SecurityRuleDirection { /** Static value Inbound for SecurityRuleDirection. */ - public static final String INBOUND = "Inbound"; + public static final SecurityRuleDirection INBOUND = new SecurityRuleDirection("Inbound"); /** Static value Outbound for SecurityRuleDirection. */ - public static final String OUTBOUND = "Outbound"; + public static final SecurityRuleDirection OUTBOUND = new SecurityRuleDirection("Outbound"); + + private String value; + + /** + * Creates a custom value for SecurityRuleDirection. + * @param value the custom value + */ + public SecurityRuleDirection(String value) { + this.value = value; + } + + @JsonValue + @Override + public String toString() { + return value; + } + + @Override + public int hashCode() { + return value.hashCode(); + } - private SecurityRuleDirection() { + @Override + public boolean equals(Object obj) { + if (!(obj instanceof SecurityRuleDirection)) { + return false; + } + if (obj == this) { + return true; + } + SecurityRuleDirection rhs = (SecurityRuleDirection) obj; + if (value == null) { + return rhs.value == null; + } else { + return value.equals(rhs.value); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/SecurityRuleProtocol.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/SecurityRuleProtocol.java index c21aafa61ed17..421d8fc478b7b 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/SecurityRuleProtocol.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/SecurityRuleProtocol.java @@ -8,19 +8,55 @@ package com.microsoft.azure.management.network; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Defines values for SecurityRuleProtocol. */ public final class SecurityRuleProtocol { /** Static value Tcp for SecurityRuleProtocol. */ - public static final String TCP = "Tcp"; + public static final SecurityRuleProtocol TCP = new SecurityRuleProtocol("Tcp"); /** Static value Udp for SecurityRuleProtocol. */ - public static final String UDP = "Udp"; + public static final SecurityRuleProtocol UDP = new SecurityRuleProtocol("Udp"); /** Static value * for SecurityRuleProtocol. */ - public static final String ASTERISK = "*"; + public static final SecurityRuleProtocol ASTERISK = new SecurityRuleProtocol("*"); + + private String value; + + /** + * Creates a custom value for SecurityRuleProtocol. + * @param value the custom value + */ + public SecurityRuleProtocol(String value) { + this.value = value; + } + + @JsonValue + @Override + public String toString() { + return value; + } + + @Override + public int hashCode() { + return value.hashCode(); + } - private SecurityRuleProtocol() { + @Override + public boolean equals(Object obj) { + if (!(obj instanceof SecurityRuleProtocol)) { + return false; + } + if (obj == this) { + return true; + } + SecurityRuleProtocol rhs = (SecurityRuleProtocol) obj; + if (value == null) { + return rhs.value == null; + } else { + return value.equals(rhs.value); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ServiceProviderProvisioningState.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ServiceProviderProvisioningState.java index 20a16fa02d63a..642d411c2b412 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ServiceProviderProvisioningState.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/ServiceProviderProvisioningState.java @@ -8,22 +8,58 @@ package com.microsoft.azure.management.network; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Defines values for ServiceProviderProvisioningState. */ public final class ServiceProviderProvisioningState { /** Static value NotProvisioned for ServiceProviderProvisioningState. */ - public static final String NOT_PROVISIONED = "NotProvisioned"; + public static final ServiceProviderProvisioningState NOT_PROVISIONED = new ServiceProviderProvisioningState("NotProvisioned"); /** Static value Provisioning for ServiceProviderProvisioningState. */ - public static final String PROVISIONING = "Provisioning"; + public static final ServiceProviderProvisioningState PROVISIONING = new ServiceProviderProvisioningState("Provisioning"); /** Static value Provisioned for ServiceProviderProvisioningState. */ - public static final String PROVISIONED = "Provisioned"; + public static final ServiceProviderProvisioningState PROVISIONED = new ServiceProviderProvisioningState("Provisioned"); /** Static value Deprovisioning for ServiceProviderProvisioningState. */ - public static final String DEPROVISIONING = "Deprovisioning"; + public static final ServiceProviderProvisioningState DEPROVISIONING = new ServiceProviderProvisioningState("Deprovisioning"); + + private String value; + + /** + * Creates a custom value for ServiceProviderProvisioningState. + * @param value the custom value + */ + public ServiceProviderProvisioningState(String value) { + this.value = value; + } + + @JsonValue + @Override + public String toString() { + return value; + } + + @Override + public int hashCode() { + return value.hashCode(); + } - private ServiceProviderProvisioningState() { + @Override + public boolean equals(Object obj) { + if (!(obj instanceof ServiceProviderProvisioningState)) { + return false; + } + if (obj == this) { + return true; + } + ServiceProviderProvisioningState rhs = (ServiceProviderProvisioningState) obj; + if (value == null) { + return rhs.value == null; + } else { + return value.equals(rhs.value); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/TransportProtocol.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/TransportProtocol.java index 183ce19ee2cbd..9b4141859a7e8 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/TransportProtocol.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/TransportProtocol.java @@ -8,16 +8,52 @@ package com.microsoft.azure.management.network; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Defines values for TransportProtocol. */ public final class TransportProtocol { /** Static value Udp for TransportProtocol. */ - public static final String UDP = "Udp"; + public static final TransportProtocol UDP = new TransportProtocol("Udp"); /** Static value Tcp for TransportProtocol. */ - public static final String TCP = "Tcp"; + public static final TransportProtocol TCP = new TransportProtocol("Tcp"); + + private String value; + + /** + * Creates a custom value for TransportProtocol. + * @param value the custom value + */ + public TransportProtocol(String value) { + this.value = value; + } + + @JsonValue + @Override + public String toString() { + return value; + } + + @Override + public int hashCode() { + return value.hashCode(); + } - private TransportProtocol() { + @Override + public boolean equals(Object obj) { + if (!(obj instanceof TransportProtocol)) { + return false; + } + if (obj == this) { + return true; + } + TransportProtocol rhs = (TransportProtocol) obj; + if (value == null) { + return rhs.value == null; + } else { + return value.equals(rhs.value); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayConnectionStatus.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayConnectionStatus.java index d8671bdf782f1..349bf23dda2fc 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayConnectionStatus.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayConnectionStatus.java @@ -8,22 +8,58 @@ package com.microsoft.azure.management.network; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Defines values for VirtualNetworkGatewayConnectionStatus. */ public final class VirtualNetworkGatewayConnectionStatus { /** Static value Unknown for VirtualNetworkGatewayConnectionStatus. */ - public static final String UNKNOWN = "Unknown"; + public static final VirtualNetworkGatewayConnectionStatus UNKNOWN = new VirtualNetworkGatewayConnectionStatus("Unknown"); /** Static value Connecting for VirtualNetworkGatewayConnectionStatus. */ - public static final String CONNECTING = "Connecting"; + public static final VirtualNetworkGatewayConnectionStatus CONNECTING = new VirtualNetworkGatewayConnectionStatus("Connecting"); /** Static value Connected for VirtualNetworkGatewayConnectionStatus. */ - public static final String CONNECTED = "Connected"; + public static final VirtualNetworkGatewayConnectionStatus CONNECTED = new VirtualNetworkGatewayConnectionStatus("Connected"); /** Static value NotConnected for VirtualNetworkGatewayConnectionStatus. */ - public static final String NOT_CONNECTED = "NotConnected"; + public static final VirtualNetworkGatewayConnectionStatus NOT_CONNECTED = new VirtualNetworkGatewayConnectionStatus("NotConnected"); + + private String value; + + /** + * Creates a custom value for VirtualNetworkGatewayConnectionStatus. + * @param value the custom value + */ + public VirtualNetworkGatewayConnectionStatus(String value) { + this.value = value; + } + + @JsonValue + @Override + public String toString() { + return value; + } + + @Override + public int hashCode() { + return value.hashCode(); + } - private VirtualNetworkGatewayConnectionStatus() { + @Override + public boolean equals(Object obj) { + if (!(obj instanceof VirtualNetworkGatewayConnectionStatus)) { + return false; + } + if (obj == this) { + return true; + } + VirtualNetworkGatewayConnectionStatus rhs = (VirtualNetworkGatewayConnectionStatus) obj; + if (value == null) { + return rhs.value == null; + } else { + return value.equals(rhs.value); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayConnectionType.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayConnectionType.java index 8f1d3c64c265e..8f87ef1613df7 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayConnectionType.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayConnectionType.java @@ -8,22 +8,58 @@ package com.microsoft.azure.management.network; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Defines values for VirtualNetworkGatewayConnectionType. */ public final class VirtualNetworkGatewayConnectionType { /** Static value IPsec for VirtualNetworkGatewayConnectionType. */ - public static final String IPSEC = "IPsec"; + public static final VirtualNetworkGatewayConnectionType IPSEC = new VirtualNetworkGatewayConnectionType("IPsec"); /** Static value Vnet2Vnet for VirtualNetworkGatewayConnectionType. */ - public static final String VNET2VNET = "Vnet2Vnet"; + public static final VirtualNetworkGatewayConnectionType VNET2VNET = new VirtualNetworkGatewayConnectionType("Vnet2Vnet"); /** Static value ExpressRoute for VirtualNetworkGatewayConnectionType. */ - public static final String EXPRESS_ROUTE = "ExpressRoute"; + public static final VirtualNetworkGatewayConnectionType EXPRESS_ROUTE = new VirtualNetworkGatewayConnectionType("ExpressRoute"); /** Static value VPNClient for VirtualNetworkGatewayConnectionType. */ - public static final String VPNCLIENT = "VPNClient"; + public static final VirtualNetworkGatewayConnectionType VPNCLIENT = new VirtualNetworkGatewayConnectionType("VPNClient"); + + private String value; + + /** + * Creates a custom value for VirtualNetworkGatewayConnectionType. + * @param value the custom value + */ + public VirtualNetworkGatewayConnectionType(String value) { + this.value = value; + } + + @JsonValue + @Override + public String toString() { + return value; + } + + @Override + public int hashCode() { + return value.hashCode(); + } - private VirtualNetworkGatewayConnectionType() { + @Override + public boolean equals(Object obj) { + if (!(obj instanceof VirtualNetworkGatewayConnectionType)) { + return false; + } + if (obj == this) { + return true; + } + VirtualNetworkGatewayConnectionType rhs = (VirtualNetworkGatewayConnectionType) obj; + if (value == null) { + return rhs.value == null; + } else { + return value.equals(rhs.value); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewaySku.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewaySku.java index 5b8d43af61408..490177be6d9ab 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewaySku.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewaySku.java @@ -17,13 +17,13 @@ public class VirtualNetworkGatewaySku { * Gateway sku name -Basic/HighPerformance/Standard. Possible values * include: 'Basic', 'HighPerformance', 'Standard'. */ - private String name; + private VirtualNetworkGatewaySkuName name; /** * Gateway sku tier -Basic/HighPerformance/Standard. Possible values * include: 'Basic', 'HighPerformance', 'Standard'. */ - private String tier; + private VirtualNetworkGatewaySkuTier tier; /** * The capacity. @@ -35,7 +35,7 @@ public class VirtualNetworkGatewaySku { * * @return the name value */ - public String name() { + public VirtualNetworkGatewaySkuName name() { return this.name; } @@ -45,7 +45,7 @@ public String name() { * @param name the name value to set * @return the VirtualNetworkGatewaySku object itself. */ - public VirtualNetworkGatewaySku withName(String name) { + public VirtualNetworkGatewaySku withName(VirtualNetworkGatewaySkuName name) { this.name = name; return this; } @@ -55,7 +55,7 @@ public VirtualNetworkGatewaySku withName(String name) { * * @return the tier value */ - public String tier() { + public VirtualNetworkGatewaySkuTier tier() { return this.tier; } @@ -65,7 +65,7 @@ public String tier() { * @param tier the tier value to set * @return the VirtualNetworkGatewaySku object itself. */ - public VirtualNetworkGatewaySku withTier(String tier) { + public VirtualNetworkGatewaySku withTier(VirtualNetworkGatewaySkuTier tier) { this.tier = tier; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewaySkuName.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewaySkuName.java index 03884ac23b56a..147781a6e77a6 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewaySkuName.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewaySkuName.java @@ -8,19 +8,55 @@ package com.microsoft.azure.management.network; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Defines values for VirtualNetworkGatewaySkuName. */ public final class VirtualNetworkGatewaySkuName { /** Static value Basic for VirtualNetworkGatewaySkuName. */ - public static final String BASIC = "Basic"; + public static final VirtualNetworkGatewaySkuName BASIC = new VirtualNetworkGatewaySkuName("Basic"); /** Static value HighPerformance for VirtualNetworkGatewaySkuName. */ - public static final String HIGH_PERFORMANCE = "HighPerformance"; + public static final VirtualNetworkGatewaySkuName HIGH_PERFORMANCE = new VirtualNetworkGatewaySkuName("HighPerformance"); /** Static value Standard for VirtualNetworkGatewaySkuName. */ - public static final String STANDARD = "Standard"; + public static final VirtualNetworkGatewaySkuName STANDARD = new VirtualNetworkGatewaySkuName("Standard"); + + private String value; + + /** + * Creates a custom value for VirtualNetworkGatewaySkuName. + * @param value the custom value + */ + public VirtualNetworkGatewaySkuName(String value) { + this.value = value; + } + + @JsonValue + @Override + public String toString() { + return value; + } + + @Override + public int hashCode() { + return value.hashCode(); + } - private VirtualNetworkGatewaySkuName() { + @Override + public boolean equals(Object obj) { + if (!(obj instanceof VirtualNetworkGatewaySkuName)) { + return false; + } + if (obj == this) { + return true; + } + VirtualNetworkGatewaySkuName rhs = (VirtualNetworkGatewaySkuName) obj; + if (value == null) { + return rhs.value == null; + } else { + return value.equals(rhs.value); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewaySkuTier.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewaySkuTier.java index 0eb722ff10221..7753ca56fa089 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewaySkuTier.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewaySkuTier.java @@ -8,19 +8,55 @@ package com.microsoft.azure.management.network; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Defines values for VirtualNetworkGatewaySkuTier. */ public final class VirtualNetworkGatewaySkuTier { /** Static value Basic for VirtualNetworkGatewaySkuTier. */ - public static final String BASIC = "Basic"; + public static final VirtualNetworkGatewaySkuTier BASIC = new VirtualNetworkGatewaySkuTier("Basic"); /** Static value HighPerformance for VirtualNetworkGatewaySkuTier. */ - public static final String HIGH_PERFORMANCE = "HighPerformance"; + public static final VirtualNetworkGatewaySkuTier HIGH_PERFORMANCE = new VirtualNetworkGatewaySkuTier("HighPerformance"); /** Static value Standard for VirtualNetworkGatewaySkuTier. */ - public static final String STANDARD = "Standard"; + public static final VirtualNetworkGatewaySkuTier STANDARD = new VirtualNetworkGatewaySkuTier("Standard"); + + private String value; + + /** + * Creates a custom value for VirtualNetworkGatewaySkuTier. + * @param value the custom value + */ + public VirtualNetworkGatewaySkuTier(String value) { + this.value = value; + } + + @JsonValue + @Override + public String toString() { + return value; + } + + @Override + public int hashCode() { + return value.hashCode(); + } - private VirtualNetworkGatewaySkuTier() { + @Override + public boolean equals(Object obj) { + if (!(obj instanceof VirtualNetworkGatewaySkuTier)) { + return false; + } + if (obj == this) { + return true; + } + VirtualNetworkGatewaySkuTier rhs = (VirtualNetworkGatewaySkuTier) obj; + if (value == null) { + return rhs.value == null; + } else { + return value.equals(rhs.value); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayType.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayType.java index 8b109b3598adf..8dfcac42d6768 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayType.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkGatewayType.java @@ -8,16 +8,52 @@ package com.microsoft.azure.management.network; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Defines values for VirtualNetworkGatewayType. */ public final class VirtualNetworkGatewayType { /** Static value Vpn for VirtualNetworkGatewayType. */ - public static final String VPN = "Vpn"; + public static final VirtualNetworkGatewayType VPN = new VirtualNetworkGatewayType("Vpn"); /** Static value ExpressRoute for VirtualNetworkGatewayType. */ - public static final String EXPRESS_ROUTE = "ExpressRoute"; + public static final VirtualNetworkGatewayType EXPRESS_ROUTE = new VirtualNetworkGatewayType("ExpressRoute"); + + private String value; + + /** + * Creates a custom value for VirtualNetworkGatewayType. + * @param value the custom value + */ + public VirtualNetworkGatewayType(String value) { + this.value = value; + } + + @JsonValue + @Override + public String toString() { + return value; + } + + @Override + public int hashCode() { + return value.hashCode(); + } - private VirtualNetworkGatewayType() { + @Override + public boolean equals(Object obj) { + if (!(obj instanceof VirtualNetworkGatewayType)) { + return false; + } + if (obj == this) { + return true; + } + VirtualNetworkGatewayType rhs = (VirtualNetworkGatewayType) obj; + if (value == null) { + return rhs.value == null; + } else { + return value.equals(rhs.value); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkPeeringState.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkPeeringState.java index c0d99d08f1925..9dde89237c2d6 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkPeeringState.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VirtualNetworkPeeringState.java @@ -8,19 +8,55 @@ package com.microsoft.azure.management.network; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Defines values for VirtualNetworkPeeringState. */ public final class VirtualNetworkPeeringState { /** Static value Initiated for VirtualNetworkPeeringState. */ - public static final String INITIATED = "Initiated"; + public static final VirtualNetworkPeeringState INITIATED = new VirtualNetworkPeeringState("Initiated"); /** Static value Connected for VirtualNetworkPeeringState. */ - public static final String CONNECTED = "Connected"; + public static final VirtualNetworkPeeringState CONNECTED = new VirtualNetworkPeeringState("Connected"); /** Static value Disconnected for VirtualNetworkPeeringState. */ - public static final String DISCONNECTED = "Disconnected"; + public static final VirtualNetworkPeeringState DISCONNECTED = new VirtualNetworkPeeringState("Disconnected"); + + private String value; + + /** + * Creates a custom value for VirtualNetworkPeeringState. + * @param value the custom value + */ + public VirtualNetworkPeeringState(String value) { + this.value = value; + } + + @JsonValue + @Override + public String toString() { + return value; + } + + @Override + public int hashCode() { + return value.hashCode(); + } - private VirtualNetworkPeeringState() { + @Override + public boolean equals(Object obj) { + if (!(obj instanceof VirtualNetworkPeeringState)) { + return false; + } + if (obj == this) { + return true; + } + VirtualNetworkPeeringState rhs = (VirtualNetworkPeeringState) obj; + if (value == null) { + return rhs.value == null; + } else { + return value.equals(rhs.value); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientParameters.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientParameters.java index 0c8b8f9180fe0..1b7da00f841d6 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientParameters.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnClientParameters.java @@ -19,14 +19,14 @@ public class VpnClientParameters { * 'Amd64', 'X86'. */ @JsonProperty(value = "ProcessorArchitecture") - private String processorArchitecture; + private ProcessorArchitecture processorArchitecture; /** * Get the processorArchitecture value. * * @return the processorArchitecture value */ - public String processorArchitecture() { + public ProcessorArchitecture processorArchitecture() { return this.processorArchitecture; } @@ -36,7 +36,7 @@ public String processorArchitecture() { * @param processorArchitecture the processorArchitecture value to set * @return the VpnClientParameters object itself. */ - public VpnClientParameters withProcessorArchitecture(String processorArchitecture) { + public VpnClientParameters withProcessorArchitecture(ProcessorArchitecture processorArchitecture) { this.processorArchitecture = processorArchitecture; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnType.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnType.java index 14279a886bf15..2c2ceb07d4fd1 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnType.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/VpnType.java @@ -8,16 +8,52 @@ package com.microsoft.azure.management.network; +import com.fasterxml.jackson.annotation.JsonValue; + /** * Defines values for VpnType. */ public final class VpnType { /** Static value PolicyBased for VpnType. */ - public static final String POLICY_BASED = "PolicyBased"; + public static final VpnType POLICY_BASED = new VpnType("PolicyBased"); /** Static value RouteBased for VpnType. */ - public static final String ROUTE_BASED = "RouteBased"; + public static final VpnType ROUTE_BASED = new VpnType("RouteBased"); + + private String value; + + /** + * Creates a custom value for VpnType. + * @param value the custom value + */ + public VpnType(String value) { + this.value = value; + } + + @JsonValue + @Override + public String toString() { + return value; + } + + @Override + public int hashCode() { + return value.hashCode(); + } - private VpnType() { + @Override + public boolean equals(Object obj) { + if (!(obj instanceof VpnType)) { + return false; + } + if (obj == this) { + return true; + } + VpnType rhs = (VpnType) obj; + if (value == null) { + return rhs.value == null; + } else { + return value.equals(rhs.value); + } } } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayBackendHttpSettingsInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayBackendHttpSettingsInner.java index 9f1301101812f..4a3f225bf5ac1 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayBackendHttpSettingsInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayBackendHttpSettingsInner.java @@ -8,6 +8,8 @@ package com.microsoft.azure.management.network.implementation; +import com.microsoft.azure.management.network.ApplicationGatewayProtocol; +import com.microsoft.azure.management.network.ApplicationGatewayCookieBasedAffinity; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -27,14 +29,14 @@ public class ApplicationGatewayBackendHttpSettingsInner extends SubResource { * Gets or sets the protocol. Possible values include: 'Http', 'Https'. */ @JsonProperty(value = "properties.protocol") - private String protocol; + private ApplicationGatewayProtocol protocol; /** * Gets or sets the cookie affinity. Possible values include: 'Enabled', * 'Disabled'. */ @JsonProperty(value = "properties.cookieBasedAffinity") - private String cookieBasedAffinity; + private ApplicationGatewayCookieBasedAffinity cookieBasedAffinity; /** * Gets or sets request timeout. @@ -91,7 +93,7 @@ public ApplicationGatewayBackendHttpSettingsInner withPort(Integer port) { * * @return the protocol value */ - public String protocol() { + public ApplicationGatewayProtocol protocol() { return this.protocol; } @@ -101,7 +103,7 @@ public String protocol() { * @param protocol the protocol value to set * @return the ApplicationGatewayBackendHttpSettingsInner object itself. */ - public ApplicationGatewayBackendHttpSettingsInner withProtocol(String protocol) { + public ApplicationGatewayBackendHttpSettingsInner withProtocol(ApplicationGatewayProtocol protocol) { this.protocol = protocol; return this; } @@ -111,7 +113,7 @@ public ApplicationGatewayBackendHttpSettingsInner withProtocol(String protocol) * * @return the cookieBasedAffinity value */ - public String cookieBasedAffinity() { + public ApplicationGatewayCookieBasedAffinity cookieBasedAffinity() { return this.cookieBasedAffinity; } @@ -121,7 +123,7 @@ public String cookieBasedAffinity() { * @param cookieBasedAffinity the cookieBasedAffinity value to set * @return the ApplicationGatewayBackendHttpSettingsInner object itself. */ - public ApplicationGatewayBackendHttpSettingsInner withCookieBasedAffinity(String cookieBasedAffinity) { + public ApplicationGatewayBackendHttpSettingsInner withCookieBasedAffinity(ApplicationGatewayCookieBasedAffinity cookieBasedAffinity) { this.cookieBasedAffinity = cookieBasedAffinity; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayFrontendIPConfigurationInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayFrontendIPConfigurationInner.java index ec5b7dc522ed5..549cb5c2ac43c 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayFrontendIPConfigurationInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayFrontendIPConfigurationInner.java @@ -8,6 +8,7 @@ package com.microsoft.azure.management.network.implementation; +import com.microsoft.azure.management.network.IPAllocationMethod; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -29,7 +30,7 @@ public class ApplicationGatewayFrontendIPConfigurationInner extends SubResource * values include: 'Static', 'Dynamic'. */ @JsonProperty(value = "properties.privateIPAllocationMethod") - private String privateIPAllocationMethod; + private IPAllocationMethod privateIPAllocationMethod; /** * Gets or sets the reference of the subnet resource. @@ -86,7 +87,7 @@ public ApplicationGatewayFrontendIPConfigurationInner withPrivateIPAddress(Strin * * @return the privateIPAllocationMethod value */ - public String privateIPAllocationMethod() { + public IPAllocationMethod privateIPAllocationMethod() { return this.privateIPAllocationMethod; } @@ -96,7 +97,7 @@ public String privateIPAllocationMethod() { * @param privateIPAllocationMethod the privateIPAllocationMethod value to set * @return the ApplicationGatewayFrontendIPConfigurationInner object itself. */ - public ApplicationGatewayFrontendIPConfigurationInner withPrivateIPAllocationMethod(String privateIPAllocationMethod) { + public ApplicationGatewayFrontendIPConfigurationInner withPrivateIPAllocationMethod(IPAllocationMethod privateIPAllocationMethod) { this.privateIPAllocationMethod = privateIPAllocationMethod; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayHttpListenerInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayHttpListenerInner.java index 9036dc2c9edf3..7162b31933c6f 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayHttpListenerInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayHttpListenerInner.java @@ -9,6 +9,7 @@ package com.microsoft.azure.management.network.implementation; import com.microsoft.azure.SubResource; +import com.microsoft.azure.management.network.ApplicationGatewayProtocol; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -33,7 +34,7 @@ public class ApplicationGatewayHttpListenerInner extends SubResource { * Gets or sets the protocol. Possible values include: 'Http', 'Https'. */ @JsonProperty(value = "properties.protocol") - private String protocol; + private ApplicationGatewayProtocol protocol; /** * Gets or sets the host name of http listener. @@ -116,7 +117,7 @@ public ApplicationGatewayHttpListenerInner withFrontendPort(SubResource frontend * * @return the protocol value */ - public String protocol() { + public ApplicationGatewayProtocol protocol() { return this.protocol; } @@ -126,7 +127,7 @@ public String protocol() { * @param protocol the protocol value to set * @return the ApplicationGatewayHttpListenerInner object itself. */ - public ApplicationGatewayHttpListenerInner withProtocol(String protocol) { + public ApplicationGatewayHttpListenerInner withProtocol(ApplicationGatewayProtocol protocol) { this.protocol = protocol; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayInner.java index 6135482700226..0fa9884563f68 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayInner.java @@ -9,6 +9,7 @@ package com.microsoft.azure.management.network.implementation; import com.microsoft.azure.management.network.ApplicationGatewaySku; +import com.microsoft.azure.management.network.ApplicationGatewayOperationalState; import java.util.List; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -30,7 +31,7 @@ public class ApplicationGatewayInner extends Resource { * include: 'Stopped', 'Starting', 'Running', 'Stopping'. */ @JsonProperty(value = "properties.operationalState", access = JsonProperty.Access.WRITE_ONLY) - private String operationalState; + private ApplicationGatewayOperationalState operationalState; /** * Gets or sets subnets of application gateway resource. @@ -136,7 +137,7 @@ public ApplicationGatewayInner withSku(ApplicationGatewaySku sku) { * * @return the operationalState value */ - public String operationalState() { + public ApplicationGatewayOperationalState operationalState() { return this.operationalState; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayProbeInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayProbeInner.java index a48de017fac59..6dd4c7d397e67 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayProbeInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayProbeInner.java @@ -8,6 +8,7 @@ package com.microsoft.azure.management.network.implementation; +import com.microsoft.azure.management.network.ApplicationGatewayProtocol; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.SubResource; @@ -21,7 +22,7 @@ public class ApplicationGatewayProbeInner extends SubResource { * Gets or sets the protocol. Possible values include: 'Http', 'Https'. */ @JsonProperty(value = "properties.protocol") - private String protocol; + private ApplicationGatewayProtocol protocol; /** * Gets or sets the host to send probe to. @@ -76,7 +77,7 @@ public class ApplicationGatewayProbeInner extends SubResource { * * @return the protocol value */ - public String protocol() { + public ApplicationGatewayProtocol protocol() { return this.protocol; } @@ -86,7 +87,7 @@ public String protocol() { * @param protocol the protocol value to set * @return the ApplicationGatewayProbeInner object itself. */ - public ApplicationGatewayProbeInner withProtocol(String protocol) { + public ApplicationGatewayProbeInner withProtocol(ApplicationGatewayProtocol protocol) { this.protocol = protocol; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayRequestRoutingRuleInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayRequestRoutingRuleInner.java index 8aaa3cc7e44cb..ff40611797d57 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayRequestRoutingRuleInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ApplicationGatewayRequestRoutingRuleInner.java @@ -8,6 +8,7 @@ package com.microsoft.azure.management.network.implementation; +import com.microsoft.azure.management.network.ApplicationGatewayRequestRoutingRuleType; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -22,7 +23,7 @@ public class ApplicationGatewayRequestRoutingRuleInner extends SubResource { * 'PathBasedRouting'. */ @JsonProperty(value = "properties.ruleType") - private String ruleType; + private ApplicationGatewayRequestRoutingRuleType ruleType; /** * Gets or sets backend address pool resource of application gateway. @@ -71,7 +72,7 @@ public class ApplicationGatewayRequestRoutingRuleInner extends SubResource { * * @return the ruleType value */ - public String ruleType() { + public ApplicationGatewayRequestRoutingRuleType ruleType() { return this.ruleType; } @@ -81,7 +82,7 @@ public String ruleType() { * @param ruleType the ruleType value to set * @return the ApplicationGatewayRequestRoutingRuleInner object itself. */ - public ApplicationGatewayRequestRoutingRuleInner withRuleType(String ruleType) { + public ApplicationGatewayRequestRoutingRuleInner withRuleType(ApplicationGatewayRequestRoutingRuleType ruleType) { this.ruleType = ruleType; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/EffectiveRouteInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/EffectiveRouteInner.java index b262d77ae289f..fe58547a37795 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/EffectiveRouteInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/EffectiveRouteInner.java @@ -9,7 +9,10 @@ package com.microsoft.azure.management.network.implementation; import com.microsoft.azure.SubResource; +import com.microsoft.azure.management.network.EffectiveRouteSource; +import com.microsoft.azure.management.network.EffectiveRouteState; import java.util.List; +import com.microsoft.azure.management.network.RouteNextHopType; /** * Effective Route. @@ -25,13 +28,13 @@ public class EffectiveRouteInner extends SubResource { * Gets who created the route. Possible values include: 'Unknown', 'User', * 'VirtualNetworkGateway', 'Default'. */ - private String source; + private EffectiveRouteSource source; /** * Gets value of effective route. Possible values include: 'Active', * 'Invalid'. */ - private String state; + private EffectiveRouteState state; /** * Gets address prefixes of the effective routes in CIDR notation. @@ -48,7 +51,7 @@ public class EffectiveRouteInner extends SubResource { * Possible values include: 'VirtualNetworkGateway', 'VnetLocal', * 'Internet', 'VirtualAppliance', 'None'. */ - private String nextHopType; + private RouteNextHopType nextHopType; /** * Get the userDefinedRoute value. @@ -75,7 +78,7 @@ public EffectiveRouteInner withUserDefinedRoute(SubResource userDefinedRoute) { * * @return the source value */ - public String source() { + public EffectiveRouteSource source() { return this.source; } @@ -85,7 +88,7 @@ public String source() { * @param source the source value to set * @return the EffectiveRouteInner object itself. */ - public EffectiveRouteInner withSource(String source) { + public EffectiveRouteInner withSource(EffectiveRouteSource source) { this.source = source; return this; } @@ -95,7 +98,7 @@ public EffectiveRouteInner withSource(String source) { * * @return the state value */ - public String state() { + public EffectiveRouteState state() { return this.state; } @@ -105,7 +108,7 @@ public String state() { * @param state the state value to set * @return the EffectiveRouteInner object itself. */ - public EffectiveRouteInner withState(String state) { + public EffectiveRouteInner withState(EffectiveRouteState state) { this.state = state; return this; } @@ -155,7 +158,7 @@ public EffectiveRouteInner withNextHopIpAddress(List nextHopIpAddress) { * * @return the nextHopType value */ - public String nextHopType() { + public RouteNextHopType nextHopType() { return this.nextHopType; } @@ -165,7 +168,7 @@ public String nextHopType() { * @param nextHopType the nextHopType value to set * @return the EffectiveRouteInner object itself. */ - public EffectiveRouteInner withNextHopType(String nextHopType) { + public EffectiveRouteInner withNextHopType(RouteNextHopType nextHopType) { this.nextHopType = nextHopType; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitAuthorizationInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitAuthorizationInner.java index d224dd4846e82..fb58840d367dd 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitAuthorizationInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitAuthorizationInner.java @@ -8,6 +8,7 @@ package com.microsoft.azure.management.network.implementation; +import com.microsoft.azure.management.network.AuthorizationUseStatus; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.SubResource; @@ -28,7 +29,7 @@ public class ExpressRouteCircuitAuthorizationInner extends SubResource { * 'Available', 'InUse'. */ @JsonProperty(value = "properties.authorizationUseStatus") - private String authorizationUseStatus; + private AuthorizationUseStatus authorizationUseStatus; /** * Gets provisioning state of the PublicIP resource @@ -73,7 +74,7 @@ public ExpressRouteCircuitAuthorizationInner withAuthorizationKey(String authori * * @return the authorizationUseStatus value */ - public String authorizationUseStatus() { + public AuthorizationUseStatus authorizationUseStatus() { return this.authorizationUseStatus; } @@ -83,7 +84,7 @@ public String authorizationUseStatus() { * @param authorizationUseStatus the authorizationUseStatus value to set * @return the ExpressRouteCircuitAuthorizationInner object itself. */ - public ExpressRouteCircuitAuthorizationInner withAuthorizationUseStatus(String authorizationUseStatus) { + public ExpressRouteCircuitAuthorizationInner withAuthorizationUseStatus(AuthorizationUseStatus authorizationUseStatus) { this.authorizationUseStatus = authorizationUseStatus; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitInner.java index 0872009de8802..c4ed9a310ad07 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitInner.java @@ -9,6 +9,7 @@ package com.microsoft.azure.management.network.implementation; import com.microsoft.azure.management.network.ExpressRouteCircuitSku; +import com.microsoft.azure.management.network.ServiceProviderProvisioningState; import java.util.List; import com.microsoft.azure.management.network.ExpressRouteCircuitServiceProviderProperties; import com.fasterxml.jackson.annotation.JsonProperty; @@ -43,7 +44,7 @@ public class ExpressRouteCircuitInner extends Resource { * 'Provisioned', 'Deprovisioning'. */ @JsonProperty(value = "properties.serviceProviderProvisioningState") - private String serviceProviderProvisioningState; + private ServiceProviderProvisioningState serviceProviderProvisioningState; /** * Gets or sets list of authorizations. @@ -153,7 +154,7 @@ public ExpressRouteCircuitInner withCircuitProvisioningState(String circuitProvi * * @return the serviceProviderProvisioningState value */ - public String serviceProviderProvisioningState() { + public ServiceProviderProvisioningState serviceProviderProvisioningState() { return this.serviceProviderProvisioningState; } @@ -163,7 +164,7 @@ public String serviceProviderProvisioningState() { * @param serviceProviderProvisioningState the serviceProviderProvisioningState value to set * @return the ExpressRouteCircuitInner object itself. */ - public ExpressRouteCircuitInner withServiceProviderProvisioningState(String serviceProviderProvisioningState) { + public ExpressRouteCircuitInner withServiceProviderProvisioningState(ServiceProviderProvisioningState serviceProviderProvisioningState) { this.serviceProviderProvisioningState = serviceProviderProvisioningState; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitPeeringInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitPeeringInner.java index 9b77dc054c01e..e0e9ea11bb5fc 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitPeeringInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ExpressRouteCircuitPeeringInner.java @@ -8,6 +8,8 @@ package com.microsoft.azure.management.network.implementation; +import com.microsoft.azure.management.network.ExpressRouteCircuitPeeringType; +import com.microsoft.azure.management.network.ExpressRouteCircuitPeeringState; import com.microsoft.azure.management.network.ExpressRouteCircuitPeeringConfig; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -23,14 +25,14 @@ public class ExpressRouteCircuitPeeringInner extends SubResource { * 'AzurePublicPeering', 'AzurePrivatePeering', 'MicrosoftPeering'. */ @JsonProperty(value = "properties.peeringType") - private String peeringType; + private ExpressRouteCircuitPeeringType peeringType; /** * Gets or sets state of Peering. Possible values include: 'Disabled', * 'Enabled'. */ @JsonProperty(value = "properties.state") - private String state; + private ExpressRouteCircuitPeeringState state; /** * Gets or sets the azure ASN. @@ -115,7 +117,7 @@ public class ExpressRouteCircuitPeeringInner extends SubResource { * * @return the peeringType value */ - public String peeringType() { + public ExpressRouteCircuitPeeringType peeringType() { return this.peeringType; } @@ -125,7 +127,7 @@ public String peeringType() { * @param peeringType the peeringType value to set * @return the ExpressRouteCircuitPeeringInner object itself. */ - public ExpressRouteCircuitPeeringInner withPeeringType(String peeringType) { + public ExpressRouteCircuitPeeringInner withPeeringType(ExpressRouteCircuitPeeringType peeringType) { this.peeringType = peeringType; return this; } @@ -135,7 +137,7 @@ public ExpressRouteCircuitPeeringInner withPeeringType(String peeringType) { * * @return the state value */ - public String state() { + public ExpressRouteCircuitPeeringState state() { return this.state; } @@ -145,7 +147,7 @@ public String state() { * @param state the state value to set * @return the ExpressRouteCircuitPeeringInner object itself. */ - public ExpressRouteCircuitPeeringInner withState(String state) { + public ExpressRouteCircuitPeeringInner withState(ExpressRouteCircuitPeeringState state) { this.state = state; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/FrontendIPConfigurationInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/FrontendIPConfigurationInner.java index b81689f22a244..5e7d965b16f76 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/FrontendIPConfigurationInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/FrontendIPConfigurationInner.java @@ -10,6 +10,7 @@ import java.util.List; import com.microsoft.azure.SubResource; +import com.microsoft.azure.management.network.IPAllocationMethod; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -53,7 +54,7 @@ public class FrontendIPConfigurationInner extends SubResource { * 'Static', 'Dynamic'. */ @JsonProperty(value = "properties.privateIPAllocationMethod") - private String privateIPAllocationMethod; + private IPAllocationMethod privateIPAllocationMethod; /** * Gets or sets the reference of the subnet resource. @@ -146,7 +147,7 @@ public FrontendIPConfigurationInner withPrivateIPAddress(String privateIPAddress * * @return the privateIPAllocationMethod value */ - public String privateIPAllocationMethod() { + public IPAllocationMethod privateIPAllocationMethod() { return this.privateIPAllocationMethod; } @@ -156,7 +157,7 @@ public String privateIPAllocationMethod() { * @param privateIPAllocationMethod the privateIPAllocationMethod value to set * @return the FrontendIPConfigurationInner object itself. */ - public FrontendIPConfigurationInner withPrivateIPAllocationMethod(String privateIPAllocationMethod) { + public FrontendIPConfigurationInner withPrivateIPAllocationMethod(IPAllocationMethod privateIPAllocationMethod) { this.privateIPAllocationMethod = privateIPAllocationMethod; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/IPConfigurationInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/IPConfigurationInner.java index c86c5769deb40..3522f6cd3a64b 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/IPConfigurationInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/IPConfigurationInner.java @@ -8,6 +8,7 @@ package com.microsoft.azure.management.network.implementation; +import com.microsoft.azure.management.network.IPAllocationMethod; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.SubResource; @@ -28,7 +29,7 @@ public class IPConfigurationInner extends SubResource { * 'Static', 'Dynamic'. */ @JsonProperty(value = "properties.privateIPAllocationMethod") - private String privateIPAllocationMethod; + private IPAllocationMethod privateIPAllocationMethod; /** * Gets or sets the reference of the subnet resource. @@ -85,7 +86,7 @@ public IPConfigurationInner withPrivateIPAddress(String privateIPAddress) { * * @return the privateIPAllocationMethod value */ - public String privateIPAllocationMethod() { + public IPAllocationMethod privateIPAllocationMethod() { return this.privateIPAllocationMethod; } @@ -95,7 +96,7 @@ public String privateIPAllocationMethod() { * @param privateIPAllocationMethod the privateIPAllocationMethod value to set * @return the IPConfigurationInner object itself. */ - public IPConfigurationInner withPrivateIPAllocationMethod(String privateIPAllocationMethod) { + public IPConfigurationInner withPrivateIPAllocationMethod(IPAllocationMethod privateIPAllocationMethod) { this.privateIPAllocationMethod = privateIPAllocationMethod; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/InboundNatPoolInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/InboundNatPoolInner.java index 0aae211ae8ab6..b0e68faa59c99 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/InboundNatPoolInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/InboundNatPoolInner.java @@ -9,6 +9,7 @@ package com.microsoft.azure.management.network.implementation; import com.microsoft.azure.SubResource; +import com.microsoft.azure.management.network.TransportProtocol; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -28,7 +29,7 @@ public class InboundNatPoolInner extends SubResource { * are Udp or Tcp. Possible values include: 'Udp', 'Tcp'. */ @JsonProperty(value = "properties.protocol", required = true) - private String protocol; + private TransportProtocol protocol; /** * Gets or sets the starting port range for the NAT pool. You can spcify @@ -104,7 +105,7 @@ public InboundNatPoolInner withFrontendIPConfiguration(SubResource frontendIPCon * * @return the protocol value */ - public String protocol() { + public TransportProtocol protocol() { return this.protocol; } @@ -114,7 +115,7 @@ public String protocol() { * @param protocol the protocol value to set * @return the InboundNatPoolInner object itself. */ - public InboundNatPoolInner withProtocol(String protocol) { + public InboundNatPoolInner withProtocol(TransportProtocol protocol) { this.protocol = protocol; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/InboundNatRuleInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/InboundNatRuleInner.java index 70275b189ac4b..4722d83f89d5c 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/InboundNatRuleInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/InboundNatRuleInner.java @@ -9,6 +9,7 @@ package com.microsoft.azure.management.network.implementation; import com.microsoft.azure.SubResource; +import com.microsoft.azure.management.network.TransportProtocol; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -36,7 +37,7 @@ public class InboundNatRuleInner extends SubResource { * are Udp or Tcp. Possible values include: 'Udp', 'Tcp'. */ @JsonProperty(value = "properties.protocol") - private String protocol; + private TransportProtocol protocol; /** * Gets or sets the port for the external endpoint. You can spcify any @@ -129,7 +130,7 @@ public NetworkInterfaceIPConfigurationInner backendIPConfiguration() { * * @return the protocol value */ - public String protocol() { + public TransportProtocol protocol() { return this.protocol; } @@ -139,7 +140,7 @@ public String protocol() { * @param protocol the protocol value to set * @return the InboundNatRuleInner object itself. */ - public InboundNatRuleInner withProtocol(String protocol) { + public InboundNatRuleInner withProtocol(TransportProtocol protocol) { this.protocol = protocol; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancingRuleInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancingRuleInner.java index 562455658cf97..aa80269cee06d 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancingRuleInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/LoadBalancingRuleInner.java @@ -9,6 +9,8 @@ package com.microsoft.azure.management.network.implementation; import com.microsoft.azure.SubResource; +import com.microsoft.azure.management.network.TransportProtocol; +import com.microsoft.azure.management.network.LoadDistribution; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -42,14 +44,14 @@ public class LoadBalancingRuleInner extends SubResource { * values are Udp or Tcp. Possible values include: 'Udp', 'Tcp'. */ @JsonProperty(value = "properties.protocol", required = true) - private String protocol; + private TransportProtocol protocol; /** * Gets or sets the load distribution policy for this rule. Possible * values include: 'Default', 'SourceIP', 'SourceIPProtocol'. */ @JsonProperty(value = "properties.loadDistribution") - private String loadDistribution; + private LoadDistribution loadDistribution; /** * Gets or sets the port for the external endpoint. You can specify any @@ -173,7 +175,7 @@ public LoadBalancingRuleInner withProbe(SubResource probe) { * * @return the protocol value */ - public String protocol() { + public TransportProtocol protocol() { return this.protocol; } @@ -183,7 +185,7 @@ public String protocol() { * @param protocol the protocol value to set * @return the LoadBalancingRuleInner object itself. */ - public LoadBalancingRuleInner withProtocol(String protocol) { + public LoadBalancingRuleInner withProtocol(TransportProtocol protocol) { this.protocol = protocol; return this; } @@ -193,7 +195,7 @@ public LoadBalancingRuleInner withProtocol(String protocol) { * * @return the loadDistribution value */ - public String loadDistribution() { + public LoadDistribution loadDistribution() { return this.loadDistribution; } @@ -203,7 +205,7 @@ public String loadDistribution() { * @param loadDistribution the loadDistribution value to set * @return the LoadBalancingRuleInner object itself. */ - public LoadBalancingRuleInner withLoadDistribution(String loadDistribution) { + public LoadBalancingRuleInner withLoadDistribution(LoadDistribution loadDistribution) { this.loadDistribution = loadDistribution; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceIPConfigurationInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceIPConfigurationInner.java index 43ae7f5a3fb88..e17f787dad1a9 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceIPConfigurationInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceIPConfigurationInner.java @@ -9,6 +9,8 @@ package com.microsoft.azure.management.network.implementation; import java.util.List; +import com.microsoft.azure.management.network.IPAllocationMethod; +import com.microsoft.azure.management.network.IPVersion; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.SubResource; @@ -48,14 +50,14 @@ public class NetworkInterfaceIPConfigurationInner extends SubResource { * 'Static', 'Dynamic'. */ @JsonProperty(value = "properties.privateIPAllocationMethod") - private String privateIPAllocationMethod; + private IPAllocationMethod privateIPAllocationMethod; /** * Gets or sets PrivateIP address version (IPv4/IPv6). Possible values * include: 'IPv4', 'IPv6'. */ @JsonProperty(value = "properties.privateIPAddressVersion") - private String privateIPAddressVersion; + private IPVersion privateIPAddressVersion; /** * The subnet property. @@ -177,7 +179,7 @@ public NetworkInterfaceIPConfigurationInner withPrivateIPAddress(String privateI * * @return the privateIPAllocationMethod value */ - public String privateIPAllocationMethod() { + public IPAllocationMethod privateIPAllocationMethod() { return this.privateIPAllocationMethod; } @@ -187,7 +189,7 @@ public String privateIPAllocationMethod() { * @param privateIPAllocationMethod the privateIPAllocationMethod value to set * @return the NetworkInterfaceIPConfigurationInner object itself. */ - public NetworkInterfaceIPConfigurationInner withPrivateIPAllocationMethod(String privateIPAllocationMethod) { + public NetworkInterfaceIPConfigurationInner withPrivateIPAllocationMethod(IPAllocationMethod privateIPAllocationMethod) { this.privateIPAllocationMethod = privateIPAllocationMethod; return this; } @@ -197,7 +199,7 @@ public NetworkInterfaceIPConfigurationInner withPrivateIPAllocationMethod(String * * @return the privateIPAddressVersion value */ - public String privateIPAddressVersion() { + public IPVersion privateIPAddressVersion() { return this.privateIPAddressVersion; } @@ -207,7 +209,7 @@ public String privateIPAddressVersion() { * @param privateIPAddressVersion the privateIPAddressVersion value to set * @return the NetworkInterfaceIPConfigurationInner object itself. */ - public NetworkInterfaceIPConfigurationInner withPrivateIPAddressVersion(String privateIPAddressVersion) { + public NetworkInterfaceIPConfigurationInner withPrivateIPAddressVersion(IPVersion privateIPAddressVersion) { this.privateIPAddressVersion = privateIPAddressVersion; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceImpl.java index a429791ca1fc8..2c61b57e014f3 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkInterfaceImpl.java @@ -8,6 +8,7 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.SubResource; +import com.microsoft.azure.management.network.IPAllocationMethod; import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.NetworkInterface; import com.microsoft.azure.management.network.NetworkSecurityGroup; @@ -294,7 +295,7 @@ public String primaryPrivateIp() { } @Override - public String primaryPrivateIpAllocationMethod() { + public IPAllocationMethod primaryPrivateIpAllocationMethod() { return this.primaryIpConfiguration().privateIpAllocationMethod(); } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityRuleImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityRuleImpl.java index 67d77c012741c..893e7d2630081 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityRuleImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NetworkSecurityRuleImpl.java @@ -7,6 +7,9 @@ import com.microsoft.azure.management.network.NetworkSecurityGroup; import com.microsoft.azure.management.network.NetworkSecurityRule; +import com.microsoft.azure.management.network.SecurityRuleAccess; +import com.microsoft.azure.management.network.SecurityRuleDirection; +import com.microsoft.azure.management.network.SecurityRuleProtocol; import com.microsoft.azure.management.resources.fluentcore.arm.models.implementation.ChildResourceImpl; /** @@ -32,18 +35,18 @@ public String name() { } @Override - public Direction direction() { - return Direction.fromString(this.inner().direction()); + public SecurityRuleDirection direction() { + return this.inner().direction(); } @Override - public Protocol protocol() { - return Protocol.fromString(this.inner().protocol()); + public SecurityRuleProtocol protocol() { + return this.inner().protocol(); } @Override - public Access access() { - return Access.fromString(this.inner().access()); + public SecurityRuleAccess access() { + return this.inner().access(); } @Override @@ -76,40 +79,40 @@ public int priority() { @Override public NetworkSecurityRuleImpl allowInbound() { return this - .withDirection(Direction.INBOUND) - .withAccess(Access.ALLOW); + .withDirection(SecurityRuleDirection.INBOUND) + .withAccess(SecurityRuleAccess.ALLOW); } @Override public NetworkSecurityRuleImpl allowOutbound() { return this - .withDirection(Direction.OUTBOUND) - .withAccess(Access.ALLOW); + .withDirection(SecurityRuleDirection.OUTBOUND) + .withAccess(SecurityRuleAccess.ALLOW); } @Override public NetworkSecurityRuleImpl denyInbound() { return this - .withDirection(Direction.INBOUND) - .withAccess(Access.DENY); + .withDirection(SecurityRuleDirection.INBOUND) + .withAccess(SecurityRuleAccess.DENY); } @Override public NetworkSecurityRuleImpl denyOutbound() { return this - .withDirection(Direction.OUTBOUND) - .withAccess(Access.DENY); + .withDirection(SecurityRuleDirection.OUTBOUND) + .withAccess(SecurityRuleAccess.DENY); } @Override - public NetworkSecurityRuleImpl withProtocol(Protocol protocol) { - this.inner().withProtocol(protocol.toString()); + public NetworkSecurityRuleImpl withProtocol(SecurityRuleProtocol protocol) { + this.inner().withProtocol(protocol); return this; } @Override public NetworkSecurityRuleImpl withAnyProtocol() { - return this.withProtocol(Protocol.ANY); + return this.withProtocol(SecurityRuleProtocol.ASTERISK); } @Override @@ -190,13 +193,13 @@ public NetworkSecurityRuleImpl withDescription(String description) { // Helpers - private NetworkSecurityRuleImpl withDirection(Direction direction) { - this.inner().withDirection(direction.toString()); + private NetworkSecurityRuleImpl withDirection(SecurityRuleDirection direction) { + this.inner().withDirection(direction); return this; } - private NetworkSecurityRuleImpl withAccess(Access permission) { - this.inner().withAccess(permission.toString()); + private NetworkSecurityRuleImpl withAccess(SecurityRuleAccess permission) { + this.inner().withAccess(permission); return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NicIpConfigurationImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NicIpConfigurationImpl.java index 5af3b39f2740a..8ae222728c8ad 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NicIpConfigurationImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/NicIpConfigurationImpl.java @@ -2,6 +2,7 @@ import com.microsoft.azure.CloudException; import com.microsoft.azure.SubResource; +import com.microsoft.azure.management.network.IPAllocationMethod; import com.microsoft.azure.management.network.LoadBalancer; import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.NetworkInterface; @@ -117,7 +118,7 @@ public String privateIp() { } @Override - public String privateIpAllocationMethod() { + public IPAllocationMethod privateIpAllocationMethod() { return this.inner().privateIPAllocationMethod(); } @@ -161,14 +162,14 @@ public NicIpConfigurationImpl withExistingNetwork(Network network) { @Override public NicIpConfigurationImpl withPrivateIpAddressDynamic() { - this.inner().withPrivateIPAllocationMethod("Dynamic"); + this.inner().withPrivateIPAllocationMethod(IPAllocationMethod.DYNAMIC); this.inner().withPrivateIPAddress(null); return this; } @Override public NicIpConfigurationImpl withPrivateIpAddressStatic(String staticPrivateIpAddress) { - this.inner().withPrivateIPAllocationMethod("Static"); + this.inner().withPrivateIPAllocationMethod(IPAllocationMethod.STATIC); this.inner().withPrivateIPAddress(staticPrivateIpAddress); return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ProbeInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ProbeInner.java index 0f6e699f22f3b..fcfab0ce1a3f2 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ProbeInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/ProbeInner.java @@ -10,6 +10,7 @@ import java.util.List; import com.microsoft.azure.SubResource; +import com.microsoft.azure.management.network.ProbeProtocol; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -32,7 +33,7 @@ public class ProbeInner extends SubResource { * values include: 'Http', 'Tcp'. */ @JsonProperty(value = "properties.protocol", required = true) - private String protocol; + private ProbeProtocol protocol; /** * Gets or sets Port for communicating the probe. Possible values range @@ -100,7 +101,7 @@ public List loadBalancingRules() { * * @return the protocol value */ - public String protocol() { + public ProbeProtocol protocol() { return this.protocol; } @@ -110,7 +111,7 @@ public String protocol() { * @param protocol the protocol value to set * @return the ProbeInner object itself. */ - public ProbeInner withProtocol(String protocol) { + public ProbeInner withProtocol(ProbeProtocol protocol) { this.protocol = protocol; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIPAddressInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIPAddressInner.java index c585f57cf20f8..53c256fed986c 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIPAddressInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIPAddressInner.java @@ -8,6 +8,8 @@ package com.microsoft.azure.management.network.implementation; +import com.microsoft.azure.management.network.IPAllocationMethod; +import com.microsoft.azure.management.network.IPVersion; import com.microsoft.azure.management.network.PublicIPAddressDnsSettings; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -23,14 +25,14 @@ public class PublicIPAddressInner extends Resource { * values include: 'Static', 'Dynamic'. */ @JsonProperty(value = "properties.publicIPAllocationMethod") - private String publicIPAllocationMethod; + private IPAllocationMethod publicIPAllocationMethod; /** * Gets or sets PublicIP address version (IPv4/IPv6). Possible values * include: 'IPv4', 'IPv6'. */ @JsonProperty(value = "properties.publicIPAddressVersion") - private String publicIPAddressVersion; + private IPVersion publicIPAddressVersion; /** * The ipConfiguration property. @@ -81,7 +83,7 @@ public class PublicIPAddressInner extends Resource { * * @return the publicIPAllocationMethod value */ - public String publicIPAllocationMethod() { + public IPAllocationMethod publicIPAllocationMethod() { return this.publicIPAllocationMethod; } @@ -91,7 +93,7 @@ public String publicIPAllocationMethod() { * @param publicIPAllocationMethod the publicIPAllocationMethod value to set * @return the PublicIPAddressInner object itself. */ - public PublicIPAddressInner withPublicIPAllocationMethod(String publicIPAllocationMethod) { + public PublicIPAddressInner withPublicIPAllocationMethod(IPAllocationMethod publicIPAllocationMethod) { this.publicIPAllocationMethod = publicIPAllocationMethod; return this; } @@ -101,7 +103,7 @@ public PublicIPAddressInner withPublicIPAllocationMethod(String publicIPAllocati * * @return the publicIPAddressVersion value */ - public String publicIPAddressVersion() { + public IPVersion publicIPAddressVersion() { return this.publicIPAddressVersion; } @@ -111,7 +113,7 @@ public String publicIPAddressVersion() { * @param publicIPAddressVersion the publicIPAddressVersion value to set * @return the PublicIPAddressInner object itself. */ - public PublicIPAddressInner withPublicIPAddressVersion(String publicIPAddressVersion) { + public PublicIPAddressInner withPublicIPAddressVersion(IPVersion publicIPAddressVersion) { this.publicIPAddressVersion = publicIPAddressVersion; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressImpl.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressImpl.java index 6f19250d85907..94a4bf4298c9a 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressImpl.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/PublicIpAddressImpl.java @@ -110,8 +110,8 @@ public int idleTimeoutInMinutes() { } @Override - public IpAllocationMethod ipAllocationMethod() { - return IpAllocationMethod.fromString(this.inner().publicIPAllocationMethod()); + public IPAllocationMethod ipAllocationMethod() { + return this.inner().publicIPAllocationMethod(); } @Override diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/RouteInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/RouteInner.java index 3f8c22c620544..267847d0564f5 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/RouteInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/RouteInner.java @@ -8,6 +8,7 @@ package com.microsoft.azure.management.network.implementation; +import com.microsoft.azure.management.network.RouteNextHopType; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.SubResource; @@ -29,7 +30,7 @@ public class RouteInner extends SubResource { * 'Internet', 'VirtualAppliance', 'None'. */ @JsonProperty(value = "properties.nextHopType", required = true) - private String nextHopType; + private RouteNextHopType nextHopType; /** * Gets or sets the IP address packets should be forwarded to. Next hop @@ -81,7 +82,7 @@ public RouteInner withAddressPrefix(String addressPrefix) { * * @return the nextHopType value */ - public String nextHopType() { + public RouteNextHopType nextHopType() { return this.nextHopType; } @@ -91,7 +92,7 @@ public String nextHopType() { * @param nextHopType the nextHopType value to set * @return the RouteInner object itself. */ - public RouteInner withNextHopType(String nextHopType) { + public RouteInner withNextHopType(RouteNextHopType nextHopType) { this.nextHopType = nextHopType; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SecurityRuleInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SecurityRuleInner.java index e821374c0df8d..1232c9fa14677 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SecurityRuleInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/SecurityRuleInner.java @@ -8,6 +8,9 @@ package com.microsoft.azure.management.network.implementation; +import com.microsoft.azure.management.network.SecurityRuleProtocol; +import com.microsoft.azure.management.network.SecurityRuleAccess; +import com.microsoft.azure.management.network.SecurityRuleDirection; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; import com.microsoft.azure.SubResource; @@ -28,7 +31,7 @@ public class SecurityRuleInner extends SubResource { * All(*). Possible values include: 'Tcp', 'Udp', '*'. */ @JsonProperty(value = "properties.protocol", required = true) - private String protocol; + private SecurityRuleProtocol protocol; /** * Gets or sets Source Port or Range. Integer or range between 0 and @@ -68,7 +71,7 @@ public class SecurityRuleInner extends SubResource { * 'Allow' and 'Deny'. Possible values include: 'Allow', 'Deny'. */ @JsonProperty(value = "properties.access", required = true) - private String access; + private SecurityRuleAccess access; /** * Gets or sets the priority of the rule. The value can be between 100 and @@ -85,7 +88,7 @@ public class SecurityRuleInner extends SubResource { * traffic. Possible values include: 'Inbound', 'Outbound'. */ @JsonProperty(value = "properties.direction", required = true) - private String direction; + private SecurityRuleDirection direction; /** * Gets provisioning state of the PublicIP resource @@ -130,7 +133,7 @@ public SecurityRuleInner withDescription(String description) { * * @return the protocol value */ - public String protocol() { + public SecurityRuleProtocol protocol() { return this.protocol; } @@ -140,7 +143,7 @@ public String protocol() { * @param protocol the protocol value to set * @return the SecurityRuleInner object itself. */ - public SecurityRuleInner withProtocol(String protocol) { + public SecurityRuleInner withProtocol(SecurityRuleProtocol protocol) { this.protocol = protocol; return this; } @@ -230,7 +233,7 @@ public SecurityRuleInner withDestinationAddressPrefix(String destinationAddressP * * @return the access value */ - public String access() { + public SecurityRuleAccess access() { return this.access; } @@ -240,7 +243,7 @@ public String access() { * @param access the access value to set * @return the SecurityRuleInner object itself. */ - public SecurityRuleInner withAccess(String access) { + public SecurityRuleInner withAccess(SecurityRuleAccess access) { this.access = access; return this; } @@ -270,7 +273,7 @@ public SecurityRuleInner withPriority(Integer priority) { * * @return the direction value */ - public String direction() { + public SecurityRuleDirection direction() { return this.direction; } @@ -280,7 +283,7 @@ public String direction() { * @param direction the direction value to set * @return the SecurityRuleInner object itself. */ - public SecurityRuleInner withDirection(String direction) { + public SecurityRuleInner withDirection(SecurityRuleDirection direction) { this.direction = direction; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayConnectionInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayConnectionInner.java index 23627a8b06f44..c62e85420b815 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayConnectionInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayConnectionInner.java @@ -8,6 +8,8 @@ package com.microsoft.azure.management.network.implementation; +import com.microsoft.azure.management.network.VirtualNetworkGatewayConnectionType; +import com.microsoft.azure.management.network.VirtualNetworkGatewayConnectionStatus; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -47,7 +49,7 @@ public class VirtualNetworkGatewayConnectionInner extends Resource { * values include: 'IPsec', 'Vnet2Vnet', 'ExpressRoute', 'VPNClient'. */ @JsonProperty(value = "properties.connectionType") - private String connectionType; + private VirtualNetworkGatewayConnectionType connectionType; /** * The Routing weight. @@ -66,7 +68,7 @@ public class VirtualNetworkGatewayConnectionInner extends Resource { * 'Unknown', 'Connecting', 'Connected', 'NotConnected'. */ @JsonProperty(value = "properties.connectionStatus") - private String connectionStatus; + private VirtualNetworkGatewayConnectionStatus connectionStatus; /** * The Egress Bytes Transferred in this connection. @@ -197,7 +199,7 @@ public VirtualNetworkGatewayConnectionInner withLocalNetworkGateway2(LocalNetwor * * @return the connectionType value */ - public String connectionType() { + public VirtualNetworkGatewayConnectionType connectionType() { return this.connectionType; } @@ -207,7 +209,7 @@ public String connectionType() { * @param connectionType the connectionType value to set * @return the VirtualNetworkGatewayConnectionInner object itself. */ - public VirtualNetworkGatewayConnectionInner withConnectionType(String connectionType) { + public VirtualNetworkGatewayConnectionInner withConnectionType(VirtualNetworkGatewayConnectionType connectionType) { this.connectionType = connectionType; return this; } @@ -257,7 +259,7 @@ public VirtualNetworkGatewayConnectionInner withSharedKey(String sharedKey) { * * @return the connectionStatus value */ - public String connectionStatus() { + public VirtualNetworkGatewayConnectionStatus connectionStatus() { return this.connectionStatus; } @@ -267,7 +269,7 @@ public String connectionStatus() { * @param connectionStatus the connectionStatus value to set * @return the VirtualNetworkGatewayConnectionInner object itself. */ - public VirtualNetworkGatewayConnectionInner withConnectionStatus(String connectionStatus) { + public VirtualNetworkGatewayConnectionInner withConnectionStatus(VirtualNetworkGatewayConnectionStatus connectionStatus) { this.connectionStatus = connectionStatus; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayIPConfigurationInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayIPConfigurationInner.java index bf9202862a7d4..95779e393da39 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayIPConfigurationInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayIPConfigurationInner.java @@ -8,6 +8,7 @@ package com.microsoft.azure.management.network.implementation; +import com.microsoft.azure.management.network.IPAllocationMethod; import com.microsoft.azure.SubResource; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -22,7 +23,7 @@ public class VirtualNetworkGatewayIPConfigurationInner extends SubResource { * 'Static', 'Dynamic'. */ @JsonProperty(value = "properties.privateIPAllocationMethod") - private String privateIPAllocationMethod; + private IPAllocationMethod privateIPAllocationMethod; /** * Gets or sets the reference of the subnet resource. @@ -59,7 +60,7 @@ public class VirtualNetworkGatewayIPConfigurationInner extends SubResource { * * @return the privateIPAllocationMethod value */ - public String privateIPAllocationMethod() { + public IPAllocationMethod privateIPAllocationMethod() { return this.privateIPAllocationMethod; } @@ -69,7 +70,7 @@ public String privateIPAllocationMethod() { * @param privateIPAllocationMethod the privateIPAllocationMethod value to set * @return the VirtualNetworkGatewayIPConfigurationInner object itself. */ - public VirtualNetworkGatewayIPConfigurationInner withPrivateIPAllocationMethod(String privateIPAllocationMethod) { + public VirtualNetworkGatewayIPConfigurationInner withPrivateIPAllocationMethod(IPAllocationMethod privateIPAllocationMethod) { this.privateIPAllocationMethod = privateIPAllocationMethod; return this; } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayInner.java index c9947160da76f..15a7a3b9b4cf0 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkGatewayInner.java @@ -9,6 +9,8 @@ package com.microsoft.azure.management.network.implementation; import java.util.List; +import com.microsoft.azure.management.network.VirtualNetworkGatewayType; +import com.microsoft.azure.management.network.VpnType; import com.microsoft.azure.SubResource; import com.microsoft.azure.management.network.VirtualNetworkGatewaySku; import com.microsoft.azure.management.network.VpnClientConfiguration; @@ -33,14 +35,14 @@ public class VirtualNetworkGatewayInner extends Resource { * 'Vpn', 'ExpressRoute'. */ @JsonProperty(value = "properties.gatewayType") - private String gatewayType; + private VirtualNetworkGatewayType gatewayType; /** * The type of this virtual network gateway. Possible values include: * 'PolicyBased', 'RouteBased'. */ @JsonProperty(value = "properties.vpnType") - private String vpnType; + private VpnType vpnType; /** * EnableBgp Flag. @@ -121,7 +123,7 @@ public VirtualNetworkGatewayInner withIpConfigurations(List generatevpnclientpackage(String resourceGroupName if (this.client.apiVersion() == null) { throw new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null."); } - final String processorArchitecture = null; + final ProcessorArchitecture processorArchitecture = null; VpnClientParameters parameters = new VpnClientParameters(); parameters.withProcessorArchitecture(null); Call call = service.generatevpnclientpackage(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent()); @@ -809,7 +810,7 @@ public ServiceCall generatevpnclientpackageAsync(String resourceGroupName, Strin serviceCallback.failure(new IllegalArgumentException("Parameter this.client.apiVersion() is required and cannot be null.")); return null; } - final String processorArchitecture = null; + final ProcessorArchitecture processorArchitecture = null; VpnClientParameters parameters = new VpnClientParameters(); parameters.withProcessorArchitecture(null); Call call = service.generatevpnclientpackage(resourceGroupName, virtualNetworkGatewayName, this.client.subscriptionId(), this.client.apiVersion(), this.client.acceptLanguage(), parameters, this.client.userAgent()); @@ -838,7 +839,7 @@ public void onResponse(Call call, Response response) * @throws IllegalArgumentException exception thrown from invalid parameters * @return the String object wrapped in {@link ServiceResponse} if successful. */ - public ServiceResponse generatevpnclientpackage(String resourceGroupName, String virtualNetworkGatewayName, String processorArchitecture) throws CloudException, IOException, IllegalArgumentException { + public ServiceResponse generatevpnclientpackage(String resourceGroupName, String virtualNetworkGatewayName, ProcessorArchitecture processorArchitecture) throws CloudException, IOException, IllegalArgumentException { if (resourceGroupName == null) { throw new IllegalArgumentException("Parameter resourceGroupName is required and cannot be null."); } @@ -867,7 +868,7 @@ public ServiceResponse generatevpnclientpackage(String resourceGroupName * @throws IllegalArgumentException thrown if callback is null * @return the {@link Call} object */ - public ServiceCall generatevpnclientpackageAsync(String resourceGroupName, String virtualNetworkGatewayName, String processorArchitecture, final ServiceCallback serviceCallback) throws IllegalArgumentException { + public ServiceCall generatevpnclientpackageAsync(String resourceGroupName, String virtualNetworkGatewayName, ProcessorArchitecture processorArchitecture, final ServiceCallback serviceCallback) throws IllegalArgumentException { if (serviceCallback == null) { throw new IllegalArgumentException("ServiceCallback is required for async calls."); } diff --git a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkPeeringInner.java b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkPeeringInner.java index aed2f071fb428..451c4d109a71a 100644 --- a/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkPeeringInner.java +++ b/azure-mgmt-network/src/main/java/com/microsoft/azure/management/network/implementation/VirtualNetworkPeeringInner.java @@ -9,6 +9,7 @@ package com.microsoft.azure.management.network.implementation; import com.microsoft.azure.SubResource; +import com.microsoft.azure.management.network.VirtualNetworkPeeringState; import com.fasterxml.jackson.annotation.JsonProperty; import com.microsoft.rest.serializer.JsonFlatten; @@ -59,7 +60,7 @@ public class VirtualNetworkPeeringInner extends SubResource { * include: 'Initiated', 'Connected', 'Disconnected'. */ @JsonProperty(value = "properties.peeringState") - private String peeringState; + private VirtualNetworkPeeringState peeringState; /** * Gets provisioning state of the resource. @@ -183,7 +184,7 @@ public VirtualNetworkPeeringInner withRemoteVirtualNetwork(SubResource remoteVir * * @return the peeringState value */ - public String peeringState() { + public VirtualNetworkPeeringState peeringState() { return this.peeringState; } @@ -193,7 +194,7 @@ public String peeringState() { * @param peeringState the peeringState value to set * @return the VirtualNetworkPeeringInner object itself. */ - public VirtualNetworkPeeringInner withPeeringState(String peeringState) { + public VirtualNetworkPeeringInner withPeeringState(VirtualNetworkPeeringState peeringState) { this.peeringState = peeringState; return this; } diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkSecurityGroup.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkSecurityGroup.java index 591e5d6aef7cc..701a614f0466a 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkSecurityGroup.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageNetworkSecurityGroup.java @@ -12,9 +12,9 @@ import com.microsoft.azure.management.compute.VirtualMachine; import com.microsoft.azure.management.compute.VirtualMachineSizeTypes; import com.microsoft.azure.management.network.Network; -import com.microsoft.azure.management.network.NetworkSecurityGroup; import com.microsoft.azure.management.network.NetworkInterface; -import com.microsoft.azure.management.network.NetworkSecurityRule; +import com.microsoft.azure.management.network.NetworkSecurityGroup; +import com.microsoft.azure.management.network.SecurityRuleProtocol; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.resources.fluentcore.utils.ResourceNamer; import com.microsoft.azure.management.samples.Utils; @@ -110,7 +110,7 @@ public static void main(String[] args) { .fromAnyPort() .toAnyAddress() .toPort(22) - .withProtocol(NetworkSecurityRule.Protocol.TCP) + .withProtocol(SecurityRuleProtocol.TCP) .withPriority(100) .withDescription("Allow SSH") .attach() @@ -120,7 +120,7 @@ public static void main(String[] args) { .fromAnyPort() .toAnyAddress() .toPort(80) - .withProtocol(NetworkSecurityRule.Protocol.TCP) + .withProtocol(SecurityRuleProtocol.TCP) .withPriority(101) .withDescription("Allow HTTP") .attach() @@ -148,7 +148,7 @@ public static void main(String[] args) { .fromAnyPort() .toAnyAddress() .toPort(1433) - .withProtocol(NetworkSecurityRule.Protocol.TCP) + .withProtocol(SecurityRuleProtocol.TCP) .withPriority(100) .withDescription("Allow SQL") .attach() @@ -285,7 +285,7 @@ public static void main(String[] args) { .fromAnyPort() .toAnyAddress() .toPortRange(20, 21) - .withProtocol(NetworkSecurityRule.Protocol.TCP) + .withProtocol(SecurityRuleProtocol.TCP) .withDescription("Allow FTP") .withPriority(200) .attach() diff --git a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualNetwork.java b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualNetwork.java index 88a24aaef8eb9..771a82cf34eb3 100644 --- a/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualNetwork.java +++ b/azure-samples/src/main/java/com/microsoft/azure/management/network/samples/ManageVirtualNetwork.java @@ -13,7 +13,7 @@ import com.microsoft.azure.management.compute.VirtualMachineSizeTypes; import com.microsoft.azure.management.network.Network; import com.microsoft.azure.management.network.NetworkSecurityGroup; -import com.microsoft.azure.management.network.NetworkSecurityRule; +import com.microsoft.azure.management.network.SecurityRuleProtocol; import com.microsoft.azure.management.resources.fluentcore.arm.Region; import com.microsoft.azure.management.resources.fluentcore.utils.ResourceNamer; import com.microsoft.azure.management.samples.Utils; @@ -143,7 +143,7 @@ public static void main(String[] args) { .fromAnyPort() .toAnyAddress() .toPort(80) - .withProtocol(NetworkSecurityRule.Protocol.TCP) + .withProtocol(SecurityRuleProtocol.TCP) .attach() .defineRule("DenyInternetOutGoing") .denyOutbound() diff --git a/azure/src/test/java/com/microsoft/azure/TestNSG.java b/azure/src/test/java/com/microsoft/azure/TestNSG.java index 1abb3bf24d7e8..048f533fe6f07 100644 --- a/azure/src/test/java/com/microsoft/azure/TestNSG.java +++ b/azure/src/test/java/com/microsoft/azure/TestNSG.java @@ -5,13 +5,12 @@ */ package com.microsoft.azure; -import org.junit.Assert; - import com.microsoft.azure.management.network.NetworkSecurityGroup; import com.microsoft.azure.management.network.NetworkSecurityGroups; import com.microsoft.azure.management.network.NetworkSecurityRule; -import com.microsoft.azure.management.network.NetworkSecurityRule.Protocol; +import com.microsoft.azure.management.network.SecurityRuleProtocol; import com.microsoft.azure.management.resources.fluentcore.arm.Region; +import org.junit.Assert; /** * Test for network security group CRUD. @@ -33,7 +32,7 @@ public NetworkSecurityGroup createResource(NetworkSecurityGroups nsgs) throws Ex .fromPort(80) .toAnyAddress() .toPort(80) - .withProtocol(Protocol.TCP) + .withProtocol(SecurityRuleProtocol.TCP) .attach() .defineRule("rule2") .allowInbound() @@ -66,7 +65,7 @@ public NetworkSecurityGroup updateResource(NetworkSecurityGroup resource) throws .fromAnyPort() .toAnyAddress() .toAnyPort() - .withProtocol(Protocol.UDP) + .withProtocol(SecurityRuleProtocol.UDP) .attach() .withoutRule("rule1") .updateRule("rule2") diff --git a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineDataDisk.java b/azure/src/test/java/com/microsoft/azure/TestVirtualMachineDataDisk.java index 6873bf6b1654f..d009157178d63 100644 --- a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineDataDisk.java +++ b/azure/src/test/java/com/microsoft/azure/TestVirtualMachineDataDisk.java @@ -36,7 +36,7 @@ public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exc .attach() .create(); - Assert.assertTrue(virtualMachine.size().equalsIgnoreCase("STANDARD_A8")); + Assert.assertTrue(virtualMachine.size().equals(VirtualMachineSizeTypes.STANDARD_A8)); Assert.assertTrue(virtualMachine.dataDisks().size() == 2); VirtualMachineDataDisk disk2 = null; for (VirtualMachineDataDisk dataDisk : virtualMachine.dataDisks()) { diff --git a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineSizes.java b/azure/src/test/java/com/microsoft/azure/TestVirtualMachineSizes.java index 965ce92bae9a2..8494f7129568e 100644 --- a/azure/src/test/java/com/microsoft/azure/TestVirtualMachineSizes.java +++ b/azure/src/test/java/com/microsoft/azure/TestVirtualMachineSizes.java @@ -34,7 +34,7 @@ public VirtualMachine createResource(VirtualMachines virtualMachines) throws Exc .withSize(availableSizes.get(0).name()) // Use the first size .create(); - Assert.assertTrue(vm.size().equalsIgnoreCase(availableSizes.get(0).name())); + Assert.assertTrue(vm.size().toString().equalsIgnoreCase(availableSizes.get(0).name())); return vm; } @@ -44,7 +44,7 @@ public VirtualMachine updateResource(VirtualMachine virtualMachine) throws Excep Assert.assertTrue(resizableSizes.size() > 1); VirtualMachineSize newSize = null; for (VirtualMachineSize resizableSize : resizableSizes) { - if (!resizableSize.name().equalsIgnoreCase(virtualMachine.size())) { + if (!resizableSize.name().equalsIgnoreCase(virtualMachine.size().toString())) { newSize = resizableSize; break; } @@ -54,7 +54,7 @@ public VirtualMachine updateResource(VirtualMachine virtualMachine) throws Excep .withSize(newSize.name()) .apply(); - Assert.assertTrue(virtualMachine.size().equalsIgnoreCase(newSize.name())); + Assert.assertTrue(virtualMachine.size().toString().equalsIgnoreCase(newSize.name())); return virtualMachine; }