Skip to content

Use unique Oracle DB TCP listener port for every DB creation test run #2497

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Aug 12, 2021
Merged

Use unique Oracle DB TCP listener port for every DB creation test run #2497

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
da965e1
first cut of DB TCP listener port change
maggiehe00 Aug 6, 2021
f24e79d
wip
maggiehe00 Aug 6, 2021
2fd9886
wip
maggiehe00 Aug 6, 2021
cb3ac99
Merge remote-tracking branch 'origin/main' into dbport
maggiehe00 Aug 9, 2021
1dd91ed
merge to the latest main
maggiehe00 Aug 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 9 additions & 5 deletions integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCrossDomainTransaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,7 +113,7 @@ class ItCrossDomainTransaction {
private static String domain2AdminServerPodName = domainUid2 + "-admin-server";
private final String domain2ManagedServerPrefix = domainUid2 + "-managed-server";
private static final String ORACLEDBURLPREFIX = "oracledb.";
private static final String ORACLEDBSUFFIX = ".svc.cluster.local:1521/devpdb.k8s";
private static String ORACLEDBSUFFIX = null;
private static LoggingFacade logger = null;
static String dbUrl;
static int dbNodePort;
Copy link
Contributor

@hzhao-github hzhao-github Aug 9, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is there a reason these two are not declared as private?

Copy link
Contributor

@hzhao-github hzhao-github Aug 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess this is not from your change :)

Copy link
Contributor

@hzhao-github hzhao-github Aug 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor Author

@maggiehe00 maggiehe00 Aug 10, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Which 2 variables are you referring to? dbUrl and dbNodePort?

Expand Down Expand Up @@ -144,12 +144,16 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
assertNotNull(namespaces.get(2), "Namespace list is null");
domain2Namespace = namespaces.get(2);

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

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

admin2ServiceNodePort = assertDoesNotThrow(
() -> getServiceNodePort(domain2Namespace, getExternalServicePodName(domain2AdminServerPodName), "default"),
() -> getServiceNodePort(domain2Namespace, getExternalServicePodName(domain2AdminServerPodName), "default"),
"Getting admin server node port failed");
assertNotEquals(-1, admin2ServiceNodePort, "admin server default node port is not valid");
}
Expand Down Expand Up @@ -365,7 +369,7 @@ void testCrossDomainTransaction() {
}
}

/*
/**
* This test verifies a cross-domain transaction with re-connection.
* It makes sure the disitibuted transaction is completed successfully
* when a coordinator server is re-started after writing to transcation log
Expand Down Expand Up @@ -399,7 +403,7 @@ void testCrossDomainTransactionWithFailInjection() {
}
}

/*
/**
* This test verifies cross-domain MessageDrivenBean communication
* A transacted MDB on Domain D1 listen on a replicated Distributed Topic
* on Domain D2.
Expand Down
12 changes: 7 additions & 5 deletions integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwBigCMMiiDomain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class ItFmwBigCMMiiDomain {

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

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

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

dbNodePort = getDBNodePort(dbNamespace, "oracledb");
logger.info("DB Node Port = {0}", dbNodePort);
Expand Down
14 changes: 7 additions & 7 deletions integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWDT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ class ItFmwDomainInPVUsingWDT {

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

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

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

// install operator and verify its running in ready state
installAndVerifyOperator(opNamespace, domainNamespace);
Expand Down
12 changes: 7 additions & 5 deletions integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWLST.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ class ItFmwDomainInPVUsingWLST {

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

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

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

// install operator and verify its running in ready state
installAndVerifyOperator(opNamespace, jrfDomainNamespace);
Expand Down
12 changes: 7 additions & 5 deletions integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicClusterMiiDomain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class ItFmwDynamicClusterMiiDomain {

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

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

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

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

logger.info("DB image: {0}, FMW image {1} used in the test",
DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC);
Expand Down
12 changes: 7 additions & 5 deletions integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicDomainInPV.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,7 +85,7 @@ class ItFmwDynamicDomainInPV {

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

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

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

logger.info("DB image: {0}, FMW image {1} used in the test",
DB_IMAGE_TO_USE_IN_SPEC, FMWINFRA_IMAGE_TO_USE_IN_SPEC);
Expand Down
12 changes: 7 additions & 5 deletions integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwMiiDomain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ class ItFmwMiiDomain {

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

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

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

// install operator and verify its running in ready state
installAndVerifyOperator(opNamespace, fmwDomainNamespace);
Expand Down
6 changes: 4 additions & 2 deletions integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossClusters.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ class ItIstioCrossClusters {
private final String domain1ManagedServerPrefix = domainUid1 + "-managed-server";
private final String domain2ManagedServerPrefix = domainUid2 + "-managed-server";
private static final String ORACLEDBURLPREFIX = "oracledb.";
private static final String ORACLEDBSUFFIX = ".svc.cluster.local:1521/devpdb.k8s";
private static String ORACLEDBSUFFIX = null;

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

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

//Start oracleDB
assertDoesNotThrow(() -> {
startOracleDB(DB_IMAGE_TO_USE_IN_SPEC, getNextFreePort(), domain2Namespace);
startOracleDB(DB_IMAGE_TO_USE_IN_SPEC, getNextFreePort(), domain2Namespace, dbListenerPort);
String.format("Failed to start Oracle DB");
});
dbNodePort = getDBNodePort(domain2Namespace, "oracledb");
Expand Down
6 changes: 4 additions & 2 deletions ...gration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossDomainTransaction.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,7 @@ class ItIstioCrossDomainTransaction {
private final String domain2ManagedServerPrefix = domainUid2 + "-managed-server";
private static String clusterName = "cluster-1";
private static final String ORACLEDBURLPREFIX = "oracledb.";
private static final String ORACLEDBSUFFIX = ".svc.cluster.local:1521/devpdb.k8s";
private static String ORACLEDBSUFFIX = null;
private static LoggingFacade logger = null;
static String dbUrl;
static int dbNodePort;
Expand Down Expand Up @@ -146,12 +146,14 @@ public static void initAll(@Namespaces(3) List<String> namespaces) {
assertNotNull(namespaces.get(2), "Namespace list is null");
domain2Namespace = namespaces.get(2);

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

//Start oracleDB
assertDoesNotThrow(() -> {
startOracleDB(DB_IMAGE_TO_USE_IN_SPEC, getNextFreePort(), domain2Namespace);
startOracleDB(DB_IMAGE_TO_USE_IN_SPEC, getNextFreePort(), domain2Namespace, dbListenerPort);
String.format("Failed to start Oracle DB");
});

Expand Down
5 changes: 4 additions & 1 deletion integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiServiceMigration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -136,8 +136,11 @@ public static void initAll(@Namespaces(2) List<String> namespaces) {
createOcirRepoSecret(domainNamespace);

//Start oracleDB
final int dbListenerPort = getNextFreePort();
logger.info("Start Oracle DB with namespace: {0}, dbListenerPort:{1}",
domainNamespace, dbListenerPort);
assertDoesNotThrow(() -> {
startOracleDB(DB_IMAGE_TO_USE_IN_SPEC, getNextFreePort(), domainNamespace);
startOracleDB(DB_IMAGE_TO_USE_IN_SPEC, getNextFreePort(), domainNamespace, dbListenerPort);
String.format("Failed to start Oracle Database Service");
});
dbNodePort = getDBNodePort(domainNamespace, "oracledb");
Expand Down
Loading