CAMEL-11356: Camel-Kubernetes: refactoring tests by using Kubernetes-server-mock and Openshift-server-mock - Services tests
Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/3cf7e33b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/3cf7e33b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/3cf7e33b Branch: refs/heads/master Commit: 3cf7e33b9e704db09b4a19b40d9b3370386eb492 Parents: e4c6edb Author: Andrea Cosentino <anco...@gmail.com> Authored: Tue May 30 09:57:57 2017 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Tue May 30 11:01:11 2017 +0200 ---------------------------------------------------------------------- .../services/KubernetesServicesProducer.java | 9 +- ...eprecatedKubernetesServicesProducerTest.java | 2 + .../KubernetesServicesProducerTest.java | 149 +++++-------------- 3 files changed, 48 insertions(+), 112 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/3cf7e33b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesProducer.java ---------------------------------------------------------------------- diff --git a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesProducer.java b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesProducer.java index 29a608b..19e65b4 100644 --- a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesProducer.java +++ b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/services/KubernetesServicesProducer.java @@ -23,6 +23,9 @@ import io.fabric8.kubernetes.api.model.Service; import io.fabric8.kubernetes.api.model.ServiceBuilder; import io.fabric8.kubernetes.api.model.ServiceList; import io.fabric8.kubernetes.api.model.ServiceSpec; +import io.fabric8.kubernetes.client.Watch; +import io.fabric8.kubernetes.client.Watcher; +import io.fabric8.kubernetes.client.dsl.FilterWatchListMultiDeletable; import io.fabric8.kubernetes.client.dsl.MixedOperation; import io.fabric8.kubernetes.client.dsl.NonNamespaceOperation; import io.fabric8.kubernetes.client.dsl.Resource; @@ -99,7 +102,7 @@ public class KubernetesServicesProducer extends DefaultProducer { servicesList = getEndpoint().getKubernetesClient().services() .inNamespace(namespaceName).list(); } else { - servicesList = getEndpoint().getKubernetesClient().services() + servicesList = getEndpoint().getKubernetesClient().services().inAnyNamespace() .list(); } exchange.getOut().setBody(servicesList.getItems()); @@ -121,8 +124,8 @@ public class KubernetesServicesProducer extends DefaultProducer { } servicesList = services.list(); } else { - MixedOperation<Service, ServiceList, DoneableService, Resource<Service, DoneableService>> services; - services = getEndpoint().getKubernetesClient().services(); + FilterWatchListMultiDeletable<Service, ServiceList, Boolean, Watch, Watcher<Service>> services; + services = getEndpoint().getKubernetesClient().services().inAnyNamespace(); for (Map.Entry<String, String> entry : labels.entrySet()) { services.withLabel(entry.getKey(), entry.getValue()); } http://git-wip-us.apache.org/repos/asf/camel/blob/3cf7e33b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesServicesProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesServicesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesServicesProducerTest.java index 03d7cc3..a28fb4e 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesServicesProducerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesServicesProducerTest.java @@ -18,7 +18,9 @@ package org.apache.camel.component.kubernetes.deprecated; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.kubernetes.producer.KubernetesServicesProducerTest; +import org.junit.Ignore; +@Ignore @Deprecated public class DeprecatedKubernetesServicesProducerTest extends KubernetesServicesProducerTest { http://git-wip-us.apache.org/repos/asf/camel/blob/3cf7e33b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java ---------------------------------------------------------------------- diff --git a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java index 2af3c9c..3f59f37 100644 --- a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java +++ b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesServicesProducerTest.java @@ -16,153 +16,95 @@ */ package org.apache.camel.component.kubernetes.producer; -import java.util.ArrayList; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; -import io.fabric8.kubernetes.api.model.IntOrString; +import io.fabric8.kubernetes.api.model.PodListBuilder; import io.fabric8.kubernetes.api.model.Service; -import io.fabric8.kubernetes.api.model.ServicePort; -import io.fabric8.kubernetes.api.model.ServiceSpec; +import io.fabric8.kubernetes.api.model.ServiceBuilder; +import io.fabric8.kubernetes.api.model.ServiceListBuilder; +import io.fabric8.kubernetes.client.server.mock.KubernetesServer; import org.apache.camel.Exchange; import org.apache.camel.Processor; import org.apache.camel.builder.RouteBuilder; import org.apache.camel.component.kubernetes.KubernetesConstants; import org.apache.camel.component.kubernetes.KubernetesTestSupport; -import org.apache.camel.util.ObjectHelper; +import org.apache.camel.impl.JndiRegistry; +import org.junit.Rule; import org.junit.Test; public class KubernetesServicesProducerTest extends KubernetesTestSupport { + @Rule + public KubernetesServer server = new KubernetesServer(); + + @Override + protected JndiRegistry createRegistry() throws Exception { + JndiRegistry registry = super.createRegistry(); + registry.bind("kubernetesClient", server.getClient()); + return registry; + } + @Test public void listTest() throws Exception { - if (ObjectHelper.isEmpty(authToken)) { - return; - } - List<Service> result = template.requestBody("direct:list", "", - List.class); - - boolean fabric8Exists = false; - - Iterator<Service> it = result.iterator(); - while (it.hasNext()) { - Service service = it.next(); - if ("fabric8".equalsIgnoreCase(service.getMetadata().getName())) { - fabric8Exists = true; - } - } + server.expect().withPath("/api/v1/services").andReturn(200, new ServiceListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once(); + List<Service> result = template.requestBody("direct:list", "", List.class); - assertTrue(fabric8Exists); + assertEquals(3, result.size()); } @Test public void listByLabelsTest() throws Exception { - if (ObjectHelper.isEmpty(authToken)) { - return; - } + server.expect().withPath("/api/v1/services?labelSelector=" + toUrlEncoded("key1=value1,key2=value2")) + .andReturn(200, new PodListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once(); Exchange ex = template.request("direct:listByLabels", new Processor() { @Override public void process(Exchange exchange) throws Exception { - exchange.getIn().setHeader( - KubernetesConstants.KUBERNETES_NAMESPACE_NAME, - "default"); Map<String, String> labels = new HashMap<String, String>(); - labels.put("component", "elasticsearch"); - exchange.getIn().setHeader( - KubernetesConstants.KUBERNETES_SERVICE_LABELS, labels); + labels.put("key1", "value1"); + labels.put("key2", "value2"); + exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_SERVICE_LABELS, labels); } }); List<Service> result = ex.getOut().getBody(List.class); - - boolean serviceExists = false; - Iterator<Service> it = result.iterator(); - while (it.hasNext()) { - Service service = it.next(); - if ("elasticsearch".equalsIgnoreCase(service.getMetadata() - .getName())) { - serviceExists = true; - } - } - - assertFalse(serviceExists); + assertEquals(3, result.size()); } @Test public void getServiceTest() throws Exception { - if (ObjectHelper.isEmpty(authToken)) { - return; - } + Service se1 = new ServiceBuilder().withNewMetadata().withName("se1").withNamespace("test").and().build(); + + server.expect().withPath("/api/v1/namespaces/test/services/se1").andReturn(200, se1).once(); Exchange ex = template.request("direct:getServices", new Processor() { @Override public void process(Exchange exchange) throws Exception { - exchange.getIn().setHeader( - KubernetesConstants.KUBERNETES_NAMESPACE_NAME, - "default"); - exchange.getIn().setHeader( - KubernetesConstants.KUBERNETES_SERVICE_NAME, - "elasticsearch"); + exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "test"); + exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_SERVICE_NAME, "se1"); } }); Service result = ex.getOut().getBody(Service.class); - assertNull(result); + assertNotNull(result); } @Test public void createAndDeleteService() throws Exception { - if (ObjectHelper.isEmpty(authToken)) { - return; - } - Exchange ex = template.request("direct:createService", new Processor() { - - @Override - public void process(Exchange exchange) throws Exception { - exchange.getIn().setHeader( - KubernetesConstants.KUBERNETES_NAMESPACE_NAME, - "default"); - exchange.getIn().setHeader( - KubernetesConstants.KUBERNETES_SERVICE_NAME, "test"); - Map<String, String> labels = new HashMap<String, String>(); - labels.put("this", "rocks"); - exchange.getIn().setHeader( - KubernetesConstants.KUBERNETES_SERVICE_LABELS, labels); - ServiceSpec serviceSpec = new ServiceSpec(); - List<ServicePort> lsp = new ArrayList<ServicePort>(); - ServicePort sp = new ServicePort(); - sp.setPort(8080); - sp.setTargetPort(new IntOrString(8080)); - sp.setProtocol("TCP"); - lsp.add(sp); - serviceSpec.setPorts(lsp); - Map<String, String> selectorMap = new HashMap<String, String>(); - selectorMap.put("containter", "test"); - serviceSpec.setSelector(selectorMap); - exchange.getIn().setHeader( - KubernetesConstants.KUBERNETES_SERVICE_SPEC, - serviceSpec); - } - }); - - Service serv = ex.getOut().getBody(Service.class); + Service se1 = new ServiceBuilder().withNewMetadata().withName("se1").withNamespace("test").and().build(); - assertEquals(serv.getMetadata().getName(), "test"); + server.expect().withPath("/api/v1/namespaces/test/services/se1").andReturn(200, se1).once(); - ex = template.request("direct:deleteService", new Processor() { + Exchange ex = template.request("direct:deleteService", new Processor() { @Override public void process(Exchange exchange) throws Exception { - exchange.getIn().setHeader( - KubernetesConstants.KUBERNETES_NAMESPACE_NAME, - "default"); - exchange.getIn().setHeader( - KubernetesConstants.KUBERNETES_SERVICE_NAME, "test"); + exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, "test"); + exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_SERVICE_NAME, "se1"); } }); @@ -176,21 +118,10 @@ public class KubernetesServicesProducerTest extends KubernetesTestSupport { return new RouteBuilder() { @Override public void configure() throws Exception { - from("direct:list") - .toF("kubernetes-services://%s?oauthToken=%s&operation=listServices", - host, authToken); - from("direct:listByLabels") - .toF("kubernetes-services://%s?oauthToken=%s&operation=listServicesByLabels", - host, authToken); - from("direct:getServices") - .toF("kubernetes-services://%s?oauthToken=%s&operation=getService", - host, authToken); - from("direct:createService") - .toF("kubernetes-services://%s?oauthToken=%s&operation=createService", - host, authToken); - from("direct:deleteService") - .toF("kubernetes-services://%s?oauthToken=%s&operation=deleteService", - host, authToken); + from("direct:list").to("kubernetes-services:///?kubernetesClient=#kubernetesClient&operation=listServices"); + from("direct:listByLabels").to("kubernetes-services:///?kubernetesClient=#kubernetesClient&operation=listServicesByLabels"); + from("direct:getServices").to("kubernetes-services:///?kubernetesClient=#kubernetesClient&operation=getService"); + from("direct:deleteService").to("kubernetes-services:///?kubernetesClient=#kubernetesClient&operation=deleteService"); } }; }
