diff options
| author | Keith Wall <kwall@apache.org> | 2014-05-21 11:05:21 +0000 |
|---|---|---|
| committer | Keith Wall <kwall@apache.org> | 2014-05-21 11:05:21 +0000 |
| commit | 18db9663c7c73af9d1dc5a82478419f56f597851 (patch) | |
| tree | b8bf591fdfd85ede99bcdd6eea89766e36b355a9 /qpid/java/systests/src | |
| parent | 6619d55f7d03e67df6f9f2956779c33d1de66776 (diff) | |
| download | qpid-python-18db9663c7c73af9d1dc5a82478419f56f597851.tar.gz | |
QPID-5715: [Java Broker] Make virtualhosts respect the states ACTIVE and STOPPED
* Add state transition tests for BDBHA virtualhostnode / virtualhost
* Prevent the BDBVHN activating the VH (this is now a responsibility of attain desired state)
* BDBHARemoteReplicationNode use state UNAVAILABLE in the case where the remote node is not MASTER or REPLICA.
Work by Andrew MacBean <andymacbean@gmail.com> and me.
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1596536 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/java/systests/src')
| -rw-r--r-- | qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java index 214a961b00..2d5f083380 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/VirtualHostNodeRestTest.java @@ -94,10 +94,10 @@ public class VirtualHostNodeRestTest extends QpidRestTestCase assertActualAndDesireStates(restUrl, "ACTIVE", "ACTIVE"); - mutateVirtualHostDesiredState(restUrl, "STOPPED"); + mutateVirtualHostNodeDesiredState(restUrl, "STOPPED"); assertActualAndDesireStates(restUrl, "STOPPED", "STOPPED"); - mutateVirtualHostDesiredState(restUrl, "ACTIVE"); + mutateVirtualHostNodeDesiredState(restUrl, "ACTIVE"); assertActualAndDesireStates(restUrl, "ACTIVE", "ACTIVE"); } @@ -145,7 +145,7 @@ public class VirtualHostNodeRestTest extends QpidRestTestCase Asserts.assertActualAndDesiredState(expectedDesiredState, expectedActualState, virtualhostNode); } - private void mutateVirtualHostDesiredState(final String restUrl, final String newState) throws IOException + private void mutateVirtualHostNodeDesiredState(final String restUrl, final String newState) throws IOException { Map<String, Object> newAttributes = new HashMap<String, Object>(); newAttributes.put(VirtualHostNode.DESIRED_STATE, newState); |