Fix imports and some formatting for container-service code
Project: http://git-wip-us.apache.org/repos/asf/brooklyn-server/repo Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-server/commit/ebe7534e Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-server/tree/ebe7534e Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-server/diff/ebe7534e Branch: refs/heads/master Commit: ebe7534ebe8f6549b27d190934d3fda5ab554267 Parents: 5a4f2e9 Author: Andrew Donald Kennedy <[email protected]> Authored: Tue Jun 13 15:02:48 2017 -0400 Committer: Andrew Donald Kennedy <[email protected]> Committed: Tue Jun 13 15:02:48 2017 -0400 ---------------------------------------------------------------------- .../entity/docker/DockerContainer.java | 5 +- .../entity/docker/DockerContainerImpl.java | 9 +- .../entity/kubernetes/KubernetesPod.java | 9 +- .../location/docker/DockerJcloudsLocation.java | 20 ++-- .../location/docker/DockerLocationResolver.java | 4 +- .../location/kubernetes/ImageChooser.java | 14 ++- .../location/kubernetes/KubernetesCerts.java | 12 +- .../kubernetes/KubernetesClientRegistry.java | 3 +- .../KubernetesClientRegistryImpl.java | 27 +++-- .../location/kubernetes/KubernetesLocation.java | 114 ++++++++++--------- .../kubernetes/KubernetesLocationConfig.java | 12 +- .../machine/KubernetesEmptyMachineLocation.java | 7 +- .../openshift/OpenShiftClientRegistryImpl.java | 5 +- .../location/openshift/OpenShiftLocation.java | 34 +++--- .../docker/DockerJcloudsLocationLiveTest.java | 23 ++-- .../docker/DockerLocationResolverTest.java | 10 +- .../location/kubernetes/ImageChooserTest.java | 6 +- .../kubernetes/KubernetesCertsTest.java | 22 ++-- .../kubernetes/KubernetesLocationLiveTest.java | 19 ++-- .../KubernetesLocationResolverTest.java | 10 +- .../KubernetesLocationYamlLiveTest.java | 41 ++++--- .../openshift/OpenShiftLocationLiveTest.java | 4 +- .../OpenShiftLocationResolverTest.java | 10 +- .../OpenShiftLocationYamlLiveTest.java | 9 +- 24 files changed, 237 insertions(+), 192 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/main/java/org/apache/brooklyn/container/entity/docker/DockerContainer.java ---------------------------------------------------------------------- diff --git a/locations/container/src/main/java/org/apache/brooklyn/container/entity/docker/DockerContainer.java b/locations/container/src/main/java/org/apache/brooklyn/container/entity/docker/DockerContainer.java index f8831a4..e17d6a7 100644 --- a/locations/container/src/main/java/org/apache/brooklyn/container/entity/docker/DockerContainer.java +++ b/locations/container/src/main/java/org/apache/brooklyn/container/entity/docker/DockerContainer.java @@ -18,8 +18,6 @@ */ package org.apache.brooklyn.container.entity.docker; -import com.google.common.collect.ImmutableMap; -import com.google.common.reflect.TypeToken; import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.BasicConfigInheritance; @@ -27,6 +25,9 @@ import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.config.MapConfigKey; import org.apache.brooklyn.entity.software.base.SoftwareProcess; +import com.google.common.collect.ImmutableMap; +import com.google.common.reflect.TypeToken; + /** * The DockerContainer type is for easily deploying any docker image from the * image repository set on the target swarm or docker-engine based location http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/main/java/org/apache/brooklyn/container/entity/docker/DockerContainerImpl.java ---------------------------------------------------------------------- diff --git a/locations/container/src/main/java/org/apache/brooklyn/container/entity/docker/DockerContainerImpl.java b/locations/container/src/main/java/org/apache/brooklyn/container/entity/docker/DockerContainerImpl.java index f0a9708..ae3ffc0 100644 --- a/locations/container/src/main/java/org/apache/brooklyn/container/entity/docker/DockerContainerImpl.java +++ b/locations/container/src/main/java/org/apache/brooklyn/container/entity/docker/DockerContainerImpl.java @@ -18,8 +18,9 @@ */ package org.apache.brooklyn.container.entity.docker; -import com.google.common.base.Strings; -import com.google.common.collect.ImmutableSet; +import java.util.Iterator; +import java.util.List; + import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.api.sensor.EnricherSpec; import org.apache.brooklyn.core.entity.Attributes; @@ -30,8 +31,8 @@ import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.entity.software.base.EmptySoftwareProcessImpl; import org.apache.brooklyn.util.collections.MutableList; -import java.util.Iterator; -import java.util.List; +import com.google.common.base.Strings; +import com.google.common.collect.ImmutableSet; public class DockerContainerImpl extends EmptySoftwareProcessImpl implements DockerContainer { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesPod.java ---------------------------------------------------------------------- diff --git a/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesPod.java b/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesPod.java index b5e9a9d..36ca3f6 100644 --- a/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesPod.java +++ b/locations/container/src/main/java/org/apache/brooklyn/container/entity/kubernetes/KubernetesPod.java @@ -18,8 +18,9 @@ */ package org.apache.brooklyn.container.entity.kubernetes; -import com.google.common.collect.ImmutableMap; -import com.google.common.reflect.TypeToken; +import java.util.List; +import java.util.Map; + import org.apache.brooklyn.api.entity.ImplementedBy; import org.apache.brooklyn.api.sensor.AttributeSensor; import org.apache.brooklyn.config.ConfigKey; @@ -31,8 +32,8 @@ import org.apache.brooklyn.core.config.MapConfigKey; import org.apache.brooklyn.core.sensor.Sensors; import org.apache.brooklyn.util.math.MathPredicates; -import java.util.List; -import java.util.Map; +import com.google.common.collect.ImmutableMap; +import com.google.common.reflect.TypeToken; @ImplementedBy(KubernetesPodImpl.class) public interface KubernetesPod extends DockerContainer { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocation.java ---------------------------------------------------------------------- diff --git a/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocation.java b/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocation.java index 5b69e74..6ec145c 100644 --- a/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocation.java +++ b/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocation.java @@ -18,9 +18,14 @@ */ package org.apache.brooklyn.container.location.docker; -import com.google.common.base.Functions; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Maps; +import static com.google.common.base.Preconditions.checkNotNull; + +import java.util.Collection; +import java.util.List; +import java.util.Map; + +import javax.annotation.Nullable; + import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.NoMachinesAvailableException; @@ -43,12 +48,9 @@ import org.jclouds.docker.compute.options.DockerTemplateOptions; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.Nullable; -import java.util.Collection; -import java.util.List; -import java.util.Map; - -import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.Functions; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Maps; /** * For provisioning docker containers, using the jclouds-docker integration. http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerLocationResolver.java ---------------------------------------------------------------------- diff --git a/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerLocationResolver.java b/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerLocationResolver.java index e76b12f..5a03eb6 100644 --- a/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerLocationResolver.java +++ b/locations/container/src/main/java/org/apache/brooklyn/container/location/docker/DockerLocationResolver.java @@ -18,6 +18,8 @@ */ package org.apache.brooklyn.container.location.docker; +import java.util.Map; + import org.apache.brooklyn.api.location.Location; import org.apache.brooklyn.api.location.LocationResolver; import org.apache.brooklyn.core.location.AbstractLocationResolver; @@ -28,8 +30,6 @@ import org.apache.brooklyn.util.collections.MutableMap; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Map; - /** * Locations starting with the given prefix (@code "docker") will use this resolver, to instantiate * a {@link DockerJcloudsLocation}. http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/ImageChooser.java ---------------------------------------------------------------------- diff --git a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/ImageChooser.java b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/ImageChooser.java index d38e843..e5a21d5 100644 --- a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/ImageChooser.java +++ b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/ImageChooser.java @@ -18,16 +18,18 @@ */ package org.apache.brooklyn.container.location.kubernetes; -import com.google.common.base.Optional; -import com.google.common.collect.ImmutableList; +import static com.google.common.base.Preconditions.checkNotNull; + +import java.util.List; + +import javax.annotation.Nullable; + import org.jclouds.compute.domain.OsFamily; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import javax.annotation.Nullable; -import java.util.List; - -import static com.google.common.base.Preconditions.checkNotNull; +import com.google.common.base.Optional; +import com.google.common.collect.ImmutableList; public class ImageChooser { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesCerts.java ---------------------------------------------------------------------- diff --git a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesCerts.java b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesCerts.java index 5bb7e2d..70d4583 100644 --- a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesCerts.java +++ b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesCerts.java @@ -18,7 +18,15 @@ */ package org.apache.brooklyn.container.location.kubernetes; -import com.google.common.base.Optional; +import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationConfig.CA_CERT_DATA; +import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationConfig.CA_CERT_FILE; +import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationConfig.CLIENT_CERT_DATA; +import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationConfig.CLIENT_CERT_FILE; +import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationConfig.CLIENT_KEY_ALGO; +import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationConfig.CLIENT_KEY_DATA; +import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationConfig.CLIENT_KEY_FILE; +import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationConfig.CLIENT_KEY_PASSPHRASE; + import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.util.core.ResourceUtils; import org.apache.brooklyn.util.core.config.ConfigBag; @@ -26,7 +34,7 @@ import org.apache.brooklyn.util.text.Strings; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationConfig.*; +import com.google.common.base.Optional; class KubernetesCerts { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistry.java ---------------------------------------------------------------------- diff --git a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistry.java b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistry.java index 9cbf0b1..06eff0c 100644 --- a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistry.java +++ b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistry.java @@ -18,9 +18,10 @@ */ package org.apache.brooklyn.container.location.kubernetes; -import io.fabric8.kubernetes.client.KubernetesClient; import org.apache.brooklyn.util.core.config.ConfigBag; +import io.fabric8.kubernetes.client.KubernetesClient; + public interface KubernetesClientRegistry { KubernetesClient getKubernetesClient(ConfigBag conf); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistryImpl.java ---------------------------------------------------------------------- diff --git a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistryImpl.java b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistryImpl.java index 27ab589..0d2e184 100644 --- a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistryImpl.java +++ b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesClientRegistryImpl.java @@ -18,19 +18,21 @@ */ package org.apache.brooklyn.container.location.kubernetes; -import com.google.common.base.Throwables; -import com.google.common.io.BaseEncoding; -import io.fabric8.kubernetes.client.ConfigBuilder; -import io.fabric8.kubernetes.client.DefaultKubernetesClient; -import io.fabric8.kubernetes.client.KubernetesClient; +import static com.google.common.base.Preconditions.checkNotNull; + +import java.net.MalformedURLException; +import java.net.URL; + import org.apache.brooklyn.util.core.config.ConfigBag; import org.apache.brooklyn.util.text.Strings; import org.apache.brooklyn.util.time.Duration; -import java.net.MalformedURLException; -import java.net.URL; +import com.google.common.base.Throwables; +import com.google.common.io.BaseEncoding; -import static com.google.common.base.Preconditions.checkNotNull; +import io.fabric8.kubernetes.client.ConfigBuilder; +import io.fabric8.kubernetes.client.DefaultKubernetesClient; +import io.fabric8.kubernetes.client.KubernetesClient; public class KubernetesClientRegistryImpl implements KubernetesClientRegistry { @@ -54,13 +56,10 @@ public class KubernetesClientRegistryImpl implements KubernetesClientRegistry { if (url.getProtocol().equals("https")) { KubernetesCerts certs = new KubernetesCerts(conf); if (certs.caCertData.isPresent()) configBuilder.withCaCertData(toBase64Encoding(certs.caCertData.get())); - if (certs.clientCertData.isPresent()) - configBuilder.withClientCertData(toBase64Encoding(certs.clientCertData.get())); - if (certs.clientKeyData.isPresent()) - configBuilder.withClientKeyData(toBase64Encoding(certs.clientKeyData.get())); + if (certs.clientCertData.isPresent()) configBuilder.withClientCertData(toBase64Encoding(certs.clientCertData.get())); + if (certs.clientKeyData.isPresent()) configBuilder.withClientKeyData(toBase64Encoding(certs.clientKeyData.get())); if (certs.clientKeyAlgo.isPresent()) configBuilder.withClientKeyAlgo(certs.clientKeyAlgo.get()); - if (certs.clientKeyPassphrase.isPresent()) - configBuilder.withClientKeyPassphrase(certs.clientKeyPassphrase.get()); + if (certs.clientKeyPassphrase.isPresent()) configBuilder.withClientKeyPassphrase(certs.clientKeyPassphrase.get()); // TODO Should we also set configBuilder.withTrustCerts(true) here? } http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java ---------------------------------------------------------------------- diff --git a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java index 23921f8..1c62b6b 100644 --- a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java +++ b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocation.java @@ -18,6 +18,63 @@ */ package org.apache.brooklyn.container.location.kubernetes; +import java.io.InputStream; +import java.net.InetAddress; +import java.nio.charset.Charset; +import java.util.Arrays; +import java.util.Collection; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.concurrent.Callable; +import java.util.concurrent.TimeUnit; + +import javax.annotation.Nullable; + +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.api.location.MachineLocation; +import org.apache.brooklyn.api.location.MachineProvisioningLocation; +import org.apache.brooklyn.api.location.NoMachinesAvailableException; +import org.apache.brooklyn.api.location.PortRange; +import org.apache.brooklyn.api.sensor.AttributeSensor; +import org.apache.brooklyn.api.sensor.EnricherSpec; +import org.apache.brooklyn.config.ConfigKey; +import org.apache.brooklyn.container.entity.docker.DockerContainer; +import org.apache.brooklyn.container.entity.kubernetes.KubernetesPod; +import org.apache.brooklyn.container.entity.kubernetes.KubernetesResource; +import org.apache.brooklyn.container.location.docker.DockerJcloudsLocation; +import org.apache.brooklyn.container.location.kubernetes.machine.KubernetesEmptyMachineLocation; +import org.apache.brooklyn.container.location.kubernetes.machine.KubernetesMachineLocation; +import org.apache.brooklyn.container.location.kubernetes.machine.KubernetesSshMachineLocation; +import org.apache.brooklyn.core.entity.BrooklynConfigKeys; +import org.apache.brooklyn.core.entity.EntityInternal; +import org.apache.brooklyn.core.location.AbstractLocation; +import org.apache.brooklyn.core.location.LocationConfigKeys; +import org.apache.brooklyn.core.location.PortRanges; +import org.apache.brooklyn.core.location.access.PortForwardManager; +import org.apache.brooklyn.core.location.access.PortForwardManagerLocationResolver; +import org.apache.brooklyn.core.location.cloud.CloudLocationConfig; +import org.apache.brooklyn.core.network.OnPublicNetworkEnricher; +import org.apache.brooklyn.core.sensor.Sensors; +import org.apache.brooklyn.location.ssh.SshMachineLocation; +import org.apache.brooklyn.util.collections.MutableList; +import org.apache.brooklyn.util.collections.MutableMap; +import org.apache.brooklyn.util.core.ResourceUtils; +import org.apache.brooklyn.util.core.config.ConfigBag; +import org.apache.brooklyn.util.core.config.ResolvingConfigBag; +import org.apache.brooklyn.util.core.internal.ssh.SshTool; +import org.apache.brooklyn.util.core.text.TemplateProcessor; +import org.apache.brooklyn.util.exceptions.ReferenceWithError; +import org.apache.brooklyn.util.net.Networking; +import org.apache.brooklyn.util.repeat.Repeater; +import org.apache.brooklyn.util.stream.Streams; +import org.apache.brooklyn.util.text.Identifiers; +import org.apache.brooklyn.util.text.Strings; +import org.apache.brooklyn.util.time.Duration; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.google.common.base.Functions; import com.google.common.base.Joiner; import com.google.common.base.Optional; @@ -34,6 +91,7 @@ import com.google.common.collect.Maps; import com.google.common.collect.Sets; import com.google.common.io.BaseEncoding; import com.google.common.net.HostAndPort; + import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.ContainerBuilder; import io.fabric8.kubernetes.api.model.ContainerPort; @@ -67,62 +125,6 @@ import io.fabric8.kubernetes.api.model.extensions.DeploymentBuilder; import io.fabric8.kubernetes.api.model.extensions.DeploymentStatus; import io.fabric8.kubernetes.client.KubernetesClient; import io.fabric8.kubernetes.client.KubernetesClientException; -import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.location.LocationSpec; -import org.apache.brooklyn.api.location.MachineLocation; -import org.apache.brooklyn.api.location.MachineProvisioningLocation; -import org.apache.brooklyn.api.location.NoMachinesAvailableException; -import org.apache.brooklyn.api.location.PortRange; -import org.apache.brooklyn.api.sensor.AttributeSensor; -import org.apache.brooklyn.api.sensor.EnricherSpec; -import org.apache.brooklyn.config.ConfigKey; -import org.apache.brooklyn.container.entity.docker.DockerContainer; -import org.apache.brooklyn.container.entity.kubernetes.KubernetesPod; -import org.apache.brooklyn.container.entity.kubernetes.KubernetesResource; -import org.apache.brooklyn.container.location.docker.DockerJcloudsLocation; -import org.apache.brooklyn.container.location.kubernetes.machine.KubernetesEmptyMachineLocation; -import org.apache.brooklyn.container.location.kubernetes.machine.KubernetesMachineLocation; -import org.apache.brooklyn.container.location.kubernetes.machine.KubernetesSshMachineLocation; -import org.apache.brooklyn.core.entity.BrooklynConfigKeys; -import org.apache.brooklyn.core.entity.EntityInternal; -import org.apache.brooklyn.core.location.AbstractLocation; -import org.apache.brooklyn.core.location.LocationConfigKeys; -import org.apache.brooklyn.core.location.PortRanges; -import org.apache.brooklyn.core.location.access.PortForwardManager; -import org.apache.brooklyn.core.location.access.PortForwardManagerLocationResolver; -import org.apache.brooklyn.core.location.cloud.CloudLocationConfig; -import org.apache.brooklyn.core.network.OnPublicNetworkEnricher; -import org.apache.brooklyn.core.sensor.Sensors; -import org.apache.brooklyn.location.ssh.SshMachineLocation; -import org.apache.brooklyn.util.collections.MutableList; -import org.apache.brooklyn.util.collections.MutableMap; -import org.apache.brooklyn.util.core.ResourceUtils; -import org.apache.brooklyn.util.core.config.ConfigBag; -import org.apache.brooklyn.util.core.config.ResolvingConfigBag; -import org.apache.brooklyn.util.core.internal.ssh.SshTool; -import org.apache.brooklyn.util.core.text.TemplateProcessor; -import org.apache.brooklyn.util.exceptions.ReferenceWithError; -import org.apache.brooklyn.util.net.Networking; -import org.apache.brooklyn.util.repeat.Repeater; -import org.apache.brooklyn.util.stream.Streams; -import org.apache.brooklyn.util.text.Identifiers; -import org.apache.brooklyn.util.text.Strings; -import org.apache.brooklyn.util.time.Duration; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.io.InputStream; -import java.net.InetAddress; -import java.nio.charset.Charset; -import java.util.Arrays; -import java.util.Collection; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.concurrent.Callable; -import java.util.concurrent.TimeUnit; - -import javax.annotation.Nullable; public class KubernetesLocation extends AbstractLocation implements MachineProvisioningLocation<KubernetesMachineLocation>, KubernetesLocationConfig { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationConfig.java ---------------------------------------------------------------------- diff --git a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationConfig.java b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationConfig.java index 771827e..f8b75bf 100644 --- a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationConfig.java +++ b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationConfig.java @@ -18,16 +18,17 @@ */ package org.apache.brooklyn.container.location.kubernetes; -import com.google.common.base.Predicates; -import com.google.common.collect.ImmutableMap; -import com.google.common.reflect.TypeToken; +import java.util.Map; + import org.apache.brooklyn.config.ConfigKey; import org.apache.brooklyn.core.config.ConfigKeys; import org.apache.brooklyn.core.location.LocationConfigKeys; import org.apache.brooklyn.core.location.cloud.CloudLocationConfig; import org.apache.brooklyn.util.time.Duration; -import java.util.Map; +import com.google.common.base.Predicates; +import com.google.common.collect.ImmutableMap; +import com.google.common.reflect.TypeToken; public interface KubernetesLocationConfig extends CloudLocationConfig { @@ -129,8 +130,7 @@ public interface KubernetesLocationConfig extends CloudLocationConfig { .build(); @SuppressWarnings("serial") - ConfigKey<Map<String, ?>> ENV = ConfigKeys.builder(new TypeToken<Map<String, ?>>() { - }) + ConfigKey<Map<String, ?>> ENV = ConfigKeys.builder(new TypeToken<Map<String, ?>>() { }) .name("env") .description("Environment variables to inject when starting the container") .defaultValue(ImmutableMap.<String, Object>of()) http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/machine/KubernetesEmptyMachineLocation.java ---------------------------------------------------------------------- diff --git a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/machine/KubernetesEmptyMachineLocation.java b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/machine/KubernetesEmptyMachineLocation.java index 563c9eb..0512c8a 100644 --- a/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/machine/KubernetesEmptyMachineLocation.java +++ b/locations/container/src/main/java/org/apache/brooklyn/container/location/kubernetes/machine/KubernetesEmptyMachineLocation.java @@ -18,15 +18,16 @@ */ package org.apache.brooklyn.container.location.kubernetes.machine; -import com.google.common.collect.ImmutableSet; +import java.net.InetAddress; +import java.util.Set; + import org.apache.brooklyn.api.location.MachineDetails; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.location.ssh.SshMachineLocation; import org.apache.brooklyn.util.net.Networking; -import java.net.InetAddress; -import java.util.Set; +import com.google.common.collect.ImmutableSet; /** * A {@link MachineLocation} represemnting a Kubernetes resource that does not support SSH access. http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftClientRegistryImpl.java ---------------------------------------------------------------------- diff --git a/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftClientRegistryImpl.java b/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftClientRegistryImpl.java index 837f3c9..61b170c 100644 --- a/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftClientRegistryImpl.java +++ b/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftClientRegistryImpl.java @@ -18,11 +18,12 @@ */ package org.apache.brooklyn.container.location.openshift; -import io.fabric8.kubernetes.client.KubernetesClient; -import io.fabric8.openshift.client.OpenShiftClient; import org.apache.brooklyn.container.location.kubernetes.KubernetesClientRegistryImpl; import org.apache.brooklyn.util.core.config.ConfigBag; +import io.fabric8.kubernetes.client.KubernetesClient; +import io.fabric8.openshift.client.OpenShiftClient; + public class OpenShiftClientRegistryImpl extends KubernetesClientRegistryImpl { public static final OpenShiftClientRegistryImpl INSTANCE = new OpenShiftClientRegistryImpl(); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocation.java ---------------------------------------------------------------------- diff --git a/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocation.java b/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocation.java index abbeb20..f6d2fb9 100644 --- a/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocation.java +++ b/locations/container/src/main/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocation.java @@ -18,7 +18,25 @@ */ package org.apache.brooklyn.container.location.openshift; +import java.net.InetAddress; +import java.util.Map; + +import org.apache.brooklyn.api.entity.Entity; +import org.apache.brooklyn.api.location.LocationSpec; +import org.apache.brooklyn.container.entity.openshift.OpenShiftPod; +import org.apache.brooklyn.container.entity.openshift.OpenShiftResource; +import org.apache.brooklyn.container.location.kubernetes.KubernetesClientRegistry; +import org.apache.brooklyn.container.location.kubernetes.KubernetesLocation; +import org.apache.brooklyn.container.location.kubernetes.machine.KubernetesMachineLocation; +import org.apache.brooklyn.location.ssh.SshMachineLocation; +import org.apache.brooklyn.util.core.config.ConfigBag; +import org.apache.brooklyn.util.core.config.ResolvingConfigBag; +import org.apache.brooklyn.util.net.Networking; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + import com.google.common.collect.ImmutableSet; + import io.fabric8.kubernetes.api.model.Container; import io.fabric8.kubernetes.api.model.HasMetadata; import io.fabric8.kubernetes.api.model.Namespace; @@ -33,22 +51,6 @@ import io.fabric8.openshift.api.model.DeploymentConfigStatus; import io.fabric8.openshift.api.model.Project; import io.fabric8.openshift.api.model.ProjectBuilder; import io.fabric8.openshift.client.OpenShiftClient; -import org.apache.brooklyn.api.entity.Entity; -import org.apache.brooklyn.api.location.LocationSpec; -import org.apache.brooklyn.container.entity.openshift.OpenShiftPod; -import org.apache.brooklyn.container.entity.openshift.OpenShiftResource; -import org.apache.brooklyn.container.location.kubernetes.KubernetesClientRegistry; -import org.apache.brooklyn.container.location.kubernetes.KubernetesLocation; -import org.apache.brooklyn.container.location.kubernetes.machine.KubernetesMachineLocation; -import org.apache.brooklyn.location.ssh.SshMachineLocation; -import org.apache.brooklyn.util.core.config.ConfigBag; -import org.apache.brooklyn.util.core.config.ResolvingConfigBag; -import org.apache.brooklyn.util.net.Networking; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -import java.net.InetAddress; -import java.util.Map; public class OpenShiftLocation extends KubernetesLocation implements OpenShiftLocationConfig { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocationLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocationLiveTest.java b/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocationLiveTest.java index f1d9c32..48674cd 100644 --- a/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocationLiveTest.java +++ b/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerJcloudsLocationLiveTest.java @@ -18,10 +18,15 @@ */ package org.apache.brooklyn.container.location.docker; -import com.google.common.base.Optional; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; +import static com.google.common.base.Preconditions.checkNotNull; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; + +import java.lang.reflect.Method; +import java.util.List; +import java.util.Map; + import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.core.test.BrooklynAppLiveTestSupport; import org.apache.brooklyn.location.jclouds.BasicJcloudsLocationCustomizer; @@ -42,12 +47,10 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.lang.reflect.Method; -import java.util.List; -import java.util.Map; - -import static com.google.common.base.Preconditions.checkNotNull; -import static org.testng.Assert.*; +import com.google.common.base.Optional; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; /** * Assumes that a pre-existing swarm endpoint is available. See system properties and the defaults http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerLocationResolverTest.java b/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerLocationResolverTest.java index 117d9d9..2edbf40 100644 --- a/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerLocationResolverTest.java +++ b/locations/container/src/test/java/org/apache/brooklyn/container/location/docker/DockerLocationResolverTest.java @@ -18,6 +18,11 @@ */ package org.apache.brooklyn.container.location.docker; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + +import java.util.Map; + import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.core.internal.BrooklynProperties; import org.apache.brooklyn.core.test.BrooklynMgmtUnitTestSupport; @@ -26,11 +31,6 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.util.Map; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - public class DockerLocationResolverTest extends BrooklynMgmtUnitTestSupport { @SuppressWarnings("unused") http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/ImageChooserTest.java ---------------------------------------------------------------------- diff --git a/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/ImageChooserTest.java b/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/ImageChooserTest.java index 7a863ae..46399b0 100644 --- a/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/ImageChooserTest.java +++ b/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/ImageChooserTest.java @@ -18,12 +18,12 @@ */ package org.apache.brooklyn.container.location.kubernetes; -import org.testng.annotations.BeforeMethod; -import org.testng.annotations.Test; - import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertFalse; +import org.testng.annotations.BeforeMethod; +import org.testng.annotations.Test; + public class ImageChooserTest { private ImageChooser chooser; http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesCertsTest.java ---------------------------------------------------------------------- diff --git a/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesCertsTest.java b/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesCertsTest.java index b216db6..d761c18 100644 --- a/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesCertsTest.java +++ b/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesCertsTest.java @@ -18,12 +18,12 @@ */ package org.apache.brooklyn.container.location.kubernetes; -import ch.qos.logback.classic.spi.ILoggingEvent; -import com.google.common.base.Charsets; -import com.google.common.base.Predicate; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; -import com.google.common.io.Files; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertFalse; + +import java.io.File; +import java.util.List; + import org.apache.brooklyn.test.Asserts; import org.apache.brooklyn.test.LogWatcher; import org.apache.brooklyn.test.LogWatcher.EventPredicates; @@ -33,11 +33,13 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.io.File; -import java.util.List; +import com.google.common.base.Charsets; +import com.google.common.base.Predicate; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; +import com.google.common.io.Files; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertFalse; +import ch.qos.logback.classic.spi.ILoggingEvent; public class KubernetesCertsTest { http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java b/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java index c9769f9..ed42bd2 100644 --- a/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java +++ b/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationLiveTest.java @@ -18,10 +18,13 @@ */ package org.apache.brooklyn.container.location.kubernetes; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.ImmutableMap; -import com.google.common.collect.Lists; -import com.google.common.net.HostAndPort; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertNotNull; +import static org.testng.Assert.assertTrue; + +import java.util.List; +import java.util.Map; + import org.apache.brooklyn.api.location.MachineDetails; import org.apache.brooklyn.api.location.OsDetails; import org.apache.brooklyn.container.location.kubernetes.machine.KubernetesMachineLocation; @@ -40,10 +43,10 @@ import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.util.List; -import java.util.Map; - -import static org.testng.Assert.*; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.ImmutableMap; +import com.google.common.collect.Lists; +import com.google.common.net.HostAndPort; /** * /** http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationResolverTest.java b/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationResolverTest.java index d8abf0d..069f4cb 100644 --- a/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationResolverTest.java +++ b/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationResolverTest.java @@ -18,6 +18,11 @@ */ package org.apache.brooklyn.container.location.kubernetes; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + +import java.util.Map; + import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.core.internal.BrooklynProperties; import org.apache.brooklyn.core.test.BrooklynMgmtUnitTestSupport; @@ -26,11 +31,6 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.util.Map; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - public class KubernetesLocationResolverTest extends BrooklynMgmtUnitTestSupport { private static final Logger LOG = LoggerFactory.getLogger(KubernetesLocationResolverTest.class); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationYamlLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationYamlLiveTest.java b/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationYamlLiveTest.java index f8b2645..a3030b1 100644 --- a/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationYamlLiveTest.java +++ b/locations/container/src/test/java/org/apache/brooklyn/container/location/kubernetes/KubernetesLocationYamlLiveTest.java @@ -18,12 +18,26 @@ */ package org.apache.brooklyn.container.location.kubernetes; -import com.google.common.base.Joiner; -import com.google.common.collect.ImmutableList; -import com.google.common.collect.Iterables; -import com.google.common.net.HostAndPort; -import io.fabric8.kubernetes.api.model.Pod; -import io.fabric8.kubernetes.client.KubernetesClient; +import static com.google.common.base.Predicates.and; +import static com.google.common.base.Predicates.equalTo; +import static com.google.common.base.Predicates.not; +import static com.google.common.base.Predicates.notNull; +import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationLiveTest.CREDENTIAL; +import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationLiveTest.IDENTITY; +import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationLiveTest.KUBERNETES_ENDPOINT; +import static org.apache.brooklyn.core.entity.EntityAsserts.assertAttributeEquals; +import static org.apache.brooklyn.core.entity.EntityAsserts.assertAttributeEqualsEventually; +import static org.apache.brooklyn.core.entity.EntityAsserts.assertAttributeEventually; +import static org.apache.brooklyn.core.entity.EntityAsserts.assertAttributeEventuallyNonNull; +import static org.apache.brooklyn.core.entity.EntityAsserts.assertEntityHealthy; +import static org.apache.brooklyn.test.Asserts.succeedsEventually; +import static org.apache.brooklyn.util.http.HttpAsserts.assertHttpStatusCodeEventuallyEquals; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + +import java.util.List; +import java.util.Map; + import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.api.location.MachineLocation; import org.apache.brooklyn.api.location.MachineProvisioningLocation; @@ -49,16 +63,13 @@ import org.apache.commons.lang3.StringUtils; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.util.List; -import java.util.Map; +import com.google.common.base.Joiner; +import com.google.common.collect.ImmutableList; +import com.google.common.collect.Iterables; +import com.google.common.net.HostAndPort; -import static com.google.common.base.Predicates.*; -import static org.apache.brooklyn.container.location.kubernetes.KubernetesLocationLiveTest.*; -import static org.apache.brooklyn.core.entity.EntityAsserts.*; -import static org.apache.brooklyn.test.Asserts.succeedsEventually; -import static org.apache.brooklyn.util.http.HttpAsserts.assertHttpStatusCodeEventuallyEquals; -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; +import io.fabric8.kubernetes.api.model.Pod; +import io.fabric8.kubernetes.client.KubernetesClient; /** * Live tests for deploying simple blueprints. Particularly useful during dev, but not so useful http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationLiveTest.java b/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationLiveTest.java index 0606f68..ef50d99 100644 --- a/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationLiveTest.java +++ b/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationLiveTest.java @@ -18,14 +18,14 @@ */ package org.apache.brooklyn.container.location.openshift; +import java.util.Map; + import org.apache.brooklyn.container.location.kubernetes.KubernetesLocationLiveTest; import org.apache.brooklyn.util.collections.MutableMap; import org.apache.brooklyn.util.os.Os; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import java.util.Map; - /** * Tests deploying containers via the {@code openshift} location, to an OpenShift endpoint. * By extending {@link KubernetesLocationLiveTest}, we get all the k8s tests. http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationResolverTest.java ---------------------------------------------------------------------- diff --git a/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationResolverTest.java b/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationResolverTest.java index 88f5d86..acb1590 100644 --- a/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationResolverTest.java +++ b/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationResolverTest.java @@ -18,6 +18,11 @@ */ package org.apache.brooklyn.container.location.openshift; +import static org.testng.Assert.assertEquals; +import static org.testng.Assert.assertTrue; + +import java.util.Map; + import org.apache.brooklyn.api.location.LocationSpec; import org.apache.brooklyn.core.internal.BrooklynProperties; import org.apache.brooklyn.core.test.BrooklynMgmtUnitTestSupport; @@ -26,11 +31,6 @@ import org.slf4j.LoggerFactory; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import java.util.Map; - -import static org.testng.Assert.assertEquals; -import static org.testng.Assert.assertTrue; - public class OpenShiftLocationResolverTest extends BrooklynMgmtUnitTestSupport { private static final Logger LOG = LoggerFactory.getLogger(OpenShiftLocationResolverTest.class); http://git-wip-us.apache.org/repos/asf/brooklyn-server/blob/ebe7534e/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationYamlLiveTest.java ---------------------------------------------------------------------- diff --git a/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationYamlLiveTest.java b/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationYamlLiveTest.java index fae87de..aa82e1d 100644 --- a/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationYamlLiveTest.java +++ b/locations/container/src/test/java/org/apache/brooklyn/container/location/openshift/OpenShiftLocationYamlLiveTest.java @@ -18,7 +18,12 @@ */ package org.apache.brooklyn.container.location.openshift; -import com.google.common.base.Joiner; +import static org.apache.brooklyn.container.location.openshift.OpenShiftLocationLiveTest.CA_CERT_FILE; +import static org.apache.brooklyn.container.location.openshift.OpenShiftLocationLiveTest.CLIENT_CERT_FILE; +import static org.apache.brooklyn.container.location.openshift.OpenShiftLocationLiveTest.CLIENT_KEY_FILE; +import static org.apache.brooklyn.container.location.openshift.OpenShiftLocationLiveTest.NAMESPACE; +import static org.apache.brooklyn.container.location.openshift.OpenShiftLocationLiveTest.OPENSHIFT_ENDPOINT; + import org.apache.brooklyn.api.entity.Entity; import org.apache.brooklyn.container.entity.openshift.OpenShiftPod; import org.apache.brooklyn.container.entity.openshift.OpenShiftResource; @@ -26,7 +31,7 @@ import org.apache.brooklyn.container.location.kubernetes.KubernetesLocationYamlL import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import static org.apache.brooklyn.container.location.openshift.OpenShiftLocationLiveTest.*; +import com.google.common.base.Joiner; /** * Tests YAML apps via the {@code openshift} location, to an OpenShift endpoint.
