Author: rgodfrey
Date: Fri Oct 17 16:21:09 2014
New Revision: 1632622
URL: http://svn.apache.org/r1632622
Log:
QPID-6161 : fix bdb ha tests where the vhn name differs from the vh name by
adding an alias into the config
Modified:
qpid/trunk/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
Modified:
qpid/trunk/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java?rev=1632622&r1=1632621&r2=1632622&view=diff
==============================================================================
---
qpid/trunk/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
(original)
+++
qpid/trunk/qpid/java/bdbstore/systests/src/test/java/org/apache/qpid/server/store/berkeleydb/replication/GroupCreator.java
Fri Oct 17 16:21:09 2014
@@ -42,15 +42,21 @@ import java.util.concurrent.TimeUnit;
import javax.jms.Connection;
-import org.apache.commons.lang.StringUtils;
+import com.sleepycat.je.rep.ReplicationConfig;
import org.apache.log4j.Logger;
+import org.codehaus.jackson.map.ObjectMapper;
+import org.codehaus.jackson.map.SerializationConfig;
+import org.junit.Assert;
+
import org.apache.qpid.client.AMQConnection;
import org.apache.qpid.client.AMQConnectionURL;
import org.apache.qpid.jms.ConnectionURL;
import org.apache.qpid.server.management.plugin.HttpManagement;
+import org.apache.qpid.server.model.PatternMatchingAlias;
import org.apache.qpid.server.model.Plugin;
import org.apache.qpid.server.model.Port;
import org.apache.qpid.server.model.VirtualHost;
+import org.apache.qpid.server.model.VirtualHostAlias;
import org.apache.qpid.server.model.VirtualHostNode;
import org.apache.qpid.server.virtualhost.berkeleydb.BDBHAVirtualHostImpl;
import org.apache.qpid.server.virtualhostnode.AbstractVirtualHostNode;
@@ -61,11 +67,6 @@ import org.apache.qpid.systest.rest.Rest
import org.apache.qpid.test.utils.QpidBrokerTestCase;
import org.apache.qpid.test.utils.TestBrokerConfiguration;
import org.apache.qpid.url.URLSyntaxException;
-import org.codehaus.jackson.map.ObjectMapper;
-import org.codehaus.jackson.map.SerializationConfig;
-import org.junit.Assert;
-
-import com.sleepycat.je.rep.ReplicationConfig;
public class GroupCreator
{
@@ -158,6 +159,18 @@ public class GroupCreator
brokerConfiguration.addHttpManagementConfiguration();
brokerConfiguration.setObjectAttribute(Plugin.class,
TestBrokerConfiguration.ENTRY_NAME_HTTP_MANAGEMENT,
HttpManagement.HTTP_BASIC_AUTHENTICATION_ENABLED, true);
brokerConfiguration.setObjectAttribute(Port.class,
TestBrokerConfiguration.ENTRY_NAME_HTTP_PORT, Port.PORT,
_testcase.getHttpManagementPort(brokerPort));
+
+ final Map<String, Object> aliasAttributes = new HashMap<>();
+ aliasAttributes.put(VirtualHostAlias.NAME, "testAlias");
+ aliasAttributes.put(VirtualHostAlias.TYPE,
PatternMatchingAlias.TYPE_NAME);
+ aliasAttributes.put(PatternMatchingAlias.PATTERN, "test");
+ aliasAttributes.put(PatternMatchingAlias.VIRTUAL_HOST_NODE,
nodeName);
+ brokerConfiguration.addObjectConfiguration(Port.class,
+
TestBrokerConfiguration.ENTRY_NAME_AMQP_PORT,
+ VirtualHostAlias.class,
+ aliasAttributes);
+
+
brokerConfiguration.setObjectAttributes(VirtualHostNode.class,
_virtualHostName, virtualHostNodeAttributes);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
