Skip to content

Commit

Permalink
Add mixed domain tests for EAP 6.4.0
Browse files Browse the repository at this point in the history
  • Loading branch information
@kabir
kabir committed Sep 1, 2015
1 parent 3f8f2ef commit a284ef9
Show file tree
Hide file tree
Showing 7 changed files with 426 additions and 234 deletions.
4 changes: 4 additions & 0 deletions ...mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/DomainAdjuster.java
View file
Expand Up @@ -52,6 +52,7 @@
import org.jboss.as.test.integration.domain.management.util.DomainTestUtils;
import org.jboss.as.test.integration.domain.mixed.eap620.DomainAdjuster620;
import org.jboss.as.test.integration.domain.mixed.eap630.DomainAdjuster630;
import org.jboss.as.test.integration.domain.mixed.eap640.DomainAdjuster640;
import org.jboss.dmr.ModelNode;
import org.junit.Assert;

Expand Down Expand Up @@ -91,6 +92,9 @@ static void adjustForVersion(final DomainClient client, final Version.AsVersion
case EAP_6_3_0:
adjuster = new DomainAdjuster630();
break;
case EAP_6_4_0:
adjuster = new DomainAdjuster640();
break;
default:
adjuster = new DomainAdjuster();
}
Expand Down
3 changes: 2 additions & 1 deletion testsuite/mixed-domain/src/test/java/org/jboss/as/test/integration/domain/mixed/Version.java
View file
Expand Up @@ -42,7 +42,8 @@

enum AsVersion {
EAP_6_2_0(EAP, "6.2.0"),
EAP_6_3_0(EAP, "6.3.0");
EAP_6_3_0(EAP, "6.3.0"),
EAP_6_4_0(EAP, "6.4.0");

final String basename;
final String version;
Expand Down
239 changes: 6 additions & 233 deletions ...in/src/test/java/org/jboss/as/test/integration/domain/mixed/eap630/DomainAdjuster630.java
View file
Expand Up @@ -22,145 +22,40 @@

package org.jboss.as.test.integration.domain.mixed.eap630;

import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.EXTENSION;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.PROFILE;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SOCKET_BINDING;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SOCKET_BINDING_GROUP;
import static org.jboss.as.controller.descriptions.ModelDescriptionConstants.SUBSYSTEM;
import static org.jboss.as.controller.operations.common.Util.createAddOperation;
import static org.jboss.as.controller.operations.common.Util.createRemoveOperation;
import static org.jboss.as.controller.operations.common.Util.getUndefineAttributeOperation;
import static org.jboss.as.controller.operations.common.Util.getWriteAttributeOperation;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;

import org.jboss.as.clustering.infinispan.subsystem.InfinispanExtension;
import org.jboss.as.clustering.jgroups.subsystem.JGroupsExtension;
import org.jboss.as.controller.PathAddress;
import org.jboss.as.controller.client.helpers.domain.DomainClient;
import org.jboss.as.controller.operations.common.Util;
import org.jboss.as.ee.subsystem.EeExtension;
import org.jboss.as.ejb3.subsystem.EJB3Extension;
import org.jboss.as.remoting.RemotingExtension;
import org.jboss.as.test.integration.domain.mixed.DomainAdjuster;
import org.jboss.as.test.integration.domain.mixed.LegacySubsystemConfigurationUtil;
import org.jboss.as.weld.WeldExtension;
import org.jboss.as.test.integration.domain.mixed.eap640.DomainAdjuster640;
import org.jboss.dmr.ModelNode;
import org.wildfly.extension.batch.jberet.BatchSubsystemDefinition;
import org.wildfly.extension.beanvalidation.BeanValidationExtension;
import org.wildfly.extension.clustering.singleton.SingletonExtension;
import org.wildfly.extension.io.IOExtension;
import org.wildfly.extension.messaging.activemq.MessagingExtension;
import org.wildfly.extension.requestcontroller.RequestControllerExtension;
import org.wildfly.extension.security.manager.SecurityManagerExtension;
import org.wildfly.extension.undertow.UndertowExtension;
import org.wildfly.iiop.openjdk.IIOPExtension;

/**
* Does adjustments to the domain model for 6.3.0 legacy slaves
*
* @author <a href="mailto:kabir.khan@jboss.com">Kabir Khan</a>
*/
public class DomainAdjuster630 extends DomainAdjuster {
public class DomainAdjuster630 extends DomainAdjuster640 {
@Override
protected List<ModelNode> adjustForVersion(final DomainClient client, PathAddress profileAddress) throws Exception {
final List<ModelNode> list = new ArrayList<>();

list.addAll(removeBatch(profileAddress.append(SUBSYSTEM, BatchSubsystemDefinition.NAME)));
list.addAll(removeBeanValidation(profileAddress.append(SUBSYSTEM, BeanValidationExtension.SUBSYSTEM_NAME)));
list.addAll(adjustEe(profileAddress.append(SUBSYSTEM, EeExtension.SUBSYSTEM_NAME)));
list.addAll(adjustEjb3(profileAddress.append(SUBSYSTEM, EJB3Extension.SUBSYSTEM_NAME)));
list.addAll(replaceIiopOpenJdk(client, profileAddress.append(SUBSYSTEM, IIOPExtension.SUBSYSTEM_NAME)));
list.addAll(adjustInfinispan(profileAddress.append(SUBSYSTEM, InfinispanExtension.SUBSYSTEM_NAME)));
list.addAll(adjustJGroups(profileAddress.append(SUBSYSTEM, JGroupsExtension.SUBSYSTEM_NAME)));
list.addAll(adjustRemoting(profileAddress.append(SUBSYSTEM, RemotingExtension.SUBSYSTEM_NAME)));
list.addAll(adjustWeld(profileAddress.append(SUBSYSTEM, WeldExtension.SUBSYSTEM_NAME)));
list.addAll(removeRequestController(profileAddress.append(SUBSYSTEM, RequestControllerExtension.SUBSYSTEM_NAME)));
list.addAll(removeSecurityManager(profileAddress.append(SecurityManagerExtension.SUBSYSTEM_PATH)));
list.addAll(replaceUndertowWithWeb(profileAddress.append(SUBSYSTEM, UndertowExtension.SUBSYSTEM_NAME)));
list.addAll(replaceActiveMqWithMessaging(profileAddress.append(SUBSYSTEM, MessagingExtension.SUBSYSTEM_NAME)));
list.addAll(removeSingletonDeployer(profileAddress.append(SUBSYSTEM, SingletonExtension.SUBSYSTEM_NAME)));
list.addAll(removeIo(profileAddress.append(SUBSYSTEM, IOExtension.SUBSYSTEM_NAME)));

//Temporary workaround, something weird is going on in infinispan/jgroups so let's get rid of those for now
//TODO Reenable these subsystems, it is important to see if we boot with them configured although the tests don't use clustering
list.add(createRemoveOperation(profileAddress.append(SUBSYSTEM, InfinispanExtension.SUBSYSTEM_NAME)));
list.add(createRemoveOperation(profileAddress.append(SUBSYSTEM, JGroupsExtension.SUBSYSTEM_NAME)));

return list;
}


private Collection<? extends ModelNode> removeBatch(final PathAddress subsystem) {
final List<ModelNode> list = new ArrayList<>();
//batch and extension don't exist
list.add(createRemoveOperation(subsystem));
list.add(createRemoveOperation(PathAddress.pathAddress(EXTENSION, "org.wildfly.extension.batch.jberet")));
return list;
}


private Collection<? extends ModelNode> removeBeanValidation(final PathAddress subsystem) {
final List<ModelNode> list = new ArrayList<>();
//bean-validation and extension don't exist
list.add(createRemoveOperation(subsystem));
list.add(createRemoveOperation(PathAddress.pathAddress(EXTENSION, "org.wildfly.extension.bean-validation")));
return list;
}

List<ModelNode> list = super.adjustForVersion(client, profileAddress);

private Collection<? extends ModelNode> removeSingletonDeployer(PathAddress subsystem) {
List<ModelNode> list = new ArrayList<>(2);
//singleton subsystem and extension doesn't exist
list.add(createRemoveOperation(subsystem));
list.add(createRemoveOperation(PathAddress.pathAddress(EXTENSION, "org.wildfly.extension.clustering.singleton")));
return list;
}
// list.addAll(adjustInfinispan(profileAddress.append(SUBSYSTEM, InfinispanExtension.SUBSYSTEM_NAME)));
// list.addAll(adjustJGroups(profileAddress.append(SUBSYSTEM, JGroupsExtension.SUBSYSTEM_NAME)));


private List<ModelNode> adjustEe(final PathAddress subsystem) throws Exception {
final List<ModelNode> list = new ArrayList<>();
//Concurrency resources are not available
list.add(createRemoveOperation(subsystem.append("context-service", "default")));
list.add(createRemoveOperation(subsystem.append("managed-thread-factory", "default")));
list.add(createRemoveOperation(subsystem.append("managed-executor-service", "default")));
list.add(createRemoveOperation(subsystem.append("managed-scheduled-executor-service", "default")));
//default-bindings are not available
list.add(createRemoveOperation(subsystem.append("service", "default-bindings")));
return list;
}

private List<ModelNode> adjustEjb3(final PathAddress subsystem) throws Exception {
final List<ModelNode> list = new ArrayList<>();
//passivation-disabled-cache-ref is not understood
list.add(
getUndefineAttributeOperation(
subsystem, "default-sfsb-passivation-disabled-cache"));
return list;
}

private List<ModelNode> replaceIiopOpenJdk(final DomainClient client, final PathAddress subsystem) throws Exception {
final List<ModelNode> list = new ArrayList<>();
//iiop-openjdk does not exist it used to be called jacorb

//Remove the iiop-openjdk subsystem and extension
list.add(createRemoveOperation(subsystem));
list.add(createRemoveOperation(PathAddress.pathAddress(EXTENSION, "org.wildfly.iiop-openjdk")));
//Add the jacorb extension
list.add(createAddOperation(PathAddress.pathAddress(EXTENSION, "org.jboss.as.jacorb")));

//This shoud be the same as in the iiop-openjdk.xml subsystem template
ModelNode add = createAddOperation(subsystem.getParent().append(SUBSYSTEM, "jacorb"));
add.get("socket-binding").set("iiop");
add.get("ssl-socket-binding").set("iiop-ssl");
add.get("transactions").set("spec");
add.get("security").set("identity");
list.add(add);

return list;
}

private List<ModelNode> adjustInfinispan(final PathAddress subsystem) throws Exception {
final List<ModelNode> list = new ArrayList<>();
Expand Down Expand Up @@ -189,15 +84,7 @@ private List<ModelNode> adjustInfinispan(final PathAddress subsystem) throws Exc
return list;
}

private Collection<? extends ModelNode> removeIo(final PathAddress subsystem) {
final List<ModelNode> list = new ArrayList<>();
//io and extension don't exist so remove them
//We also must remove the remoting requirement for io worker capability
list.add(createRemoveOperation(subsystem.getParent().append(SUBSYSTEM, "remoting").append("configuration", "endpoint")));
list.add(createRemoveOperation(subsystem));
list.add(createRemoveOperation(PathAddress.pathAddress(EXTENSION, "org.wildfly.extension.io")));
return list;
}



private List<ModelNode> adjustJGroups(final PathAddress subsystem) throws Exception {
Expand Down Expand Up @@ -250,121 +137,7 @@ private List<ModelNode> adjustJGroups(final PathAddress subsystem) throws Except
return list;
}

private Collection<? extends ModelNode> adjustRemoting(final PathAddress subsystem) {
final List<ModelNode> list = new ArrayList<>();
//The endpoint configuration does not exist
// BES 2015/07/15 -- this is done in removeIO now so the io worker capability and the requirement for it
// both go in the same op
//list.add(createRemoveOperation(subsystem.append("configuration", "endpoint")));

//Replace the http-remoting connector with a normal remoting-connector. This needs the remoting socket binding,
//so add that too
list.add(createRemoveOperation(subsystem.append("http-connector", "http-remoting-connector")));
ModelNode addSocketBinding =
createAddOperation(
PathAddress.pathAddress(SOCKET_BINDING_GROUP, "full-ha-sockets")
.append(SOCKET_BINDING, "remoting"));
addSocketBinding.get("port").set(4447);
list.add(addSocketBinding);
ModelNode addRemoting = createAddOperation(subsystem.append("connector", "remoting-connector"));
addRemoting.get("socket-binding").set("remoting");
addRemoting.get("security-realm").set("ApplicationRealm");
list.add(addRemoting);
return list;

}

private Collection<? extends ModelNode> removeRequestController(final PathAddress subsystem) {
final List<ModelNode> list = new ArrayList<>();
//request controller and extension don't exist
list.add(createRemoveOperation(subsystem));
list.add(createRemoveOperation(PathAddress.pathAddress(EXTENSION, "org.wildfly.extension.request-controller")));
return list;
}

private Collection<? extends ModelNode> removeSecurityManager(final PathAddress subsystem) {
final List<ModelNode> list = new ArrayList<>();
//security manager and extension don't exist
list.add(createRemoveOperation(subsystem));
list.add(createRemoveOperation(PathAddress.pathAddress(EXTENSION, "org.wildfly.extension.security.manager")));
return list;
}


private Collection<? extends ModelNode> replaceUndertowWithWeb(final PathAddress subsystem) {
final List<ModelNode> list = new ArrayList<>();
//Undertow does not exist, remove it and the extension
list.add(createRemoveOperation(subsystem));
list.add(createRemoveOperation(PathAddress.pathAddress(EXTENSION, "org.wildfly.extension.undertow")));

//Add JBoss Web extension and subsystem
list.add(createAddOperation(PathAddress.pathAddress(EXTENSION, "org.jboss.as.web")));
final PathAddress web = subsystem.getParent().append(SUBSYSTEM, "web");
final ModelNode addWeb = Util.createAddOperation(web);
addWeb.get("default-virtual-server").set("default-host");
addWeb.get("native").set("false");
list.add(addWeb);
list.add(createAddOperation(web.append("configuration", "container")));
list.add(createAddOperation(web.append("configuration", "static-resources")));
list.add(createAddOperation(web.append("configuration", "jsp-configuration")));
ModelNode addHttp = Util.createAddOperation(web.append("connector", "http"));
addHttp.get("protocol").set("HTTP/1.1");
addHttp.get("scheme").set("http");
addHttp.get("socket-binding").set("http");
list.add(addHttp);
ModelNode addAjp = Util.createAddOperation(web.append("connector", "ajp"));
addAjp.get("protocol").set("AJP/1.3");
addAjp.get("scheme").set("http");
addAjp.get("socket-binding").set("ajp");
list.add(addAjp);
ModelNode addVirtualServer = Util.createAddOperation(web.append("virtual-server", "default-host"));
addVirtualServer.get("enable-welcome-root").set(true);
addVirtualServer.get("alias").add("localhost").add("example.com");
list.add(addVirtualServer);

return list;
}

private Collection<? extends ModelNode> replaceActiveMqWithMessaging(PathAddress subsystem) throws Exception {
final List<ModelNode> list = new ArrayList<>();
//messaging-activemq does not exist, remove it and the extension
list.add(createRemoveOperation(subsystem));
list.add(createRemoveOperation(PathAddress.pathAddress(EXTENSION, "org.wildfly.extension.messaging-activemq")));

//Add legacy messaging extension
list.add(createAddOperation(PathAddress.pathAddress(EXTENSION, "org.jboss.as.messaging")));

//Get the subsystem add operations (since the subsystem is huge, and there is a template, use the util)
LegacySubsystemConfigurationUtil util =
new LegacySubsystemConfigurationUtil(
new org.jboss.as.messaging.MessagingExtension(), "messaging", "ha", "subsystem-templates/messaging.xml");

list.addAll(util.getSubsystemOperations());


//Now adjust the things from the template which are not available in the legacy server

//http acceptors and connectors are not available
PathAddress messaging = PathAddress.pathAddress(PROFILE, "full-ha").append(SUBSYSTEM, "messaging");
PathAddress server = messaging.append("hornetq-server", "default");
list.add(createRemoveOperation(server.append("http-acceptor", "http-acceptor")));
list.add(createRemoveOperation(server.append("http-acceptor", "http-acceptor-throughput")));
list.add(createRemoveOperation(server.append("http-connector", "http-connector")));
list.add(createRemoveOperation(server.append("http-connector", "http-connector-throughput")));
//TODO here we should add a remote connector, for now use the in-vm one
list.add(getWriteAttributeOperation(server.append("broadcast-group", "bg-group1"), "connectors",
new ModelNode().add("in-vm")));

return list;
}


private Collection<? extends ModelNode> adjustWeld(final PathAddress subsystem) {
final List<ModelNode> list = new ArrayList<>();
list.add(getWriteAttributeOperation(subsystem, "require-bean-descriptor", true));
list.add(getWriteAttributeOperation(subsystem, "non-portable-mode", true));
return list;
}

private ModelNode setStatisticsEnabledTrue(final PathAddress addr) {
return getWriteAttributeOperation(addr, "statistics-enabled", true);
Expand Down

0 comments on commit a284ef9

Please sign in to comment.