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/03/02 05:02:51 UTC
stratos git commit: Updating kubernetes clean test to exclude
kubernetes owned services
Repository: stratos
Updated Branches:
refs/heads/master 618a5f268 -> bb61ab0d4
Updating kubernetes clean test to exclude kubernetes owned services
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/bb61ab0d
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/bb61ab0d
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/bb61ab0d
Branch: refs/heads/master
Commit: bb61ab0d49a6807a174bfc1b50260ade42c49fca
Parents: 618a5f2
Author: Imesh Gunaratne <im...@apache.org>
Authored: Mon Mar 2 09:32:40 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Mon Mar 2 09:32:40 2015 +0530
----------------------------------------------------------------------
.../kubernetes/client/live/AbstractLiveTest.java | 3 ++-
.../client/live/KubernetesClusterCleanTest.java | 16 ++++++++++++++--
2 files changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/bb61ab0d/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 bf00c40..6cf30cf 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
@@ -163,6 +163,7 @@ public class AbstractLiveTest extends TestCase {
client.deletePod(podId);
podIdList.remove(podId);
+ sleep(1000);
assertNull(client.getPod(podId));
log.info("Pod deleted successfully: " + podId);
}
@@ -194,7 +195,7 @@ public class AbstractLiveTest extends TestCase {
client.deleteService(serviceId);
serviceIdList.remove(serviceId);
- sleep(1000);
+ sleep(2000);
assertNull(client.getService(serviceId));
log.info(String.format("Service deleted successfully: [service] %s", serviceId));
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/bb61ab0d/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 c1d150d..1104e0f 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
@@ -21,10 +21,12 @@ package org.apache.stratos.kubernetes.client.live;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.apache.stratos.kubernetes.client.exceptions.KubernetesClientException;
import org.apache.stratos.kubernetes.client.model.Pod;
import org.apache.stratos.kubernetes.client.model.Service;
import org.junit.Test;
+import java.util.ArrayList;
import java.util.List;
/**
@@ -46,16 +48,26 @@ public class KubernetesClusterCleanTest extends AbstractLiveTest {
podList = client.getPods();
}
- List<Service> serviceList = client.getServices();
+ List<Service> serviceList = getServices();
while((serviceList != null) && (serviceList.size() > 0)) {
for(Service service : serviceList) {
deleteService(service.getId());
}
- serviceList = client.getServices();
+ serviceList = getServices();
}
log.info("Kubernetes cluster cleaned successfully");
} catch (Exception e) {
log.error(e);
}
}
+
+ private List<Service> getServices() throws KubernetesClientException {
+ List<Service> serviceList = new ArrayList<Service>();
+ for(Service service : client.getServices()) {
+ if(!service.getId().startsWith("kubernetes")) {
+ serviceList.add(service);
+ }
+ }
+ return serviceList;
+ }
}