From cc3ad739943c3a598c43c407eccd322024735ae1 Mon Sep 17 00:00:00 2001 From: Dani Estevez Date: Wed, 11 Jul 2018 14:09:19 -0400 Subject: [PATCH] Adds missing virtualMachine field to NetworkInterfaceCardProperties --- .../arm/domain/NetworkInterfaceCardProperties.java | 13 ++++++------- .../features/NetworkInterfaceCardApiMockTest.java | 2 +- .../features/VirtualMachineScaleSetApiMockTest.java | 3 +-- 3 files changed, 8 insertions(+), 10 deletions(-) diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/NetworkInterfaceCardProperties.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/NetworkInterfaceCardProperties.java index e6a975550e..5a0404da61 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/NetworkInterfaceCardProperties.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/NetworkInterfaceCardProperties.java @@ -32,21 +32,20 @@ public abstract class NetworkInterfaceCardProperties implements Provisionable { @Nullable public abstract Boolean enableIPForwarding(); @Nullable public abstract List ipConfigurations(); @Nullable public abstract IdReference networkSecurityGroup(); - - @Nullable - public abstract Boolean primary(); + @Nullable public abstract IdReference virtualMachine(); + @Nullable public abstract Boolean primary(); @SerializedNames({"provisioningState", "resourceGuid", "enableIPForwarding", "ipConfigurations", - "networkSecurityGroup", "primary" }) + "networkSecurityGroup", "virtualMachine", "primary" }) public static NetworkInterfaceCardProperties create(final String provisioningState, final String resourceGuid, final Boolean enableIPForwarding, final List ipConfigurations, - final IdReference networkSecurityGroup, final Boolean primary) { + final IdReference networkSecurityGroup, final IdReference virtualMachine, final Boolean primary) { NetworkInterfaceCardProperties.Builder builder = NetworkInterfaceCardProperties.builder() .provisioningState(provisioningState) .resourceGuid(resourceGuid) .enableIPForwarding(enableIPForwarding) .ipConfigurations(ipConfigurations == null ? null : ImmutableList.copyOf(ipConfigurations)) - .networkSecurityGroup(networkSecurityGroup).primary(primary); + .networkSecurityGroup(networkSecurityGroup).virtualMachine(virtualMachine).primary(primary); return builder.build(); } @@ -68,7 +67,7 @@ public abstract class NetworkInterfaceCardProperties implements Provisionable { public abstract Builder enableIPForwarding(Boolean enableIPForwarding); public abstract Builder ipConfigurations(List ipConfigurations); public abstract Builder networkSecurityGroup(IdReference networkSecurityGroup); - + public abstract Builder virtualMachine(IdReference virtualMachine); public abstract Builder primary(Boolean primary); diff --git a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/NetworkInterfaceCardApiMockTest.java b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/NetworkInterfaceCardApiMockTest.java index 46aad731e7..c00fad68c9 100644 --- a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/NetworkInterfaceCardApiMockTest.java +++ b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/NetworkInterfaceCardApiMockTest.java @@ -148,7 +148,7 @@ public class NetworkInterfaceCardApiMockTest extends BaseAzureComputeApiMockTest .create(null, null, null, Arrays.asList(IpConfiguration.create("myipconfig", null, null, IpConfigurationProperties .create(null, null, "Dynamic", IdReference.create(SubnetID), null, null, null, Boolean.TRUE))), - null, Boolean.TRUE); + null, null, Boolean.TRUE); final Map tags = ImmutableMap.of("mycustomtag", "foobar"); diff --git a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApiMockTest.java b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApiMockTest.java index a87bfe73b0..300a4c88ed 100644 --- a/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApiMockTest.java +++ b/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApiMockTest.java @@ -351,8 +351,7 @@ public class VirtualMachineScaleSetApiMockTest extends BaseAzureComputeApiMockTe "/subscriptions/xxxxx-xxxx-xxxx-xxxx-xxxxxx/resourceGroups/" + "jcloud-eastus/providers/" + "Microsoft.Network/virtualNetworks/" + "jclouds-eastus-virtualNetworkName" - + "/subnets/" - + "jclouds-eastus-subnet"), Boolean.TRUE + + "/subnets/" + "jclouds-eastus-subnet"), null, Boolean.TRUE ); Map tags = ImmutableMap.of("jclouds", "livetest");