Skip to content

Commit f6ac656

Browse files
rjeberhardrjeberhard
committed
Merge branch 'fmwpodmain_2' into 'main'
Fmw domain DBOperator and Podman conversion (part 2) See merge request weblogic-cloud/weblogic-kubernetes-operator!4585
2 parents a1cd703 + ffb7238 commit f6ac656

File tree

3 files changed

+58
-43
lines changed

3 files changed

+58
-43
lines changed

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

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
// Copyright (c) 2021, 2023, Oracle and/or its affiliates.
1+
// Copyright (c) 2021, 2024, Oracle and/or its affiliates.
22
// Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
package oracle.weblogic.kubernetes;
@@ -24,7 +24,6 @@
2424

2525
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
2626
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
27-
import static oracle.weblogic.kubernetes.TestConstants.DB_IMAGE_TO_USE_IN_SPEC;
2827
import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TO_USE_IN_SPEC;
2928
import static oracle.weblogic.kubernetes.TestConstants.HTTPS_PROXY;
3029
import static oracle.weblogic.kubernetes.TestConstants.HTTP_PROXY;
@@ -37,8 +36,10 @@
3736
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getNextFreePort;
3837
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
3938
import static oracle.weblogic.kubernetes.utils.ConfigMapUtils.createConfigMapForDomainCreation;
39+
import static oracle.weblogic.kubernetes.utils.DbUtils.createOracleDBUsingOperator;
40+
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSchema;
4041
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSecretWithUsernamePassword;
41-
import static oracle.weblogic.kubernetes.utils.DbUtils.setupDBandRCUschema;
42+
import static oracle.weblogic.kubernetes.utils.DbUtils.installDBOperator;
4243
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
4344
import static oracle.weblogic.kubernetes.utils.FmwUtils.createDomainResourceOnPv;
4445
import static oracle.weblogic.kubernetes.utils.FmwUtils.verifyDomainReady;
@@ -77,10 +78,11 @@ class ItFmwDomainInPVUsingWDT {
7778
private static final String RCUSCHEMAUSERNAME = "myrcuuser";
7879
private static final String RCUSCHEMAPASSWORD = "Oradoc_db1";
7980

81+
private static final String domainUid = "fmw-domainonpv-wdt";
8082
private static String dbUrl = null;
83+
private static String dbName = domainUid + "my-oracle-db";
8184
private static LoggingFacade logger = null;
8285
private static String DOMAINHOMEPREFIX = null;
83-
private static final String domainUid = "fmw-domainonpv-wdt";
8486
private static final String clusterName = "cluster-1";
8587
private static final String adminServerName = "admin-server";
8688
private static final String managedServerNameBase = "managed-server";
@@ -108,9 +110,6 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
108110
logger.info("Assign a unique namespace for DB and RCU");
109111
assertNotNull(namespaces.get(0), "Namespace is null");
110112
dbNamespace = namespaces.get(0);
111-
final int dbListenerPort = getNextFreePort();
112-
ORACLEDBSUFFIX = ".svc.cluster.local:" + dbListenerPort + "/devpdb.k8s";
113-
dbUrl = ORACLEDBURLPREFIX + dbNamespace + ORACLEDBSUFFIX;
114113

115114
// get a new unique opNamespace
116115
logger.info("Assign a unique namespace for operator1");
@@ -123,14 +122,17 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
123122
domainNamespace = namespaces.get(2);
124123

125124
DOMAINHOMEPREFIX = "/shared/" + domainNamespace + "/domains/";
126-
// start DB and create RCU schema
127-
logger.info("Start DB and create RCU schema for namespace: {0}, dbListenerPort: {1}, RCU prefix: {2}, "
128-
+ "dbUrl: {3}, dbImage: {4}, fmwImage: {5} ", dbNamespace, dbListenerPort, RCUSCHEMAPREFIX, dbUrl,
129-
DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC);
130-
assertDoesNotThrow(() -> setupDBandRCUschema(DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC,
131-
RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl, dbListenerPort),
132-
String.format("Failed to create RCU schema for prefix %s in the namespace %s with "
133-
+ "dbUrl %s, dbListenerPost %s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
125+
126+
//install Oracle Database Operator
127+
assertDoesNotThrow(() -> installDBOperator(dbNamespace), "Failed to install database operator");
128+
129+
logger.info("Create Oracle DB in namespace: {0} ", dbNamespace);
130+
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, RCUSYSPASSWORD, dbNamespace));
131+
132+
logger.info("Create RCU schema with fmwImage: {0}, rcuSchemaPrefix: {1}, dbUrl: {2}, "
133+
+ " dbNamespace: {3}", FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX, dbUrl, dbNamespace);
134+
assertDoesNotThrow(() -> createRcuSchema(FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX,
135+
dbUrl, dbNamespace));
134136

135137
// install operator and verify its running in ready state
136138
installAndVerifyOperator(opNamespace, domainNamespace);

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

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -47,8 +47,10 @@
4747
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getNextFreePort;
4848
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getUniqueName;
4949
import static oracle.weblogic.kubernetes.utils.ConfigMapUtils.createConfigMapForDomainCreation;
50+
import static oracle.weblogic.kubernetes.utils.DbUtils.createOracleDBUsingOperator;
51+
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSchema;
5052
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSecretWithUsernamePassword;
51-
import static oracle.weblogic.kubernetes.utils.DbUtils.setupDBandRCUschema;
53+
import static oracle.weblogic.kubernetes.utils.DbUtils.installDBOperator;
5254
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
5355
import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
5456
import static oracle.weblogic.kubernetes.utils.JobUtils.createDomainJob;
@@ -90,7 +92,8 @@ class ItFmwDomainInPVUsingWLST {
9092
private static String dbUrl = null;
9193
private static LoggingFacade logger = null;
9294

93-
private final String domainUid = "jrfdomain-inpv";
95+
private static final String domainUid = "jrfdomain-inpv-wlst";
96+
private static String dbName = domainUid + "my-oracle-db";
9497
private final String wlSecretName = domainUid + "-weblogic-credentials";
9598
private final String rcuSecretName = domainUid + "-rcu-credentials";
9699

@@ -109,9 +112,6 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
109112
logger.info("Assign a unique namespace for DB and RCU");
110113
assertNotNull(namespaces.get(0), "Namespace is null");
111114
dbNamespace = namespaces.get(0);
112-
final int dbListenerPort = getNextFreePort();
113-
ORACLEDBSUFFIX = ".svc.cluster.local:" + dbListenerPort + "/devpdb.k8s";
114-
dbUrl = ORACLEDBURLPREFIX + dbNamespace + ORACLEDBSUFFIX;
115115

116116
logger.info("Assign a unique namespace for operator");
117117
assertNotNull(namespaces.get(1), "Namespace is null");
@@ -121,13 +121,16 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
121121
assertNotNull(namespaces.get(2), "Namespace is null");
122122
jrfDomainNamespace = namespaces.get(2);
123123

124-
logger.info("Start DB and create RCU schema for namespace: {0}, dbListenerPort: {1}, RCU prefix: {2}, "
125-
+ "dbUrl: {3}, dbImage: {4}, fmwImage: {5} ", dbNamespace, dbListenerPort, RCUSCHEMAPREFIX, dbUrl,
126-
DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC);
127-
assertDoesNotThrow(() -> setupDBandRCUschema(DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC,
128-
RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl, dbListenerPort),
129-
String.format("Failed to create RCU schema for prefix %s in the namespace %s with "
130-
+ "dbUrl %s, dbListenerPost %s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
124+
//install Oracle Database Operator
125+
assertDoesNotThrow(() -> installDBOperator(dbNamespace), "Failed to install database operator");
126+
127+
logger.info("Create Oracle DB in namespace: {0} ", dbNamespace);
128+
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, RCUSYSPASSWORD, dbNamespace));
129+
130+
logger.info("Create RCU schema with fmwImage: {0}, rcuSchemaPrefix: {1}, dbUrl: {2}, "
131+
+ " dbNamespace: {3}", FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX, dbUrl, dbNamespace);
132+
assertDoesNotThrow(() -> createRcuSchema(FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX,
133+
dbUrl, dbNamespace));
131134

132135
// install operator and verify its running in ready state
133136
installAndVerifyOperator(opNamespace, jrfDomainNamespace);

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

Lines changed: 26 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@
2828

2929
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_PASSWORD_DEFAULT;
3030
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
31-
import static oracle.weblogic.kubernetes.TestConstants.DB_IMAGE_TO_USE_IN_SPEC;
3231
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_API_VERSION;
3332
import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_NAME;
3433
import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TAG;
@@ -38,11 +37,14 @@
3837
import static oracle.weblogic.kubernetes.TestConstants.OKE_CLUSTER;
3938
import static oracle.weblogic.kubernetes.TestConstants.TEST_IMAGES_REPO_SECRET_NAME;
4039
import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
40+
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.createIngressHostRouting;
4141
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.getNextFreePort;
4242
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.isAppInServerPodReady;
4343
import static oracle.weblogic.kubernetes.utils.CommonTestUtils.testUntil;
44+
import static oracle.weblogic.kubernetes.utils.DbUtils.createOracleDBUsingOperator;
4445
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuAccessSecret;
45-
import static oracle.weblogic.kubernetes.utils.DbUtils.setupDBandRCUschema;
46+
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSchema;
47+
import static oracle.weblogic.kubernetes.utils.DbUtils.installDBOperator;
4648
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
4749
import static oracle.weblogic.kubernetes.utils.FmwUtils.verifyDomainReady;
4850
import static oracle.weblogic.kubernetes.utils.FmwUtils.verifyEMconsoleAccess;
@@ -77,13 +79,14 @@ class ItFmwDynamicClusterMiiDomain {
7779
private static final String RCUSCHEMAPREFIX = "jrfdomainmii";
7880
private static final String ORACLEDBURLPREFIX = "oracledb.";
7981
private static String ORACLEDBSUFFIX = null;
82+
private static final String RCUSYSPASSWORD = "Oradoc_db1";
8083
private static final String RCUSCHEMAPASSWORD = "Oradoc_db1";
8184
private static final String modelFile = "model-fmw-dynamicdomain.yaml";
8285

8386
private static String dbUrl = null;
8487
private static LoggingFacade logger = null;
88+
private static String domainUid = "jrf-dynamicdomain-mii";
8589

86-
private String domainUid = "jrf-dynamicdomain-mii";
8790
private String adminServerPodName = domainUid + "-admin-server";
8891
private String managedServerPrefix = domainUid + "-managed-server";
8992
private String adminSecretName = domainUid + "-weblogic-credentials";
@@ -92,6 +95,10 @@ class ItFmwDynamicClusterMiiDomain {
9295
private String opsswalletpassSecretName = domainUid + "-opss-wallet-password-secret";
9396
private int replicaCount = 1;
9497
private String adminSvcExtHost = null;
98+
private static String dbName = domainUid + "my-oracle-db";
99+
private static String hostHeader;
100+
private static int adminPort = 7001;
101+
private static final String adminServerName = "admin-server";
95102

96103
/**
97104
* Start DB service and create RCU schema.
@@ -108,9 +115,6 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
108115
logger.info("Assign a unique namespace for DB and RCU");
109116
assertNotNull(namespaces.get(0), "Namespace is null");
110117
dbNamespace = namespaces.get(0);
111-
final int dbListenerPort = getNextFreePort();
112-
ORACLEDBSUFFIX = ".svc.cluster.local:" + dbListenerPort + "/devpdb.k8s";
113-
dbUrl = ORACLEDBURLPREFIX + dbNamespace + ORACLEDBSUFFIX;
114118

115119
logger.info("Assign a unique namespace for operator");
116120
assertNotNull(namespaces.get(1), "Namespace is null");
@@ -120,16 +124,16 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
120124
assertNotNull(namespaces.get(2), "Namespace is null");
121125
domainNamespace = namespaces.get(2);
122126

123-
logger.info("Start DB and create RCU schema for namespace: {0}, dbListenerPort: {1}, RCU prefix: {2}, "
124-
+ "dbUrl: {3}, dbImage: {4}, fmwImage: {5} ", dbNamespace, dbListenerPort, RCUSCHEMAPREFIX, dbUrl,
125-
DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC);
126-
assertDoesNotThrow(() -> setupDBandRCUschema(DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC,
127-
RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl, dbListenerPort),
128-
String.format("Failed to create RCU schema for prefix %s in the namespace %s with "
129-
+ "dbUrl %s, dbListenerPost %s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
127+
//install Oracle Database Operator
128+
assertDoesNotThrow(() -> installDBOperator(dbNamespace), "Failed to install database operator");
130129

131-
logger.info("DB image: {0}, FMW image {1} used in the test",
132-
DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC);
130+
logger.info("Create Oracle DB in namespace: {0} ", dbNamespace);
131+
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, RCUSYSPASSWORD, dbNamespace));
132+
133+
logger.info("Create RCU schema with fmwImage: {0}, rcuSchemaPrefix: {1}, dbUrl: {2}, "
134+
+ " dbNamespace: {3}", FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX, dbUrl, dbNamespace);
135+
assertDoesNotThrow(() -> createRcuSchema(FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX,
136+
dbUrl, dbNamespace));
133137

134138
// install operator and verify its running in ready state
135139
installAndVerifyOperator(opNamespace, domainNamespace);
@@ -157,7 +161,13 @@ void testFmwDynamicClusterDomainInModelInImage() {
157161
} else {
158162
// Expose the admin service external node port as a route for OKD
159163
adminSvcExtHost = createRouteForOKD(getExternalServicePodName(adminServerPodName), domainNamespace);
160-
verifyEMconsoleAccess(domainNamespace, domainUid, adminSvcExtHost);
164+
if (TestConstants.KIND_CLUSTER
165+
&& !TestConstants.WLSIMG_BUILDER.equals(TestConstants.WLSIMG_BUILDER_DEFAULT)) {
166+
hostHeader = createIngressHostRouting(domainNamespace, domainUid, adminServerName, adminPort);
167+
verifyEMconsoleAccess(domainNamespace, domainUid, adminSvcExtHost, hostHeader);
168+
} else {
169+
verifyEMconsoleAccess(domainNamespace, domainUid, adminSvcExtHost);
170+
}
161171
}
162172
}
163173

0 commit comments

Comments
 (0)