Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #10730 from kabir/WFLY-9634
Add mixed domain tests
- Loading branch information
Showing
21 changed files
with
729 additions
and
39 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
84 changes: 84 additions & 0 deletions
84
...in/src/test/java/org/jboss/as/test/integration/domain/mixed/eap710/DomainAdjuster710.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,84 @@ | ||
| /* | ||
| * JBoss, Home of Professional Open Source. | ||
| * Copyright 2017, Red Hat, Inc., and individual contributors | ||
| * as indicated by the @author tags. See the copyright.txt file in the | ||
| * distribution for a full listing of individual contributors. | ||
| * | ||
| * This is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as | ||
| * published by the Free Software Foundation; either version 2.1 of | ||
| * the License, or (at your option) any later version. | ||
| * | ||
| * This software is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this software; if not, write to the Free | ||
| * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| * 02110-1301 USA, or see the FSF site: http://www.fsf.org. | ||
| */ | ||
|
|
||
| package org.jboss.as.test.integration.domain.mixed.eap710; | ||
|
|
||
| import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.AUTO_START; | ||
| import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.HOST; | ||
| import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SERVER_CONFIG; | ||
| import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM; | ||
|
|
||
| import java.util.ArrayList; | ||
| import java.util.Collection; | ||
| import java.util.List; | ||
|
|
||
| import org.jboss.as.controller.PathAddress; | ||
| import org.jboss.as.controller.client.helpers.domain.DomainClient; | ||
| import org.jboss.as.controller.descriptions.ModelDescriptionConstants; | ||
| import org.jboss.as.controller.operations.common.Util; | ||
| import org.jboss.as.test.integration.domain.mixed.DomainAdjuster; | ||
| import org.jboss.dmr.ModelNode; | ||
|
|
||
| /** | ||
| * Does adjustments to the domain model for 7.1.0 legacy slaves. | ||
| * | ||
| * @author <a href="mailto:kabir.khan@jboss.com">Kabir Khan</a> | ||
| */ | ||
| public class DomainAdjuster710 extends DomainAdjuster { | ||
|
|
||
| @Override | ||
| protected List<ModelNode> adjustForVersion(final DomainClient client, PathAddress profileAddress, boolean withMasterServers) throws Exception { | ||
| final List<ModelNode> list = new ArrayList<>(); | ||
|
|
||
| adjustUndertow(profileAddress.append(SUBSYSTEM, "undertow"), list); | ||
|
|
||
| if (withMasterServers) { | ||
| list.addAll(reconfigureServers()); | ||
| } | ||
|
|
||
| return list; | ||
| } | ||
|
|
||
| private void adjustUndertow(PathAddress undertow, List<ModelNode> ops) { | ||
| // EAP 7.0 and earlier required explicit SSL configuration. Wildfly 10.1 added support | ||
| // for SSL by default, which automatically generates certs. | ||
| // This could be removed if all hosts were configured to contain a security domain with SSL | ||
| // enabled. | ||
| final PathAddress httpsListener = undertow | ||
| .append("server", "default-server") | ||
| .append("https-listener", "https"); | ||
| ops.add(Util.getEmptyOperation(ModelDescriptionConstants.REMOVE, httpsListener.toModelNode())); | ||
| } | ||
|
|
||
| private Collection<? extends ModelNode> reconfigureServers() { | ||
| final List<ModelNode> list = new ArrayList<>(); | ||
| //Reconfigure master servers | ||
| final PathAddress masterHostAddress = PathAddress.pathAddress(HOST, "master"); | ||
| list.add(Util.getWriteAttributeOperation(masterHostAddress.append(SERVER_CONFIG, "server-one"), AUTO_START, true)); | ||
| list.add(Util.getWriteAttributeOperation(masterHostAddress.append(SERVER_CONFIG, "server-one"), ModelDescriptionConstants.GROUP, "main-server-group")); | ||
| list.add(Util.getUndefineAttributeOperation(masterHostAddress.append(SERVER_CONFIG, "server-one"), ModelDescriptionConstants.SOCKET_BINDING_PORT_OFFSET)); | ||
| list.add(Util.getWriteAttributeOperation(masterHostAddress.append(SERVER_CONFIG, "server-two"), AUTO_START, true)); | ||
| list.add(Util.getWriteAttributeOperation(masterHostAddress.append(SERVER_CONFIG, "server-two"), ModelDescriptionConstants.SOCKET_BINDING_PORT_OFFSET, 100)); | ||
| return list; | ||
| } | ||
|
|
||
| } |
47 changes: 47 additions & 0 deletions
47
...java/org/jboss/as/test/integration/domain/mixed/eap710/DomainHostExcludes710TestCase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,47 @@ | ||
| /* | ||
| * JBoss, Home of Professional Open Source. | ||
| * Copyright 2017, Red Hat, Inc., and individual contributors | ||
| * as indicated by the @author tags. See the copyright.txt file in the | ||
| * distribution for a full listing of individual contributors. | ||
| * | ||
| * This is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as | ||
| * published by the Free Software Foundation; either version 2.1 of | ||
| * the License, or (at your option) any later version. | ||
| * | ||
| * This software is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this software; if not, write to the Free | ||
| * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| * 02110-1301 USA, or see the FSF site: http://www.fsf.org. | ||
| */ | ||
|
|
||
| package org.jboss.as.test.integration.domain.mixed.eap710; | ||
|
|
||
| import java.io.IOException; | ||
| import java.util.concurrent.TimeoutException; | ||
|
|
||
| import org.jboss.as.controller.ModelVersion; | ||
| import org.jboss.as.test.integration.domain.mixed.DomainHostExcludesTest; | ||
| import org.jboss.as.test.integration.domain.mixed.Version; | ||
| import org.jboss.as.test.integration.management.util.MgmtOperationException; | ||
| import org.junit.BeforeClass; | ||
|
|
||
| /** | ||
| * Tests of the ability of a DC to exclude resources from visibility to an EAP 7.1.0 slave. | ||
| * | ||
| * @author Brian Stansberry | ||
| */ | ||
| @Version(Version.AsVersion.EAP_7_1_0) | ||
| public class DomainHostExcludes710TestCase extends DomainHostExcludesTest { | ||
|
|
||
| @BeforeClass | ||
| public static void beforeClass() throws InterruptedException, TimeoutException, MgmtOperationException, IOException { | ||
| LegacyConfig710TestSuite.initializeDomain(); | ||
| setup(DomainHostExcludes710TestCase.class,"EAP7.1", ModelVersion.create(5, 0)); | ||
| } | ||
| } |
45 changes: 45 additions & 0 deletions
45
...java/org/jboss/as/test/integration/domain/mixed/eap710/ElytronOnlyMaster710TestSuite.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,45 @@ | ||
| /* | ||
| * JBoss, Home of Professional Open Source. | ||
| * Copyright 2017, Red Hat, Inc., and individual contributors | ||
| * as indicated by the @author tags. See the copyright.txt file in the | ||
| * distribution for a full listing of individual contributors. | ||
| * | ||
| * This is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as | ||
| * published by the Free Software Foundation; either version 2.1 of | ||
| * the License, or (at your option) any later version. | ||
| * | ||
| * This software is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this software; if not, write to the Free | ||
| * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| * 02110-1301 USA, or see the FSF site: http://www.fsf.org. | ||
| */ | ||
|
|
||
| package org.jboss.as.test.integration.domain.mixed.eap710; | ||
|
|
||
| import org.jboss.as.test.integration.domain.mixed.ElytronOnlyMasterTestSuite; | ||
| import org.jboss.as.test.integration.domain.mixed.Version; | ||
| import org.junit.BeforeClass; | ||
| import org.junit.Ignore; | ||
| import org.junit.runner.RunWith; | ||
| import org.junit.runners.Suite; | ||
|
|
||
| /** | ||
| * @author Martin Simka | ||
| */ | ||
| @RunWith(Suite.class) | ||
| @Suite.SuiteClasses(value= {ElytronOnlyMasterSmoke710TestCase.class}) | ||
| @Version(Version.AsVersion.EAP_7_1_0) | ||
| @Ignore("Ignore until WFCORE-2882 is integrated") | ||
| public class ElytronOnlyMaster710TestSuite extends ElytronOnlyMasterTestSuite { | ||
|
|
||
| @BeforeClass | ||
| public static void initializeDomain() { | ||
| ElytronOnlyMasterTestSuite.getSupport(ElytronOnlyMaster710TestSuite.class); | ||
| } | ||
| } |
39 changes: 39 additions & 0 deletions
39
.../org/jboss/as/test/integration/domain/mixed/eap710/ElytronOnlyMasterSmoke710TestCase.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,39 @@ | ||
| /* | ||
| * JBoss, Home of Professional Open Source. | ||
| * Copyright 2017, Red Hat, Inc., and individual contributors | ||
| * as indicated by the @author tags. See the copyright.txt file in the | ||
| * distribution for a full listing of individual contributors. | ||
| * | ||
| * This is free software; you can redistribute it and/or modify it | ||
| * under the terms of the GNU Lesser General Public License as | ||
| * published by the Free Software Foundation; either version 2.1 of | ||
| * the License, or (at your option) any later version. | ||
| * | ||
| * This software is distributed in the hope that it will be useful, | ||
| * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
| * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | ||
| * Lesser General Public License for more details. | ||
| * | ||
| * You should have received a copy of the GNU Lesser General Public | ||
| * License along with this software; if not, write to the Free | ||
| * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA | ||
| * 02110-1301 USA, or see the FSF site: http://www.fsf.org. | ||
| */ | ||
|
|
||
| package org.jboss.as.test.integration.domain.mixed.eap710; | ||
|
|
||
| import org.jboss.as.test.integration.domain.mixed.ElytronOnlyMasterSmokeTestCase; | ||
| import org.jboss.as.test.integration.domain.mixed.Version; | ||
| import org.junit.BeforeClass; | ||
|
|
||
| /** | ||
| * @author Martin Simka | ||
| */ | ||
| @Version(Version.AsVersion.EAP_7_1_0) | ||
| public class ElytronOnlyMasterSmoke710TestCase extends ElytronOnlyMasterSmokeTestCase { | ||
|
|
||
| @BeforeClass | ||
| public static void beforeClass() { | ||
| ElytronOnlyMaster710TestSuite.initializeDomain(); | ||
| } | ||
| } |
Oops, something went wrong.