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/01/22 14:09:53 UTC
[2/2] stratos git commit: Fixing kubernetes service port in
kubernetes api client live tests
Fixing kubernetes service port in kubernetes api client live tests
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/27408cc7
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/27408cc7
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/27408cc7
Branch: refs/heads/master
Commit: 27408cc71636926216dba5f992b424c109a4373d
Parents: 0735d11
Author: Imesh Gunaratne <im...@apache.org>
Authored: Thu Jan 22 18:39:45 2015 +0530
Committer: Imesh Gunaratne <im...@apache.org>
Committed: Thu Jan 22 18:39:45 2015 +0530
----------------------------------------------------------------------
.../live/KubernetesApiClientLiveTest.java | 20 ++++++++++++--------
1 file changed, 12 insertions(+), 8 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/27408cc7/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 6603b6d..635ce49 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
@@ -92,8 +92,9 @@ public class KubernetesApiClientLiveTest extends TestCase{
String podId = "stratos-test-pod-1";
String podName = "stratos-test-pod";
+ String containerPortName = "http-1";
- List<Port> ports = createPorts();
+ List<Port> ports = createPorts(containerPortName);
client.createPod(podId, podName, dockerImage, ports);
Thread.sleep(2000);
@@ -112,12 +113,12 @@ public class KubernetesApiClientLiveTest extends TestCase{
log.info("Pod deleted successfully: " + pod.getId());
}
- private List<Port> createPorts() {
+ private List<Port> createPorts(String containerPortName) {
List<Port> ports = new ArrayList<Port>();
Port port = new Port();
- port.setName("port-1");
+ port.setName(containerPortName);
port.setContainerPort(CONTAINER_PORT);
- port.setHostPort(PROXY_PORT);
+ port.setHostPort(SERVICE_PORT);
ports.add(port);
return ports;
}
@@ -135,9 +136,10 @@ public class KubernetesApiClientLiveTest extends TestCase{
public void testReplicationControllerCreationAndDeletion() throws Exception {
String replicationControllerId = "stratos-test-rc-1";
String replicationControllerName = "stratos-test-rc";
+ String containerPortName = "http-1";
int replicas = 2;
- List<Port> ports = createPorts();
+ List<Port> ports = createPorts(containerPortName);
client.createReplicationController(replicationControllerId, replicationControllerName,
dockerImage, ports, null, replicas);
@@ -174,24 +176,26 @@ public class KubernetesApiClientLiveTest extends TestCase{
String podName = "stratos-test-pod";
String serviceId = "stratos-test-service-1";
String serviceName = "stratos-test-service";
+ String containerPortName = "http-1";
+
InetAddress address = InetAddress.getByName(new URL(endpoint).getHost());
String publicIp = address.getHostAddress();
- List<Port> ports = createPorts();
+ List<Port> ports = createPorts(containerPortName);
client.createPod(podId, podName, dockerImage, ports);
Thread.sleep(2000);
Pod podCreated = client.getPod(podId);
assertNotNull(podCreated);
- client.createService(serviceId, serviceName, SERVICE_PORT, "port-1", publicIp);
+ client.createService(serviceId, serviceName, SERVICE_PORT, containerPortName, publicIp);
Thread.sleep(2000);
Service service = client.getService(serviceId);
assertNotNull(service);
// test recreation using same id
- client.createService(serviceId, serviceName, SERVICE_PORT, "port-1", publicIp);
+ client.createService(serviceId, serviceName, SERVICE_PORT, containerPortName, publicIp);
Thread.sleep(2000);
service = client.getService(serviceId);