Repository: stratos Updated Branches: refs/heads/stratos-4.1.x aa925bb74 -> aaac01b54
Committing kubernetes client live test classes Project: http://git-wip-us.apache.org/repos/asf/stratos/repo Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/aaac01b5 Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/aaac01b5 Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/aaac01b5 Branch: refs/heads/stratos-4.1.x Commit: aaac01b54eee1efcdd09ea271543780ac2a55b78 Parents: aa925bb Author: Akila Perera <[email protected]> Authored: Sun Sep 20 12:55:01 2015 +0530 Committer: Akila Perera <[email protected]> Committed: Sun Sep 20 12:55:01 2015 +0530 ---------------------------------------------------------------------- .../client/live/AbstractLiveTest.java | 14 +++++---- .../live/KubernetesApiClientLiveTest.java | 33 +++++++++++++------- 2 files changed, 30 insertions(+), 17 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/stratos/blob/aaac01b5/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 f8f2155..842c672 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 @@ -124,13 +124,13 @@ public class AbstractLiveTest extends TestCase { log.info("Kubernetes resources cleaned"); } - protected void createPod(String podId, String podName, Map<String, String> labelMap, String containerPortName, - String cpu, String memory) + protected void createPod(String podId, String podName, Map<String, String> labelMap, Map<String, String> + annotations, String containerPortName, String cpu, String memory) throws KubernetesClientException { log.info("Creating pod: [pod] " + podId); List<ContainerPort> ports = createPorts(containerPortName); - client.createPod(podId, podName, labelMap, dockerImage, cpu, memory, ports, null); + client.createPod(podId, podName, annotations, labelMap, dockerImage, cpu, memory, ports, null); podIdList.add(podId); sleep(2000); @@ -197,12 +197,14 @@ public class AbstractLiveTest extends TestCase { } } - protected void createService(String serviceId, String serviceName, Map<String, String> labelMap, int nodePort, - String serviceType, String containerPortName, int containerPort, + protected void createService(String serviceId, String serviceName, Map<String, String> labelMap, Map<String, + String> annotationMap, int nodePort, String serviceType, String containerPortName, int containerPort, List<String> publicIPs) throws KubernetesClientException, InterruptedException, IOException { log.info("Creating service..."); - client.createService(serviceId, serviceName, labelMap, nodePort, serviceType, containerPortName, containerPort, + + client.createService(serviceId, serviceName, labelMap, annotationMap, nodePort, serviceType, + containerPortName, containerPort, KubernetesConstants.SESSION_AFFINITY_CLIENT_IP); serviceIdList.add(serviceId); http://git-wip-us.apache.org/repos/asf/stratos/blob/aaac01b5/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 4913be6..ea10c97 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 @@ -50,11 +50,15 @@ public class KubernetesApiClientLiveTest extends AbstractLiveTest { log.info("Testing pod creation..."); Map<String, String> podLabels1 = new HashMap<>(); podLabels1.put("applicationId", "my-application-1"); - createPod("stratos-test-pod-1", "stratos-test-pod", podLabels1, "http-1", "1", "512Mi"); + Map<String, String> podAnnocations1 = new HashMap<>(); + podAnnocations1.put("test", "test"); + createPod("stratos-test-pod-1", "stratos-test-pod", podLabels1, podAnnocations1, "http-1", "1", "512Mi"); Map<String, String> podLabels2 = new HashMap<>(); podLabels2.put("applicationId", "my-application-2"); - createPod("stratos-test-pod-2", "stratos-test-pod", podLabels2, "http-1", "2", "4Gi"); + Map<String, String> podAnnocations2 = new HashMap<>(); + podAnnocations2.put("test", "test"); + createPod("stratos-test-pod-2", "stratos-test-pod", podLabels2, podAnnocations2, "http-1", "2", "4Gi"); deletePod("stratos-test-pod-1"); deletePod("stratos-test-pod-2"); @@ -80,17 +84,24 @@ public class KubernetesApiClientLiveTest extends AbstractLiveTest { Map<String, String> serviceLabels1 = new HashMap<>(); serviceLabels1.put("applicationId", "my-application-1"); - createService(serviceId, serviceName, serviceLabels1, SERVICE_PORT, serviceType, containerPortName, - containerPort, - minionPublicIPs); - Map<String, String> podLabels1 = new HashMap<>(); - podLabels1.put("applicationId", "my-application-3"); - createPod("stratos-test-pod-3", serviceName, podLabels1, containerPortName, "1", "512"); + Map<String, String> annotationMap = new HashMap<>(); + annotationMap.put("test", "test"); - Map<String, String> podLabels2 = new HashMap<>(); - podLabels2.put("applicationId", "my-application-4"); - createPod("stratos-test-pod-4", serviceName, podLabels2, containerPortName, "2", "512"); + createService(serviceId, serviceName, serviceLabels1, annotationMap, SERVICE_PORT, serviceType, + containerPortName, containerPort, minionPublicIPs); + + Map<String, String> podLabels3 = new HashMap<>(); + podLabels3.put("applicationId", "my-application-3"); + Map<String, String> podAnnocations3 = new HashMap<>(); + podAnnocations3.put("test", "test"); + createPod("stratos-test-pod-3", serviceName, podLabels3, podAnnocations3, containerPortName, "1", "512"); + + Map<String, String> podLabels4 = new HashMap<>(); + podLabels4.put("applicationId", "my-application-4"); + Map<String, String> podAnnocations4 = new HashMap<>(); + podAnnocations4.put("test", "test"); + createPod("stratos-test-pod-4", serviceName, podLabels4, podAnnocations4, containerPortName, "2", "512"); if (testServiceSocket) { // test service accessibility
