You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by im...@apache.org on 2015/05/27 06:56:27 UTC
stratos git commit: Updating kubernetes clean mvn command to exclude
kubernetes pods
Repository: stratos
Updated Branches:
refs/heads/master 1338cb56a -> 309378ac7
Updating kubernetes clean mvn command to exclude kubernetes pods
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/309378ac
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/309378ac
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/309378ac
Branch: refs/heads/master
Commit: 309378ac7db973e01128dc909420483bc65d4aa7
Parents: 1338cb5
Author: Imesh Gunaratne <im...@apache.org>
Authored: Wed May 27 10:26:03 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Wed May 27 10:26:21 2015 +0530
----------------------------------------------------------------------
.../client/live/KubernetesClusterCleanTest.java | 14 ++++++++++++--
1 file changed, 12 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/309378ac/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 eea90b4..b8af5ca 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
@@ -40,7 +40,7 @@ public class KubernetesClusterCleanTest extends AbstractLiveTest {
public void testClean() {
try {
log.info("Cleaning kubernetes cluster...");
- List<Pod> podList = client.getPods();
+ List<Pod> podList = getPods();
while ((podList != null) && (podList.size() > 0)) {
for (Pod pod : podList) {
deletePod(pod.getId());
@@ -61,10 +61,20 @@ public class KubernetesClusterCleanTest extends AbstractLiveTest {
}
}
+ private List<Pod> getPods() throws KubernetesClientException {
+ List<Pod> podList = new ArrayList<Pod>();
+ for(Pod pod : client.getPods()) {
+ if(!pod.getId().startsWith("kube")) {
+ podList.add(pod);
+ }
+ }
+ return podList;
+ }
+
private List<Service> getServices() throws KubernetesClientException {
List<Service> serviceList = new ArrayList<Service>();
for (Service service : client.getServices()) {
- if (!service.getId().startsWith("kubernetes")) {
+ if (!service.getId().startsWith("kube")) {
serviceList.add(service);
}
}