Skip to content

Commit 064c888

Browse files
rjeberhardrjeberhard
committed
Merge branch 'main_porting' into 'main'
Forward port MR4773 to main branch See merge request weblogic-cloud/weblogic-kubernetes-operator!4856
2 parents e5df5ac + 46050c5 commit 064c888

File tree

3 files changed

+75
-19
lines changed

3 files changed

+75
-19
lines changed

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

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,11 +24,13 @@
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;
2728
import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TO_USE_IN_SPEC;
2829
import static oracle.weblogic.kubernetes.TestConstants.HTTPS_PROXY;
2930
import static oracle.weblogic.kubernetes.TestConstants.HTTP_PROXY;
3031
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
3132
import static oracle.weblogic.kubernetes.TestConstants.NO_PROXY;
33+
import static oracle.weblogic.kubernetes.TestConstants.OKD;
3234
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_TEMPFILE;
3335
import static oracle.weblogic.kubernetes.actions.ActionConstants.MODEL_DIR;
3436
import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
@@ -40,6 +42,7 @@
4042
import static oracle.weblogic.kubernetes.utils.DbUtils.createOracleDBUsingOperator;
4143
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSchema;
4244
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSecretWithUsernamePassword;
45+
import static oracle.weblogic.kubernetes.utils.DbUtils.setupDBandRCUschema;
4346
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
4447
import static oracle.weblogic.kubernetes.utils.FmwUtils.createDomainResourceOnPv;
4548
import static oracle.weblogic.kubernetes.utils.FmwUtils.verifyDomainReady;
@@ -70,6 +73,8 @@ class ItFmwDomainInPVUsingWDT {
7073
private static String oracle_home = null;
7174
private static String java_home = null;
7275

76+
private static final String ORACLEDBURLPREFIX = "oracledb.";
77+
private static String ORACLEDBSUFFIX = null;
7378
private static final String RCUSCHEMAPREFIX = "fmwdomainpv";
7479
private static final String RCUSYSUSERNAME = "sys";
7580
private static final String RCUSYSPASSWORD = "Oradoc_db1";
@@ -117,16 +122,31 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
117122
assertNotNull(namespaces.get(2), "Namespace is null");
118123
domainNamespace = namespaces.get(2);
119124

125+
final int dbListenerPort = getNextFreePort();
126+
ORACLEDBSUFFIX = ".svc.cluster.local:" + dbListenerPort + "/devpdb.k8s";
127+
dbUrl = ORACLEDBURLPREFIX + dbNamespace + ORACLEDBSUFFIX;
128+
120129
DOMAINHOMEPREFIX = "/shared/" + domainNamespace + "/domains/";
121130

122-
logger.info("Create Oracle DB in namespace: {0} ", dbNamespace);
123-
createBaseRepoSecret(dbNamespace);
124-
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, RCUSYSPASSWORD, dbNamespace));
131+
if (OKD) {
132+
logger.info("Start DB and create RCU schema for namespace: {0}, dbListenerPort: {1}, RCU prefix: {2}, "
133+
+ "dbUrl: {3}, dbImage: {4}, fmwImage: {5} ", dbNamespace, dbListenerPort, RCUSCHEMAPREFIX, dbUrl,
134+
DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC);
135+
assertDoesNotThrow(() -> setupDBandRCUschema(DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC,
136+
RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl, dbListenerPort),
137+
String.format("Failed to create RCU schema for prefix %s in the namespace %s with "
138+
+ "dbUrl %s, dbListenerPost %s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
139+
} else {
140+
logger.info("Create Oracle DB in namespace: {0} ", dbNamespace);
141+
createBaseRepoSecret(dbNamespace);
142+
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, RCUSYSPASSWORD, dbNamespace));
143+
144+
logger.info("Create RCU schema with fmwImage: {0}, rcuSchemaPrefix: {1}, dbUrl: {2}, "
145+
+ " dbNamespace: {3}", FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX, dbUrl, dbNamespace);
146+
assertDoesNotThrow(() -> createRcuSchema(FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX,
147+
dbUrl, dbNamespace));
148+
}
125149

126-
logger.info("Create RCU schema with fmwImage: {0}, rcuSchemaPrefix: {1}, dbUrl: {2}, "
127-
+ " dbNamespace: {3}", FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX, dbUrl, dbNamespace);
128-
assertDoesNotThrow(() -> createRcuSchema(FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX,
129-
dbUrl, dbNamespace));
130150

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

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

Lines changed: 27 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,7 @@
4141
import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TO_USE_IN_SPEC;
4242
import static oracle.weblogic.kubernetes.TestConstants.IMAGE_PULL_POLICY;
4343
import static oracle.weblogic.kubernetes.TestConstants.K8S_NODEPORT_HOST;
44+
import static oracle.weblogic.kubernetes.TestConstants.OKD;
4445
import static oracle.weblogic.kubernetes.TestConstants.RESULTS_TEMPFILE;
4546
import static oracle.weblogic.kubernetes.actions.ActionConstants.RESOURCE_DIR;
4647
import static oracle.weblogic.kubernetes.actions.impl.primitive.Image.getImageEnvVar;
@@ -51,6 +52,7 @@
5152
import static oracle.weblogic.kubernetes.utils.DbUtils.createOracleDBUsingOperator;
5253
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSchema;
5354
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSecretWithUsernamePassword;
55+
import static oracle.weblogic.kubernetes.utils.DbUtils.setupDBandRCUschema;
5456
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
5557
import static oracle.weblogic.kubernetes.utils.ImageUtils.createBaseRepoSecret;
5658
import static oracle.weblogic.kubernetes.utils.JobUtils.createDomainJob;
@@ -81,6 +83,8 @@ class ItFmwDomainInPVUsingWLST {
8183
private static String oracle_home = null;
8284
private static String java_home = null;
8385

86+
private static final String ORACLEDBURLPREFIX = "oracledb.";
87+
private static String ORACLEDBSUFFIX = null;
8488
private static final String RCUSCHEMAPREFIX = "jrfdomainpv";
8589
private static final String RCUSYSUSERNAME = "sys";
8690
private static final String RCUSYSPASSWORD = "Oradoc_db1";
@@ -119,14 +123,30 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
119123
assertNotNull(namespaces.get(2), "Namespace is null");
120124
jrfDomainNamespace = namespaces.get(2);
121125

122-
logger.info("Create Oracle DB in namespace: {0} ", dbNamespace);
123-
createBaseRepoSecret(dbNamespace);
124-
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, RCUSYSPASSWORD, dbNamespace));
126+
final int dbListenerPort = getNextFreePort();
127+
ORACLEDBSUFFIX = ".svc.cluster.local:" + dbListenerPort + "/devpdb.k8s";
128+
dbUrl = ORACLEDBURLPREFIX + dbNamespace + ORACLEDBSUFFIX;
129+
130+
if (OKD) {
131+
logger.info("Start DB and create RCU schema for namespace: {0}, dbListenerPort: {1}, RCU prefix: {2}, "
132+
+ "dbUrl: {3}, dbImage: {4}, fmwImage: {5} ", dbNamespace, dbListenerPort, RCUSCHEMAPREFIX, dbUrl,
133+
DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC);
134+
assertDoesNotThrow(() -> setupDBandRCUschema(DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC,
135+
RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl, dbListenerPort),
136+
String.format("Failed to create RCU schema for prefix %s in the namespace %s with "
137+
+ "dbUrl %s, dbListenerPost %s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
138+
139+
} else {
140+
logger.info("Create Oracle DB in namespace: {0} ", dbNamespace);
141+
createBaseRepoSecret(dbNamespace);
142+
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, RCUSYSPASSWORD, dbNamespace));
143+
144+
logger.info("Create RCU schema with fmwImage: {0}, rcuSchemaPrefix: {1}, dbUrl: {2}, "
145+
+ " dbNamespace: {3}", FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX, dbUrl, dbNamespace);
146+
assertDoesNotThrow(() -> createRcuSchema(FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX,
147+
dbUrl, dbNamespace));
148+
}
125149

126-
logger.info("Create RCU schema with fmwImage: {0}, rcuSchemaPrefix: {1}, dbUrl: {2}, "
127-
+ " dbNamespace: {3}", FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX, dbUrl, dbNamespace);
128-
assertDoesNotThrow(() -> createRcuSchema(FMWINFRA_IMAGE_TO_USE_IN_SPEC, RCUSCHEMAPREFIX,
129-
dbUrl, dbNamespace));
130150

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

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

Lines changed: 21 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import static oracle.weblogic.kubernetes.TestConstants.ADMIN_USERNAME_DEFAULT;
4040
import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_PREFIX;
4141
import static oracle.weblogic.kubernetes.TestConstants.BASE_IMAGES_REPO_SECRET_NAME;
42+
import static oracle.weblogic.kubernetes.TestConstants.DB_IMAGE_TO_USE_IN_SPEC;
4243
import static oracle.weblogic.kubernetes.TestConstants.DOMAIN_IMAGES_PREFIX;
4344
import static oracle.weblogic.kubernetes.TestConstants.ELASTICSEARCH_HOST;
4445
import static oracle.weblogic.kubernetes.TestConstants.FMWINFRA_IMAGE_TO_USE_IN_SPEC;
@@ -66,6 +67,7 @@
6667
import static oracle.weblogic.kubernetes.utils.DbUtils.createOracleDBUsingOperator;
6768
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuAccessSecret;
6869
import static oracle.weblogic.kubernetes.utils.DbUtils.createRcuSchema;
70+
import static oracle.weblogic.kubernetes.utils.DbUtils.startOracleDB;
6971
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainAndVerify;
7072
import static oracle.weblogic.kubernetes.utils.DomainUtils.createDomainResourceOnPv;
7173
import static oracle.weblogic.kubernetes.utils.DomainUtils.deleteDomainResource;
@@ -101,6 +103,8 @@ class ItFmwDomainOnPV {
101103
private static String domainNamespace = null;
102104
private static String dbNamespace = null;
103105

106+
private static final String ORACLEDBURLPREFIX = "oracledb.";
107+
private static String ORACLEDBSUFFIX = null;
104108
private static final String RCUSCHEMAPREFIX = "fmwdomainpv";
105109
private static final String RCUSYSPASSWORD = "Oradoc_db1";
106110
private static final String RCUSCHEMAPASSWORD = "Oradoc_db1";
@@ -127,6 +131,9 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
127131
logger.info("Assign a unique namespace for DB");
128132
assertNotNull(namespaces.get(0), "Namespace is null");
129133
dbNamespace = namespaces.get(0);
134+
final int dbListenerPort = getNextFreePort();
135+
dbUrl = ORACLEDBURLPREFIX + dbNamespace + ".svc.cluster.local:" + dbListenerPort + "/devpdb.k8s";
136+
130137

131138
// get a new unique opNamespace
132139
logger.info("Assign a unique namespace for operator");
@@ -140,11 +147,20 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
140147

141148
DOMAINHOMEPREFIX = "/shared/" + domainNamespace + "/domains/";
142149

143-
//install Oracle Database Operator
144-
String dbName = "fmwdomainonpv1" + "my-oracle-db";
145-
logger.info("Create Oracle DB in namespace: {0} ", dbNamespace);
146-
createBaseRepoSecret(dbNamespace);
147-
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, RCUSYSPASSWORD, dbNamespace));
150+
if (OKD) {
151+
logger.info("Start DB in namespace: {0}, dbListenerPort: {1}, dbUrl: {2}, dbImage: {3}",
152+
dbNamespace, dbListenerPort, dbUrl, DB_IMAGE_TO_USE_IN_SPEC);
153+
assertDoesNotThrow(() -> startOracleDB(DB_IMAGE_TO_USE_IN_SPEC, getNextFreePort(), dbNamespace, dbListenerPort),
154+
String.format("Failed to start Oracle DB in the namespace %s with dbUrl %s, dbListenerPost %s",
155+
dbNamespace, dbUrl, dbListenerPort));
156+
} else {
157+
String dbName = "fmwdomainonpv1" + "my-oracle-db";
158+
logger.info("Create Oracle DB in namespace: {0} ", dbNamespace);
159+
createBaseRepoSecret(dbNamespace);
160+
dbUrl = assertDoesNotThrow(() -> createOracleDBUsingOperator(dbName, RCUSYSPASSWORD, dbNamespace));
161+
162+
}
163+
148164
// install operator and verify its running in ready state
149165
HelmParams opHelmParams =
150166
new HelmParams().releaseName(OPERATOR_RELEASE_NAME)

0 commit comments

Comments
 (0)