Skip to content

Commit 8b13b5b

Browse files
rjeberhardrjeberhard
committed
Merge branch 'xc-122145-42' into 'release/4.2'
Use correct test class name when creating domain configuration See merge request weblogic-cloud/weblogic-kubernetes-operator!4823
2 parents bbb8045 + a921de5 commit 8b13b5b

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
@@ -104,6 +104,7 @@
104104
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
105105
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainResourceOnPv;
106106
import static oracle.weblogic.kubernetes.utils.ExecCommand.exec;
107+
import static oracle.weblogic.kubernetes.utils.FileUtils.createWdtPropertyFile;
107108
import static oracle.weblogic.kubernetes.utils.FileUtils.replaceStringInFile;
108109
import static oracle.weblogic.kubernetes.utils.FmwUtils.getConfiguration;
109110
import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
@@ -983,7 +984,7 @@ private void createDomain() {
983984
final String wlsModelFilePrefix = "model-dci-introspect";
984985
final String wlsModelFile = wlsModelFilePrefix + ".yaml";
985986
t3ChannelPort = getNextFreePort();
986-
File wlsModelPropFile = ItIntrospectVersion.createWdtPropertyFile(wlsModelFilePrefix,
987+
File wlsModelPropFile = createWdtPropertyFile(wlsModelFilePrefix,
987988
K8S_NODEPORT_HOST, t3ChannelPort);
988989
// create domainCreationImage
989990
String domainCreationImageName = DOMAIN_IMAGES_PREFIX + "wls-domain-on-pv-image";
@@ -1013,7 +1014,7 @@ private void createDomain() {
10131014
configuration = getConfiguration(pvcName, pvcRequest, "oci-fss");
10141015
} else {
10151016
configuration = getConfiguration(pvName, pvcName, pvCapacity, pvcRequest, storageClassName,
1016-
ItIntrospectVersion.class.getName());
1017+
ItConfigDistributionStrategy.class.getSimpleName());
10171018
}
10181019
configuration.getInitializeDomainOnPV().domain(new DomainOnPV()
10191020
.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
@@ -135,6 +135,7 @@
135135
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
136136
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainResourceOnPv;
137137
import static oracle.weblogic.kubernetes.utils.DomainUtils.verifyDomainStatusConditionTypeDoesNotExist;
138+
import static oracle.weblogic.kubernetes.utils.FileUtils.createWdtPropertyFile;
138139
import static oracle.weblogic.kubernetes.utils.FmwUtils.getConfiguration;
139140
import static oracle.weblogic.kubernetes.utils.ImageUtils.createMiiImageAndVerify;
140141
import static oracle.weblogic.kubernetes.utils.ImageUtils.createTestRepoSecret;
@@ -1506,26 +1507,4 @@ private void updateIngressBackendServicePort(int newAdminPort) throws ApiExcepti
15061507
fail("Ingress is null, failed to update ingress");
15071508
}
15081509
}
1509-
1510-
public static File createWdtPropertyFile(String wlsModelFilePrefix, String nodePortHost, int t3Port) {
1511-
1512-
// create property file used with domain model file
1513-
Properties p = new Properties();
1514-
p.setProperty("WebLogicAdminUserName", ADMIN_USERNAME_DEFAULT);
1515-
p.setProperty("WebLogicAdminPassword", ADMIN_PASSWORD_DEFAULT);
1516-
p.setProperty("K8S_NODEPORT_HOST", nodePortHost);
1517-
p.setProperty("T3_CHANNEL_PORT", Integer.toString(t3Port));
1518-
1519-
// create a model property file
1520-
File domainPropertiesFile = assertDoesNotThrow(() ->
1521-
File.createTempFile(wlsModelFilePrefix, ".properties", new File(RESULTS_TEMPFILE)),
1522-
"Failed to create WLS model properties file");
1523-
1524-
// create the property file
1525-
assertDoesNotThrow(() ->
1526-
p.store(new FileOutputStream(domainPropertiesFile), "WLS properties file"),
1527-
"Failed to write WLS properties file");
1528-
1529-
return domainPropertiesFile;
1530-
}
15311510
}

‎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
@@ -802,7 +803,7 @@ private static DomainResource createDomain(String domainNamespace, String domain
802803
configuration = getConfiguration(pvcName, pvcRequest, "oci-fss");
803804
} else {
804805
configuration = getConfiguration(pvName, pvcName, pvCapacity, pvcRequest, storageClassName,
805-
ItIntrospectVersion.class.getName());
806+
ItKubernetesDomainEvents.class.getSimpleName());
806807
}
807808
configuration.getInitializeDomainOnPV().domain(new DomainOnPV()
808809
.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
@@ -424,7 +425,7 @@ private void createDomain() {
424425
configuration = getConfiguration(pvcName, pvcRequest, "oci-fss");
425426
} else {
426427
configuration = getConfiguration(pvName, pvcName, pvCapacity, pvcRequest, storageClassName,
427-
ItIntrospectVersion.class.getName());
428+
ItSystemResOverrides.class.getSimpleName());
428429
}
429430
configuration.getInitializeDomainOnPV().domain(new DomainOnPV()
430431
.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
@@ -205,7 +206,7 @@ void testAdminServerT3Channel() {
205206
configuration = getConfiguration(pvcName, pvcRequest, "oci-fss");
206207
} else {
207208
configuration = getConfiguration(pvName, pvcName, pvCapacity, pvcRequest, storageClassName,
208-
ItIntrospectVersion.class.getName());
209+
ItT3Channel.class.getSimpleName());
209210
}
210211
configuration.getInitializeDomainOnPV().domain(new DomainOnPV()
211212
.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)