Merge pull request #631 from oracle/fix-build

Fix build

Author: rjeberhard

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

@@ -990,6 +990,7 @@ private static Step[] bringAdminServerUpSteps(DomainPresenceInfo info, Step next
     resources.add(PodHelper.createAdminPodStep(null));
     resources.add(new BeforeAdminServiceStep(null));
 
+    Domain dom = info.getDomain();
     if (dom.getSpec().getAdminServer().getAdminService() != null) {
       resources.add(ServiceHelper.createForAdminServiceStep(null));
     }

operator/src/test/java/oracle/kubernetes/operator/helpers/ServiceHelperTest.java

@@ -45,25 +45,23 @@
 import io.kubernetes.client.models.V1ServiceSpec;
 import io.kubernetes.client.models.V1Status;
 import java.net.HttpURLConnection;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.List;
 import java.util.logging.Level;
 import java.util.logging.LogRecord;
 import oracle.kubernetes.TestUtils;
 import oracle.kubernetes.operator.ProcessingConstants;
 import oracle.kubernetes.operator.VersionConstants;
 import oracle.kubernetes.operator.utils.WlsDomainConfigSupport;
 import oracle.kubernetes.operator.wlsconfig.NetworkAccessPoint;
-import oracle.kubernetes.operator.wlsconfig.WlsDomainConfig;
-import oracle.kubernetes.operator.wlsconfig.WlsServerConfig;
 import oracle.kubernetes.operator.work.Step;
 import oracle.kubernetes.operator.work.TerminalStep;
 import oracle.kubernetes.weblogic.domain.AdminServerConfigurator;
 import oracle.kubernetes.weblogic.domain.DomainConfigurator;
 import oracle.kubernetes.weblogic.domain.DomainConfiguratorFactory;
-import oracle.kubernetes.weblogic.domain.v2.Channel;
 import oracle.kubernetes.weblogic.domain.v2.Domain;
 import oracle.kubernetes.weblogic.domain.v2.DomainSpec;
-import org.joda.time.DateTime;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -127,7 +125,6 @@ public void setUp() throws Exception {
         .addToPacket(PORT, TEST_PORT)
         .addToPacket(ProcessingConstants.DOMAIN_TOPOLOGY, configSupport.createDomainConfig())
         .addDomainPresenceInfo(domainPresenceInfo);
-    registerWlsDomainConfigScan();
   }
 
   @After
@@ -702,122 +699,4 @@ private V1ServiceSpec createExternalChannelServiceSpec() {
   private CallTestSupport.CannedResponse expectReadService(String serviceName) {
     return testSupport.createCannedResponse("readService").withNamespace(NS).withName(serviceName);
   }
-
-  @Test
-  public void onAdminServiceStepRunWithNoService_createIt() {
-    configAdminService();
-    V1Service newService = createAdminService();
-    initializeAdminServiceFromRecord(null);
-    expectCreateService(newService).returning(newService);
-
-    testSupport.addToPacket(SERVER_NAME, domainPresenceInfo.getDomain().getAsName());
-    testSupport.runSteps(ServiceHelper.createForAdminServiceStep(terminalStep));
-
-    assertThat(logRecords, containsInfo(ADMIN_SERVICE_CREATED));
-  }
-
-  @Test
-  public void onAdminServiceStepRunWithNoService_retryOnFailure() {
-    configAdminService();
-    testSupport.addRetryStrategy(retryStrategy);
-    V1Service newService = createAdminService();
-    initializeAdminServiceFromRecord(null);
-    expectCreateService(newService).failingWithStatus(401);
-
-    testSupport.addToPacket(SERVER_NAME, domainPresenceInfo.getDomain().getAsName());
-    testSupport.runSteps(ServiceHelper.createForAdminServiceStep(terminalStep));
-
-    testSupport.verifyCompletionThrowable(ApiException.class);
-  }
-
-  @Test
-  public void onAdminServiceStepRunWitBadVersion_replaceIt() {
-    verifyAdminServiceReplaced(this::withBadVersion);
-  }
-
-  private void verifyAdminServiceReplaced(ServiceMutator mutator) {
-    configAdminService();
-    V1Service newService = createAdminService();
-    initializeAdminServiceFromRecord(mutator.change(createAdminService()));
-    expectDeleteServiceSuccessful(getAdminServiceName());
-    expectSuccessfulCreateService(newService);
-
-    testSupport.addToPacket(SERVER_NAME, domainPresenceInfo.getDomain().getAsName());
-    testSupport.runSteps(ServiceHelper.createForAdminServiceStep(terminalStep));
-
-    assertThat(logRecords, containsInfo(ADMIN_SERVICE_REPLACED));
-  }
-
-  @Test
-  public void onAdminServiceStepRunWithMatchingService_addToSko() {
-    configAdminService();
-    V1Service newService = createAdminService();
-    initializeAdminServiceFromRecord(newService);
-
-    testSupport.addToPacket(SERVER_NAME, domainPresenceInfo.getDomain().getAsName());
-    testSupport.runSteps(ServiceHelper.createForAdminServiceStep(terminalStep));
-
-    assertThat(logRecords, containsFine(ADMIN_SERVICE_EXISTS));
-  }
-
-  private V1Service createAdminService() {
-    return new V1Service()
-        .spec(createAdminServiceSpec())
-        .metadata(
-            new V1ObjectMeta()
-                .name(getAdminServiceName())
-                .namespace(NS)
-                .putLabelsItem(RESOURCE_VERSION_LABEL, VersionConstants.DOMAIN_V2)
-                .putLabelsItem(DOMAINUID_LABEL, UID)
-                .putLabelsItem(DOMAINNAME_LABEL, DOMAIN_NAME)
-                .putLabelsItem(SERVERNAME_LABEL, domainPresenceInfo.getDomain().getAsName())
-                .putLabelsItem(CREATEDBYOPERATOR_LABEL, "true"));
-  }
-
-  private V1ServiceSpec createAdminServiceSpec() {
-    return new V1ServiceSpec()
-        .putSelectorItem(DOMAINUID_LABEL, UID)
-        .putSelectorItem(SERVERNAME_LABEL, domainPresenceInfo.getDomain().getAsName())
-        .putSelectorItem(CREATEDBYOPERATOR_LABEL, "true")
-        .type("NodePort")
-        .ports(createPorts());
-  }
-
-  private String getAdminServiceName() {
-    return LegalNames.toAdminServiceName(UID, domainPresenceInfo.getDomain().getAsName());
-  }
-
-  private List<V1ServicePort> createPorts() {
-    List<V1ServicePort> ports = new ArrayList<>();
-    ports.add(new V1ServicePort().port(TEST_PORT).nodePort(TEST_NODE_PORT).name("default"));
-    return ports;
-  }
-
-  private void configAdminService() {
-    configureAdminServer()
-        .configureAdminService()
-        .addChannel("default", new Channel(TEST_NODE_PORT));
-  }
-
-  private void initializeAdminServiceFromRecord(V1Service service) {
-    domainPresenceInfo.getServers().put(ADMIN_SERVER, createSko(service));
-  }
-
-  private void registerWlsDomainConfigScan() {
-    ScanCache.INSTANCE.registerScan(
-        domainPresenceInfo.getNamespace(),
-        domainPresenceInfo.getDomainUID(),
-        new Scan(createWlsDomainConfig(), new DateTime()));
-  }
-
-  private WlsDomainConfig createWlsDomainConfig() {
-    Map<String, WlsServerConfig> wlsServerConfigs = new HashMap<>();
-    wlsServerConfigs.put(
-        ADMIN_SERVER, new WlsServerConfig(ADMIN_SERVER, TEST_PORT, null, null, false, null, null));
-
-    WlsDomainConfig wlsDomainConfig =
-        new WlsDomainConfig(DOMAIN_NAME, new HashMap<>(), wlsServerConfigs, null, null);
-    wlsDomainConfig.setAdminServerName(ADMIN_SERVER);
-    return wlsDomainConfig;
-  }
 }