Repository: stratos Updated Branches: refs/heads/master 9d852d2f7 -> e171d58e1
Fixing the live test with 0.5.2 Kubernetes version. Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/e171d58e Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/e171d58e Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/e171d58e Branch: refs/heads/master Commit: e171d58e15dfd4a8bfae65afce21ef18e37f3d72 Parents: 5459639 Author: Nirmal Fernando <[email protected]> Authored: Fri Nov 28 10:42:04 2014 +0530 Committer: Nirmal Fernando <[email protected]> Committed: Fri Nov 28 14:07:08 2014 +0530 ---------------------------------------------------------------------- .../client/live/KubernetesApiClientLiveTest.java | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/e171d58e/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/KubernetesApiClientLiveTest.java ---------------------------------------------------------------------- diff --git a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/KubernetesApiClientLiveTest.java b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/KubernetesApiClientLiveTest.java index eadb4ca..7f74f40 100644 --- a/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/KubernetesApiClientLiveTest.java +++ b/components/org.apache.stratos.kubernetes.client/src/test/java/org/apache/stratos/kubernetes/client/live/KubernetesApiClientLiveTest.java @@ -20,6 +20,9 @@ */ package org.apache.stratos.kubernetes.client.live; +import java.net.InetAddress; +import java.net.URL; + import junit.framework.TestCase; import org.apache.commons.logging.Log; @@ -45,10 +48,11 @@ public class KubernetesApiClientLiveTest extends TestCase{ private static final Log log = LogFactory.getLog(KubernetesApiClientLiveTest.class); private KubernetesApiClient client; private String dockerImage; + private String endpoint; @Before public void setUp() { - String endpoint = System.getProperty("kubernetes.api.endpoint"); + endpoint = System.getProperty("kubernetes.api.endpoint"); if (endpoint == null) { endpoint = "http://192.168.1.100:8080/api/v1beta1/";; } @@ -283,6 +287,9 @@ public class KubernetesApiClientLiveTest extends TestCase{ serv.setPort(5000); serv.setId(serviceId); serv.setKind("Service"); + InetAddress address = InetAddress.getByName(new URL(endpoint).getHost()); + String publicIp = address.getHostAddress(); + serv.setPublicIPs(new String[]{publicIp}); Label l = new Label(); l.setName("nirmal"); @@ -293,6 +300,9 @@ public class KubernetesApiClientLiveTest extends TestCase{ selector.setName(l.getName()); serv.setSelector(selector); + // get the services count before creation + int count = client.getAllServices().length; + if (log.isDebugEnabled()) { log.debug("Creating a Service Proxy: "+serv); } @@ -303,7 +313,7 @@ public class KubernetesApiClientLiveTest extends TestCase{ client.createService(serv); assertNotNull(client.getService(serviceId)); - assertEquals(1, client.getAllServices().length); + assertEquals(count+1, client.getAllServices().length); client.deleteService(serviceId); try {
