QPID-5109: remove invalid options from qpid-config

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1519480 13f79535-47bb-0310-9956-ffa450edef68

2 files changed, 13 insertions, 27 deletions

diff --git a/qpid/cpp/src/tests/cli_tests.py b/qpid/cpp/src/tests/cli_tests.py
index dceafc5427..eee9bc648c 100755
--- a/qpid/cpp/src/tests/cli_tests.py
+++ b/qpid/cpp/src/tests/cli_tests.py
@@ -69,47 +69,39 @@ class CliTests(TestBase010):
         self.startBrokerAccess()
         queue1 = self.makeQueue("test_queue_params1", "--limit-policy none")
         queue2 = self.makeQueue("test_queue_params2", "--limit-policy reject")
-        queue3 = self.makeQueue("test_queue_params3", "--limit-policy flow-to-disk")
-        queue4 = self.makeQueue("test_queue_params4", "--limit-policy ring")
-        queue5 = self.makeQueue("test_queue_params5", "--limit-policy ring-strict")
+        queue3 = self.makeQueue("test_queue_params3", "--limit-policy ring")
 
         LIMIT = "qpid.policy_type"
         assert LIMIT not in queue1.arguments
         self.assertEqual(queue2.arguments[LIMIT], "reject")
-        self.assertEqual(queue3.arguments[LIMIT], "flow_to_disk")
-        self.assertEqual(queue4.arguments[LIMIT], "ring")
-        self.assertEqual(queue5.arguments[LIMIT], "ring_strict")
+        self.assertEqual(queue3.arguments[LIMIT], "ring")
 
-        queue6 = self.makeQueue("test_queue_params6", "--lvq-key lkey")
+        queue4 = self.makeQueue("test_queue_params4", "--lvq-key lkey")
 
         LVQKEY = "qpid.last_value_queue_key"
 
-        assert LVQKEY not in queue5.arguments
-        assert LVQKEY     in queue6.arguments
-        assert queue6.arguments[LVQKEY] == "lkey"
+        assert LVQKEY not in queue3.arguments
+        assert LVQKEY     in queue4.arguments
+        assert queue4.arguments[LVQKEY] == "lkey"
 
     def test_queue_params_api(self):
         self.startBrokerAccess()
         queue1 = self.makeQueue("test_queue_params_api1", "--limit-policy none", True)
         queue2 = self.makeQueue("test_queue_params_api2", "--limit-policy reject", True)
-        queue3 = self.makeQueue("test_queue_params_api3", "--limit-policy flow-to-disk", True)
-        queue4 = self.makeQueue("test_queue_params_api4", "--limit-policy ring", True)
-        queue5 = self.makeQueue("test_queue_params_api5", "--limit-policy ring-strict", True)
+        queue3 = self.makeQueue("test_queue_params_api3", "--limit-policy ring", True)
 
         LIMIT = "qpid.policy_type"
         assert LIMIT not in queue1.arguments
         self.assertEqual(queue2.arguments[LIMIT], "reject")
-        self.assertEqual(queue3.arguments[LIMIT], "flow_to_disk")
-        self.assertEqual(queue4.arguments[LIMIT], "ring")
-        self.assertEqual(queue5.arguments[LIMIT], "ring_strict")
+        self.assertEqual(queue3.arguments[LIMIT], "ring")
 
-        queue6 = self.makeQueue("test_queue_params_api6", "--lvq-key lkey")
+        queue4 = self.makeQueue("test_queue_params_api4", "--lvq-key lkey")
 
         LVQKEY = "qpid.last_value_queue_key"
 
-        assert LVQKEY not in queue5.arguments
-        assert LVQKEY     in queue6.arguments
-        assert queue6.arguments[LVQKEY] == "lkey"
+        assert LVQKEY not in queue3.arguments
+        assert LVQKEY     in queue4.arguments
+        assert queue4.arguments[LVQKEY] == "lkey"
 
 
     def test_qpid_config(self):
diff --git a/qpid/tools/src/py/qpid-config b/qpid/tools/src/py/qpid-config
index ecb880be21..1e995674c4 100755
--- a/qpid/tools/src/py/qpid-config
+++ b/qpid/tools/src/py/qpid-config
@@ -66,9 +66,7 @@ Queue Limit Actions:
 
     none (default) - Use broker's default policy
     reject         - Reject enqueued messages
-    flow-to-disk   - Page messages to disk
     ring           - Replace oldest unacquired message with new
-    ring-strict    - Replace oldest message, reject if oldest is acquired
 
 Replication levels:
 
@@ -198,7 +196,7 @@ def OptionsAndArguments(argv):
     group3.add_option("--file-size", action="store", type="int", metavar="<n>", help="File size in pages (64KiB/page)")
     group3.add_option("--max-queue-size", action="store", type="int", metavar="<n>", help="Maximum in-memory queue size as bytes")
     group3.add_option("--max-queue-count", action="store", type="int", metavar="<n>", help="Maximum in-memory queue size as a number of messages")
-    group3.add_option("--limit-policy", action="store", choices=["none", "reject", "flow-to-disk", "ring", "ring-strict"], metavar="<policy>", help="Action to take when queue limit is reached")
+    group3.add_option("--limit-policy", action="store", choices=["none", "reject", "ring", "ring-strict"], metavar="<policy>", help="Action to take when queue limit is reached")
     group3.add_option("--lvq-key", action="store", metavar="<key>", help="Last Value Queue key")
     group3.add_option("--generate-queue-events", action="store", type="int", metavar="<n>", help="If set to 1, every enqueue will generate an event that can be processed by registered listeners (e.g. for replication). If set to 2, events will be generated for enqueues and dequeues.")
     group3.add_option("--flow-stop-size", action="store", type="int", metavar="<n>",
@@ -597,12 +595,8 @@ class BrokerManager:
                 pass
             elif config._limitPolicy == "reject":
                 declArgs[POLICY_TYPE] = "reject"
-            elif config._limitPolicy == "flow-to-disk":
-                declArgs[POLICY_TYPE] = "flow_to_disk"
             elif config._limitPolicy == "ring":
                 declArgs[POLICY_TYPE] = "ring"
-            elif config._limitPolicy == "ring-strict":
-                declArgs[POLICY_TYPE] = "ring_strict"
 
         if config._clusterDurable:
             declArgs[CLUSTER_DURABLE] = 1