Skip to content

Commit 47a40b3

Browse files
rjeberhardrjeberhard
committed
Merge branch 'xc-122451' into 'main'
backport MR 4823 to main branch See merge request weblogic-cloud/weblogic-kubernetes-operator!4832
2 parents ccf6763 + f1dcbd0 commit 47a40b3

File tree

6 files changed

+46
-30
lines changed

6 files changed

+46
-30
lines changed

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItConfigDistributionStrategy.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@
101101
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
102102
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainResourceOnPv;
103103
import static oracle.weblogic.kubernetes.utils.ExecCommand.exec;
104+
import static oracle.weblogic.kubernetes.utils.FileUtils.createWdtPropertyFile;
104105
import static oracle.weblogic.kubernetes.utils.FileUtils.replaceStringInFile;
105106
import static oracle.weblogic.kubernetes.utils.FmwUtils.getConfiguration;
106107
import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
@@ -981,7 +982,7 @@ private void createDomain() {
981982
final String wlsModelFilePrefix = "model-dci-introspect";
982983
final String wlsModelFile = wlsModelFilePrefix + ".yaml";
983984
t3ChannelPort = getNextFreePort();
984-
File wlsModelPropFile = ItIntrospectVersion.createWdtPropertyFile(wlsModelFilePrefix,
985+
File wlsModelPropFile = createWdtPropertyFile(wlsModelFilePrefix,
985986
K8S_NODEPORT_HOST, t3ChannelPort);
986987
// create domainCreationImage
987988
String domainCreationImageName = DOMAIN_IMAGES_PREFIX + "configdist-domain-on-pv-image";
@@ -1010,7 +1011,7 @@ private void createDomain() {
10101011
configuration = getConfiguration(pvcName, pvcRequest, "oci-fss");
10111012
} else {
10121013
configuration = getConfiguration(pvName, pvcName, pvCapacity, pvcRequest, storageClassName,
1013-
ItIntrospectVersion.class.getName());
1014+
ItConfigDistributionStrategy.class.getSimpleName());
10141015
}
10151016
configuration.getInitializeDomainOnPV().domain(new DomainOnPV()
10161017
.createMode(CreateIfNotExists.DOMAIN)

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIntrospectVersion.java‎

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -136,6 +136,7 @@
136136
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
137137
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainResourceOnPv;
138138
import static oracle.weblogic.kubernetes.utils.DomainUtils.verifyDomainStatusConditionTypeDoesNotExist;
139+
import static oracle.weblogic.kubernetes.utils.FileUtils.createWdtPropertyFile;
139140
import static oracle.weblogic.kubernetes.utils.FmwUtils.getConfiguration;
140141
import static oracle.weblogic.kubernetes.utils.ImageUtils.createMiiImageAndVerify;
141142
import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
@@ -1554,26 +1555,4 @@ private void updateIngressBackendServicePort(int newAdminPort) throws ApiExcepti
15541555
fail("Ingress is null, failed to update ingress");
15551556
}
15561557
}
1557-
1558-
public static File createWdtPropertyFile(String wlsModelFilePrefix, String nodePortHost, int t3Port) {
1559-
1560-
// create property file used with domain model file
1561-
Properties p = new Properties();
1562-
p.setProperty("WebLogicAdminUserName", ADMIN_USERNAME_DEFAULT);
1563-
p.setProperty("WebLogicAdminPassword", ADMIN_PASSWORD_DEFAULT);
1564-
p.setProperty("K8S_NODEPORT_HOST", nodePortHost);
1565-
p.setProperty("T3_CHANNEL_PORT", Integer.toString(t3Port));
1566-
1567-
// create a model property file
1568-
File domainPropertiesFile = assertDoesNotThrow(() ->
1569-
File.createTempFile(wlsModelFilePrefix, ".properties", new File(RESULTS_TEMPFILE)),
1570-
"Failed to create WLS model properties file");
1571-
1572-
// create the property file
1573-
assertDoesNotThrow(() ->
1574-
p.store(new FileOutputStream(domainPropertiesFile), "WLS properties file"),
1575-
"Failed to write WLS properties file");
1576-
1577-
return domainPropertiesFile;
1578-
}
15791558
}

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItKubernetesDomainEvents.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@
9393
import static oracle.weblogic.kubernetes.utils.DomainUtils.deleteDomainResource;
9494
import static oracle.weblogic.kubernetes.utils.DomainUtils.removeClusterInDomainResource;
9595
import static oracle.weblogic.kubernetes.utils.DomainUtils.verifyDomainStatusConditionTypeDoesNotExist;
96+
import static oracle.weblogic.kubernetes.utils.FileUtils.createWdtPropertyFile;
9697
import static oracle.weblogic.kubernetes.utils.FmwUtils.getConfiguration;
9798
import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
9899
import static oracle.weblogic.kubernetes.utils.JobUtils.getIntrospectJobName;
@@ -771,7 +772,7 @@ private static DomainResource createDomain(String domainNamespace, String domain
771772
final String wlsModelFilePrefix = "model-dci-introspect";
772773
final String wlsModelFile = wlsModelFilePrefix + ".yaml";
773774
int t3ChannelPort = getNextFreePort();
774-
File wlsModelPropFile = ItIntrospectVersion.createWdtPropertyFile(wlsModelFilePrefix,
775+
File wlsModelPropFile = createWdtPropertyFile(wlsModelFilePrefix,
775776
K8S_NODEPORT_HOST, t3ChannelPort);
776777

777778
// create domainCreationImage
@@ -801,7 +802,7 @@ private static DomainResource createDomain(String domainNamespace, String domain
801802
configuration = getConfiguration(pvcName, pvcRequest, "oci-fss");
802803
} else {
803804
configuration = getConfiguration(pvName, pvcName, pvCapacity, pvcRequest, storageClassName,
804-
ItIntrospectVersion.class.getName());
805+
ItKubernetesDomainEvents.class.getSimpleName());
805806
}
806807
configuration.getInitializeDomainOnPV().domain(new DomainOnPV()
807808
.createMode(CreateIfNotExists.DOMAIN)

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItSystemResOverrides.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@
9090
import static oracle.weblogic.kubernetes.utils.ConfigMapUtils.createConfigMapFromFiles;
9191
import static oracle.weblogic.kubernetes.utils.DeployUtil.deployUsingWlst;
9292
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
93+
import static oracle.weblogic.kubernetes.utils.FileUtils.createWdtPropertyFile;
9394
import static oracle.weblogic.kubernetes.utils.FmwUtils.getConfiguration;
9495
import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
9596
import static oracle.weblogic.kubernetes.utils.JobUtils.createDomainJob;
@@ -393,7 +394,7 @@ private void createDomain() {
393394
final String wlsModelFilePrefix = "sitconfig-dci-model";
394395
final String wlsModelFile = wlsModelFilePrefix + ".yaml";
395396
t3ChannelPort = getNextFreePort();
396-
File wlsModelPropFile = ItIntrospectVersion.createWdtPropertyFile(wlsModelFilePrefix,
397+
File wlsModelPropFile = createWdtPropertyFile(wlsModelFilePrefix,
397398
K8S_NODEPORT_HOST, t3ChannelPort);
398399

399400
// create domainCreationImage
@@ -423,7 +424,7 @@ private void createDomain() {
423424
configuration = getConfiguration(pvcName, pvcRequest, "oci-fss");
424425
} else {
425426
configuration = getConfiguration(pvName, pvcName, pvCapacity, pvcRequest, storageClassName,
426-
ItIntrospectVersion.class.getName());
427+
ItSystemResOverrides.class.getSimpleName());
427428
}
428429
configuration.getInitializeDomainOnPV().domain(new DomainOnPV()
429430
.createMode(CreateIfNotExists.DOMAIN)

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/ItT3Channel.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,7 @@
8080
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
8181
import static oracle.weblogic.kubernetes.utils.DeployUtil.deployUsingWlst;
8282
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
83+
import static oracle.weblogic.kubernetes.utils.FileUtils.createWdtPropertyFile;
8384
import static oracle.weblogic.kubernetes.utils.FmwUtils.getConfiguration;
8485
import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
8586
import static oracle.weblogic.kubernetes.utils.OperatorUtils.installAndVerifyOperator;
@@ -174,7 +175,7 @@ void testAdminServerT3Channel() {
174175

175176
final String wlsModelFilePrefix = "model-dci-introspect";
176177
final String wlsModelFile = wlsModelFilePrefix + ".yaml";
177-
File wlsModelPropFile = ItIntrospectVersion.createWdtPropertyFile(wlsModelFilePrefix,
178+
File wlsModelPropFile = createWdtPropertyFile(wlsModelFilePrefix,
178179
K8S_NODEPORT_HOST, t3ChannelPort);
179180

180181
// create domainCreationImage
@@ -204,7 +205,7 @@ void testAdminServerT3Channel() {
204205
configuration = getConfiguration(pvcName, pvcRequest, "oci-fss");
205206
} else {
206207
configuration = getConfiguration(pvName, pvcName, pvCapacity, pvcRequest, storageClassName,
207-
ItIntrospectVersion.class.getName());
208+
ItT3Channel.class.getSimpleName());
208209
}
209210
configuration.getInitializeDomainOnPV().domain(new DomainOnPV()
210211
.createMode(CreateIfNotExists.DOMAIN)

‎integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/FileUtils.java‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
import java.nio.file.attribute.BasicFileAttributes;
1818
import java.util.List;
1919
import java.util.Map;
20+
import java.util.Properties;
2021
import java.util.concurrent.Callable;
2122
import java.util.stream.Collectors;
2223
import java.util.stream.Stream;
@@ -31,8 +32,11 @@
3132
import oracle.weblogic.kubernetes.logging.LoggingFacade;
3233

3334
import static java.nio.file.StandardCopyOption.REPLACE_EXISTING;
35+
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
36+
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
3437
import static oracle.weblogic.kubernetes.TestConstants.KUBERNETES_CLI;
3538
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_ROOT;
39+
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_TEMPFILE;
3640
import static oracle.weblogic.kubernetes.TestConstants.WLSIMG_BUILDER;
3741
import static oracle.weblogic.kubernetes.actions.ActionConstants.DOWNLOAD_DIR;
3842
import static oracle.weblogic.kubernetes.actions.ActionConstants.WDT_DOWNLOAD_FILENAME_DEFAULT;
@@ -616,4 +620,33 @@ public static boolean searchStringInFile(String fileName, String searchString) t
616620
logger.info("Failed to find string {0} in the file {1}", searchString, fileName);
617621
return false;
618622
}
623+
624+
/**
625+
* Create WDT property file.
626+
* @param wlsModelFilePrefix the model file prefix
627+
* @param nodePortHost the K8S node port host name
628+
* @param t3Port T3_CHANNEL_PORT
629+
* @return WDT property file
630+
*/
631+
public static File createWdtPropertyFile(String wlsModelFilePrefix, String nodePortHost, int t3Port) {
632+
633+
// create property file used with domain model file
634+
Properties p = new Properties();
635+
p.setProperty("WebLogicAdminUserName", ADMIN_USERNAME_DEFAULT);
636+
p.setProperty("WebLogicAdminPassword", ADMIN_PASSWORD_DEFAULT);
637+
p.setProperty("K8S_NODEPORT_HOST", nodePortHost);
638+
p.setProperty("T3_CHANNEL_PORT", Integer.toString(t3Port));
639+
640+
// create a model property file
641+
File domainPropertiesFile = assertDoesNotThrow(() ->
642+
File.createTempFile(wlsModelFilePrefix, ".properties", new File(RESULTS_TEMPFILE)),
643+
"Failed to create WLS model properties file");
644+
645+
// create the property file
646+
assertDoesNotThrow(() ->
647+
p.store(new FileOutputStream(domainPropertiesFile), "WLS properties file"),
648+
"Failed to write WLS properties file");
649+
650+
return domainPropertiesFile;
651+
}
619652
}

0 commit comments

Comments
 (0)