CAMEL-11356: Camel-Kubernetes: refactoring tests by using 
Kubernetes-server-mock and Openshift-server-mock - PersistentVolumeClaims tests


Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/c0923bbf
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/c0923bbf
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/c0923bbf

Branch: refs/heads/master
Commit: c0923bbf1c74c1b6e3ae32dd66a0931bdc5d029d
Parents: 994d628
Author: Andrea Cosentino <[email protected]>
Authored: Mon May 29 16:42:09 2017 +0200
Committer: Andrea Cosentino <[email protected]>
Committed: Tue May 30 11:01:11 2017 +0200

----------------------------------------------------------------------
 ...bernetesPersistentVolumesClaimsProducer.java |   7 +-
 ...etesPersistentVolumesClaimsProducerTest.java |   2 +
 ...etesPersistentVolumesClaimsProducerTest.java | 155 +++++--------------
 3 files changed, 44 insertions(+), 120 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/camel/blob/c0923bbf/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsProducer.java
----------------------------------------------------------------------
diff --git 
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsProducer.java
 
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsProducer.java
index 98d18bb..5109b8c 100644
--- 
a/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsProducer.java
+++ 
b/components/camel-kubernetes/src/main/java/org/apache/camel/component/kubernetes/persistent_volumes_claims/KubernetesPersistentVolumesClaimsProducer.java
@@ -23,6 +23,9 @@ import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaimBuilder;
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaimList;
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaimSpec;
+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;
@@ -117,8 +120,8 @@ public class KubernetesPersistentVolumesClaimsProducer 
extends DefaultProducer {
             }
             pvcList = pvcs.list();
         } else {
-            MixedOperation<PersistentVolumeClaim, PersistentVolumeClaimList, 
DoneablePersistentVolumeClaim, 
-            Resource<PersistentVolumeClaim, DoneablePersistentVolumeClaim>> 
pvcs = getEndpoint().getKubernetesClient().persistentVolumeClaims();
+            FilterWatchListMultiDeletable<PersistentVolumeClaim, 
PersistentVolumeClaimList, Boolean, 
+            Watch, Watcher<PersistentVolumeClaim>> pvcs = 
getEndpoint().getKubernetesClient().persistentVolumeClaims().inAnyNamespace();
             for (Map.Entry<String, String> entry : labels.entrySet()) {
                 pvcs.withLabel(entry.getKey(), entry.getValue());
             }

http://git-wip-us.apache.org/repos/asf/camel/blob/c0923bbf/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesPersistentVolumesClaimsProducerTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesPersistentVolumesClaimsProducerTest.java
 
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesPersistentVolumesClaimsProducerTest.java
index 276aed3..f2dcfcd 100644
--- 
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesPersistentVolumesClaimsProducerTest.java
+++ 
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/deprecated/DeprecatedKubernetesPersistentVolumesClaimsProducerTest.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.KubernetesPersistentVolumesClaimsProducerTest;
+import org.junit.Ignore;
 
+@Ignore
 @Deprecated
 public class DeprecatedKubernetesPersistentVolumesClaimsProducerTest extends
         KubernetesPersistentVolumesClaimsProducerTest {

http://git-wip-us.apache.org/repos/asf/camel/blob/c0923bbf/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java
----------------------------------------------------------------------
diff --git 
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java
 
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java
index 6d2d7b1..971773c 100644
--- 
a/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java
+++ 
b/components/camel-kubernetes/src/test/java/org/apache/camel/component/kubernetes/producer/KubernetesPersistentVolumesClaimsProducerTest.java
@@ -16,149 +16,77 @@
  */
 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.ObjectMeta;
 import io.fabric8.kubernetes.api.model.PersistentVolume;
 import io.fabric8.kubernetes.api.model.PersistentVolumeClaim;
-import io.fabric8.kubernetes.api.model.PersistentVolumeClaimSpec;
-import io.fabric8.kubernetes.api.model.Quantity;
-import io.fabric8.kubernetes.api.model.ResourceRequirements;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaimBuilder;
+import io.fabric8.kubernetes.api.model.PersistentVolumeClaimListBuilder;
+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 KubernetesPersistentVolumesClaimsProducerTest extends
-        KubernetesTestSupport {
+public class KubernetesPersistentVolumesClaimsProducerTest 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<PersistentVolumeClaim> result = template.requestBody(
-                "direct:list", "", List.class);
+        
server.expect().withPath("/api/v1/namespaces/test/persistentvolumeclaims")
+            .andReturn(200, new 
PersistentVolumeClaimListBuilder().addNewItem().and().addNewItem().and().addNewItem().and().build()).once();
+        List<PersistentVolumeClaim> result = 
template.requestBody("direct:list", "", List.class);
 
-        assertTrue(result.size() == 0);
+        assertEquals(3, result.size());
     }
 
     @Test
     public void listByLabelsTest() throws Exception {
-        if (ObjectHelper.isEmpty(authToken)) {
-            return;
-        }
+        
server.expect().withPath("/api/v1/namespaces/test/persistentvolumeclaims?labelSelector="
 + toUrlEncoded("key1=value1,key2=value2"))
+            .andReturn(200, new 
PersistentVolumeClaimListBuilder().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");
+                
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, 
"test");
                 Map<String, String> labels = new HashMap<String, String>();
-                labels.put("component", "elasticsearch");
-                exchange.getIn()
-                        .setHeader(
-                                
KubernetesConstants.KUBERNETES_PERSISTENT_VOLUMES_CLAIMS_LABELS,
-                                labels);
+                labels.put("key1", "value1");
+                labels.put("key2", "value2");
+                
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_PERSISTENT_VOLUMES_CLAIMS_LABELS,
 labels);
             }
         });
 
         List<PersistentVolume> result = ex.getOut().getBody(List.class);
+        assertEquals(3, result.size());
     }
 
     @Test
     public void createListAndDeletePersistentVolumeClaim() throws Exception {
-        if (ObjectHelper.isEmpty(authToken)) {
-            return;
-        }
-        Exchange ex = template.request("direct:create", new Processor() {
-            @Override
-            public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(
-                        KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
-                        "default");
-                exchange.getIn()
-                        .setHeader(
-                                
KubernetesConstants.KUBERNETES_PERSISTENT_VOLUME_CLAIM_NAME,
-                                "test");
-                Map<String, String> labels = new HashMap<String, String>();
-                labels.put("this", "rocks");
-                exchange.getIn()
-                        .setHeader(
-                                
KubernetesConstants.KUBERNETES_PERSISTENT_VOLUMES_CLAIMS_LABELS,
-                                labels);
-                PersistentVolumeClaimSpec pvcSpec = new 
PersistentVolumeClaimSpec();
-                ResourceRequirements rr = new ResourceRequirements();
-                Map<String, Quantity> mp = new HashMap<String, Quantity>();
-                mp.put("storage", new Quantity("100"));
-                rr.setLimits(mp);
-                Map<String, Quantity> req = new HashMap<String, Quantity>();
-                req.put("storage", new Quantity("100"));
-                rr.setRequests(req);
-                pvcSpec.setResources(rr);
-                pvcSpec.setVolumeName("vol001");
-                List<String> access = new ArrayList<String>();
-                access.add("ReadWriteOnce");
-                pvcSpec.setAccessModes(access);
-                exchange.getIn()
-                        .setHeader(
-                                
KubernetesConstants.KUBERNETES_PERSISTENT_VOLUME_CLAIM_SPEC,
-                                pvcSpec);
-            }
-        });
-
-        PersistentVolumeClaim pvc = ex.getOut().getBody(
-                PersistentVolumeClaim.class);
-
-        assertEquals(pvc.getMetadata().getName(), "test");
-
-        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("this", "rocks");
-                exchange.getIn()
-                        .setHeader(
-                                
KubernetesConstants.KUBERNETES_PERSISTENT_VOLUMES_CLAIMS_LABELS,
-                                labels);
-            }
-        });
-
-        List<PersistentVolumeClaim> result = ex.getOut().getBody(List.class);
-
-        boolean pvcExists = false;
-        Iterator<PersistentVolumeClaim> it = result.iterator();
-        while (it.hasNext()) {
-            PersistentVolumeClaim pvcLocal = it.next();
-            if ("test".equalsIgnoreCase(pvcLocal.getMetadata().getName())) {
-                pvcExists = true;
-            }
-        }
-
-        assertTrue(pvcExists);
-
-        ex = template.request("direct:delete", new Processor() {
+        ObjectMeta meta = new ObjectMeta();
+        meta.setName("pvc1");
+        
server.expect().withPath("/api/v1/namespaces/test/persistentvolumeclaims/pvc1").andReturn(200,
 new PersistentVolumeClaimBuilder().withMetadata(meta).build()).once();
+        Exchange ex = template.request("direct:delete", new Processor() {
 
             @Override
             public void process(Exchange exchange) throws Exception {
-                exchange.getIn().setHeader(
-                        KubernetesConstants.KUBERNETES_NAMESPACE_NAME,
-                        "default");
-                exchange.getIn()
-                        .setHeader(
-                                
KubernetesConstants.KUBERNETES_PERSISTENT_VOLUME_CLAIM_NAME,
-                                "test");
+                
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_NAMESPACE_NAME, 
"test");
+                
exchange.getIn().setHeader(KubernetesConstants.KUBERNETES_PERSISTENT_VOLUME_CLAIM_NAME,
 "pvc1");
             }
         });
 
@@ -172,18 +100,9 @@ public class KubernetesPersistentVolumesClaimsProducerTest 
extends
         return new RouteBuilder() {
             @Override
             public void configure() throws Exception {
-                from("direct:list")
-                        
.toF("kubernetes-persistent-volumes-claims://%s?oauthToken=%s&operation=listPersistentVolumesClaims",
-                                host, authToken);
-                from("direct:listByLabels")
-                        
.toF("kubernetes-persistent-volumes-claims://%s?oauthToken=%s&operation=listPersistentVolumesClaimsByLabels",
-                                host, authToken);
-                from("direct:create")
-                        
.toF("kubernetes-persistent-volumes-claims://%s?oauthToken=%s&operation=createPersistentVolumeClaim",
-                                host, authToken);
-                from("direct:delete")
-                        
.toF("kubernetes-persistent-volumes-claims://%s?oauthToken=%s&operation=deletePersistentVolumeClaim",
-                                host, authToken);
+                
from("direct:list").to("kubernetes-persistent-volumes-claims:///?kubernetesClient=#kubernetesClient&operation=listPersistentVolumesClaims");
+                
from("direct:listByLabels").to("kubernetes-persistent-volumes-claims:///?kubernetesClient=#kubernetesClient&operation=listPersistentVolumesClaimsByLabels");
+                
from("direct:delete").to("kubernetes-persistent-volumes-claims:///?kubernetesClient=#kubernetesClient&operation=deletePersistentVolumeClaim");
             }
         };
     }

Reply via email to