From da965e18ba589021f64e2048751aba91d3938caf Mon Sep 17 00:00:00 2001 From: "MAGGIE.HE@ORACLE.COM" Date: Fri, 6 Aug 2021 03:49:12 +0000 Subject: [PATCH 1/3] first cut of DB TCP listener port change --- .../kubernetes/ItCrossDomainTransaction.java | 15 ++++--- .../kubernetes/ItFmwBigCMMiiDomain.java | 13 +++--- .../kubernetes/ItFmwDomainInPVUsingWDT.java | 15 ++++--- .../kubernetes/ItFmwDomainInPVUsingWLST.java | 13 +++--- .../ItFmwDynamicClusterMiiDomain.java | 13 +++--- .../kubernetes/ItFmwDynamicDomainInPV.java | 13 +++--- .../weblogic/kubernetes/ItFmwMiiDomain.java | 14 +++--- .../kubernetes/ItIstioCrossClusters.java | 3 +- .../ItIstioCrossDomainTransaction.java | 3 +- .../kubernetes/ItMiiServiceMigration.java | 5 ++- .../kubernetes/ItOpUpgradeFmwDomainInPV.java | 14 +++--- .../weblogic/kubernetes/utils/DbUtils.java | 43 +++++++++++-------- 12 files changed, 101 insertions(+), 63 deletions(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCrossDomainTransaction.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCrossDomainTransaction.java index 4c8e1eb29d5..2e28a8f7ded 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCrossDomainTransaction.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCrossDomainTransaction.java @@ -113,7 +113,8 @@ public 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 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; @@ -144,12 +145,16 @@ public static void initAll(@Namespaces(3) List 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"); @@ -322,7 +327,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"); } @@ -365,7 +370,7 @@ public 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 @@ -399,7 +404,7 @@ public void testCrossDomainTransactionWithFailInjection() { } } - /* + /** * This test verifies cross-domain MessageDrivenBean communication * A transacted MDB on Domain D1 listen on a replicated Distributed Topic * on Domain D2. diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwBigCMMiiDomain.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwBigCMMiiDomain.java index 4767d5e8171..91ae7d64efc 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwBigCMMiiDomain.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwBigCMMiiDomain.java @@ -71,7 +71,8 @@ public 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 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"; @@ -114,6 +115,8 @@ public static void initAll(@Namespaces(3) List 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"); @@ -124,13 +127,13 @@ public static void initAll(@Namespaces(3) List 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); diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWDT.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWDT.java index 3d6bc033f47..3e6275242a4 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWDT.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWDT.java @@ -69,7 +69,8 @@ public 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 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"; @@ -112,6 +113,8 @@ public static void initAll(@Namespaces(3) List 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 @@ -125,15 +128,13 @@ public static void initAll(@Namespaces(3) List 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); diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWLST.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWLST.java index c704861270d..6c24b469512 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWLST.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWLST.java @@ -76,7 +76,8 @@ public 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 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"; @@ -110,6 +111,8 @@ public static void initAll(@Namespaces(3) List 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"); @@ -120,13 +123,13 @@ public static void initAll(@Namespaces(3) List 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); diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicClusterMiiDomain.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicClusterMiiDomain.java index 6bf25f58a7f..23f707309c8 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicClusterMiiDomain.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicClusterMiiDomain.java @@ -75,7 +75,8 @@ public 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 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"; @@ -112,6 +113,8 @@ public static void initAll(@Namespaces(3) List 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"); @@ -122,13 +125,13 @@ public static void initAll(@Namespaces(3) List 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); diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicDomainInPV.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicDomainInPV.java index aba7af20f95..ee839d35d66 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicDomainInPV.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicDomainInPV.java @@ -81,7 +81,8 @@ public 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 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"; @@ -117,6 +118,8 @@ public static void initAll(@Namespaces(3) List 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"); @@ -127,13 +130,13 @@ public static void initAll(@Namespaces(3) List 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); diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwMiiDomain.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwMiiDomain.java index b1b00d70ae2..58b468e13eb 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwMiiDomain.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwMiiDomain.java @@ -69,7 +69,9 @@ public 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 ORACLEDBSUFFIX = ".svc.cluster.local:1561/devpdb.k8s"; + //private static final String ORACLEDBSUFFIX = ".svc.cluster.local:" + getNextFreePort(1025, 65000) + "/devpdb.k8s"; private static final String RCUSYSUSERNAME = "sys"; private static final String RCUSYSPASSWORD = "Oradoc_db1"; private static final String RCUSCHEMAUSERNAME = "myrcuuser"; @@ -112,6 +114,8 @@ public static void initAll(@Namespaces(3) List 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"); @@ -122,13 +126,13 @@ public static void initAll(@Namespaces(3) List 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); diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossClusters.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossClusters.java index 7a950a42d26..f96b7d30354 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossClusters.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossClusters.java @@ -157,8 +157,9 @@ public static void initAll(@Namespaces(3) List namespaces) { createSecretForBaseImages(domain2Namespace); //Start oracleDB + final int dbListenerPort = getNextFreePort(); 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"); diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossDomainTransaction.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossDomainTransaction.java index 4f3bbec66dc..f30cab52f4f 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossDomainTransaction.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossDomainTransaction.java @@ -150,8 +150,9 @@ public static void initAll(@Namespaces(3) List namespaces) { createSecretForBaseImages(domain2Namespace); //Start oracleDB + final int dbListenerPort = getNextFreePort(); 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"); }); diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiServiceMigration.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiServiceMigration.java index 272df50256f..fc76faebea6 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiServiceMigration.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItMiiServiceMigration.java @@ -136,8 +136,11 @@ public static void initAll(@Namespaces(2) List 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"); diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOpUpgradeFmwDomainInPV.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOpUpgradeFmwDomainInPV.java index 7d452380acb..636f50e608a 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOpUpgradeFmwDomainInPV.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOpUpgradeFmwDomainInPV.java @@ -106,7 +106,8 @@ public class ItOpUpgradeFmwDomainInPV { 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 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"; @@ -162,6 +163,9 @@ public void beforeEach(@Namespaces(4) List 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; dbUrl = ORACLEDBURLPREFIX + dbNamespace + ORACLEDBSUFFIX; logger.info("Assign a unique namespace for operator1"); @@ -176,13 +180,13 @@ public void beforeEach(@Namespaces(4) List namespaces) { assertNotNull(namespaces.get(3), "Namespace is null"); domainNamespace = namespaces.get(3); - 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); diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DbUtils.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DbUtils.java index bbbf7bf3e28..454e7fd9f2f 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DbUtils.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DbUtils.java @@ -93,16 +93,15 @@ public class DbUtils { */ public static synchronized void setupDBandRCUschema(String dbImage, String fmwImage, String rcuSchemaPrefix, - String dbNamespace, - int dbPort, String dbUrl) throws ApiException { + String dbNamespace, int dbPort, String dbUrl, int dbListenerPort) throws ApiException { LoggingFacade logger = getLogger(); // create pull secrets when running in non Kind Kubernetes cluster // this secret is used only for non-kind cluster createSecretForBaseImages(dbNamespace); - logger.info("Start Oracle DB with dbImage: {0}, dbPort: {1}, dbNamespace: {2}", - dbImage, dbPort, dbNamespace); - startOracleDB(dbImage, dbPort, dbNamespace); + logger.info("Start Oracle DB with dbImage: {0}, dbPort: {1}, dbNamespace: {2}, dbListenerPort:{3}", + dbImage, dbPort, dbNamespace, dbListenerPort); + startOracleDB(dbImage, dbPort, dbNamespace, dbListenerPort); logger.info("Create RCU schema with fmwImage: {0}, rcuSchemaPrefix: {1}, dbUrl: {2}, " + " dbNamespace: {3}:", fmwImage, rcuSchemaPrefix, dbUrl, dbNamespace); createRcuSchema(fmwImage, rcuSchemaPrefix, dbUrl, dbNamespace); @@ -115,9 +114,10 @@ public static synchronized void setupDBandRCUschema(String dbImage, String fmwIm * @param dbBaseImageName full image name for DB deployment * @param dbPort NodePort of DB * @param dbNamespace namespace where DB instance is going to start + * @param dbListenerPort TCP listener port of DB */ - public static synchronized void startOracleDB(String dbBaseImageName, int dbPort, String dbNamespace) - throws ApiException { + public static synchronized void startOracleDB(String dbBaseImageName, int dbPort, String dbNamespace, + int dbListenerPort) throws ApiException { LoggingFacade logger = getLogger(); Map labels = new HashMap(); labels.put("app", "database"); @@ -142,7 +142,7 @@ public static synchronized void startOracleDB(String dbBaseImageName, int dbPort .ports(Arrays.asList( new V1ServicePort() .name("tns") - .port(1521) + .port(dbListenerPort) .protocol("TCP") .targetPort(new IntOrString(1521)) .nodePort(dbPort))) @@ -150,15 +150,17 @@ public static synchronized void startOracleDB(String dbBaseImageName, int dbPort .sessionAffinity("None") .type("LoadBalancer")); - logger.info("Create service for Oracle DB service in namespace {0}", dbNamespace); + logger.info("Create service for Oracle DB service in namespace {0}, dbListenerPort: {1}", dbNamespace, + dbListenerPort); boolean serviceCreated = assertDoesNotThrow(() -> Kubernetes.createService(oracleDBService), String.format("Create service failed with ApiException for oracleDBService in namespace %s", dbNamespace)); assertTrue(serviceCreated, String.format( - "Create service failed for OracleDbService in namespace %s ", dbNamespace)); + "Create service failed for OracleDbService in namespace %s dbListenerPort %s ", dbNamespace, dbListenerPort)); //create V1Deployment for Oracle DB - logger.info("Configure V1Deployment in namespace {0} using image {1}", dbNamespace, dbBaseImageName); + logger.info("Configure V1Deployment in namespace {0} using image {1} dbListenerPort {2}", dbNamespace, + dbBaseImageName, dbListenerPort); oracleDbDepl = new V1Deployment() .apiVersion("apps/v1") .kind("Deployment") @@ -190,10 +192,10 @@ public static synchronized void startOracleDB(String dbBaseImageName, int dbPort .name("oracledb") .ports(Arrays.asList( new V1ContainerPort() - .containerPort(1521) + .containerPort(dbListenerPort) .name("tns") .protocol("TCP") - .hostPort(1521))) + .hostPort(dbListenerPort))) .resources(new V1ResourceRequirements() .limits(limits) .requests(requests)) @@ -207,14 +209,14 @@ public static synchronized void startOracleDB(String dbBaseImageName, int dbPort new V1LocalObjectReference() .name(BASE_IMAGES_REPO_SECRET)))))); - logger.info("Create deployment for Oracle DB in namespace {0}", - dbNamespace); + logger.info("Create deployment for Oracle DB in namespace {0} dbListenerPost {1}", + dbNamespace, dbListenerPort); boolean deploymentCreated = assertDoesNotThrow(() -> Kubernetes.createDeployment(oracleDbDepl), String.format("Create deployment failed with ApiException for Oracle DB in namespace %s", dbNamespace)); assertTrue(deploymentCreated, String.format( - "Create deployment failed for oracleDbDepl in namespace %s ", - dbNamespace)); + "Create deployment failed for oracleDbDepl in namespace %s dbListenerPort %s", + dbNamespace, dbListenerPort)); // sleep for a while to make sure the DB pod is created try { @@ -259,11 +261,15 @@ public static synchronized void startOracleDB(String dbBaseImageName, int dbPort public static synchronized void createRcuSchema(String fmwBaseImageName, String rcuPrefix, String dbUrl, String dbNamespace) throws ApiException { LoggingFacade logger = getLogger(); - logger.info("Create RCU pod for RCU prefix {0}", rcuPrefix); + //logger.info("Create RCU pod for RCU prefix {0}", rcuPrefix); + logger.info("Create RCU pod for for namespace: {0}, RCU prefix: {1}, " + + "dbUrl: {2}, fmwImage: {3} ", dbNamespace, rcuPrefix, dbUrl, fmwBaseImageName); assertDoesNotThrow(() -> createRcuPod(fmwBaseImageName, dbUrl, dbNamespace), String.format("Creating RCU pod failed with ApiException for image: %s, rcuPrefix: %s, dbUrl: %s, " + "in namespace: %s", fmwBaseImageName, rcuPrefix, dbUrl, dbNamespace)); + logger.info("createRcuRepository for dbNamespace: {0}, dbUrl: {1}, RCU prefix: {2} ", + dbNamespace, dbUrl, rcuPrefix); assertTrue(assertDoesNotThrow( () -> createRcuRepository(dbNamespace, dbUrl, rcuPrefix), String.format("createRcuRepository failed for dbNamespace: %s, dbUrl: %s, rcuPrefix: %s", @@ -631,4 +637,5 @@ public static void updateRcuPassword(String dbNamespace, String rcuprefix, Strin assertTrue(execResult.exitValue() == 0, "Could not update the RCU schema password"); } + } From f24e79dddb4f78aa650b1ca9447ba952a8ea3371 Mon Sep 17 00:00:00 2001 From: "MAGGIE.HE@ORACLE.COM" Date: Fri, 6 Aug 2021 03:55:56 +0000 Subject: [PATCH 2/3] wip --- .../src/test/java/oracle/weblogic/kubernetes/utils/DbUtils.java | 1 - 1 file changed, 1 deletion(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DbUtils.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DbUtils.java index 454e7fd9f2f..21a300e8af6 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DbUtils.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/utils/DbUtils.java @@ -261,7 +261,6 @@ public static synchronized void startOracleDB(String dbBaseImageName, int dbPort public static synchronized void createRcuSchema(String fmwBaseImageName, String rcuPrefix, String dbUrl, String dbNamespace) throws ApiException { LoggingFacade logger = getLogger(); - //logger.info("Create RCU pod for RCU prefix {0}", rcuPrefix); logger.info("Create RCU pod for for namespace: {0}, RCU prefix: {1}, " + "dbUrl: {2}, fmwImage: {3} ", dbNamespace, rcuPrefix, dbUrl, fmwBaseImageName); assertDoesNotThrow(() -> createRcuPod(fmwBaseImageName, dbUrl, dbNamespace), From 2fd98869bbe086650321139fd06f707b75ca44f4 Mon Sep 17 00:00:00 2001 From: "MAGGIE.HE@ORACLE.COM" Date: Fri, 6 Aug 2021 16:48:13 +0000 Subject: [PATCH 3/3] wip --- .../oracle/weblogic/kubernetes/ItCrossDomainTransaction.java | 1 - .../java/oracle/weblogic/kubernetes/ItFmwBigCMMiiDomain.java | 1 - .../oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWDT.java | 1 - .../oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWLST.java | 1 - .../weblogic/kubernetes/ItFmwDynamicClusterMiiDomain.java | 1 - .../oracle/weblogic/kubernetes/ItFmwDynamicDomainInPV.java | 1 - .../test/java/oracle/weblogic/kubernetes/ItFmwMiiDomain.java | 2 -- .../oracle/weblogic/kubernetes/ItIstioCrossClusters.java | 5 +++-- .../weblogic/kubernetes/ItIstioCrossDomainTransaction.java | 5 +++-- .../oracle/weblogic/kubernetes/ItOpUpgradeFmwDomainInPV.java | 2 -- 10 files changed, 6 insertions(+), 14 deletions(-) diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCrossDomainTransaction.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCrossDomainTransaction.java index 2e28a8f7ded..7cfb0f32679 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCrossDomainTransaction.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItCrossDomainTransaction.java @@ -113,7 +113,6 @@ public 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; diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwBigCMMiiDomain.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwBigCMMiiDomain.java index 91ae7d64efc..a26dc9ce894 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwBigCMMiiDomain.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwBigCMMiiDomain.java @@ -71,7 +71,6 @@ public 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"; diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWDT.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWDT.java index 3e6275242a4..fb3eb34948b 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWDT.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWDT.java @@ -69,7 +69,6 @@ public 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"; diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWLST.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWLST.java index 6c24b469512..875ed6a5f1f 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWLST.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDomainInPVUsingWLST.java @@ -76,7 +76,6 @@ public 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"; diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicClusterMiiDomain.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicClusterMiiDomain.java index 23f707309c8..fa0f9e042a9 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicClusterMiiDomain.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicClusterMiiDomain.java @@ -75,7 +75,6 @@ public 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"; diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicDomainInPV.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicDomainInPV.java index ee839d35d66..059686e4ba6 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicDomainInPV.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwDynamicDomainInPV.java @@ -81,7 +81,6 @@ public 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"; diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwMiiDomain.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwMiiDomain.java index 58b468e13eb..0996082f68e 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwMiiDomain.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItFmwMiiDomain.java @@ -70,8 +70,6 @@ public class ItFmwMiiDomain { private static final String RCUSCHEMAPREFIX = "FMWDOMAINMII"; private static final String ORACLEDBURLPREFIX = "oracledb."; private static String ORACLEDBSUFFIX = null; - //private static final String ORACLEDBSUFFIX = ".svc.cluster.local:1561/devpdb.k8s"; - //private static final String ORACLEDBSUFFIX = ".svc.cluster.local:" + getNextFreePort(1025, 65000) + "/devpdb.k8s"; private static final String RCUSYSUSERNAME = "sys"; private static final String RCUSYSPASSWORD = "Oradoc_db1"; private static final String RCUSCHEMAUSERNAME = "myrcuuser"; diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossClusters.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossClusters.java index f96b7d30354..52438653e7c 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossClusters.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossClusters.java @@ -107,7 +107,7 @@ public 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; @@ -153,11 +153,12 @@ public static void initAll(@Namespaces(3) List 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 - final int dbListenerPort = getNextFreePort(); assertDoesNotThrow(() -> { startOracleDB(DB_IMAGE_TO_USE_IN_SPEC, getNextFreePort(), domain2Namespace, dbListenerPort); String.format("Failed to start Oracle DB"); diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossDomainTransaction.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossDomainTransaction.java index f30cab52f4f..32b9a3d998c 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossDomainTransaction.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItIstioCrossDomainTransaction.java @@ -115,7 +115,7 @@ public 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; @@ -146,11 +146,12 @@ public static void initAll(@Namespaces(3) List 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 - final int dbListenerPort = getNextFreePort(); assertDoesNotThrow(() -> { startOracleDB(DB_IMAGE_TO_USE_IN_SPEC, getNextFreePort(), domain2Namespace, dbListenerPort); String.format("Failed to start Oracle DB"); diff --git a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOpUpgradeFmwDomainInPV.java b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOpUpgradeFmwDomainInPV.java index 636f50e608a..ecf940a2ded 100644 --- a/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOpUpgradeFmwDomainInPV.java +++ b/integration-tests/src/test/java/oracle/weblogic/kubernetes/ItOpUpgradeFmwDomainInPV.java @@ -106,7 +106,6 @@ public class ItOpUpgradeFmwDomainInPV { 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"; @@ -166,7 +165,6 @@ public void beforeEach(@Namespaces(4) List namespaces) { final int dbListenerPort = getNextFreePort(); ORACLEDBSUFFIX = ".svc.cluster.local:" + dbListenerPort + "/devpdb.k8s"; dbUrl = ORACLEDBURLPREFIX + dbNamespace + ORACLEDBSUFFIX; - dbUrl = ORACLEDBURLPREFIX + dbNamespace + ORACLEDBSUFFIX; logger.info("Assign a unique namespace for operator1"); assertNotNull(namespaces.get(1), "Namespace is null");