You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/04/13 05:22:15 UTC
[02/16] stratos git commit: Formatting Kubernetes client module
Formatting Kubernetes client module
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/88ae13e8
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/88ae13e8
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/88ae13e8
Branch: refs/heads/master
Commit: 88ae13e82f8667d3d876eb42ee29db0c8cbab480
Parents: 6952466
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Sun Apr 12 20:43:32 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Sun Apr 12 20:43:32 2015 +0530
----------------------------------------------------------------------
.../kubernetes/client/KubernetesApiClient.java | 18 +-
.../exceptions/KubernetesClientException.java | 12 +-
.../KubernetesAPIClientInterface.java | 234 +++++++++---------
.../kubernetes/client/model/Container.java | 178 +++++++-------
.../client/model/EnvironmentVariable.java | 43 ++--
.../stratos/kubernetes/client/model/Labels.java | 24 +-
.../kubernetes/client/model/Manifest.java | 80 +++---
.../stratos/kubernetes/client/model/Pod.java | 242 +++++++++----------
.../kubernetes/client/model/PodList.java | 62 ++---
.../stratos/kubernetes/client/model/Policy.java | 22 +-
.../stratos/kubernetes/client/model/Port.java | 82 ++++---
.../client/model/ReplicationController.java | 164 ++++++-------
.../client/model/ReplicationControllerList.java | 62 ++---
.../kubernetes/client/model/Selector.java | 24 +-
.../kubernetes/client/model/Service.java | 204 ++++++++--------
.../kubernetes/client/model/ServiceList.java | 62 ++---
.../stratos/kubernetes/client/model/State.java | 179 ++++++++------
.../stratos/kubernetes/client/model/Volume.java | 26 +-
.../kubernetes/client/model/VolumeMount.java | 64 ++---
.../kubernetes/client/rest/HttpResponse.java | 5 +
.../client/rest/KubernetesResponseHandler.java | 6 +-
.../kubernetes/client/rest/RestClient.java | 66 ++---
.../stratos/kubernetes/client/LiveTests.java | 2 +-
.../stratos/kubernetes/client/UnitTests.java | 2 +-
.../client/live/AbstractLiveTest.java | 18 +-
.../client/live/KubernetesClusterCleanTest.java | 12 +-
.../kubernetes/client/unit/PodUnitTest.java | 42 ++--
27 files changed, 1003 insertions(+), 932 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java
index f8f7c63..aec99eb 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/KubernetesApiClient.java
@@ -50,10 +50,11 @@ public class KubernetesApiClient implements KubernetesAPIClientInterface {
/**
* Create new pod
- * @param podId Identifier of the pod
- * @param podLabel Pod name to be used by the pod label
- * @param dockerImage Docker image to be used by the pod
- * @param ports Ports exposed by the pod
+ *
+ * @param podId Identifier of the pod
+ * @param podLabel Pod name to be used by the pod label
+ * @param dockerImage Docker image to be used by the pod
+ * @param ports Ports exposed by the pod
* @param environmentVariables Environment variables to be passed to the pod
* @throws KubernetesClientException
*/
@@ -500,9 +501,10 @@ public class KubernetesApiClient implements KubernetesAPIClientInterface {
/**
* Create kubernetes service
- * @param serviceId Service id
- * @param serviceLabel Service name to be used by the label name
- * @param servicePort Port to be exposed by the service
+ *
+ * @param serviceId Service id
+ * @param serviceLabel Service name to be used by the label name
+ * @param servicePort Port to be exposed by the service
* @param containerPortName Container port name defined in the port label
* @param publicIPs
* @throws KubernetesClientException
@@ -742,7 +744,7 @@ public class KubernetesApiClient implements KubernetesAPIClientInterface {
}
private String extractMessageInResponse(HttpResponse response) {
- if((response != null) && (response.getKubernetesResponse() != null)) {
+ if ((response != null) && (response.getKubernetesResponse() != null)) {
return response.getKubernetesResponse().getMessage();
} else {
return "";
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/exceptions/KubernetesClientException.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/exceptions/KubernetesClientException.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/exceptions/KubernetesClientException.java
index 20702f4..45ec67f 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/exceptions/KubernetesClientException.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/exceptions/KubernetesClientException.java
@@ -22,23 +22,23 @@ package org.apache.stratos.kubernetes.client.exceptions;
public class KubernetesClientException extends Exception {
- private static final long serialVersionUID = -7521673271244696906L;
+ private static final long serialVersionUID = -7521673271244696906L;
private String message;
- public KubernetesClientException(String message, Exception exception){
+ public KubernetesClientException(String message, Exception exception) {
super(message, exception);
this.message = message;
}
- public KubernetesClientException(Exception exception){
+ public KubernetesClientException(Exception exception) {
super(exception);
}
-
- public KubernetesClientException(String msg){
+
+ public KubernetesClientException(String msg) {
super(msg);
this.message = msg;
}
-
+
@Override
public String getMessage() {
return this.message;
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/interfaces/KubernetesAPIClientInterface.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/interfaces/KubernetesAPIClientInterface.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/interfaces/KubernetesAPIClientInterface.java
index 80d4b52..739677e 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/interfaces/KubernetesAPIClientInterface.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/interfaces/KubernetesAPIClientInterface.java
@@ -28,124 +28,138 @@ import java.util.List;
public interface KubernetesAPIClientInterface {
- /**
- * Create pod.
- * @param podId
- * @param podLabel
- * @param dockerImage
- * @param ports
- * @throws KubernetesClientException
- */
- public void createPod(String podId, String podLabel, String dockerImage, List<Port> ports,
+ /**
+ * Create pod.
+ *
+ * @param podId
+ * @param podLabel
+ * @param dockerImage
+ * @param ports
+ * @throws KubernetesClientException
+ */
+ public void createPod(String podId, String podLabel, String dockerImage, List<Port> ports,
EnvironmentVariable[] environmentVariables)
- throws KubernetesClientException;
-
- /**
- * Get information of a Pod given the PodID
- * @param podId id of the pod
- * @return {@link Pod}
- * @throws KubernetesClientException
- */
- public Pod getPod(String podId) throws KubernetesClientException;
-
- /**
- * Get all Pods
- * @return Pods
- * @throws KubernetesClientException
- */
- public List<Pod> getPods() throws KubernetesClientException;
-
- /**
- * Run a label query and retrieve a sub set of Pods.
- * @param labels of labels for the label query
- * @return Pods selected Pods by executing the label query.
- * @throws KubernetesClientException
- */
- public List<Pod> queryPods(Labels[] labels) throws KubernetesClientException;
-
- /**
- * Delete a Pod
- * @param podId Id of the Pod to be deleted
- * @throws KubernetesClientException
- */
- public void deletePod(String podId) throws KubernetesClientException;
-
- /**
- * Create replication controller.
- * @param replicationControllerId
- * @param replicationControllerName
- * @param dockerImage
- * @param ports
- * @param replicas
- * @throws KubernetesClientException
- */
- public void createReplicationController(String replicationControllerId,
+ throws KubernetesClientException;
+
+ /**
+ * Get information of a Pod given the PodID
+ *
+ * @param podId id of the pod
+ * @return {@link Pod}
+ * @throws KubernetesClientException
+ */
+ public Pod getPod(String podId) throws KubernetesClientException;
+
+ /**
+ * Get all Pods
+ *
+ * @return Pods
+ * @throws KubernetesClientException
+ */
+ public List<Pod> getPods() throws KubernetesClientException;
+
+ /**
+ * Run a label query and retrieve a sub set of Pods.
+ *
+ * @param labels of labels for the label query
+ * @return Pods selected Pods by executing the label query.
+ * @throws KubernetesClientException
+ */
+ public List<Pod> queryPods(Labels[] labels) throws KubernetesClientException;
+
+ /**
+ * Delete a Pod
+ *
+ * @param podId Id of the Pod to be deleted
+ * @throws KubernetesClientException
+ */
+ public void deletePod(String podId) throws KubernetesClientException;
+
+ /**
+ * Create replication controller.
+ *
+ * @param replicationControllerId
+ * @param replicationControllerName
+ * @param dockerImage
+ * @param ports
+ * @param replicas
+ * @throws KubernetesClientException
+ */
+ public void createReplicationController(String replicationControllerId,
String replicationControllerName,
String dockerImage,
List<Port> ports,
EnvironmentVariable[] environmentVariables,
int replicas) throws KubernetesClientException;
- /**
- * Get a Replication Controller Info
- * @param controllerId id of the Replication Controller
- * @return {@link ReplicationController}
- * @throws KubernetesClientException
- */
- public ReplicationController getReplicationController(String controllerId) throws KubernetesClientException;
-
- /**
- * Get all Replication Controllers.
- * @return {@link ReplicationController}s
- * @throws KubernetesClientException
- */
- public List<ReplicationController> getReplicationControllers() throws KubernetesClientException;
-
- /**
- * Update a Replication Controller (update the number of replicas).
- * @param replicationController replication controller to be updated
- * @throws KubernetesClientException
- */
- public void updateReplicationController(ReplicationController replicationController) throws KubernetesClientException;
-
- /**
- * Delete a Replication Controller.
- * @param replicationControllerId controller id controller id to be deleted.
- * @throws KubernetesClientException
- */
- public void deleteReplicationController(String replicationControllerId) throws KubernetesClientException;
-
- /**
- * Create service.
- * @param serviceId
- * @param serviceLabel
- * @param servicePort
- * @param containerPortName
- * @param publicIPs
+ /**
+ * Get a Replication Controller Info
+ *
+ * @param controllerId id of the Replication Controller
+ * @return {@link ReplicationController}
+ * @throws KubernetesClientException
+ */
+ public ReplicationController getReplicationController(String controllerId) throws KubernetesClientException;
+
+ /**
+ * Get all Replication Controllers.
+ *
+ * @return {@link ReplicationController}s
+ * @throws KubernetesClientException
+ */
+ public List<ReplicationController> getReplicationControllers() throws KubernetesClientException;
+
+ /**
+ * Update a Replication Controller (update the number of replicas).
+ *
+ * @param replicationController replication controller to be updated
+ * @throws KubernetesClientException
+ */
+ public void updateReplicationController(ReplicationController replicationController) throws KubernetesClientException;
+
+ /**
+ * Delete a Replication Controller.
+ *
+ * @param replicationControllerId controller id controller id to be deleted.
+ * @throws KubernetesClientException
+ */
+ public void deleteReplicationController(String replicationControllerId) throws KubernetesClientException;
+
+ /**
+ * Create service.
+ *
+ * @param serviceId
+ * @param serviceLabel
+ * @param servicePort
+ * @param containerPortName
+ * @param publicIPs
* @throws KubernetesClientException
- */
- public void createService(String serviceId, String serviceLabel, int servicePort,
+ */
+ public void createService(String serviceId, String serviceLabel, int servicePort,
String containerPortName, String[] publicIPs) throws KubernetesClientException;
- /**
- * Get the Service with the given id.
- * @param serviceId id of the service.
- * @return {@link Service}
- * @throws KubernetesClientException
- */
- public Service getService(String serviceId) throws KubernetesClientException;
-
- /**
- * Get services.
- * @return array of {@link Service}s
- * @throws KubernetesClientException
- */
- public List<Service> getServices() throws KubernetesClientException;
-
- /**
- * Delete a service.
- * @param serviceId service id to be deleted.
- * @throws KubernetesClientException
- */
- public void deleteService(String serviceId) throws KubernetesClientException;
+ /**
+ * Get the Service with the given id.
+ *
+ * @param serviceId id of the service.
+ * @return {@link Service}
+ * @throws KubernetesClientException
+ */
+ public Service getService(String serviceId) throws KubernetesClientException;
+
+ /**
+ * Get services.
+ *
+ * @return array of {@link Service}s
+ * @throws KubernetesClientException
+ */
+ public List<Service> getServices() throws KubernetesClientException;
+
+ /**
+ * Delete a service.
+ *
+ * @param serviceId service id to be deleted.
+ * @throws KubernetesClientException
+ */
+ public void deleteService(String serviceId) throws KubernetesClientException;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Container.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Container.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Container.java
index dd10493..f8353ca 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Container.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Container.java
@@ -28,93 +28,93 @@ import org.apache.commons.lang3.ArrayUtils;
public class Container {
- private String name;
- private String image;
- private String workingDir;
- private String[] command;
- private VolumeMount[] volumeMounts;
- private List<Port> ports;
- private String imagePullPolicy;
- private EnvironmentVariable[] env;
-
- public Container() {
- ports = new ArrayList<Port>();
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public String getImage() {
- return image;
- }
-
- public void setImage(String image) {
- this.image = image;
- }
-
- public String getWorkingDir() {
- return workingDir;
- }
-
- public void setWorkingDir(String workingDir) {
- this.workingDir = workingDir;
- }
-
- public String[] getCommand() {
- return command;
- }
-
- public void setCommand(String[] command) {
- this.command = ArrayUtils.clone(command);
- }
-
- public VolumeMount[] getVolumeMounts() {
- return volumeMounts;
- }
-
- public void setVolumeMounts(VolumeMount[] volumeMounts) {
- this.volumeMounts = ArrayUtils.clone(volumeMounts);
- }
-
- public List<Port> getPorts() {
- return ports;
- }
-
- public void addPort(Port port) {
- this.ports.add(port);
- }
-
- public void setPorts(List<Port> ports) {
- this.ports = ports;
- }
-
- public EnvironmentVariable[] getEnv() {
- return env;
- }
-
- public void setEnv(EnvironmentVariable[] env) {
- this.env = ArrayUtils.clone(env);
- }
-
- @Override
- public String toString() {
- return "Container [name=" + name + ", image=" + image + ", workingDir="
- + workingDir + ", command=" + Arrays.toString(command)
- + ", volumeMounts=" + Arrays.toString(volumeMounts)
- + ", ports=" + ports + ", env="
- + Arrays.toString(env) + "]";
- }
-
- public String getImagePullPolicy() {
- return imagePullPolicy;
- }
-
- public void setImagePullPolicy(String imagePullPolicy) {
- this.imagePullPolicy = imagePullPolicy;
- }
+ private String name;
+ private String image;
+ private String workingDir;
+ private String[] command;
+ private VolumeMount[] volumeMounts;
+ private List<Port> ports;
+ private String imagePullPolicy;
+ private EnvironmentVariable[] env;
+
+ public Container() {
+ ports = new ArrayList<Port>();
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getImage() {
+ return image;
+ }
+
+ public void setImage(String image) {
+ this.image = image;
+ }
+
+ public String getWorkingDir() {
+ return workingDir;
+ }
+
+ public void setWorkingDir(String workingDir) {
+ this.workingDir = workingDir;
+ }
+
+ public String[] getCommand() {
+ return command;
+ }
+
+ public void setCommand(String[] command) {
+ this.command = ArrayUtils.clone(command);
+ }
+
+ public VolumeMount[] getVolumeMounts() {
+ return volumeMounts;
+ }
+
+ public void setVolumeMounts(VolumeMount[] volumeMounts) {
+ this.volumeMounts = ArrayUtils.clone(volumeMounts);
+ }
+
+ public List<Port> getPorts() {
+ return ports;
+ }
+
+ public void addPort(Port port) {
+ this.ports.add(port);
+ }
+
+ public void setPorts(List<Port> ports) {
+ this.ports = ports;
+ }
+
+ public EnvironmentVariable[] getEnv() {
+ return env;
+ }
+
+ public void setEnv(EnvironmentVariable[] env) {
+ this.env = ArrayUtils.clone(env);
+ }
+
+ @Override
+ public String toString() {
+ return "Container [name=" + name + ", image=" + image + ", workingDir="
+ + workingDir + ", command=" + Arrays.toString(command)
+ + ", volumeMounts=" + Arrays.toString(volumeMounts)
+ + ", ports=" + ports + ", env="
+ + Arrays.toString(env) + "]";
+ }
+
+ public String getImagePullPolicy() {
+ return imagePullPolicy;
+ }
+
+ public void setImagePullPolicy(String imagePullPolicy) {
+ this.imagePullPolicy = imagePullPolicy;
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/EnvironmentVariable.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/EnvironmentVariable.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/EnvironmentVariable.java
index 4fb9ab7..0515b5e 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/EnvironmentVariable.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/EnvironmentVariable.java
@@ -22,24 +22,27 @@ package org.apache.stratos.kubernetes.client.model;
public class EnvironmentVariable {
- private String name;
- private String value;
-
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
- public String getValue() {
- return value;
- }
- public void setValue(String value) {
- this.value = value;
- }
-
- @Override
- public String toString() {
- return "EnvironmentVariable [name=" + name + ", value=" + value + "]";
- }
+ private String name;
+ private String value;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getValue() {
+ return value;
+ }
+
+ public void setValue(String value) {
+ this.value = value;
+ }
+
+ @Override
+ public String toString() {
+ return "EnvironmentVariable [name=" + name + ", value=" + value + "]";
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Labels.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Labels.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Labels.java
index 59abcdc..4ced7d1 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Labels.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Labels.java
@@ -27,20 +27,20 @@ import java.io.Serializable;
*/
public class Labels implements Serializable {
- private static final long serialVersionUID = -9019445613544931617L;
+ private static final long serialVersionUID = -9019445613544931617L;
- private String name;
+ private String name;
- public String getName() {
- return name;
- }
+ public String getName() {
+ return name;
+ }
- public void setName(String name) {
- this.name = name;
- }
+ public void setName(String name) {
+ this.name = name;
+ }
- @Override
- public String toString() {
- return "Label [name=" + name + "]";
- }
+ @Override
+ public String toString() {
+ return "Label [name=" + name + "]";
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Manifest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Manifest.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Manifest.java
index c4c850e..c487921 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Manifest.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Manifest.java
@@ -28,58 +28,56 @@ import org.apache.commons.lang3.ArrayUtils;
/**
* https://github.com/GoogleCloudPlatform/kubernetes/blob/master/api/doc/manifest-schema.json
- *
- *
*/
public class Manifest {
- private String version;
- private String id;
- private List<Container> containers;
- private List<Volume> volumes;
+ private String version;
+ private String id;
+ private List<Container> containers;
+ private List<Volume> volumes;
+
+ public Manifest() {
+ containers = new ArrayList<Container>();
+ volumes = new ArrayList<Volume>();
+ }
- public Manifest() {
- containers = new ArrayList<Container>();
- volumes = new ArrayList<Volume>();
- }
+ public String getVersion() {
+ return version;
+ }
- public String getVersion() {
- return version;
- }
+ public void setVersion(String version) {
+ this.version = version;
+ }
- public void setVersion(String version) {
- this.version = version;
- }
+ public String getId() {
+ return id;
+ }
- public String getId() {
- return id;
- }
+ public void setId(String id) {
+ this.id = id;
+ }
- public void setId(String id) {
- this.id = id;
- }
+ public List<Container> getContainers() {
+ return containers;
+ }
- public List<Container> getContainers() {
- return containers;
- }
+ public void addContainer(Container container) {
+ containers.add(container);
+ }
- public void addContainer(Container container) {
- containers.add(container);
- }
+ public List<Volume> getVolumes() {
+ return volumes;
+ }
- public List<Volume> getVolumes() {
- return volumes;
- }
+ public void addVolume(Volume volume) {
+ volumes.add(volume);
+ }
- public void addVolume(Volume volume) {
- volumes.add(volume);
- }
+ @Override
+ public String toString() {
+ return "Manifest [version=" + version + ", id=" + id + ", containers="
+ + containers + ", volumes="
+ + volumes + "]";
+ }
- @Override
- public String toString() {
- return "Manifest [version=" + version + ", id=" + id + ", containers="
- + containers + ", volumes="
- + volumes + "]";
- }
-
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Pod.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Pod.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Pod.java
index 4547db5..9292b4f 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Pod.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Pod.java
@@ -24,131 +24,130 @@ import javax.xml.bind.annotation.XmlRootElement;
/**
* https://github.com/GoogleCloudPlatform/kubernetes/blob/master/api/doc/pod-schema.json
- *
- *
*/
@XmlRootElement
public class Pod {
- private String kind;
- private String id;
- private String creationTimestamp;
- private String selfLink;
- private String resourceVersion;
- private String apiVersion;
- private State desiredState;
- private State currentState;
- private String status;
- private String message;
- private String code;
- private Labels labels;
-
- public String getKind() {
- return kind;
- }
-
- public void setKind(String kind) {
- this.kind = kind;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCreationTimestamp() {
- return creationTimestamp;
- }
-
- public void setCreationTimestamp(String creationTimestamp) {
- this.creationTimestamp = creationTimestamp;
- }
-
- public String getSelfLink() {
- return selfLink;
- }
-
- public void setSelfLink(String selfLink) {
- this.selfLink = selfLink;
- }
-
- public State getDesiredState() {
- return desiredState;
- }
-
- public void setDesiredState(State desiredState) {
- this.desiredState = desiredState;
- }
-
- public State getCurrentState() {
- return currentState;
- }
-
- public void setCurrentState(State currentState) {
- this.currentState = currentState;
- }
-
- public String getResourceVersion() {
- return resourceVersion;
- }
-
- public void setResourceVersion(String resourceVersion) {
- this.resourceVersion = resourceVersion;
- }
-
- public String getApiVersion() {
- return apiVersion;
- }
-
- public void setApiVersion(String apiVersion) {
- this.apiVersion = apiVersion;
- }
-
- public Labels getLabels() {
- return labels;
- }
-
- public void setLabels(Labels labels) {
- this.labels = labels;
- }
-
- public String getStatus() {
- return status;
- }
-
- public void setStatus(String status) {
- this.status = status;
- }
-
- public String getMessage() {
- return message;
- }
-
- public void setMessage(String message) {
- this.message = message;
- }
-
- public String getCode() {
- return code;
- }
-
- public void setCode(String code) {
- this.code = code;
- }
-
- @Override
- public String toString() {
- return "Pod [kind=" + kind + ", id=" + id + ", creationTimestamp="
- + creationTimestamp + ", selfLink=" + selfLink
- + ", resourceVersion=" + resourceVersion + ", apiVersion="
- + apiVersion + ", desiredState=" + desiredState
- + ", currentState=" + currentState + ", status=" + status
- + ", message=" + message + ", code=" + code + ", labels="
- + labels + "]";
- }
+ private String kind;
+ private String id;
+ private String creationTimestamp;
+ private String selfLink;
+ private String resourceVersion;
+ private String apiVersion;
+ private State desiredState;
+ private State currentState;
+ private String status;
+ private String message;
+ private String code;
+ private Labels labels;
+
+ public String getKind() {
+ return kind;
+ }
+
+ public void setKind(String kind) {
+ this.kind = kind;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCreationTimestamp() {
+ return creationTimestamp;
+ }
+
+ public void setCreationTimestamp(String creationTimestamp) {
+ this.creationTimestamp = creationTimestamp;
+ }
+
+ public String getSelfLink() {
+ return selfLink;
+ }
+
+ public void setSelfLink(String selfLink) {
+ this.selfLink = selfLink;
+ }
+
+ public State getDesiredState() {
+ return desiredState;
+ }
+
+ public void setDesiredState(State desiredState) {
+ this.desiredState = desiredState;
+ }
+
+ public State getCurrentState() {
+ return currentState;
+ }
+
+ public void setCurrentState(State currentState) {
+ this.currentState = currentState;
+ }
+
+ public String getResourceVersion() {
+ return resourceVersion;
+ }
+
+ public void setResourceVersion(String resourceVersion) {
+ this.resourceVersion = resourceVersion;
+ }
+
+ public String getApiVersion() {
+ return apiVersion;
+ }
+
+ public void setApiVersion(String apiVersion) {
+ this.apiVersion = apiVersion;
+ }
+
+ public Labels getLabels() {
+ return labels;
+ }
+
+ public void setLabels(Labels labels) {
+ this.labels = labels;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getMessage() {
+ return message;
+ }
+
+ public void setMessage(String message) {
+ this.message = message;
+ }
+
+ public String getCode() {
+ return code;
+ }
+
+ public void setCode(String code) {
+ this.code = code;
+ }
+
+ @Override
+ public String toString() {
+ return "Pod [kind=" + kind + ", id=" + id + ", creationTimestamp="
+ + creationTimestamp + ", selfLink=" + selfLink
+ + ", resourceVersion=" + resourceVersion + ", apiVersion="
+ + apiVersion + ", desiredState=" + desiredState
+ + ", currentState=" + currentState + ", status=" + status
+ + ", message=" + message + ", code=" + code + ", labels="
+ + labels + "]";
+ }
+
@Override
public int hashCode() {
final int prime = 31;
@@ -156,6 +155,7 @@ public class Pod {
result = prime * result + ((id == null) ? 0 : id.hashCode());
return result;
}
+
@Override
public boolean equals(Object obj) {
if (this == obj)
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/PodList.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/PodList.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/PodList.java
index 1fc22fb..95dfaf9 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/PodList.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/PodList.java
@@ -29,32 +29,38 @@ import org.apache.commons.lang3.ArrayUtils;
@XmlRootElement
public class PodList {
- private String kind;
- private String apiVersion;
- private Pod[] items;
-
- public String getKind() {
- return kind;
- }
- public void setKind(String kind) {
- this.kind = kind;
- }
- public String getApiVersion() {
- return apiVersion;
- }
- public void setApiVersion(String apiVersion) {
- this.apiVersion = apiVersion;
- }
- public Pod[] getItems() {
- return items;
- }
- public void setItems(Pod[] items) {
- this.items = ArrayUtils.clone(items);
- }
- @Override
- public String toString() {
- return "PodList [kind=" + kind + ", apiVersion=" + apiVersion
- + ", items=" + Arrays.toString(items) + "]";
- }
-
+ private String kind;
+ private String apiVersion;
+ private Pod[] items;
+
+ public String getKind() {
+ return kind;
+ }
+
+ public void setKind(String kind) {
+ this.kind = kind;
+ }
+
+ public String getApiVersion() {
+ return apiVersion;
+ }
+
+ public void setApiVersion(String apiVersion) {
+ this.apiVersion = apiVersion;
+ }
+
+ public Pod[] getItems() {
+ return items;
+ }
+
+ public void setItems(Pod[] items) {
+ this.items = ArrayUtils.clone(items);
+ }
+
+ @Override
+ public String toString() {
+ return "PodList [kind=" + kind + ", apiVersion=" + apiVersion
+ + ", items=" + Arrays.toString(items) + "]";
+ }
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Policy.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Policy.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Policy.java
index 9b43c2f..9e0f951 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Policy.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Policy.java
@@ -22,18 +22,18 @@ package org.apache.stratos.kubernetes.client.model;
public class Policy {
- private String type;
+ private String type;
- public String getType() {
- return type;
- }
+ public String getType() {
+ return type;
+ }
- public void setType(String type) {
- this.type = type;
- }
+ public void setType(String type) {
+ this.type = type;
+ }
- @Override
- public String toString() {
- return "Policy [type=" + type + "]";
- }
+ @Override
+ public String toString() {
+ return "Policy [type=" + type + "]";
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Port.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Port.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Port.java
index b59ad15..616da09 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Port.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Port.java
@@ -22,41 +22,49 @@ package org.apache.stratos.kubernetes.client.model;
public class Port {
- private String name;
- private String protocol;
- private int containerPort;
- private int hostPort;
-
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
- public String getProtocol() {
- return protocol;
- }
- public void setProtocol(String protocol) {
- this.protocol = protocol;
- }
- public int getContainerPort() {
- return containerPort;
- }
- public void setContainerPort(int containerPort) {
- this.containerPort = containerPort;
- }
- public int getHostPort() {
- return hostPort;
- }
- public void setHostPort(int hostPort) {
- this.hostPort = hostPort;
- }
- @Override
- public String toString() {
- return "Port [name=" + name + ", protocol=" + protocol
- + ", containerPort=" + containerPort + ", hostPort=" + hostPort
- + "]";
- }
-
-
+ private String name;
+ private String protocol;
+ private int containerPort;
+ private int hostPort;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getProtocol() {
+ return protocol;
+ }
+
+ public void setProtocol(String protocol) {
+ this.protocol = protocol;
+ }
+
+ public int getContainerPort() {
+ return containerPort;
+ }
+
+ public void setContainerPort(int containerPort) {
+ this.containerPort = containerPort;
+ }
+
+ public int getHostPort() {
+ return hostPort;
+ }
+
+ public void setHostPort(int hostPort) {
+ this.hostPort = hostPort;
+ }
+
+ @Override
+ public String toString() {
+ return "Port [name=" + name + ", protocol=" + protocol
+ + ", containerPort=" + containerPort + ", hostPort=" + hostPort
+ + "]";
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationController.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationController.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationController.java
index a8a757e..df9d2e4 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationController.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationController.java
@@ -31,86 +31,86 @@ import java.util.List;
@XmlRootElement
public class ReplicationController {
- private String kind;
- private String id;
- private int resourceVersion;
- private String creationTimestamp;
- private String selfLink;
- private String apiVersion;
- private Labels labels;
- private State desiredState;
-
- public String getKind() {
- return kind;
- }
-
- public void setKind(String kind) {
- this.kind = kind;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCreationTimestamp() {
- return creationTimestamp;
- }
-
- public void setCreationTimestamp(String creationTimestamp) {
- this.creationTimestamp = creationTimestamp;
- }
-
- public String getSelfLink() {
- return selfLink;
- }
-
- public void setSelfLink(String selfLink) {
- this.selfLink = selfLink;
- }
-
- public Labels getLabels() {
- return labels;
- }
-
- public void setLabels(Labels labels) {
- this.labels = labels;
- }
-
- public State getDesiredState() {
- return desiredState;
- }
-
- public void setDesiredState(State desiredState) {
- this.desiredState = desiredState;
- }
-
- public String getApiVersion() {
- return apiVersion;
- }
-
- public void setApiVersion(String apiVersion) {
- this.apiVersion = apiVersion;
- }
-
- public int getResourceVersion() {
- return resourceVersion;
- }
-
- public void setResourceVersion(int resourceVersion) {
- this.resourceVersion = resourceVersion;
- }
-
- @Override
- public String toString() {
- return "ReplicationController [kind=" + kind + ", id=" + id
- + ", resourceVersion=" + resourceVersion
- + ", creationTimestamp=" + creationTimestamp + ", selfLink="
- + selfLink + ", apiVersion=" + apiVersion + ", labels="
- + labels + ", desiredState=" + desiredState + "]";
- }
-
+ private String kind;
+ private String id;
+ private int resourceVersion;
+ private String creationTimestamp;
+ private String selfLink;
+ private String apiVersion;
+ private Labels labels;
+ private State desiredState;
+
+ public String getKind() {
+ return kind;
+ }
+
+ public void setKind(String kind) {
+ this.kind = kind;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCreationTimestamp() {
+ return creationTimestamp;
+ }
+
+ public void setCreationTimestamp(String creationTimestamp) {
+ this.creationTimestamp = creationTimestamp;
+ }
+
+ public String getSelfLink() {
+ return selfLink;
+ }
+
+ public void setSelfLink(String selfLink) {
+ this.selfLink = selfLink;
+ }
+
+ public Labels getLabels() {
+ return labels;
+ }
+
+ public void setLabels(Labels labels) {
+ this.labels = labels;
+ }
+
+ public State getDesiredState() {
+ return desiredState;
+ }
+
+ public void setDesiredState(State desiredState) {
+ this.desiredState = desiredState;
+ }
+
+ public String getApiVersion() {
+ return apiVersion;
+ }
+
+ public void setApiVersion(String apiVersion) {
+ this.apiVersion = apiVersion;
+ }
+
+ public int getResourceVersion() {
+ return resourceVersion;
+ }
+
+ public void setResourceVersion(int resourceVersion) {
+ this.resourceVersion = resourceVersion;
+ }
+
+ @Override
+ public String toString() {
+ return "ReplicationController [kind=" + kind + ", id=" + id
+ + ", resourceVersion=" + resourceVersion
+ + ", creationTimestamp=" + creationTimestamp + ", selfLink="
+ + selfLink + ", apiVersion=" + apiVersion + ", labels="
+ + labels + ", desiredState=" + desiredState + "]";
+ }
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationControllerList.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationControllerList.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationControllerList.java
index 3e73b4f..5e43b98 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationControllerList.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ReplicationControllerList.java
@@ -29,32 +29,38 @@ import org.apache.commons.lang3.ArrayUtils;
@XmlRootElement
public class ReplicationControllerList {
- private String kind;
- private String apiVersion;
- private ReplicationController[] items;
-
- public String getKind() {
- return kind;
- }
- public void setKind(String kind) {
- this.kind = kind;
- }
- public String getApiVersion() {
- return apiVersion;
- }
- public void setApiVersion(String apiVersion) {
- this.apiVersion = apiVersion;
- }
- public ReplicationController[] getItems() {
- return items;
- }
- public void setItems(ReplicationController[] items) {
- this.items = ArrayUtils.clone(items);
- }
- @Override
- public String toString() {
- return "ReplicationControllerList [kind=" + kind + ", apiVersion="
- + apiVersion + ", items=" + Arrays.toString(items) + "]";
- }
-
+ private String kind;
+ private String apiVersion;
+ private ReplicationController[] items;
+
+ public String getKind() {
+ return kind;
+ }
+
+ public void setKind(String kind) {
+ this.kind = kind;
+ }
+
+ public String getApiVersion() {
+ return apiVersion;
+ }
+
+ public void setApiVersion(String apiVersion) {
+ this.apiVersion = apiVersion;
+ }
+
+ public ReplicationController[] getItems() {
+ return items;
+ }
+
+ public void setItems(ReplicationController[] items) {
+ this.items = ArrayUtils.clone(items);
+ }
+
+ @Override
+ public String toString() {
+ return "ReplicationControllerList [kind=" + kind + ", apiVersion="
+ + apiVersion + ", items=" + Arrays.toString(items) + "]";
+ }
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Selector.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Selector.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Selector.java
index c1d7d8d..7d82556 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Selector.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Selector.java
@@ -24,20 +24,20 @@ import java.io.Serializable;
public class Selector implements Serializable {
- private static final long serialVersionUID = 8384843252305848574L;
+ private static final long serialVersionUID = 8384843252305848574L;
- private String name;
+ private String name;
- public String getName() {
- return name;
- }
+ public String getName() {
+ return name;
+ }
- public void setName(String name) {
- this.name = name;
- }
+ public void setName(String name) {
+ this.name = name;
+ }
- @Override
- public String toString() {
- return "Selector [name=" + name + "]";
- }
+ @Override
+ public String toString() {
+ return "Selector [name=" + name + "]";
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Service.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Service.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Service.java
index 7480edf..e21c01d 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Service.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Service.java
@@ -26,114 +26,112 @@ import java.util.Arrays;
/**
* https://github.com/GoogleCloudPlatform/kubernetes/blob/master/api/doc/service-schema.json
- *
- *
*/
@XmlRootElement
public class Service implements Serializable {
- private static final long serialVersionUID = 7766915353839414993L;
-
- private String kind;
- private String id;
- private String creationTimestamp;
- private String selfLink;
- private String name;
- private int port;
- private String containerPort;
- private Selector selector;
- private String apiVersion;
- private Labels labels;
- private String[] publicIPs;
+ private static final long serialVersionUID = 7766915353839414993L;
+
+ private String kind;
+ private String id;
+ private String creationTimestamp;
+ private String selfLink;
+ private String name;
+ private int port;
+ private String containerPort;
+ private Selector selector;
+ private String apiVersion;
+ private Labels labels;
+ private String[] publicIPs;
private String portalIP;
-
- public String getKind() {
- return kind;
- }
-
- public void setKind(String kind) {
- this.kind = kind;
- }
-
- public String getId() {
- return id;
- }
-
- public void setId(String id) {
- this.id = id;
- }
-
- public String getCreationTimestamp() {
- return creationTimestamp;
- }
-
- public void setCreationTimestamp(String creationTimestamp) {
- this.creationTimestamp = creationTimestamp;
- }
-
- public String getSelfLink() {
- return selfLink;
- }
-
- public void setSelfLink(String selfLink) {
- this.selfLink = selfLink;
- }
-
- public String getApiVersion() {
- return apiVersion;
- }
-
- public void setApiVersion(String apiVersion) {
- this.apiVersion = apiVersion;
- }
-
- public Labels getLabels() {
- return labels;
- }
-
- public void setLabels(Labels labels) {
- this.labels = labels;
- }
-
- public String getName() {
- return name;
- }
-
- public void setName(String name) {
- this.name = name;
- }
-
- public int getPort() {
- return port;
- }
-
- public void setPort(int port) {
- this.port = port;
- }
-
- public String getContainerPort() {
- return containerPort;
- }
-
- public void setContainerPort(String containerPort) {
- this.containerPort = containerPort;
- }
-
- public Selector getSelector() {
- return selector;
- }
-
- public void setSelector(Selector selector) {
- this.selector = selector;
- }
-
- public String[] getPublicIPs() {
- return publicIPs;
- }
-
- public void setPublicIPs(String[] publicIPs) {
- this.publicIPs = publicIPs;
- }
+
+ public String getKind() {
+ return kind;
+ }
+
+ public void setKind(String kind) {
+ this.kind = kind;
+ }
+
+ public String getId() {
+ return id;
+ }
+
+ public void setId(String id) {
+ this.id = id;
+ }
+
+ public String getCreationTimestamp() {
+ return creationTimestamp;
+ }
+
+ public void setCreationTimestamp(String creationTimestamp) {
+ this.creationTimestamp = creationTimestamp;
+ }
+
+ public String getSelfLink() {
+ return selfLink;
+ }
+
+ public void setSelfLink(String selfLink) {
+ this.selfLink = selfLink;
+ }
+
+ public String getApiVersion() {
+ return apiVersion;
+ }
+
+ public void setApiVersion(String apiVersion) {
+ this.apiVersion = apiVersion;
+ }
+
+ public Labels getLabels() {
+ return labels;
+ }
+
+ public void setLabels(Labels labels) {
+ this.labels = labels;
+ }
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public int getPort() {
+ return port;
+ }
+
+ public void setPort(int port) {
+ this.port = port;
+ }
+
+ public String getContainerPort() {
+ return containerPort;
+ }
+
+ public void setContainerPort(String containerPort) {
+ this.containerPort = containerPort;
+ }
+
+ public Selector getSelector() {
+ return selector;
+ }
+
+ public void setSelector(Selector selector) {
+ this.selector = selector;
+ }
+
+ public String[] getPublicIPs() {
+ return publicIPs;
+ }
+
+ public void setPublicIPs(String[] publicIPs) {
+ this.publicIPs = publicIPs;
+ }
public String getPortalIP() {
return portalIP;
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ServiceList.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ServiceList.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ServiceList.java
index d27ec25..809c376 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ServiceList.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/ServiceList.java
@@ -29,32 +29,38 @@ import org.apache.commons.lang3.ArrayUtils;
@XmlRootElement
public class ServiceList {
- private String kind;
- private String apiVersion;
- private Service[] items;
-
- public String getKind() {
- return kind;
- }
- public void setKind(String kind) {
- this.kind = kind;
- }
- public String getApiVersion() {
- return apiVersion;
- }
- public void setApiVersion(String apiVersion) {
- this.apiVersion = apiVersion;
- }
- public Service[] getItems() {
- return items;
- }
- public void setItems(Service[] items) {
- this.items = ArrayUtils.clone(items);
- }
- @Override
- public String toString() {
- return "ServiceList [kind=" + kind + ", apiVersion=" + apiVersion
- + ", items=" + Arrays.toString(items) + "]";
- }
-
+ private String kind;
+ private String apiVersion;
+ private Service[] items;
+
+ public String getKind() {
+ return kind;
+ }
+
+ public void setKind(String kind) {
+ this.kind = kind;
+ }
+
+ public String getApiVersion() {
+ return apiVersion;
+ }
+
+ public void setApiVersion(String apiVersion) {
+ this.apiVersion = apiVersion;
+ }
+
+ public Service[] getItems() {
+ return items;
+ }
+
+ public void setItems(Service[] items) {
+ this.items = ArrayUtils.clone(items);
+ }
+
+ @Override
+ public String toString() {
+ return "ServiceList [kind=" + kind + ", apiVersion=" + apiVersion
+ + ", items=" + Arrays.toString(items) + "]";
+ }
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/State.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/State.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/State.java
index 756246a..e4bd8b6 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/State.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/State.java
@@ -22,84 +22,103 @@ package org.apache.stratos.kubernetes.client.model;
public class State {
- private Manifest manifest;
- private String status;
- private String host;
- private String hostIP;
- private String podIP;
- private int replicas;
- private Selector replicaSelector;
- private Pod podTemplate;
- private Policy restartPolicy;
- private Object info;
-
- public Manifest getManifest() {
- return manifest;
- }
- public void setManifest(Manifest manifest) {
- this.manifest = manifest;
- }
- public String getStatus() {
- return status;
- }
- public void setStatus(String status) {
- this.status = status;
- }
- public String getHost() {
- return host;
- }
- public void setHost(String host) {
- this.host = host;
- }
- public String getHostIP() {
- return hostIP;
- }
- public void setHostIP(String hostIP) {
- this.hostIP = hostIP;
- }
- public Policy getRestartPolicy() {
- return restartPolicy;
- }
- public void setRestartPolicy(Policy restartPolicy) {
- this.restartPolicy = restartPolicy;
- }
- public String getPodIP() {
- return podIP;
- }
- public void setPodIP(String podIP) {
- this.podIP = podIP;
- }
- public int getReplicas() {
- return replicas;
- }
- public void setReplicas(int replicas) {
- this.replicas = replicas;
- }
- public Selector getReplicaSelector() {
- return replicaSelector;
- }
- public void setReplicaSelector(Selector replicaSelector) {
- this.replicaSelector = replicaSelector;
- }
- public Pod getPodTemplate() {
- return podTemplate;
- }
- public void setPodTemplate(Pod podTemplate) {
- this.podTemplate = podTemplate;
- }
- public Object getInfo() {
- return info;
- }
- public void setInfo(Object info) {
- this.info = info;
- }
-
- @Override
- public String toString() {
- return "State [manifest=" + manifest + ", status=" + status + ", host="
- + host + ", hostIP=" + hostIP + ", podIP=" + podIP
- + ", replicas=" + replicas + ", replicaSelector="
- + replicaSelector + ", podTemplate=" + podTemplate
- + ", restartPolicy=" + restartPolicy + ", info=" + info + "]";
- }
+ private Manifest manifest;
+ private String status;
+ private String host;
+ private String hostIP;
+ private String podIP;
+ private int replicas;
+ private Selector replicaSelector;
+ private Pod podTemplate;
+ private Policy restartPolicy;
+ private Object info;
+
+ public Manifest getManifest() {
+ return manifest;
+ }
+
+ public void setManifest(Manifest manifest) {
+ this.manifest = manifest;
+ }
+
+ public String getStatus() {
+ return status;
+ }
+
+ public void setStatus(String status) {
+ this.status = status;
+ }
+
+ public String getHost() {
+ return host;
+ }
+
+ public void setHost(String host) {
+ this.host = host;
+ }
+
+ public String getHostIP() {
+ return hostIP;
+ }
+
+ public void setHostIP(String hostIP) {
+ this.hostIP = hostIP;
+ }
+
+ public Policy getRestartPolicy() {
+ return restartPolicy;
+ }
+
+ public void setRestartPolicy(Policy restartPolicy) {
+ this.restartPolicy = restartPolicy;
+ }
+
+ public String getPodIP() {
+ return podIP;
+ }
+
+ public void setPodIP(String podIP) {
+ this.podIP = podIP;
+ }
+
+ public int getReplicas() {
+ return replicas;
+ }
+
+ public void setReplicas(int replicas) {
+ this.replicas = replicas;
+ }
+
+ public Selector getReplicaSelector() {
+ return replicaSelector;
+ }
+
+ public void setReplicaSelector(Selector replicaSelector) {
+ this.replicaSelector = replicaSelector;
+ }
+
+ public Pod getPodTemplate() {
+ return podTemplate;
+ }
+
+ public void setPodTemplate(Pod podTemplate) {
+ this.podTemplate = podTemplate;
+ }
+
+ public Object getInfo() {
+ return info;
+ }
+
+ public void setInfo(Object info) {
+ this.info = info;
+ }
+
+ @Override
+ public String toString() {
+ return "State [manifest=" + manifest + ", status=" + status + ", host="
+ + host + ", hostIP=" + hostIP + ", podIP=" + podIP
+ + ", replicas=" + replicas + ", replicaSelector="
+ + replicaSelector + ", podTemplate=" + podTemplate
+ + ", restartPolicy=" + restartPolicy + ", info=" + info + "]";
+ }
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Volume.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Volume.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Volume.java
index fd389c1..91b59b0 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Volume.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/Volume.java
@@ -22,20 +22,20 @@ package org.apache.stratos.kubernetes.client.model;
public class Volume {
- private String name;
+ private String name;
- public String getName() {
- return name;
- }
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ @Override
+ public String toString() {
+ return "Volume [name=" + name + "]";
+ }
- public void setName(String name) {
- this.name = name;
- }
- @Override
- public String toString() {
- return "Volume [name=" + name + "]";
- }
-
-
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/VolumeMount.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/VolumeMount.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/VolumeMount.java
index 098d03e..1534988 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/VolumeMount.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/model/VolumeMount.java
@@ -22,33 +22,39 @@ package org.apache.stratos.kubernetes.client.model;
public class VolumeMount {
- private String name;
- private String mountPath;
- private boolean readOnly;
-
- public String getName() {
- return name;
- }
- public void setName(String name) {
- this.name = name;
- }
- public String getMountPath() {
- return mountPath;
- }
- public void setMountPath(String mountPath) {
- this.mountPath = mountPath;
- }
- public boolean isReadOnly() {
- return readOnly;
- }
- public void setReadOnly(boolean readOnly) {
- this.readOnly = readOnly;
- }
- @Override
- public String toString() {
- return "VolumeMount [name=" + name + ", mountPath=" + mountPath
- + ", readOnly=" + readOnly + "]";
- }
-
-
+ private String name;
+ private String mountPath;
+ private boolean readOnly;
+
+ public String getName() {
+ return name;
+ }
+
+ public void setName(String name) {
+ this.name = name;
+ }
+
+ public String getMountPath() {
+ return mountPath;
+ }
+
+ public void setMountPath(String mountPath) {
+ this.mountPath = mountPath;
+ }
+
+ public boolean isReadOnly() {
+ return readOnly;
+ }
+
+ public void setReadOnly(boolean readOnly) {
+ this.readOnly = readOnly;
+ }
+
+ @Override
+ public String toString() {
+ return "VolumeMount [name=" + name + ", mountPath=" + mountPath
+ + ", readOnly=" + readOnly + "]";
+ }
+
+
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/HttpResponse.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/HttpResponse.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/HttpResponse.java
index 1a8ab86..6a287c1 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/HttpResponse.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/HttpResponse.java
@@ -31,18 +31,23 @@ public class HttpResponse {
public int getStatusCode() {
return statusCode;
}
+
public void setStatusCode(int statusCode) {
this.statusCode = statusCode;
}
+
public String getContent() {
return content;
}
+
public void setContent(String content) {
this.content = content;
}
+
public String getReason() {
return reason;
}
+
public void setReason(String reason) {
this.reason = reason;
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/KubernetesResponseHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/KubernetesResponseHandler.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/KubernetesResponseHandler.java
index 35a15be..6530a09 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/KubernetesResponseHandler.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/KubernetesResponseHandler.java
@@ -38,7 +38,7 @@ import java.io.InputStreamReader;
/**
* Handles a HttpResponse and returns a {@link HttpResponse}
*/
-public class KubernetesResponseHandler implements ResponseHandler<HttpResponse>{
+public class KubernetesResponseHandler implements ResponseHandler<HttpResponse> {
private static final Log log = LogFactory.getLog(KubernetesResponseHandler.class);
@Override
@@ -63,13 +63,13 @@ public class KubernetesResponseHandler implements ResponseHandler<HttpResponse>{
HttpResponse httpResponse = new HttpResponse();
httpResponse.setStatusCode(statusLine.getStatusCode());
httpResponse.setContent(result);
- if(StringUtils.isNotBlank(result) && (isJson(result))) {
+ if (StringUtils.isNotBlank(result) && (isJson(result))) {
httpResponse.setKubernetesResponse(parseKubernetesResponse(result));
}
httpResponse.setReason(statusLine.getReasonPhrase());
if (log.isDebugEnabled()) {
- log.debug("Extracted Kubernetes Response: "+httpResponse.toString());
+ log.debug("Extracted Kubernetes Response: " + httpResponse.toString());
}
return httpResponse;
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/RestClient.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/RestClient.java b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/RestClient.java
index 090dae0..ba532a4 100644
--- a/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/RestClient.java
+++ b/components/org.apache.stratos.kubernetes.client/src/main/java/org/apache/stratos/kubernetes/client/rest/RestClient.java
@@ -1,20 +1,20 @@
/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
-
- * http://www.apache.org/licenses/LICENSE-2.0
-
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied. See the License for the
- * specific language governing permissions and limitations
- * under the License.
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ * <p/>
+ * http://www.apache.org/licenses/LICENSE-2.0
+ * <p/>
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
*/
package org.apache.stratos.kubernetes.client.rest;
@@ -32,18 +32,18 @@ import org.apache.http.impl.conn.PoolingClientConnectionManager;
public class RestClient {
private DefaultHttpClient httpClient;
-
+
public RestClient() {
PoolingClientConnectionManager cm = new PoolingClientConnectionManager();
// Increase max total connection to 200
cm.setMaxTotal(200);
// Increase default max connection per route to 50
cm.setDefaultMaxPerRoute(50);
-
+
httpClient = new DefaultHttpClient(cm);
}
- /**
+ /**
* Handle http post request. Return String
*
* @param resourcePath This should be REST endpoint
@@ -51,7 +51,7 @@ public class RestClient {
* @return The HttpResponse
* @throws Exception if any errors occur when executing the request
*/
- public HttpResponse doPost(URI resourcePath, String jsonParamString) throws Exception{
+ public HttpResponse doPost(URI resourcePath, String jsonParamString) throws Exception {
HttpPost postRequest = null;
try {
postRequest = new HttpPost(resourcePath);
@@ -74,7 +74,7 @@ public class RestClient {
* @throws org.apache.http.client.ClientProtocolException and IOException
* if any errors occur when executing the request
*/
- public HttpResponse doGet(URI resourcePath) throws Exception{
+ public HttpResponse doGet(URI resourcePath) throws Exception {
HttpGet getRequest = null;
try {
getRequest = new HttpGet(resourcePath);
@@ -85,7 +85,7 @@ public class RestClient {
releaseConnection(getRequest);
}
}
-
+
public HttpResponse doDelete(URI resourcePath) throws Exception {
HttpDelete httpDelete = null;
try {
@@ -94,26 +94,26 @@ public class RestClient {
return httpClient.execute(httpDelete, new KubernetesResponseHandler());
} finally {
- releaseConnection(httpDelete);
+ releaseConnection(httpDelete);
}
}
public HttpResponse doPut(URI resourcePath, String jsonParamString) throws Exception {
HttpPut putRequest = null;
- try {
- putRequest = new HttpPut(resourcePath);
+ try {
+ putRequest = new HttpPut(resourcePath);
- StringEntity input = new StringEntity(jsonParamString);
- input.setContentType("application/json");
- putRequest.setEntity(input);
+ StringEntity input = new StringEntity(jsonParamString);
+ input.setContentType("application/json");
+ putRequest.setEntity(input);
- return httpClient.execute(putRequest, new KubernetesResponseHandler());
- } finally {
- releaseConnection(putRequest);
- }
+ return httpClient.execute(putRequest, new KubernetesResponseHandler());
+ } finally {
+ releaseConnection(putRequest);
+ }
}
-
+
private void releaseConnection(HttpRequestBase request) {
if (request != null) {
request.releaseConnection();
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/LiveTests.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/LiveTests.java b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/LiveTests.java
index 888898b..1799d6b 100644
--- a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/LiveTests.java
+++ b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/LiveTests.java
@@ -26,5 +26,5 @@ import org.junit.experimental.categories.Category;
* Set {@link Category} of all Live tests to be this class.
*/
public interface LiveTests {
-
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/UnitTests.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/UnitTests.java b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/UnitTests.java
index d869a7d..1cb57e0 100644
--- a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/UnitTests.java
+++ b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/UnitTests.java
@@ -26,5 +26,5 @@ import org.junit.experimental.categories.Category;
* Set {@link Category} of all Unit tests to be this class.
*/
public interface UnitTests {
-
+
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/AbstractLiveTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/AbstractLiveTest.java b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/AbstractLiveTest.java
index 6cf30cf..faab5ab 100644
--- a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/AbstractLiveTest.java
+++ b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/AbstractLiveTest.java
@@ -64,7 +64,7 @@ public class AbstractLiveTest extends TestCase {
protected int containerPort;
protected boolean testPodActivation;
protected boolean testServiceSocket;
- protected String[] minionPublicIPs = { "172.17.8.102" };
+ protected String[] minionPublicIPs = {"172.17.8.102"};
protected List<String> podIdList = new ArrayList<String>();
protected List<String> serviceIdList = new ArrayList<String>();
@@ -108,7 +108,7 @@ public class AbstractLiveTest extends TestCase {
log.info(TEST_SERVICE_SOCKET + ": " + testServiceSocket);
String minionPublicIPsStr = System.getProperty(MINION_PUBLIC_IPS);
- if(StringUtils.isNotBlank(minionPublicIPsStr)) {
+ if (StringUtils.isNotBlank(minionPublicIPsStr)) {
minionPublicIPs = minionPublicIPsStr.split(",");
}
log.info(MINION_PUBLIC_IPS + ": " + minionPublicIPsStr);
@@ -137,17 +137,17 @@ public class AbstractLiveTest extends TestCase {
if (testPodActivation) {
boolean activated = false;
long startTime = System.currentTimeMillis();
- while(!activated) {
- if((System.currentTimeMillis() - startTime) > POD_ACTIVATION_WAIT_TIME) {
+ while (!activated) {
+ if ((System.currentTimeMillis() - startTime) > POD_ACTIVATION_WAIT_TIME) {
log.info(String.format("Pod did not activate within %d seconds: [pod] %s",
- POD_ACTIVATION_WAIT_TIME/1000, podId));
+ POD_ACTIVATION_WAIT_TIME / 1000, podId));
break;
}
log.info("Waiting pod status to be changed to running: [pod] " + podId);
sleep(2000);
pod = client.getPod(podId);
- if((pod != null) && (pod.getCurrentState().getStatus().equals(KubernetesConstants.POD_STATUS_RUNNING))) {
+ if ((pod != null) && (pod.getCurrentState().getStatus().equals(KubernetesConstants.POD_STATUS_RUNNING))) {
activated = true;
log.info("Pod state changed to running: [pod]" + pod.getId());
}
@@ -170,7 +170,7 @@ public class AbstractLiveTest extends TestCase {
public void deletePods() {
try {
- for(String podId : podIdList) {
+ for (String podId : podIdList) {
deletePod(podId);
}
} catch (KubernetesClientException e) {
@@ -179,7 +179,7 @@ public class AbstractLiveTest extends TestCase {
}
protected void createService(String serviceId, String serviceName, int servicePort, String containerPortName,
- String[] publicIPs) throws KubernetesClientException, InterruptedException, IOException {
+ String[] publicIPs) throws KubernetesClientException, InterruptedException, IOException {
log.info("Creating service...");
client.createService(serviceId, serviceName, servicePort, containerPortName, publicIPs);
serviceIdList.add(serviceId);
@@ -202,7 +202,7 @@ public class AbstractLiveTest extends TestCase {
protected void deleteServices() {
try {
- for(String serviceId : serviceIdList) {
+ for (String serviceId : serviceIdList) {
deleteService(serviceId);
}
} catch (KubernetesClientException e) {
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/KubernetesClusterCleanTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/KubernetesClusterCleanTest.java b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/KubernetesClusterCleanTest.java
index 1104e0f..eea90b4 100644
--- a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/KubernetesClusterCleanTest.java
+++ b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/KubernetesClusterCleanTest.java
@@ -41,16 +41,16 @@ public class KubernetesClusterCleanTest extends AbstractLiveTest {
try {
log.info("Cleaning kubernetes cluster...");
List<Pod> podList = client.getPods();
- while((podList != null) && (podList.size() > 0)) {
- for(Pod pod : podList) {
+ while ((podList != null) && (podList.size() > 0)) {
+ for (Pod pod : podList) {
deletePod(pod.getId());
}
podList = client.getPods();
}
List<Service> serviceList = getServices();
- while((serviceList != null) && (serviceList.size() > 0)) {
- for(Service service : serviceList) {
+ while ((serviceList != null) && (serviceList.size() > 0)) {
+ for (Service service : serviceList) {
deleteService(service.getId());
}
serviceList = getServices();
@@ -63,8 +63,8 @@ public class KubernetesClusterCleanTest extends AbstractLiveTest {
private List<Service> getServices() throws KubernetesClientException {
List<Service> serviceList = new ArrayList<Service>();
- for(Service service : client.getServices()) {
- if(!service.getId().startsWith("kubernetes")) {
+ for (Service service : client.getServices()) {
+ if (!service.getId().startsWith("kubernetes")) {
serviceList.add(service);
}
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/88ae13e8/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/unit/PodUnitTest.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/unit/PodUnitTest.java b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/unit/PodUnitTest.java
index 8c374ac..b42b72b 100644
--- a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/unit/PodUnitTest.java
+++ b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/unit/PodUnitTest.java
@@ -33,17 +33,17 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
@Category(org.apache.stratos.kubernetes.client.UnitTests.class)
-public class PodUnitTest extends TestCase{
+public class PodUnitTest extends TestCase {
- @Before
- public void setUp() {
- }
-
- @Test
- public void testPods() throws Exception {
- String podId = "nirmal-test-pod";
- String time = "2014/11/02";
- String selfLink = "link";
+ @Before
+ public void setUp() {
+ }
+
+ @Test
+ public void testPods() throws Exception {
+ String podId = "nirmal-test-pod";
+ String time = "2014/11/02";
+ String selfLink = "link";
Pod pod = new Pod();
String apiVersion = "v1beta1";
pod.setApiVersion(apiVersion);
@@ -72,7 +72,7 @@ public class PodUnitTest extends TestCase{
pod.setDesiredState(desiredState);
State currentState = desiredState;
pod.setCurrentState(currentState);
-
+
assertEquals(podId, pod.getId());
assertEquals(apiVersion, pod.getApiVersion());
assertEquals(apiVersion, pod.getResourceVersion());
@@ -82,31 +82,31 @@ public class PodUnitTest extends TestCase{
assertEquals(selfLink, pod.getSelfLink());
assertEquals(desiredState, pod.getDesiredState());
assertEquals(time, pod.getCreationTimestamp());
-
+
assertEquals(true, pod.equals(pod));
-
+
Pod pod2 = new Pod();
pod2.setId(podId);
-
+
assertEquals(true, pod.equals(pod2));
assertEquals(true, pod.hashCode() == pod2.hashCode());
-
+
pod2.setId("aa");
assertEquals(false, pod.equals(pod2));
-
+
pod2.setId(null);
assertEquals(false, pod.equals(pod2));
-
+
assertEquals(false, pod.equals(null));
assertEquals(false, pod.equals(desiredState));
-
+
pod.setId(null);
pod2.setId(podId);
assertEquals(false, pod.equals(pod2));
-
+
pod2.setId(null);
assertEquals(true, pod.equals(pod2));
assertEquals(true, pod.hashCode() == pod2.hashCode());
-
- }
+
+ }
}