From 9d1210ea9582fa8863fe788428751fca8e2f64ad Mon Sep 17 00:00:00 2001
From: Kenneth Anthony Giusti <kgiusti@apache.org>
Date: Wed, 16 Feb 2011 20:14:56 +0000
Subject: QPID-2935: remove flow control parameters from qmf schema.

git-svn-id: https://svn.apache.org/repos/asf/qpid/branches/qpid-2935@1071381 13f79535-47bb-0310-9956-ffa450edef68
---
 qpid/cpp/src/qpid/broker/QueueFlowLimit.cpp  |  4 ----
 qpid/cpp/src/tests/queue_flow_limit_tests.py | 16 ++++++++--------
 qpid/specs/management-schema.xml             |  5 -----
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/qpid/cpp/src/qpid/broker/QueueFlowLimit.cpp b/qpid/cpp/src/qpid/broker/QueueFlowLimit.cpp
index f3e6e088b9..7e8739fe9e 100644
--- a/qpid/cpp/src/qpid/broker/QueueFlowLimit.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueFlowLimit.cpp
@@ -238,10 +238,6 @@ void QueueFlowLimit::setManagementObject(_qmfBroker::Queue *mgmtObject)
 {
     queueMgmtObj = mgmtObject;
     if (queueMgmtObj) {
-        queueMgmtObj->set_flowStopCount(getFlowStopCount());
-        queueMgmtObj->set_flowResumeCount(getFlowResumeCount());
-        queueMgmtObj->set_flowStopSize(getFlowStopSize());
-        queueMgmtObj->set_flowResumeSize(getFlowResumeSize());
         queueMgmtObj->set_flowStopped(isFlowControlActive());
     }
 }
diff --git a/qpid/cpp/src/tests/queue_flow_limit_tests.py b/qpid/cpp/src/tests/queue_flow_limit_tests.py
index 9bfba28e15..27fbe2afcc 100644
--- a/qpid/cpp/src/tests/queue_flow_limit_tests.py
+++ b/qpid/cpp/src/tests/queue_flow_limit_tests.py
@@ -53,13 +53,13 @@ class QueueFlowLimitTests(TestBase010):
             if i.name == name:
                 # verify flow settings
                 if (stop_count is not None):
-                    self.assertEqual(i.flowStopCount, stop_count)
+                    self.assertEqual(i.arguments.get("qpid.flow_stop_count"), stop_count)
                 if (resume_count is not None):
-                    self.assertEqual(i.flowResumeCount, resume_count)
+                    self.assertEqual(i.arguments.get("qpid.flow_resume_count"), resume_count)
                 if (stop_size is not None):
-                    self.assertEqual(i.flowStopSize, stop_size)
+                    self.assertEqual(i.arguments.get("qpid.flow_stop_size"), stop_size)
                 if (resume_size is not None):
-                    self.assertEqual(i.flowResumeSize, resume_size)
+                    self.assertEqual(i.arguments.get("qpid.flow_resume_size"), resume_size)
                 self.assertFalse(i.flowStopped)
                 return i.getObjectId()
         self.fail("Unable to create queue '%s'" % name)
@@ -123,10 +123,10 @@ class QueueFlowLimitTests(TestBase010):
             qs = self.qmf.getObjects(_class="queue")
             for i in qs:
                 if i.name == "test01":
-                    self.assertEqual(i.flowStopCount, 999)
-                    self.assertEqual(i.flowResumeCount, 55)
-                    self.assertEqual(i.flowStopSize, 5000000)
-                    self.assertEqual(i.flowResumeSize, 100000)
+                    self.assertEqual(i.arguments.get("qpid.flow_stop_count"), 999)
+                    self.assertEqual(i.arguments.get("qpid.flow_resume_count"), 55)
+                    self.assertEqual(i.arguments.get("qpid.flow_stop_size"), 5000000)
+                    self.assertEqual(i.arguments.get("qpid.flow_resume_size"), 100000)
                     self.assertFalse(i.flowStopped)
                     break;
             self.assertEqual(i.name, "test01")
diff --git a/qpid/specs/management-schema.xml b/qpid/specs/management-schema.xml
index 6d17357f00..cde77c47d2 100644
--- a/qpid/specs/management-schema.xml
+++ b/qpid/specs/management-schema.xml
@@ -143,11 +143,6 @@
     <property name="exclusive"   type="bool"  access="RC"/>
     <property name="arguments"   type="map"   access="RO" desc="Arguments supplied in queue.declare"/>
     <property name="altExchange" type="objId" references="Exchange" access="RO" optional="y"/>
-    <property name="flowStopCount"   type="uint32" access="RO" optional="y" desc="Flow control: # messages to force flow control."/>
-    <property name="flowResumeCount" type="uint32" access="RO" optional="y" desc="Flow control: # messages to release flow control."/>
-    <property name="flowStopSize"    type="uint64" access="RO" optional="y" desc="Flow control: # enqueued bytes to force flow control."/>
-    <property name="flowResumeSize"  type="uint64" access="RO" optional="y" desc="Flow control: # enqueued bytes to release flow control."/>
-
 
     <statistic name="msgTotalEnqueues"    type="count64"  unit="message"     desc="Total messages enqueued"/>
     <statistic name="msgTotalDequeues"    type="count64"  unit="message"     desc="Total messages dequeued"/>
-- 
cgit v1.2.1