Adds missing virtualMachine field to NetworkInterfaceCardProperties
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/e45c262f Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/e45c262f Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/e45c262f Branch: refs/heads/master Commit: e45c262ff21d1a4e8703f4f9a4584512b44091c6 Parents: 566ac23 Author: Dani Estevez <[email protected]> Authored: Wed Jul 11 14:09:19 2018 -0400 Committer: Ignasi Barrera <[email protected]> Committed: Thu Jul 12 09:24:00 2018 -0700 ---------------------------------------------------------------------- .../arm/domain/NetworkInterfaceCardProperties.java | 13 ++++++------- .../arm/features/NetworkInterfaceCardApiMockTest.java | 2 +- .../features/VirtualMachineScaleSetApiMockTest.java | 3 +-- 3 files changed, 8 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/e45c262f/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/NetworkInterfaceCardProperties.java ---------------------------------------------------------------------- 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 e6a9755..5a0404d 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<IpConfiguration> 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<IpConfiguration> 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<IpConfiguration> ipConfigurations); public abstract Builder networkSecurityGroup(IdReference networkSecurityGroup); - + public abstract Builder virtualMachine(IdReference virtualMachine); public abstract Builder primary(Boolean primary); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e45c262f/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/NetworkInterfaceCardApiMockTest.java ---------------------------------------------------------------------- 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 46aad73..c00fad6 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<String, String> tags = ImmutableMap.of("mycustomtag", "foobar"); http://git-wip-us.apache.org/repos/asf/jclouds/blob/e45c262f/providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApiMockTest.java ---------------------------------------------------------------------- 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 a87bfe7..300a4c8 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<String, String> tags = ImmutableMap.of("jclouds", "livetest");
