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

Added ID to the LoadBalancer entity

This commit is contained in:
Ignasi Barrera 2017-04-25 12:44:13 +02:00
parent 3d274239a1
commit 3b9609f2d5
3 changed files with 48 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/domain/LoadBalancer.java
View File

@ -26,25 +26,42 @@ import com.google.common.collect.ImmutableMap;
@AutoValue
public abstract class LoadBalancer {
@Nullable
public abstract String name();
@Nullable public abstract String id();
@Nullable public abstract String name();
@Nullable public abstract String location();
@Nullable public abstract String etag();
@Nullable public abstract Map<String, String> tags();
@Nullable public abstract LoadBalancerProperties properties();
@Nullable
public abstract String location();
@SerializedNames({ "id", "name", "location", "etag", "tags", "properties", })
public static LoadBalancer create(String id, final String name, final String location, final String etag,
final Map<String, String> tags, final LoadBalancerProperties properties) {
return builder().id(id).name(name).location(location).etag(etag).tags(tags).properties(properties).build();
}
public abstract Builder toBuilder();
@Nullable
public abstract Map<String, String> tags();
public static Builder builder() {
return new AutoValue_LoadBalancer.Builder();
}
@AutoValue.Builder
public abstract static class Builder {
public abstract Builder id(String id);
public abstract Builder name(String name);
public abstract Builder location(String location);
public abstract Builder etag(String etag);
public abstract Builder tags(Map<String, String> tags);
public abstract Builder properties(LoadBalancerProperties properties);
abstract Map<String, String> tags();
@Nullable
public abstract LoadBalancerProperties properties();
@Nullable
public abstract String etag();
@SerializedNames({ "name", "location", "tags", "properties", "etag" })
public static LoadBalancer create(final String name, final String location, final Map<String, String> tags,
final LoadBalancerProperties properties, final String etag) {
return new AutoValue_LoadBalancer(name, location, tags == null ? null : ImmutableMap.copyOf(tags), properties,
etag);
abstract LoadBalancer autoBuild();
public LoadBalancer build() {
tags(tags() != null ? ImmutableMap.copyOf(tags()) : null);
return autoBuild();
}
}
}

10
providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/LoadBalancerApiLiveTest.java
View File

@ -326,9 +326,13 @@ public class LoadBalancerApiLiveTest extends BaseComputeServiceContextLiveTest {
.builder().build();
FrontendIPConfigurations frontendIPConfigurations = FrontendIPConfigurations.create("ipConfigs", null,
frontendIPConfigurationsProperties, null);
return LoadBalancer.create(lbName, locationName, null,
LoadBalancerProperties.builder().frontendIPConfigurations(ImmutableList.of(frontendIPConfigurations))
.build(), null);
return LoadBalancer
.builder()
.name(lbName)
.location(locationName)
.properties(
LoadBalancerProperties.builder().frontendIPConfigurations(ImmutableList.of(frontendIPConfigurations))
.build()).build();
}
private void assertResourceDeleted(final URI uri) {

9
providers/azurecompute-arm/src/test/java/org/jclouds/azurecompute/arm/features/LoadBalancerApiMockTest.java
View File

@ -149,7 +149,12 @@ public class LoadBalancerApiMockTest extends BaseAzureComputeApiMockTest {
.builder().build();
FrontendIPConfigurations frontendIPConfigurations = FrontendIPConfigurations.create("ipConfigs", null,
frontendIPConfigurationsProperties, null);
return LoadBalancer.create(lbName, "westus", null, LoadBalancerProperties.builder()
.frontendIPConfigurations(ImmutableList.of(frontendIPConfigurations)).build(), null);
return LoadBalancer
.builder()
.name(lbName)
.location("westus")
.properties(
LoadBalancerProperties.builder().frontendIPConfigurations(ImmutableList.of(frontendIPConfigurations))
.build()).build();
}
}