Skip to content

Commit 0076a9c

Browse files
maggiehe00maggiehe00
authored
Use unique Oracle DB TCP listener port for every DB creation test run (#2497)
* Use unique Oracle DB TCP listener port for every DB creation test run
1 parent 7f6ceec commit 0076a9c

12 files changed

+93
-65
lines changed

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

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@ class ItCrossDomainTransaction {
113113
private static String domain2AdminServerPodName = domainUid2 + "-admin-server";
114114
private final String domain2ManagedServerPrefix = domainUid2 + "-managed-server";
115115
private static final String ORACLEDBURLPREFIX = "oracledb.";
116-
private static final String ORACLEDBSUFFIX = ".svc.cluster.local:1521/devpdb.k8s";
116+
private static String ORACLEDBSUFFIX = null;
117117
private static LoggingFacade logger = null;
118118
static String dbUrl;
119119
static int dbNodePort;
@@ -144,12 +144,16 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
144144
assertNotNull(namespaces.get(2), "Namespace list is null");
145145
domain2Namespace = namespaces.get(2);
146146

147+
final int dbListenerPort = getNextFreePort();
148+
ORACLEDBSUFFIX = ".svc.cluster.local:" + dbListenerPort + "/devpdb.k8s";
147149
dbUrl = ORACLEDBURLPREFIX + domain2Namespace + ORACLEDBSUFFIX;
148150
createSecretForBaseImages(domain2Namespace);
149151

150152
//Start oracleDB
153+
logger.info("Start Oracle DB with namespace: {0}, dbListenerPort:{1}",
154+
domain2Namespace, dbListenerPort);
151155
assertDoesNotThrow(() -> {
152-
startOracleDB(DB_IMAGE_TO_USE_IN_SPEC, getNextFreePort(), domain2Namespace);
156+
startOracleDB(DB_IMAGE_TO_USE_IN_SPEC, getNextFreePort(), domain2Namespace, dbListenerPort);
153157
String.format("Failed to start Oracle DB");
154158
});
155159
dbNodePort = getDBNodePort(domain2Namespace, "oracledb");
@@ -322,7 +326,7 @@ private static void buildApplicationsAndDomains() {
322326
assertNotEquals(-1, domain1AdminServiceNodePort, "admin server default node port is not valid");
323327

324328
admin2ServiceNodePort = assertDoesNotThrow(
325-
() -> getServiceNodePort(domain2Namespace, getExternalServicePodName(domain2AdminServerPodName), "default"),
329+
() -> getServiceNodePort(domain2Namespace, getExternalServicePodName(domain2AdminServerPodName), "default"),
326330
"Getting admin server node port failed");
327331
assertNotEquals(-1, admin2ServiceNodePort, "admin server default node port is not valid");
328332
}
@@ -365,7 +369,7 @@ void testCrossDomainTransaction() {
365369
}
366370
}
367371

368-
/*
372+
/**
369373
* This test verifies a cross-domain transaction with re-connection.
370374
* It makes sure the disitibuted transaction is completed successfully
371375
* when a coordinator server is re-started after writing to transcation log
@@ -399,7 +403,7 @@ void testCrossDomainTransactionWithFailInjection() {
399403
}
400404
}
401405

402-
/*
406+
/**
403407
* This test verifies cross-domain MessageDrivenBean communication
404408
* A transacted MDB on Domain D1 listen on a replicated Distributed Topic
405409
* on Domain D2.

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ class ItFmwBigCMMiiDomain {
7171

7272
private static final String RCUSCHEMAPREFIX = "jrfdomainmii";
7373
private static final String ORACLEDBURLPREFIX = "oracledb.";
74-
private static final String ORACLEDBSUFFIX = ".svc.cluster.local:1521/devpdb.k8s";
74+
private static String ORACLEDBSUFFIX = null;
7575
private static final String RCUSYSUSERNAME = "sys";
7676
private static final String RCUSYSPASSWORD = "Oradoc_db1";
7777
private static final String RCUSCHEMAUSERNAME = "myrcuuser";
@@ -114,6 +114,8 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
114114
logger.info("Assign a unique namespace for DB and RCU");
115115
assertNotNull(namespaces.get(0), "Namespace is null");
116116
dbNamespace = namespaces.get(0);
117+
final int dbListenerPort = getNextFreePort();
118+
ORACLEDBSUFFIX = ".svc.cluster.local:" + dbListenerPort + "/devpdb.k8s";
117119
dbUrl = ORACLEDBURLPREFIX + dbNamespace + ORACLEDBSUFFIX;
118120

119121
logger.info("Assign a unique namespace for operator");
@@ -124,13 +126,13 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
124126
assertNotNull(namespaces.get(2), "Namespace is null");
125127
jrfDomainNamespace = namespaces.get(2);
126128

127-
logger.info("Start DB and create RCU schema for namespace: {0}, RCU prefix: {1}, "
128-
+ "dbUrl: {2}, dbImage: {3}, fmwImage: {4} ", dbNamespace, RCUSCHEMAPREFIX, dbUrl,
129+
logger.info("Start DB and create RCU schema for namespace: {0}, dbListenerPort: {1}, RCU prefix: {2}, "
130+
+ "dbUrl: {3}, dbImage: {4}, fmwImage: {5} ", dbNamespace, dbListenerPort, RCUSCHEMAPREFIX, dbUrl,
129131
DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC);
130132
assertDoesNotThrow(() -> setupDBandRCUschema(DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC,
131-
RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl),
133+
RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl, dbListenerPort),
132134
String.format("Failed to create RCU schema for prefix %s in the namespace %s with "
133-
+ "dbUrl %s", RCUSCHEMAPREFIX, dbNamespace, dbUrl));
135+
+ "dbUrl %s, dbListenerPost $s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
134136

135137
dbNodePort = getDBNodePort(dbNamespace, "oracledb");
136138
logger.info("DB Node Port = {0}", dbNodePort);

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class ItFmwDomainInPVUsingWDT {
6969

7070
private static final String RCUSCHEMAPREFIX = "fmwdomainpv";
7171
private static final String ORACLEDBURLPREFIX = "oracledb.";
72-
private static final String ORACLEDBSUFFIX = ".svc.cluster.local:1521/devpdb.k8s";
72+
private static String ORACLEDBSUFFIX = null;
7373
private static final String RCUSYSUSERNAME = "sys";
7474
private static final String RCUSYSPASSWORD = "Oradoc_db1";
7575
private static final String RCUSCHEMAUSERNAME = "myrcuuser";
@@ -112,6 +112,8 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
112112
logger.info("Assign a unique namespace for DB and RCU");
113113
assertNotNull(namespaces.get(0), "Namespace is null");
114114
dbNamespace = namespaces.get(0);
115+
final int dbListenerPort = getNextFreePort();
116+
ORACLEDBSUFFIX = ".svc.cluster.local:" + dbListenerPort + "/devpdb.k8s";
115117
dbUrl = ORACLEDBURLPREFIX + dbNamespace + ORACLEDBSUFFIX;
116118

117119
// get a new unique opNamespace
@@ -125,15 +127,13 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
125127
domainNamespace = namespaces.get(2);
126128

127129
// start DB and create RCU schema
128-
logger.info("Start DB and create RCU schema for namespace: {0}, RCU prefix: {1}, "
129-
+ "dbUrl: {2}, dbImage: {3}, fmwImage: {4} ", dbNamespace, RCUSCHEMAPREFIX, dbUrl,
130+
logger.info("Start DB and create RCU schema for namespace: {0}, dbListenerPort: {1}, RCU prefix: {2}, "
131+
+ "dbUrl: {3}, dbImage: {4}, fmwImage: {5} ", dbNamespace, dbListenerPort, RCUSCHEMAPREFIX, dbUrl,
130132
DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC);
131133
assertDoesNotThrow(() -> setupDBandRCUschema(DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC,
132-
RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl),
134+
RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl, dbListenerPort),
133135
String.format("Failed to create RCU schema for prefix %s in the namespace %s with "
134-
+ "dbUrl %s", RCUSCHEMAPREFIX, dbNamespace, dbUrl));
135-
logger.info("DB image: {0}, FMW image {1} used in the test",
136-
DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC);
136+
+ "dbUrl %s, dbListenerPost $s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
137137

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

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ class ItFmwDomainInPVUsingWLST {
8080

8181
private static final String RCUSCHEMAPREFIX = "jrfdomainpv";
8282
private static final String ORACLEDBURLPREFIX = "oracledb.";
83-
private static final String ORACLEDBSUFFIX = ".svc.cluster.local:1521/devpdb.k8s";
83+
private static String ORACLEDBSUFFIX = null;
8484
private static final String RCUSYSUSERNAME = "sys";
8585
private static final String RCUSYSPASSWORD = "Oradoc_db1";
8686
private static final String RCUSCHEMAUSERNAME = "myrcuuser";
@@ -114,6 +114,8 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
114114
logger.info("Assign a unique namespace for DB and RCU");
115115
assertNotNull(namespaces.get(0), "Namespace is null");
116116
dbNamespace = namespaces.get(0);
117+
final int dbListenerPort = getNextFreePort();
118+
ORACLEDBSUFFIX = ".svc.cluster.local:" + dbListenerPort + "/devpdb.k8s";
117119
dbUrl = ORACLEDBURLPREFIX + dbNamespace + ORACLEDBSUFFIX;
118120

119121
logger.info("Assign a unique namespace for operator");
@@ -124,13 +126,13 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
124126
assertNotNull(namespaces.get(2), "Namespace is null");
125127
jrfDomainNamespace = namespaces.get(2);
126128

127-
logger.info("Start DB and create RCU schema for namespace: {0}, RCU prefix: {1}, "
128-
+ "dbUrl: {2}, dbImage: {3}, fmwImage: {4} ", dbNamespace, RCUSCHEMAPREFIX, dbUrl,
129+
logger.info("Start DB and create RCU schema for namespace: {0}, dbListenerPort: {1}, RCU prefix: {2}, "
130+
+ "dbUrl: {3}, dbImage: {4}, fmwImage: {5} ", dbNamespace, dbListenerPort, RCUSCHEMAPREFIX, dbUrl,
129131
DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC);
130132
assertDoesNotThrow(() -> setupDBandRCUschema(DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC,
131-
RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl),
133+
RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl, dbListenerPort),
132134
String.format("Failed to create RCU schema for prefix %s in the namespace %s with "
133-
+ "dbUrl %s", RCUSCHEMAPREFIX, dbNamespace, dbUrl));
135+
+ "dbUrl %s, dbListenerPost $s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
134136

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

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class ItFmwDynamicClusterMiiDomain {
7575

7676
private static final String RCUSCHEMAPREFIX = "jrfdomainmii";
7777
private static final String ORACLEDBURLPREFIX = "oracledb.";
78-
private static final String ORACLEDBSUFFIX = ".svc.cluster.local:1521/devpdb.k8s";
78+
private static String ORACLEDBSUFFIX = null;
7979
private static final String RCUSCHEMAPASSWORD = "Oradoc_db1";
8080
private static final String modelFile = "model-fmw-dynamicdomain.yaml";
8181

@@ -112,6 +112,8 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
112112
logger.info("Assign a unique namespace for DB and RCU");
113113
assertNotNull(namespaces.get(0), "Namespace is null");
114114
dbNamespace = namespaces.get(0);
115+
final int dbListenerPort = getNextFreePort();
116+
ORACLEDBSUFFIX = ".svc.cluster.local:" + dbListenerPort + "/devpdb.k8s";
115117
dbUrl = ORACLEDBURLPREFIX + dbNamespace + ORACLEDBSUFFIX;
116118

117119
logger.info("Assign a unique namespace for operator");
@@ -122,13 +124,13 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
122124
assertNotNull(namespaces.get(2), "Namespace is null");
123125
domainNamespace = namespaces.get(2);
124126

125-
logger.info("Start DB and create RCU schema for namespace: {0}, RCU prefix: {1}, "
126-
+ "dbUrl: {2}, dbImage: {3}, fmwImage: {4} ", dbNamespace, RCUSCHEMAPREFIX, dbUrl,
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,
127129
DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC);
128130
assertDoesNotThrow(() -> setupDBandRCUschema(DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC,
129-
RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl),
131+
RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl, dbListenerPort),
130132
String.format("Failed to create RCU schema for prefix %s in the namespace %s with "
131-
+ "dbUrl %s", RCUSCHEMAPREFIX, dbNamespace, dbUrl));
133+
+ "dbUrl %s, dbListenerPost $s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
132134

133135
logger.info("DB image: {0}, FMW image {1} used in the test",
134136
DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC);

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ class ItFmwDynamicDomainInPV {
8585

8686
private static final String RCUSCHEMAPREFIX = "fmwdomainpv";
8787
private static final String ORACLEDBURLPREFIX = "oracledb.";
88-
private static final String ORACLEDBSUFFIX = ".svc.cluster.local:1521/devpdb.k8s";
88+
private static String ORACLEDBSUFFIX = null;
8989
private static final String RCUSYSUSERNAME = "sys";
9090
private static final String RCUSYSPASSWORD = "Oradoc_db1";
9191
private static final String RCUSCHEMAUSERNAME = "myrcuuser";
@@ -121,6 +121,8 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
121121
logger.info("Assign a unique namespace for DB and RCU");
122122
assertNotNull(namespaces.get(0), "Namespace is null");
123123
dbNamespace = namespaces.get(0);
124+
final int dbListenerPort = getNextFreePort();
125+
ORACLEDBSUFFIX = ".svc.cluster.local:" + dbListenerPort + "/devpdb.k8s";
124126
dbUrl = ORACLEDBURLPREFIX + dbNamespace + ORACLEDBSUFFIX;
125127

126128
logger.info("Assign a unique namespace for operator1");
@@ -131,13 +133,13 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
131133
assertNotNull(namespaces.get(2), "Namespace is null");
132134
domainNamespace = namespaces.get(2);
133135

134-
logger.info("Start DB and create RCU schema for namespace: {0}, RCU prefix: {1}, "
135-
+ "dbUrl: {2}, dbImage: {3}, fmwImage: {4} ", dbNamespace, RCUSCHEMAPREFIX, dbUrl,
136+
logger.info("Start DB and create RCU schema for namespace: {0}, dbListenerPort: {1}, RCU prefix: {2}, "
137+
+ "dbUrl: {3}, dbImage: {4}, fmwImage: {5} ", dbNamespace, dbListenerPort, RCUSCHEMAPREFIX, dbUrl,
136138
DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC);
137139
assertDoesNotThrow(() -> setupDBandRCUschema(DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC,
138-
RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl),
140+
RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl, dbListenerPort),
139141
String.format("Failed to create RCU schema for prefix %s in the namespace %s with "
140-
+ "dbUrl %s", RCUSCHEMAPREFIX, dbNamespace, dbUrl));
142+
+ "dbUrl %s, dbListenerPost $s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
141143

142144
logger.info("DB image: {0}, FMW image {1} used in the test",
143145
DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC);

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

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ class ItFmwMiiDomain {
7575

7676
private static final String RCUSCHEMAPREFIX = "FMWDOMAINMII";
7777
private static final String ORACLEDBURLPREFIX = "oracledb.";
78-
private static final String ORACLEDBSUFFIX = ".svc.cluster.local:1521/devpdb.k8s";
78+
private static String ORACLEDBSUFFIX = null;
7979
private static final String RCUSYSUSERNAME = "sys";
8080
private static final String RCUSYSPASSWORD = "Oradoc_db1";
8181
private static final String RCUSCHEMAUSERNAME = "myrcuuser";
@@ -118,6 +118,8 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
118118
logger.info("Assign a unique namespace for DB and RCU");
119119
assertNotNull(namespaces.get(0), "Namespace is null");
120120
dbNamespace = namespaces.get(0);
121+
final int dbListenerPort = getNextFreePort();
122+
ORACLEDBSUFFIX = ".svc.cluster.local:" + dbListenerPort + "/devpdb.k8s";
121123
dbUrl = ORACLEDBURLPREFIX + dbNamespace + ORACLEDBSUFFIX;
122124

123125
logger.info("Assign a unique namespace for operator");
@@ -128,13 +130,13 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
128130
assertNotNull(namespaces.get(2), "Namespace is null");
129131
fmwDomainNamespace = namespaces.get(2);
130132

131-
logger.info("Start DB and create RCU schema for namespace: {0}, RCU prefix: {1}, "
132-
+ "dbUrl: {2}, dbImage: {3}, fmwImage: {4} ", dbNamespace, RCUSCHEMAPREFIX, dbUrl,
133+
logger.info("Start DB and create RCU schema for namespace: {0}, dbListenerPort: {1}, RCU prefix: {2}, "
134+
+ "dbUrl: {3}, dbImage: {4}, fmwImage: {5} ", dbNamespace, dbListenerPort, RCUSCHEMAPREFIX, dbUrl,
133135
DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC);
134136
assertDoesNotThrow(() -> setupDBandRCUschema(DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC,
135-
RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl),
137+
RCUSCHEMAPREFIX, dbNamespace, getNextFreePort(), dbUrl, dbListenerPort),
136138
String.format("Failed to create RCU schema for prefix %s in the namespace %s with "
137-
+ "dbUrl %s", RCUSCHEMAPREFIX, dbNamespace, dbUrl));
139+
+ "dbUrl %s, dbListenerPost $s", RCUSCHEMAPREFIX, dbNamespace, dbUrl, dbListenerPort));
138140

139141
// install operator and verify its running in ready state
140142
installAndVerifyOperator(opNamespace, fmwDomainNamespace);

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ class ItIstioCrossClusters {
107107
private final String domain1ManagedServerPrefix = domainUid1 + "-managed-server";
108108
private final String domain2ManagedServerPrefix = domainUid2 + "-managed-server";
109109
private static final String ORACLEDBURLPREFIX = "oracledb.";
110-
private static final String ORACLEDBSUFFIX = ".svc.cluster.local:1521/devpdb.k8s";
110+
private static String ORACLEDBSUFFIX = null;
111111

112112
private static LoggingFacade logger = null;
113113
static String dbUrl;
@@ -153,12 +153,14 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
153153
assertNotNull(namespaces.get(2), "Namespace list is null");
154154
domain2Namespace = namespaces.get(2);
155155

156+
final int dbListenerPort = getNextFreePort();
157+
ORACLEDBSUFFIX = ".svc.cluster.local:" + dbListenerPort + "/devpdb.k8s";
156158
dbUrl = ORACLEDBURLPREFIX + domain2Namespace + ORACLEDBSUFFIX;
157159
createSecretForBaseImages(domain2Namespace);
158160

159161
//Start oracleDB
160162
assertDoesNotThrow(() -> {
161-
startOracleDB(DB_IMAGE_TO_USE_IN_SPEC, getNextFreePort(), domain2Namespace);
163+
startOracleDB(DB_IMAGE_TO_USE_IN_SPEC, getNextFreePort(), domain2Namespace, dbListenerPort);
162164
String.format("Failed to start Oracle DB");
163165
});
164166
dbNodePort = getDBNodePort(domain2Namespace, "oracledb");

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ class ItIstioCrossDomainTransaction {
115115
private final String domain2ManagedServerPrefix = domainUid2 + "-managed-server";
116116
private static String clusterName = "cluster-1";
117117
private static final String ORACLEDBURLPREFIX = "oracledb.";
118-
private static final String ORACLEDBSUFFIX = ".svc.cluster.local:1521/devpdb.k8s";
118+
private static String ORACLEDBSUFFIX = null;
119119
private static LoggingFacade logger = null;
120120
static String dbUrl;
121121
static int dbNodePort;
@@ -146,12 +146,14 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
146146
assertNotNull(namespaces.get(2), "Namespace list is null");
147147
domain2Namespace = namespaces.get(2);
148148

149+
final int dbListenerPort = getNextFreePort();
150+
ORACLEDBSUFFIX = ".svc.cluster.local:" + dbListenerPort + "/devpdb.k8s";
149151
dbUrl = ORACLEDBURLPREFIX + domain2Namespace + ORACLEDBSUFFIX;
150152
createSecretForBaseImages(domain2Namespace);
151153

152154
//Start oracleDB
153155
assertDoesNotThrow(() -> {
154-
startOracleDB(DB_IMAGE_TO_USE_IN_SPEC, getNextFreePort(), domain2Namespace);
156+
startOracleDB(DB_IMAGE_TO_USE_IN_SPEC, getNextFreePort(), domain2Namespace, dbListenerPort);
155157
String.format("Failed to start Oracle DB");
156158
});
157159

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -136,8 +136,11 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
136136
createOcirRepoSecret(domainNamespace);
137137

138138
//Start oracleDB
139+
final int dbListenerPort = getNextFreePort();
140+
logger.info("Start Oracle DB with namespace: {0}, dbListenerPort:{1}",
141+
domainNamespace, dbListenerPort);
139142
assertDoesNotThrow(() -> {
140-
startOracleDB(DB_IMAGE_TO_USE_IN_SPEC, getNextFreePort(), domainNamespace);
143+
startOracleDB(DB_IMAGE_TO_USE_IN_SPEC, getNextFreePort(), domainNamespace, dbListenerPort);
141144
String.format("Failed to start Oracle Database Service");
142145
});
143146
dbNodePort = getDBNodePort(domainNamespace, "oracledb");

0 commit comments

Comments
 (0)