Skip to content

Commit 420d3c8

Browse files
russgoldrussgold
committed
Bring up servers in a unit test
1 parent b705aca commit 420d3c8

File tree

10 files changed

+316
-58
lines changed

10 files changed

+316
-58
lines changed

‎operator/src/main/java/oracle/kubernetes/operator/DomainProcessorDelegate.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@
44

55
package oracle.kubernetes.operator;
66

7-
import java.util.concurrent.ScheduledExecutorService;
7+
import java.util.concurrent.ScheduledFuture;
8+
import java.util.concurrent.TimeUnit;
89
import oracle.kubernetes.operator.helpers.KubernetesVersion;
910
import oracle.kubernetes.operator.work.FiberGate;
1011
import oracle.kubernetes.operator.work.Step;
@@ -16,13 +17,12 @@ public interface DomainProcessorDelegate {
1617

1718
boolean isNamespaceRunning(String namespace);
1819

19-
String getPrincipal();
20-
2120
KubernetesVersion getVersion();
2221

2322
FiberGate createFiberGate();
2423

2524
void runSteps(Step firstStep);
2625

27-
ScheduledExecutorService getExecutor();
26+
ScheduledFuture<?> scheduleWithFixedDelay(
27+
Runnable command, long initialDelay, long delay, TimeUnit unit);
2828
}

‎operator/src/main/java/oracle/kubernetes/operator/DomainProcessorImpl.java‎

Lines changed: 14 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -365,27 +365,23 @@ public void onCompletion(Packet packet) {
365365
registerStatusUpdater(
366366
info.getNamespace(),
367367
info.getDomainUID(),
368-
delegate
369-
.getExecutor()
370-
.scheduleWithFixedDelay(
371-
r,
372-
main.eventualLongDelay,
373-
main.eventualLongDelay,
374-
TimeUnit.SECONDS));
368+
delegate.scheduleWithFixedDelay(
369+
r,
370+
main.eventualLongDelay,
371+
main.eventualLongDelay,
372+
TimeUnit.SECONDS));
375373
}
376374
} else {
377375
// reset to trying after shorter delay because of changed status
378376
unchangedCount.set(0);
379377
registerStatusUpdater(
380378
info.getNamespace(),
381379
info.getDomainUID(),
382-
delegate
383-
.getExecutor()
384-
.scheduleWithFixedDelay(
385-
r,
386-
main.initialShortDelay,
387-
main.initialShortDelay,
388-
TimeUnit.SECONDS));
380+
delegate.scheduleWithFixedDelay(
381+
r,
382+
main.initialShortDelay,
383+
main.initialShortDelay,
384+
TimeUnit.SECONDS));
389385
}
390386
}
391387

@@ -397,13 +393,8 @@ public void onThrowable(Packet packet, Throwable throwable) {
397393
registerStatusUpdater(
398394
info.getNamespace(),
399395
info.getDomainUID(),
400-
delegate
401-
.getExecutor()
402-
.scheduleWithFixedDelay(
403-
r,
404-
main.initialShortDelay,
405-
main.initialShortDelay,
406-
TimeUnit.SECONDS));
396+
delegate.scheduleWithFixedDelay(
397+
r, main.initialShortDelay, main.initialShortDelay, TimeUnit.SECONDS));
407398
}
408399
});
409400
} catch (Throwable t) {
@@ -416,10 +407,8 @@ public void onThrowable(Packet packet, Throwable throwable) {
416407
registerStatusUpdater(
417408
info.getNamespace(),
418409
info.getDomainUID(),
419-
delegate
420-
.getExecutor()
421-
.scheduleWithFixedDelay(
422-
command, main.initialShortDelay, main.initialShortDelay, TimeUnit.SECONDS));
410+
delegate.scheduleWithFixedDelay(
411+
command, main.initialShortDelay, main.initialShortDelay, TimeUnit.SECONDS));
423412
}
424413

425414
public void makeRightDomainPresence(
@@ -726,7 +715,6 @@ public NextAction apply(Packet packet) {
726715
.put(
727716
ProcessingConstants.DOMAIN_COMPONENT_NAME,
728717
Component.createFor(info, delegate.getVersion(), PodAwaiterStepFactory.class, pw));
729-
packet.put(ProcessingConstants.PRINCIPAL, delegate.getPrincipal());
730718
return doNext(packet);
731719
}
732720
}
@@ -770,7 +758,6 @@ public NextAction apply(Packet packet) {
770758
.put(
771759
ProcessingConstants.DOMAIN_COMPONENT_NAME,
772760
Component.createFor(info, delegate.getVersion(), PodAwaiterStepFactory.class, pw));
773-
packet.put(ProcessingConstants.PRINCIPAL, delegate.getPrincipal());
774761
return doNext(packet);
775762
}
776763
}

‎operator/src/main/java/oracle/kubernetes/operator/Main.java‎

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
import java.util.TreeSet;
2626
import java.util.concurrent.ConcurrentHashMap;
2727
import java.util.concurrent.ScheduledExecutorService;
28+
import java.util.concurrent.ScheduledFuture;
2829
import java.util.concurrent.Semaphore;
2930
import java.util.concurrent.ThreadFactory;
3031
import java.util.concurrent.TimeUnit;
@@ -717,11 +718,6 @@ public boolean isNamespaceRunning(String namespace) {
717718
return !isNamespaceStopping.get(namespace).get();
718719
}
719720

720-
@Override
721-
public String getPrincipal() {
722-
return principal;
723-
}
724-
725721
@Override
726722
public KubernetesVersion getVersion() {
727723
return version;
@@ -738,8 +734,9 @@ public void runSteps(Step firstStep) {
738734
}
739735

740736
@Override
741-
public ScheduledExecutorService getExecutor() {
742-
return Main.engine.getExecutor();
737+
public ScheduledFuture<?> scheduleWithFixedDelay(
738+
Runnable command, long initialDelay, long delay, TimeUnit unit) {
739+
return Main.engine.getExecutor().scheduleWithFixedDelay(command, initialDelay, delay, unit);
743740
}
744741
}
745742
}

‎operator/src/main/java/oracle/kubernetes/operator/helpers/DomainPresenceInfo.java‎

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66

77
import io.kubernetes.client.models.V1EnvVar;
88
import io.kubernetes.client.models.V1ObjectMeta;
9+
import io.kubernetes.client.models.V1Pod;
910
import io.kubernetes.client.models.V1Service;
1011
import java.util.Collection;
1112
import java.util.Collections;
@@ -75,6 +76,10 @@ public V1Service getServerService(String serverName) {
7576
return getSko(serverName).getService().get();
7677
}
7778

79+
public V1Pod getServerPod(String serverName) {
80+
return getSko(serverName).getPod().get();
81+
}
82+
7883
void setServerServiceFromEvent(String serverName, V1Service event) {
7984
getSko(serverName).getService().accumulateAndGet(event, this::getNewerService);
8085
}
@@ -102,7 +107,7 @@ void removeClusterService(String clusterName) {
102107
clusters.remove(clusterName);
103108
}
104109

105-
V1Service getClusterService(String clusterName) {
110+
public V1Service getClusterService(String clusterName) {
106111
return clusters.get(clusterName);
107112
}
108113

‎operator/src/main/java/oracle/kubernetes/operator/helpers/KubernetesVersion.java‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
/** Major and minor version of Kubernetes API Server. */
1111
public class KubernetesVersion {
1212
static KubernetesVersion UNREADABLE = new KubernetesVersion(0, 0);
13+
public static final KubernetesVersion TEST_VERSION = new KubernetesVersion(1, 10);
1314
private static final String[] MINIMUM_K8S_VERSIONS = {"1.10.11", "1.11.5", "1.12.3"};
1415

1516
private final int major;

‎operator/src/main/java/oracle/kubernetes/operator/helpers/LegalNames.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public static String toClusterServiceName(String domainUID, String clusterName)
2828
return toDNS1123LegalName(String.format(CLUSTER_SERVICE_PATTERN, domainUID, clusterName));
2929
}
3030

31-
static String toJobIntrospectorName(String domainUID) {
31+
public static String toJobIntrospectorName(String domainUID) {
3232
return toDNS1123LegalName(String.format(DOMAIN_INTROSPECTOR_JOB_PATTERN, domainUID));
3333
}
3434

0 commit comments

Comments
 (0)