Merge remote-tracking branch 'origin/master' into simplify-ingress

Author: rjeberhard

pom.xml

@@ -496,6 +496,13 @@
             <artifactId>junit</artifactId>
             <version>${junit-version}</version>
         </dependency>
+        <dependency>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-exec</artifactId>
+            <version>1.3</version>
+            <scope>test</scope>
+        </dependency>
+
     </dependencies>
 
     <properties>

src/test/java/oracle/kubernetes/TestUtils.java

@@ -0,0 +1,59 @@
+package oracle.kubernetes;
+
+import org.apache.commons.exec.CommandLine;
+import org.apache.commons.exec.DefaultExecutor;
+
+import java.io.ByteArrayOutputStream;
+import java.io.IOException;
+import java.io.PrintStream;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.logging.ConsoleHandler;
+import java.util.logging.Handler;
+import java.util.logging.Logger;
+
+public class TestUtils {
+  private static Boolean kubernetesStatus;
+
+  /**
+   * Returns true if Kubernetes-dependent tests should run
+   */
+  public static boolean isKubernetesAvailable() { // assume it is available when running on Linux
+    if (kubernetesStatus == null)
+      kubernetesStatus = checkKubernetes();
+    return kubernetesStatus;
+  }
+
+    private static Boolean checkKubernetes() {
+      PrintStream savedOut = System.out;
+      System.setOut(new PrintStream(new ByteArrayOutputStream()));
+      try {
+        CommandLine cmdLine = CommandLine.parse("kubectl cluster-info");
+        DefaultExecutor executor = new DefaultExecutor();
+        executor.execute(cmdLine);
+        return true;
+      } catch (IOException e) {
+        return false;
+      } finally {
+        System.setOut(savedOut);
+      }
+    }
+
+  public static List<Handler> removeConsoleHandlers(Logger logger) {
+    List<Handler> savedHandlers = new ArrayList<>();
+    for (Handler handler : logger.getHandlers()) {
+      if (handler instanceof ConsoleHandler) {
+        savedHandlers.add(handler);
+      }
+    }
+    for (Handler handler : savedHandlers)
+      logger.removeHandler(handler);
+    return savedHandlers;
+  }
+
+  public static void restoreConsoleHandlers(Logger logger, List<Handler> savedHandlers) {
+    for (Handler handler : savedHandlers) {
+      logger.addHandler(handler);
+    }
+  }
+}

…ernetes/custom/TestCustomObjectApis.java …ernetes/custom/CustomObjectApisTest.javasrc/test/java/oracle/kubernetes/custom/TestCustomObjectApis.java renamed to src/test/java/oracle/kubernetes/custom/CustomObjectApisTest.java src/test/java/oracle/kubernetes/custom/TestCustomObjectApis.java renamed to src/test/java/oracle/kubernetes/custom/CustomObjectApisTest.java

@@ -12,26 +12,32 @@
 import io.kubernetes.client.models.V1beta1CustomResourceDefinitionSpec;
 import io.kubernetes.client.util.Watch;
 import io.kubernetes.client.util.Watch.Response;
+import oracle.kubernetes.TestUtils;
 import oracle.kubernetes.operator.helpers.ClientHelper;
 import oracle.kubernetes.operator.helpers.ClientHolder;
 import oracle.kubernetes.operator.logging.LoggingFacade;
 import oracle.kubernetes.operator.logging.LoggingFactory;
 import oracle.kubernetes.operator.logging.MessageKeys;
 import oracle.kubernetes.operator.watcher.Watcher;
 import oracle.kubernetes.operator.watcher.Watching;
-
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.logging.Handler;
 
 /**
  * Test CustomResourceDefinitions and custom objects
  */
-public class TestCustomObjectApis {
+@Ignore("Ignore - sometimes runs indefinitely")
+public class CustomObjectApisTest {
 
   // Parameters for custom resources
   static final String NAMESPACE = "default";
@@ -44,6 +50,17 @@ public class TestCustomObjectApis {
   private static final LoggingFacade LOGGER = LoggingFactory.getLogger("Operator", "Operator");
   private AtomicBoolean finished = new AtomicBoolean(false);
   private int timeoutLoop = 0;
+  private List<Handler> savedHandlers;
+
+  @Before
+  public void setUp() throws Exception {
+    savedHandlers = TestUtils.removeConsoleHandlers(LOGGER.getUnderlyingLogger());
+  }
+
+  @After
+  public void tearDown() throws Exception {
+    TestUtils.restoreConsoleHandlers(LOGGER.getUnderlyingLogger(), savedHandlers);
+  }
 
   @Test
   public void testCustomResourceWatches() throws Exception {
@@ -67,7 +84,6 @@ public void testCustomResourceWatches() throws Exception {
       e.printStackTrace();
       LOGGER.info(MessageKeys.EXCEPTION, e);
     } finally {
-      System.out.println("End of this test");
       ClientHelper.getInstance().recycle(client);
     }
   }
@@ -167,7 +183,6 @@ public Watch initiateWatch(Object context, String resourceVersion) throws ApiExc
 
       private void formatTheObject(String type, Object object) {
         TestDomain dom = (TestDomain) object;
-        System.out.println(">>>>> " + type + " " + dom.toString());
       }
 
       @Override

…rnetes/custom/TestDomainListWatcher.java …kubernetes/custom/DomainWatcherTest.javasrc/test/java/oracle/kubernetes/custom/TestDomainListWatcher.java renamed to src/test/java/oracle/kubernetes/custom/DomainWatcherTest.java src/test/java/oracle/kubernetes/custom/TestDomainListWatcher.java renamed to src/test/java/oracle/kubernetes/custom/DomainWatcherTest.java

@@ -1,6 +1,7 @@
 /* Copyright (c) 2017, Oracle and/or its affiliates. All rights reserved. */
 package oracle.kubernetes.custom;
 
+import io.kubernetes.client.ApiException;
 import io.kubernetes.client.models.V1DeleteOptions;
 import io.kubernetes.client.models.V1ObjectMeta;
 import io.kubernetes.client.models.V1Status;
@@ -14,23 +15,22 @@
 import oracle.kubernetes.operator.helpers.ClientHelper;
 import oracle.kubernetes.operator.helpers.ClientHolder;
 import oracle.kubernetes.operator.watcher.WatchingEventDestination;
-import org.junit.After;
-import org.junit.Assume;
-import org.junit.Before;
-import org.junit.Test;
+import org.junit.*;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.UUID;
 import java.util.concurrent.atomic.AtomicBoolean;
 
+import static oracle.kubernetes.TestUtils.isKubernetesAvailable;
 import static org.junit.Assert.fail;
 
 /**
  * This test class verifies that watch events are received for custom resource
  * operations.
  */
-public class TestDomainListWatcher implements WatchingEventDestination<Domain> {
+@Ignore
+public class DomainWatcherTest implements WatchingEventDestination<Domain> {
 
   private static final String NAMESPACE = "default";
   private static final String NAME = "domains.weblogic.oracle";
@@ -46,7 +46,7 @@ public class TestDomainListWatcher implements WatchingEventDestination<Domain> {
   private boolean crdCreatedHere = false;
 
   @Before
-  public void beforeTest() {
+  public void beforeTest() throws ApiException {
     // Create the Domain definition if it doesn't exist.
     if (isKubernetesAvailable()) createWeblogicCRD();
   }
@@ -62,7 +62,7 @@ public void afterTest() {
    * they are all reported.
    */
   @Test
-  public void testDomainListWatcher() {
+  public void testDomainListWatcher() throws ApiException {
     Assume.assumeTrue(isKubernetesAvailable());
     AtomicBoolean isStopping = new AtomicBoolean(false);
     DomainWatcher dlw = DomainWatcher.create("default", "", this, isStopping);
@@ -88,7 +88,6 @@ public void testDomainListWatcher() {
     for (int count = 30; count > 0; count--) {
       synchronized (feedback) {
         if (feedback.isEmpty()) {
-          System.out.println("Processed all events successfully, shutting down");
           isStopping.set(true);
           return;
         }
@@ -105,10 +104,6 @@ public void testDomainListWatcher() {
     fail("Not all watch events were received for created objects");
   }
 
-  private boolean isKubernetesAvailable() { // assume it is available when running on Linux
-    return System.getProperty("os.name").toLowerCase().contains("nix");
-  }
-
   // This override intercepts all watch events whioch would have
   // normally sent to the operator for processing.
   @Override
@@ -136,7 +131,7 @@ private void sleep(long ms) {
   /**
    * Create the weblogic-operator custom resource
    */
-  private void createWeblogicCRD() {
+  private void createWeblogicCRD() throws ApiException {
 
     ClientHolder clientHolder = ClientHelper.getInstance().take();
 
@@ -202,7 +197,7 @@ private void deleteWeblogicCRD() {
     System.out.println("Deleted CRD:" + NAME);
   }
 
-  private void createCustomResource(ClientHolder clientHolder, String name, boolean tag) {
+  private void createCustomResource(ClientHolder clientHolder, String name, boolean tag) throws ApiException {
 
     Domain domain = new Domain();
     domain.setApiVersion(GROUP + "/" + VERSION);
@@ -218,8 +213,7 @@ private void createCustomResource(ClientHolder clientHolder, String name, boolea
     domain.setSpec(spec);
 
     String token = "ADDED." + name;
-    try {
-      if ( tag ) {  
+      if ( tag ) {
         System.out.println("Creating " + token);
         synchronized (feedback) {
            feedback.add(token);
@@ -233,10 +227,6 @@ private void createCustomResource(ClientHolder clientHolder, String name, boolea
           , PLURAL
           , domain
           , "false");
-    } catch (Exception ex) {
-      fail("Failed to create custom resource: " + name
-          + ", Error: " + ex);
-    }
   }
 
   private void deleteCustomResource(ClientHolder client, String name, boolean tag) {

src/test/java/oracle/kubernetes/operator/ExternalChannelTest.java

@@ -4,18 +4,23 @@
 package oracle.kubernetes.operator;
 
 import io.kubernetes.client.models.V1ObjectMeta;
+import oracle.kubernetes.TestUtils;
 import oracle.kubernetes.operator.domain.model.oracle.kubernetes.weblogic.domain.v1.Domain;
 import oracle.kubernetes.operator.domain.model.oracle.kubernetes.weblogic.domain.v1.DomainSpec;
+import oracle.kubernetes.operator.logging.LoggingFactory;
 import oracle.kubernetes.operator.wlsconfig.NetworkAccessPoint;
 import oracle.kubernetes.operator.wlsconfig.WlsDomainConfig;
 import oracle.kubernetes.operator.wlsconfig.WlsServerConfig;
+import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
 
 import java.lang.reflect.Field;
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
+import java.util.logging.Handler;
+import java.util.logging.Logger;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
@@ -61,6 +66,19 @@ public class ExternalChannelTest {
            "    }" +
            "]}}";
 
+   private static final Logger UNDERLYING_LOGGER = LoggingFactory.getLogger("Operator", "Operator").getUnderlyingLogger();
+   private List<Handler> savedhandlers;
+
+   @Before
+   public void disableConsoleLogging() {
+      savedhandlers = TestUtils.removeConsoleHandlers(UNDERLYING_LOGGER);
+   }
+
+   @After
+   public void restoreConsoleLogging() {
+      TestUtils.restoreConsoleHandlers(UNDERLYING_LOGGER, savedhandlers);
+   }
+
    @Before
    public void setupConstants() throws NoSuchFieldException {
 

src/test/java/oracle/kubernetes/operator/HealthCheckHelperTest.java

@@ -5,6 +5,7 @@
 import io.kubernetes.client.ApiException;
 import io.kubernetes.client.models.V1Namespace;
 import io.kubernetes.client.models.V1ObjectMeta;
+import oracle.kubernetes.TestUtils;
 import oracle.kubernetes.operator.helpers.ClientHelper;
 import oracle.kubernetes.operator.helpers.ClientHolder;
 import oracle.kubernetes.operator.helpers.HealthCheckHelper;
@@ -18,10 +19,10 @@
 import org.junit.Test;
 
 import java.io.ByteArrayOutputStream;
+import java.util.ArrayList;
 import java.util.Collections;
-import java.util.logging.Handler;
-import java.util.logging.SimpleFormatter;
-import java.util.logging.StreamHandler;
+import java.util.List;
+import java.util.logging.*;
 
 public class HealthCheckHelperTest {
 
@@ -35,12 +36,14 @@ public class HealthCheckHelperTest {
   private static final LoggingFacade LOGGER = LoggingFactory.getLogger("Operator", "Operator");
   private static ByteArrayOutputStream bos = new ByteArrayOutputStream();
   private static Handler hdlr = new StreamHandler(bos, new SimpleFormatter());
+  private List<Handler> savedHandlers = new ArrayList<>();
 
   @Before
   public void setUp() throws Exception {
+    savedHandlers = TestUtils.removeConsoleHandlers(LOGGER.getUnderlyingLogger());
     LOGGER.getUnderlyingLogger().addHandler(hdlr);
 
-    if (!isKubernetesAvailable()) return;
+    if (!TestUtils.isKubernetesAvailable()) return;
 
     ClientHolder client = ClientHelper.getInstance().take();
     try {
@@ -56,7 +59,7 @@ public void setUp() throws Exception {
 
   @After
   public void tearDown() throws Exception {
-
+    TestUtils.restoreConsoleHandlers(LOGGER.getUnderlyingLogger(), savedHandlers);
     LOGGER.getUnderlyingLogger().removeHandler(hdlr);
 
     // Delete anything we created
@@ -97,7 +100,7 @@ public void testUnitTestNamespace() throws Exception {
 
   @Test
   public void testAccountNoPrivs() throws Exception {
-    Assume.assumeTrue(isKubernetesAvailable());
+    Assume.assumeTrue(TestUtils.isKubernetesAvailable());
     unitHealthCheckHelper.performSecurityChecks("unit-test-svc-account-no-privs");
     hdlr.flush();
     String logOutput = bos.toString();
@@ -107,10 +110,6 @@ public void testAccountNoPrivs() throws Exception {
     bos.reset();
   }
 
-  private boolean isKubernetesAvailable() { // assume it is available whenever running on linux
-    return System.getProperty("os.name").toLowerCase().contains("nix");
-  }
-
   // Create a named namespace
   private V1Namespace createNamespace(ClientHolder client, String name) throws Exception {