From cd126b93a9ec0b3891e19a2b3012e5ccc222cbbd Mon Sep 17 00:00:00 2001 From: Keith Wall Date: Sun, 20 Jul 2014 09:18:41 +0000 Subject: QPID-5867: [Java Broker] Allow the virtualhost's permitted node list to passed via the virtualhostnode's virtualhost blueprint context variable. Work completed by Andrew MacBean and me. git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1612064 13f79535-47bb-0310-9956-ffa450edef68 --- .../berkeleydb/BDBHAVirtualHostNodeImpl.java | 37 ++++++++++++++++++++-- .../store/berkeleydb/BDBHAVirtualHostNodeTest.java | 25 +++++++++------ .../AbstractStandardVirtualHostNode.java | 2 -- .../virtualhostnode/AbstractVirtualHostNode.java | 2 ++ .../AbstractStandardVirtualHostNodeTest.java | 13 ++++---- .../apache/qpid/server/store/SplitStoreTest.java | 4 +-- .../apache/qpid/test/utils/QpidBrokerTestCase.java | 4 +-- 7 files changed, 61 insertions(+), 26 deletions(-) (limited to 'qpid/java') diff --git a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java index e5e24de4bb..e629da3d26 100644 --- a/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java +++ b/qpid/java/bdbstore/src/main/java/org/apache/qpid/server/virtualhostnode/berkeleydb/BDBHAVirtualHostNodeImpl.java @@ -66,6 +66,8 @@ import org.apache.qpid.server.store.berkeleydb.replication.ReplicatedEnvironment import org.apache.qpid.server.store.berkeleydb.replication.ReplicatedEnvironmentFacadeFactory; import org.apache.qpid.server.store.berkeleydb.replication.ReplicationGroupListener; import org.apache.qpid.server.util.ServerScopedRuntimeException; +import org.apache.qpid.server.virtualhost.berkeleydb.BDBHAVirtualHost; +import org.apache.qpid.server.virtualhost.berkeleydb.BDBHAVirtualHostImpl; import org.apache.qpid.server.virtualhostnode.AbstractVirtualHostNode; @ManagedObject( category = false, type = BDBHAVirtualHostNodeImpl.VIRTUAL_HOST_NODE_TYPE ) @@ -414,14 +416,43 @@ public class BDBHAVirtualHostNodeImpl extends AbstractVirtualHostNode hostAttributes = new HashMap<>(); + if (hasBlueprint && !blueprintUtilised) + { + Map virtualhostBlueprint = + getContextValue(Map.class, VIRTUALHOST_BLUEPRINT_CONTEXT_VAR); + + if (LOGGER.isDebugEnabled()) + { + LOGGER.debug("Using virtualhost blueprint " + virtualhostBlueprint); + } + + hostAttributes.putAll(virtualhostBlueprint); + + } - Map hostAttributes = new HashMap(); hostAttributes.put(VirtualHost.MODEL_VERSION, BrokerModel.MODEL_VERSION); hostAttributes.put(VirtualHost.NAME, getGroupName()); - hostAttributes.put(VirtualHost.TYPE, "BDB_HA"); + hostAttributes.put(VirtualHost.TYPE, BDBHAVirtualHostImpl.VIRTUAL_HOST_TYPE); host = createChild(VirtualHost.class, hostAttributes); + + if (hasBlueprint && !blueprintUtilised) + { + // Update the context with the utilised flag + Map actualContext = (Map) getActualAttributes().get(CONTEXT); + Map context = new HashMap<>(actualContext); + context.put(VIRTUALHOST_BLUEPRINT_UTILISED_CONTEXT_VAR, Boolean.TRUE.toString()); + setAttribute(CONTEXT, getContext(), context); + } } else { diff --git a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java index 0d631ae52b..66b252a246 100644 --- a/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java +++ b/qpid/java/bdbstore/src/test/java/org/apache/qpid/server/store/berkeleydb/BDBHAVirtualHostNodeTest.java @@ -20,6 +20,7 @@ */ package org.apache.qpid.server.store.berkeleydb; +import static java.util.Collections.*; import static org.mockito.Mockito.when; import java.io.File; @@ -45,6 +46,7 @@ import org.apache.qpid.server.model.VirtualHost; import org.apache.qpid.server.store.DurableConfigurationStore; import org.apache.qpid.server.virtualhost.berkeleydb.BDBHAVirtualHost; import org.apache.qpid.server.virtualhost.berkeleydb.BDBHAVirtualHostImpl; +import org.apache.qpid.server.virtualhostnode.AbstractVirtualHostNode; import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBHARemoteReplicationNode; import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBHARemoteReplicationNodeImpl; import org.apache.qpid.server.virtualhostnode.berkeleydb.BDBHAVirtualHostNode; @@ -95,7 +97,7 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase attributes.put(BDBHAVirtualHostNode.HELPER_ADDRESS, helperHostPort); attributes.put(BDBHAVirtualHostNode.STORE_PATH, messageStorePath); attributes.put(BDBHAVirtualHostNode.CONTEXT, - Collections.singletonMap(ReplicationConfig.REP_STREAM_TIMEOUT, repStreamTimeout)); + singletonMap(ReplicationConfig.REP_STREAM_TIMEOUT, repStreamTimeout)); BDBHAVirtualHostNode node = _helper.createHaVHN(attributes); @@ -467,10 +469,18 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase { String messageStorePath = _helper.getMessageStorePath(); int node1PortNumber = findFreePort(); + int node2PortNumber = getNextAvailable(node1PortNumber+1); String helperAddress = "localhost:" + node1PortNumber; String groupName = "group"; - Map node1Attributes = new HashMap(); + List permittedNodes = new ArrayList<>(); + permittedNodes.add(helperAddress); + String node2Address = "localhost:" + node2PortNumber; + permittedNodes.add(node2Address); + + String blueprint = String.format("{ \"%s\" : [ \"%s\", \"%s\" ] } ", BDBHAVirtualHost.PERMITTED_NODES, helperAddress, node2Address); + + Map node1Attributes = new HashMap<>(); node1Attributes.put(BDBHAVirtualHostNode.ID, UUID.randomUUID()); node1Attributes.put(BDBHAVirtualHostNode.TYPE, "BDB_HA"); node1Attributes.put(BDBHAVirtualHostNode.NAME, "node1"); @@ -478,22 +488,17 @@ public class BDBHAVirtualHostNodeTest extends QpidTestCase node1Attributes.put(BDBHAVirtualHostNode.ADDRESS, helperAddress); node1Attributes.put(BDBHAVirtualHostNode.HELPER_ADDRESS, helperAddress); node1Attributes.put(BDBHAVirtualHostNode.STORE_PATH, messageStorePath + File.separator + "1"); + Map contextMap = singletonMap(AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, blueprint); + node1Attributes.put(BDBHAVirtualHostNode.CONTEXT, contextMap); BDBHAVirtualHostNode node1 = _helper.createAndStartHaVHN(node1Attributes); - BDBHAVirtualHost host = (BDBHAVirtualHost)node1.getVirtualHost(); - - List permittedNodes = new ArrayList(); - int node2PortNumber = getNextAvailable(node1PortNumber+1); - permittedNodes.add(helperAddress); - permittedNodes.add("localhost:" + node2PortNumber); - host.setAttributes(Collections.singletonMap(BDBHAVirtualHost.PERMITTED_NODES, permittedNodes)); Map node2Attributes = new HashMap(); node2Attributes.put(BDBHAVirtualHostNode.ID, UUID.randomUUID()); node2Attributes.put(BDBHAVirtualHostNode.TYPE, "BDB_HA"); node2Attributes.put(BDBHAVirtualHostNode.NAME, "node2"); node2Attributes.put(BDBHAVirtualHostNode.GROUP_NAME, groupName); - node2Attributes.put(BDBHAVirtualHostNode.ADDRESS, "localhost:" + node2PortNumber); + node2Attributes.put(BDBHAVirtualHostNode.ADDRESS, node2Address); node2Attributes.put(BDBHAVirtualHostNode.HELPER_ADDRESS, helperAddress); node2Attributes.put(BDBHAVirtualHostNode.STORE_PATH, messageStorePath + File.separator + "2"); node2Attributes.put(BDBHAVirtualHostNode.HELPER_NODE_NAME, "node1"); diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java index 2a286379f4..b2a124a309 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNode.java @@ -44,8 +44,6 @@ public abstract class AbstractStandardVirtualHostNode { private static final Logger LOGGER = Logger.getLogger(AbstractStandardVirtualHostNode.class); - public static final String VIRTUALHOST_BLUEPRINT_CONTEXT_VAR = "virtualhostBlueprint"; - public static final String VIRTUALHOST_BLUEPRINT_UTILISED_CONTEXT_VAR = "virtualhostBlueprintUtilised"; public AbstractStandardVirtualHostNode(Map attributes, Broker parent) diff --git a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java index c9220b7b74..368ac58bee 100644 --- a/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java +++ b/qpid/java/broker-core/src/main/java/org/apache/qpid/server/virtualhostnode/AbstractVirtualHostNode.java @@ -47,6 +47,8 @@ import java.util.concurrent.atomic.AtomicReference; public abstract class AbstractVirtualHostNode> extends AbstractConfiguredObject implements VirtualHostNode { + public static final String VIRTUALHOST_BLUEPRINT_CONTEXT_VAR = "virtualhostBlueprint"; + public static final String VIRTUALHOST_BLUEPRINT_UTILISED_CONTEXT_VAR = "virtualhostBlueprintUtilised"; private static final Logger LOGGER = Logger.getLogger(AbstractVirtualHostNode.class); private final Broker _broker; diff --git a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java index d7c35ba6a8..884e729c52 100644 --- a/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java +++ b/qpid/java/broker-core/src/test/java/org/apache/qpid/server/virtualhostnode/AbstractStandardVirtualHostNodeTest.java @@ -20,7 +20,6 @@ */ package org.apache.qpid.server.virtualhostnode; -import static org.apache.qpid.server.virtualhostnode.AbstractStandardVirtualHostNode.*; import static org.mockito.Mockito.doThrow; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -145,7 +144,7 @@ public class AbstractStandardVirtualHostNodeTest extends QpidTestCase String vhBlueprint = String.format("{ \"type\" : \"%s\", \"name\" : \"%s\"}", TestMemoryVirtualHost.VIRTUAL_HOST_TYPE, TEST_VIRTUAL_HOST_NAME); - Map context = Collections.singletonMap(VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, vhBlueprint); + Map context = Collections.singletonMap(AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, vhBlueprint); Map nodeAttributes = new HashMap<>(); nodeAttributes.put(VirtualHostNode.NAME, TEST_VIRTUAL_HOST_NODE_NAME); @@ -166,10 +165,10 @@ public class AbstractStandardVirtualHostNodeTest extends QpidTestCase Map updatedContext = node.getContext(); assertTrue("Context should now have utilised flag", updatedContext.containsKey( - VIRTUALHOST_BLUEPRINT_UTILISED_CONTEXT_VAR)); + AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_UTILISED_CONTEXT_VAR)); assertEquals("Utilised flag should be true", Boolean.TRUE.toString(), - updatedContext.get(VIRTUALHOST_BLUEPRINT_UTILISED_CONTEXT_VAR)); + updatedContext.get(AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_UTILISED_CONTEXT_VAR)); } /** @@ -185,8 +184,8 @@ public class AbstractStandardVirtualHostNodeTest extends QpidTestCase TestMemoryVirtualHost.VIRTUAL_HOST_TYPE, TEST_VIRTUAL_HOST_NAME); Map context = new HashMap<>(); - context.put(VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, vhBlueprint); - context.put(VIRTUALHOST_BLUEPRINT_UTILISED_CONTEXT_VAR, Boolean.TRUE.toString()); + context.put(AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, vhBlueprint); + context.put(AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_UTILISED_CONTEXT_VAR, Boolean.TRUE.toString()); Map nodeAttributes = new HashMap<>(); nodeAttributes.put(VirtualHostNode.NAME, TEST_VIRTUAL_HOST_NODE_NAME); @@ -217,7 +216,7 @@ public class AbstractStandardVirtualHostNodeTest extends QpidTestCase String vhBlueprint = String.format("{ \"type\" : \"%s\", \"name\" : \"%s\"}", TestMemoryVirtualHost.VIRTUAL_HOST_TYPE, "vhFromBlueprint"); - Map context = Collections.singletonMap(VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, vhBlueprint); + Map context = Collections.singletonMap(AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, vhBlueprint); Map nodeAttributes = new HashMap<>(); nodeAttributes.put(VirtualHostNode.NAME, TEST_VIRTUAL_HOST_NODE_NAME); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SplitStoreTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SplitStoreTest.java index dcab2cbe76..7916f39488 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SplitStoreTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/server/store/SplitStoreTest.java @@ -32,7 +32,7 @@ import javax.jms.Session; import org.apache.qpid.configuration.ClientProperties; import org.apache.qpid.server.model.VirtualHostNode; -import org.apache.qpid.server.virtualhostnode.AbstractStandardVirtualHostNode; +import org.apache.qpid.server.virtualhostnode.AbstractVirtualHostNode; import org.apache.qpid.server.virtualhostnode.JsonVirtualHostNode; import org.apache.qpid.server.virtualhostnode.JsonVirtualHostNodeImpl; import org.apache.qpid.test.utils.QpidBrokerTestCase; @@ -88,7 +88,7 @@ public class SplitStoreTest extends QpidBrokerTestCase { final String blueprint = String.format( "{ \"type\" : \"%s\", \"storePath\" : \"%s\" }", virtualHostType, _messageStorePath); - final Map contextMap = Collections.singletonMap(AbstractStandardVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, + final Map contextMap = Collections.singletonMap(AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, blueprint); TestBrokerConfiguration config = getBrokerConfiguration(); diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java index 67cc87e103..2ccf85c5a5 100755 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java @@ -69,7 +69,7 @@ import org.apache.qpid.server.model.Port; import org.apache.qpid.server.model.Protocol; import org.apache.qpid.server.model.VirtualHostNode; import org.apache.qpid.server.store.MemoryConfigurationStore; -import org.apache.qpid.server.virtualhostnode.AbstractStandardVirtualHostNode; +import org.apache.qpid.server.virtualhostnode.AbstractVirtualHostNode; import org.apache.qpid.server.virtualhostnode.JsonVirtualHostNode; import org.apache.qpid.url.URLSyntaxException; import org.apache.qpid.util.FileUtils; @@ -873,7 +873,7 @@ public class QpidBrokerTestCase extends QpidTestCase final String blueprint = getTestProfileVirtualHostNodeBlueprint(); - attributes.put(ConfiguredObject.CONTEXT, Collections.singletonMap(AbstractStandardVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, + attributes.put(ConfiguredObject.CONTEXT, Collections.singletonMap(AbstractVirtualHostNode.VIRTUALHOST_BLUEPRINT_CONTEXT_VAR, blueprint)); int port = getPort(brokerPort); -- cgit v1.2.1