Clarified broker/agent banks in method names. Added new accessor methods for bank values

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

1 files changed, 11 insertions, 5 deletions

diff --git a/python/qpid/qmfconsole.py b/python/qpid/qmfconsole.py
index 3ceb41b7a6..e173a4b864 100644
--- a/python/qpid/qmfconsole.py
+++ b/python/qpid/qmfconsole.py
@@ -671,7 +671,7 @@ class Session:
             self._encodeValue(sendCodec, argList[aIdx], arg.type)
             aIdx += 1
         smsg = broker._message(sendCodec.encoded, "agent.%d.%d" %
-                               (objectId.getBroker(), objectId.getBank()))
+                               (objectId.getBrokerBank(), objectId.getAgentBank()))
         broker._send(smsg)
         return seq
     return None
@@ -866,7 +866,7 @@ class ObjectId:
 
   def __repr__(self):
     return "%d-%d-%d-%d-%d" % (self.getFlags(), self.getSequence(),
-                               self.getBroker(), self.getBank(), self.getObject())
+                               self.getBrokerBank(), self.getAgentBank(), self.getObject())
 
   def index(self):
     return (self.first, self.second)
@@ -877,10 +877,10 @@ class ObjectId:
   def getSequence(self):
     return (self.first & 0x0FFF000000000000) >> 48
 
-  def getBroker(self):
+  def getBrokerBank(self):
     return (self.first & 0x0000FFFFF0000000) >> 28
 
-  def getBank(self):
+  def getAgentBank(self):
     return self.first & 0x000000000FFFFFFF
 
   def getObject(self):
@@ -1014,7 +1014,7 @@ class Object(object):
             self._session._encodeValue(sendCodec, args[aIdx], arg.type)
             aIdx += 1
         smsg = self._broker._message(sendCodec.encoded, "agent.%d.%d" %
-                                     (self._objectId.getBroker(), self._objectId.getBank()))
+                                     (self._objectId.getBrokerBank(), self._objectId.getAgentBank()))
         if synchronous:
           try:
             self._broker.cv.acquire()
@@ -1109,6 +1109,9 @@ class Broker:
     """ Get broker's unique identifier (UUID) """
     return self.brokerId
 
+  def getBrokerBank(self):
+    return 1
+
   def getSessionId(self):
     """ Get the identifier of the AMQP session to the broker """
     return self.amqpSessionId
@@ -1316,6 +1319,9 @@ class Agent:
   def getBroker(self):
     return self.broker
 
+  def getAgentBank(self):
+    return self.bank
+
 class Event:
   """ """
   def __init__(self, session, broker, codec):