Added oracle.kubernetes.weblogic.domain.v2.Cluster#fillInFrom; Added tests related to replacing a service if its label/annotation changes.

Author: chunshi-ora

model/src/main/java/oracle/kubernetes/weblogic/domain/v2/Cluster.java

@@ -127,6 +127,14 @@ void setMaxUnavailable(Integer maxUnavailable) {
     this.maxUnavailable = maxUnavailable;
   }
 
+  void fillInFrom(Cluster other) {
+    if (other == null) {
+      return;
+    }
+    super.fillInFrom(other);
+    clusterService.fillInFrom(other.clusterService);
+  }
+
   @Override
   public String toString() {
     return new ToStringBuilder(this)

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

@@ -291,14 +291,45 @@ public void onClusterStepRunWithServiceWithBadPort_replaceIt() {
     verifyClusterServiceReplaced(this::withBadPort);
   }
 
-  // TODO: oracle.kubernetes.weblogic.domain.v2.Cluster.getConfiguration is broken. Doesn't fill in
-  // Cluster#clusterService.
-  // @Test
+  @Test
   public void onClusterStepRunWithServiceWithLabelAdded_replaceIt() {
     configureClusterWithLabel("anyLabel", "anyValue");
     verifyClusterServiceReplaced(createClusterService(), withLabel(createClusterService()));
   }
 
+  @Test
+  public void onClusterStepRunWithServiceWithLabelValueChanged_replaceIt() {
+    final String newLabelValue = "newValue";
+    configureClusterWithLabel("anyLabel", newLabelValue);
+    verifyClusterServiceReplaced(
+        withLabel(createClusterService()), withLabel(createClusterService(), newLabelValue));
+  }
+
+  @Test
+  public void onClusterStepRunWithServiceWithLabelRemoved_replaceIt() {
+    verifyClusterServiceReplaced(this::withLabel);
+  }
+
+  @Test
+  public void onClusterStepRunWithServiceWithAnnotationAdded_replaceIt() {
+    configureClusterWithAnnotation("anyAnnotation", "anyValue");
+    verifyClusterServiceReplaced(createClusterService(), withAnnotation(createClusterService()));
+  }
+
+  @Test
+  public void onClusterStepRunWithServiceWithAnnotationValueChanged_replaceIt() {
+    final String newAnnotationValue = "newValue";
+    configureClusterWithAnnotation("anyAnnotation", newAnnotationValue);
+    verifyClusterServiceReplaced(
+        withAnnotation(createClusterService()),
+        withAnnotation(createClusterService(), newAnnotationValue));
+  }
+
+  @Test
+  public void onClusterStepRunWithServiceWithAnnotationRemoved_replaceIt() {
+    verifyClusterServiceReplaced(this::withAnnotation);
+  }
+
   @Test
   public void whenAttemptToReplaceBadClusterServiceFailsOnDelete_reportCompletionFailure() {
     V1Service existingService = createClusterServiceWithBadPort();
@@ -759,6 +790,10 @@ private void configureClusterWithLabel(String label, String value) {
     configureDomain().configureCluster(TEST_CLUSTER).withServiceLabel(label, value);
   }
 
+  private void configureClusterWithAnnotation(String annotation, String value) {
+    configureDomain().configureCluster(TEST_CLUSTER).withServiceAnnotation(annotation, value);
+  }
+
   private void configureManagedServerWithLabel(String label, String value) {
     configureDomain().configureServer(TEST_SERVER_NAME).withServiceLabel(label, value);
   }