Skip to content

Commit a42614a

Browse files
committed
update the managed server names
1 parent 6f9f164 commit a42614a

File tree

1 file changed

+29
-12
lines changed

1 file changed

+29
-12
lines changed

integration-tests/src/test/java/oracle/kubernetes/operator/ITMultipleClusters.java

Lines changed: 29 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,16 @@ public void testCreateDomainTwoConfiguredCluster() throws Exception {
102102
addCluster2ToDomainTemplate();
103103
domain = TestUtils.createDomain(domainMap);
104104
domain.verifyDomainCreated();
105-
verifyServersStatus(domain);
105+
String pods[] = {
106+
DOMAINUID + "-" + domain.getAdminServerName(),
107+
DOMAINUID + "-managed-server",
108+
DOMAINUID + "-managed-server1",
109+
DOMAINUID + "-managed-server2",
110+
DOMAINUID + "-new-managed-server1",
111+
DOMAINUID + "-new-managed-server2",
112+
};
113+
verifyServersStatus(domain, pods);
114+
106115
testBasicUseCases(domain);
107116
if (!SMOKETEST) {
108117
domain.testWlsLivenessProbe();
@@ -150,7 +159,16 @@ public void testCreateDomainTwoMixedCluster() throws Exception {
150159
addCluster2ToDomainTemplate();
151160
domain = TestUtils.createDomain(domainMap);
152161
domain.verifyDomainCreated();
153-
verifyServersStatus(domain);
162+
String pods[] = {
163+
DOMAINUID + "-" + domain.getAdminServerName(),
164+
DOMAINUID + "-managed-server",
165+
DOMAINUID + "-managed-server1",
166+
DOMAINUID + "-managed-server2",
167+
DOMAINUID + "-new-managed-server1",
168+
DOMAINUID + "-new-managed-server2",
169+
};
170+
verifyServersStatus(domain, pods);
171+
154172
testBasicUseCases(domain);
155173
if (!SMOKETEST) {
156174
domain.testWlsLivenessProbe();
@@ -207,7 +225,14 @@ public void testCreateDomainTwoClusterWDTInImage() throws Exception {
207225
StandardCopyOption.REPLACE_EXISTING);
208226
domain = TestUtils.createDomain(domainMap);
209227
domain.verifyDomainCreated();
210-
verifyServersStatus(domain);
228+
String pods[] = {
229+
DOMAINUID + "-" + domain.getAdminServerName(),
230+
DOMAINUID + "-managed-server1",
231+
DOMAINUID + "-managed-server2",
232+
DOMAINUID + "-managed-server-21",
233+
DOMAINUID + "-managed-server-22",
234+
};
235+
verifyServersStatus(domain, pods);
211236
testBasicUseCases(domain);
212237
if (!SMOKETEST) {
213238
domain.testWlsLivenessProbe();
@@ -257,18 +282,10 @@ private void restoreDomainTemplate() throws IOException {
257282
*
258283
* @param Domain
259284
*/
260-
private void verifyServersStatus(Domain domain) {
285+
private void verifyServersStatus(Domain domain, String[] pods) {
261286
K8sTestUtils testUtil = new K8sTestUtils();
262287
String domain1LabelSelector = String.format("weblogic.domainUID in (%s)", DOMAINUID);
263288
String namespace = domain.getDomainNS();
264-
String pods[] = {
265-
DOMAINUID + "-" + domain.getAdminServerName(),
266-
DOMAINUID + "-managed-server",
267-
DOMAINUID + "-managed-server1",
268-
DOMAINUID + "-managed-server2",
269-
DOMAINUID + "-new-managed-server1",
270-
DOMAINUID + "-new-managed-server2",
271-
};
272289
for (String pod : pods) {
273290
assertTrue(
274291
pod + " Pod not running", testUtil.isPodRunning(namespace, domain1LabelSelector, pod));

0 commit comments

Comments
 (0)