Add test cases for extend client inside kubernetes cluster (#503)

Author: tmiddlet2666

api/v1/coherenceresourcespec_types.go

@@ -501,6 +501,9 @@ func (in *CoherenceResourceSpec) FindPortServiceNames(deployment *Coherence) map
 				m[port.Name] = s
 			}
 		}
+
+		// manually add the wka port which will be <resource-name>-wka
+		m["wka"] = deployment.Name + "-wka"
 	}
 	return m
 }

controllers/statefulset/probe.go

@@ -273,7 +273,7 @@ func (in *CoherenceProbe) ProbeUsingHTTP(pod corev1.Pod, handler *coh.Probe) (bo
 	p := httpprobe.New()
 	result, s, err := p.Probe(u, header, handler.GetTimeout())
 
-	log.Info(fmt.Sprintf("HTTP Probe URL: %s result=%s msg=%s error=%s", u.String(), result, s, err))
+	log.Info(fmt.Sprintf("HTTP Probe URL: %s result=%v msg=%s error=%s", u.String(), result, s, err))
 
 	return result == probe.Success, err
 }

java/operator-test-client/src/main/resources/test-cache-config-ns.xml

@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<!--
+  ~ Copyright (c) 2021, Oracle and/or its affiliates.
+  ~ Licensed under the Universal Permissive License v 1.0 as shown at
+  ~ http://oss.oracle.com/licenses/upl.
+  -->
+<cache-config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xmlns="http://xmlns.oracle.com/coherence/coherence-cache-config"
+        xsi:schemaLocation="http://xmlns.oracle.com/coherence/coherence-cache-config coherence-cache-config.xsd">
+
+  <caching-scheme-mapping>
+    <cache-mapping>
+      <cache-name>*</cache-name>
+      <scheme-name>remote-scheme</scheme-name>
+    </cache-mapping>
+  </caching-scheme-mapping>
+
+  <caching-schemes>
+    <remote-cache-scheme>
+      <scheme-name>remote-scheme</scheme-name>
+      <service-name>RemoteCache</service-name>
+      <proxy-service-name>Proxy</proxy-service-name>
+      <initiator-config>
+        <tcp-initiator>
+          <name-service-addresses>
+            <socket-address>
+              <address system-property="coherence.extend.address">127.0.0.1</address>
+              <port system-property="coherence.extend.port">20000</port>
+            </socket-address>
+          </name-service-addresses>
+        </tcp-initiator>
+      </initiator-config>
+    </remote-cache-scheme>
+  </caching-schemes>
+</cache-config>

java/operator-test-client/src/main/resources/test-cache-config.xml

@@ -6,7 +6,6 @@
   -->
 <cache-config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
         xmlns="http://xmlns.oracle.com/coherence/coherence-cache-config"
-        xmlns:xi="http://www.w3.org/2001/XInclude"
         xsi:schemaLocation="http://xmlns.oracle.com/coherence/coherence-cache-config coherence-cache-config.xsd">
 
   <caching-scheme-mapping>
@@ -17,7 +16,6 @@
   </caching-scheme-mapping>
 
   <caching-schemes>
-    <xi:include href="remote-scheme.xml" parse="xml"/>
     <remote-cache-scheme>
       <scheme-name>remote-scheme</scheme-name>
       <service-name>RemoteCache</service-name>

test/e2e/clients/client_test.go

@@ -26,8 +26,10 @@ func TestSimpleClients(t *testing.T) {
 
 	// Create all the child test cases.
 	testCases := []ClientTestCase{
-		// Simple Extend test
-		{ClientType: ClientTypeExtend, Name: "ExtendInternal", Cluster: cluster, Test: simpleClientTest},
+		// Simple Extend test direct connection
+		{ClientType: ClientTypeExtend, Name: "ExtendInternalDirect", Cluster: cluster, Test: simpleClientTest},
+		//Simple Extend test name-service connection
+		{ClientType: ClientTypeExtend, Name: "ExtendInternalNS", Cluster: cluster, Test: simpleClientTest, CacheConfig: "test-cache-config-ns.xml"},
 		// Simple gRPC test
 		{ClientType: ClientTypeGrpc, Name: "GrpcInternal", Cluster: cluster, Test: simpleClientTest},
 	}
@@ -54,11 +56,11 @@ func simpleClientTest(t *testing.T, tc ClientTestCase) {
 
 	// ensure we delete the Job when the test finishes
 	t.Cleanup(func() {
-		_ = client.Delete(testContext.Context, jobName, metav1.DeleteOptions{})
+		_ = helper.DeleteJob(testContext, ns, jobName)
 	})
 
 	// ensure there is no Job left from a previous test
-	_ = client.Delete(testContext.Context, jobName, metav1.DeleteOptions{})
+	_ = helper.DeleteJob(testContext, ns, jobName)
 
 	// Create the Job to run the client
 	job := CreateClientJob(ns, jobName, tc)

test/e2e/clients/client_test_helpers.go

@@ -7,6 +7,7 @@
 package clients
 
 import (
+	v1 "github.com/oracle/coherence-operator/api/v1"
 	"github.com/oracle/coherence-operator/test/e2e/helper"
 	batchv1 "k8s.io/api/batch/v1"
 	corev1 "k8s.io/api/core/v1"
@@ -21,6 +22,7 @@ type CoherenceCluster struct {
 	Services       map[string]string
 	ServiceFQDNs   map[string]string
 	ServiceIngress map[string][]corev1.LoadBalancerIngress
+	Coherence      v1.Coherence
 }
 
 func DeployTestCluster(testContext helper.TestContext, t *testing.T, yaml string) (*CoherenceCluster, error) {
@@ -49,6 +51,7 @@ func DeployTestCluster(testContext helper.TestContext, t *testing.T, yaml string
 		Services:       svcNames,
 		ServiceFQDNs:   svcFQDN,
 		ServiceIngress: ingress,
+		Coherence:      cluster,
 	}, nil
 }
 
@@ -74,13 +77,34 @@ func CreateClientJob(ns, name string, tc ClientTestCase) *batchv1.Job {
 			Name:  "COHERENCE_DISTRIBUTED_LOCALSTORAGE",
 			Value: "false",
 		},
+		{
+			Name:  "COHERENCE_CLUSTER",
+			Value: tc.Cluster.Coherence.GetCoherenceClusterName(),
+		},
 	}
 
 	switch tc.ClientType {
 	case ClientTypeExtend:
+		var extendAddress string
+		var extendPort string
+
+		if tc.Name == "ExtendInternalNS" {
+			// Use name service
+			extendAddress = tc.Cluster.ServiceFQDNs["wka"]
+			extendPort = "7574"
+		} else {
+			// use direct socket address
+			extendAddress = tc.Cluster.ServiceFQDNs["extend"]
+			extendPort = "20000"
+		}
+
 		envVars = append(envVars, corev1.EnvVar{
 			Name:  "COHERENCE_EXTEND_ADDRESS",
-			Value: tc.Cluster.ServiceFQDNs["extend"],
+			Value: extendAddress,
+		})
+		envVars = append(envVars, corev1.EnvVar{
+			Name:  "COHERENCE_EXTEND_PORT",
+			Value: extendPort,
 		})
 	case ClientTypeGrpc:
 		envVars = append(envVars, corev1.EnvVar{

test/e2e/helper/e2e-helpers.go

@@ -497,6 +497,23 @@ func WaitForOperatorPods(ctx TestContext, namespace string, retryInterval, timeo
 	return WaitForPodsWithSelector(ctx, namespace, operatorPodSelector, retryInterval, timeout)
 }
 
+func DeleteJob(ctx TestContext, namespace, jobName string) error {
+	client := ctx.KubeClient.BatchV1().Jobs(namespace)
+	if err := client.Delete(ctx.Context, jobName, metav1.DeleteOptions{}); err != nil && !errors.IsNotFound(err) {
+		return err
+	}
+	pods, err := ListPodsWithLabelSelector(ctx, namespace, "job-name=" + jobName)
+	if err != nil {
+		return err
+	}
+
+	for i := range pods {
+		_ = ctx.Client.Delete(ctx.Context, &pods[i])
+	}
+
+	return nil
+}
+
 // WaitForPodsWithSelector waits for a Coherence Operator Pods to be created.
 func WaitForPodsWithSelector(ctx TestContext, namespace, selector string, retryInterval, timeout time.Duration) ([]corev1.Pod, error) {
 	var pods []corev1.Pod