Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Adds missing virtualMachine field to NetworkInterfaceCardProperties

This commit is contained in:
Dani Estevez 2018-07-11 14:09:19 -04:00 committed by Ignasi Barrera
parent 566ac23392
commit e45c262ff2
3 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/NetworkInterfaceCardProperties.java
View File

@ -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);

2
providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/NetworkInterfaceCardApiMockTest.java
View File

@ -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");

3
providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/VirtualMachineScaleSetApiMockTest.java
View File

@ -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");