Merge conflict step improvements after recent PodHelper refactoring

Author: rjeberhard

operator/src/main/java/oracle/kubernetes/operator/helpers/PodHelper.java

@@ -343,4 +343,4 @@ private Step deletePod(String name, String namespace, Step next) {
           .deletePodAsync(name, namespace, deleteOptions, new DefaultResponseStep<>(next));
     }
   }
-}
+}

operator/src/main/java/oracle/kubernetes/operator/helpers/PodStepContext.java

@@ -50,6 +50,7 @@
 import oracle.kubernetes.operator.work.Packet;
 import oracle.kubernetes.operator.work.Step;
 import oracle.kubernetes.weblogic.domain.v1.ServerStartup;
+import org.apache.commons.lang3.builder.EqualsBuilder;
 
 @SuppressWarnings("deprecation")
 public abstract class PodStepContext {
@@ -70,9 +71,8 @@ public abstract class PodStepContext {
   private static final String START_SERVER = "/weblogic-operator/scripts/startServer.sh";
   private static final String READINESS_PROBE = "/weblogic-operator/scripts/readinessProbe.sh";
   private static final String LIVENESS_PROBE = "/weblogic-operator/scripts/livenessProbe.sh";
-  
-  private static final String READ_WRITE_MANY_ACCESS = "ReadWriteMany";
 
+  private static final String READ_WRITE_MANY_ACCESS = "ReadWriteMany";
 
   private final DomainPresenceInfo info;
   private final Step conflictStep;
@@ -100,9 +100,33 @@ private void createSubstitutionMap() {
   private V1Pod getPodModel() {
     return podModel;
   }
-  
+
   private Step getConflictStep() {
-    return readPod(conflictStep);
+    return new ConflictStep();
+  }
+
+  private class ConflictStep extends Step {
+
+    @Override
+    public NextAction apply(Packet packet) {
+      return doNext(getConflictStep(), packet);
+    }
+
+    @Override
+    public boolean equals(Object other) {
+      if (other == this) {
+        return true;
+      }
+      if ((other instanceof ConflictStep) == false) {
+        return false;
+      }
+      ConflictStep rhs = ((ConflictStep) other);
+      return new EqualsBuilder().append(conflictStep, rhs.getConflictStep()).isEquals();
+    }
+
+    private Step getConflictStep() {
+      return conflictStep;
+    }
   }
 
   // ------------------------ data methods ----------------------------
@@ -382,17 +406,17 @@ public NextAction onFailure(Packet packet, CallResponse<V1Pod> callResponse) {
       }
       return super.onFailure(packet, callResponse);
     }
-    
+
     @Override
     public NextAction onSuccess(Packet packet, CallResponse<V1Pod> callResponse) {
       V1Pod currentPod = callResponse.getResult();
-      getSko().getPod().set(currentPod);
+      setRecordedPod(currentPod);
       return doNext(packet);
     }
   }
-  
+
   private class VerifyPodStep extends Step {
-    
+
     VerifyPodStep(Step next) {
       super(next);
     }
@@ -405,13 +429,11 @@ public NextAction apply(Packet packet) {
         return doNext(createNewPod(getNext()), packet);
       } else if (canUseCurrentPod(currentPod)) {
         logPodExists();
-        setRecordedPod(currentPod);
         return doNext(packet);
       } else {
         return doNext(replaceCurrentPod(getNext()), packet);
       }
     }
-    
   }
 
   private ResponseStep<V1Pod> createResponse(Step next) {

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

@@ -14,7 +14,6 @@
 import static org.hamcrest.Matchers.empty;
 import static org.hamcrest.Matchers.equalTo;
 import static org.hamcrest.Matchers.not;
-import static org.hamcrest.Matchers.sameInstance;
 import static org.hamcrest.junit.MatcherAssert.assertThat;
 
 import io.kubernetes.client.ApiException;
@@ -77,7 +76,8 @@ private void verifyAdminPodReplacedWhen(PodMutator mutator) {
 
     V1Pod existingPod = createPodModel();
     mutator.mutate(existingPod);
-    expectReadPod(getPodName()).returning(existingPod);
+    initializeExistingPod(existingPod);
+    expectListPersistentVolume().returning(createPersistentVolumeList());
     expectDeletePod(getPodName()).returning(new V1Status());
     expectCreatePod(podWithName(getPodName())).returning(createPodModel());
 
@@ -101,7 +101,8 @@ public void whenDeleteReportsNotFound_replaceAdminPod() {
         PodAwaiterStepFactory.class,
         (pod, next) -> terminalStep);
 
-    expectReadPod(getPodName()).returning(getIncompatiblePod());
+    initializeExistingPod(getIncompatiblePod());
+    expectListPersistentVolume().returning(createPersistentVolumeList());
     expectDeletePod(getPodName()).failingWithStatus(CallBuilder.NOT_FOUND);
     expectCreatePod(podWithName(getPodName())).returning(createPodModel());
 
@@ -119,7 +120,8 @@ private V1Pod getIncompatiblePod() {
   @Test
   public void whenAdminPodDeletionFails_retryOnFailure() {
     testSupport.addRetryStrategy(retryStrategy);
-    expectReadPod(getPodName()).returning(getIncompatiblePod());
+    initializeExistingPod(getIncompatiblePod());
+    expectListPersistentVolume().returning(createPersistentVolumeList());
     expectDeletePod(getPodName()).failingWithStatus(401);
     expectStepsAfterCreation();
 
@@ -128,13 +130,13 @@ public void whenAdminPodDeletionFails_retryOnFailure() {
     testSupport.runSteps(initialStep);
 
     testSupport.verifyCompletionThrowable(ApiException.class);
-    assertThat(retryStrategy.getConflictStep(), sameInstance(initialStep));
   }
 
   @Test
   public void whenAdminPodReplacementFails_retryOnFailure() {
     testSupport.addRetryStrategy(retryStrategy);
-    expectReadPod(getPodName()).returning(getIncompatiblePod());
+    initializeExistingPod(getIncompatiblePod());
+    expectListPersistentVolume().returning(createPersistentVolumeList());
     expectDeletePod(getPodName()).returning(new V1Status());
     expectCreatePod(podWithName(getPodName())).failingWithStatus(401);
     expectStepsAfterCreation();
@@ -144,7 +146,6 @@ public void whenAdminPodReplacementFails_retryOnFailure() {
     testSupport.runSteps(initialStep);
 
     testSupport.verifyCompletionThrowable(ApiException.class);
-    assertThat(retryStrategy.getConflictStep(), sameInstance(initialStep));
   }
 
   @Test
@@ -209,11 +210,13 @@ public void whenExistingAdminPodSpecContainerHasWrongEnvFrom_replaceIt() {
 
   @Test
   public void whenAdminPodCreated_specHasPodNameAsHostName() {
+    expectListPersistentVolume().returning(createPersistentVolumeList());
     assertThat(getCreatedPod().getSpec().getHostname(), equalTo(getPodName()));
   }
 
   @Test
   public void whenAdminPodCreated_containerHasStartServerCommand() {
+    expectListPersistentVolume().returning(createPersistentVolumeList());
     assertThat(
         getCreatedPodSpecContainer().getCommand(),
         contains("/weblogic-operator/scripts/startServer.sh", UID, getServerName(), DOMAIN_NAME));
@@ -222,6 +225,7 @@ public void whenAdminPodCreated_containerHasStartServerCommand() {
   @Test
   public void whenAdminPodCreated_hasOperatorCertEnvVariable() {
     putTuningParameter(INTERNAL_OPERATOR_CERT_FILE_PARAM, CERTFILE);
+    expectListPersistentVolume().returning(createPersistentVolumeList());
     assertThat(
         getCreatedPodSpecContainer().getEnv(),
         hasEnvVar(INTERNAL_OPERATOR_CERT_ENV_NAME, CERTFILE));
@@ -231,6 +235,7 @@ public void whenAdminPodCreated_hasOperatorCertEnvVariable() {
   public void whenDomainPresenceHasNullEnvironmentItems_createAdminPodStartupWithDefaultItems() {
     domainPresenceInfo.getDomain().getSpec().setServerStartup(null);
 
+    expectListPersistentVolume().returning(createPersistentVolumeList());
     assertThat(getCreatedPodSpecContainer().getEnv(), not(empty()));
   }
 
@@ -245,6 +250,7 @@ public void whenDomainPresenceHasEnvironmentItems_createAdminPodStartupWithThem(
                 .withVar("item2", "value2")
                 .build());
 
+    expectListPersistentVolume().returning(createPersistentVolumeList());
     assertThat(
         getCreatedPodSpecContainer().getEnv(),
         allOf(hasEnvVar("item1", "value1"), hasEnvVar("item2", "value2")));
@@ -261,6 +267,7 @@ public void whenDomainPresenceHasEnvironmentItemsWithVariables_createAdminPodSta
                 .withVar("item2", "$(SERVER_NAME) is $(ADMIN_NAME):$(ADMIN_PORT)")
                 .build());
 
+    expectListPersistentVolume().returning(createPersistentVolumeList());
     assertThat(
         getCreatedPodSpecContainer().getEnv(),
         allOf(
@@ -287,6 +294,11 @@ List<ServerStartup> build() {
     }
   }
 
+  @Override
+  protected void onAdminExpectListPersistentVolume() {
+    expectListPersistentVolume().returning(createPersistentVolumeList());
+  }
+
   @Override
   V1Pod createPodModel() {
     return new V1Pod().metadata(createPodMetadata()).spec(createPodSpec());

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

@@ -226,7 +226,7 @@ private void verifyRollManagedPodWhen(PodMutator mutator) {
 
     V1Pod existingPod = createPodModel();
     mutator.mutate(existingPod);
-    expectReadPod(getPodName()).returning(existingPod);
+    initializeExistingPod(existingPod);
 
     testSupport.runSteps(getStepFactory(), terminalStep);