QPID-1174 Remote Management Agent for management of external components

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

1 files changed, 14 insertions, 13 deletions

diff --git a/python/qpid/managementdata.py b/python/qpid/managementdata.py
index d755057e1f..4c34b514d4 100644
--- a/python/qpid/managementdata.py
+++ b/python/qpid/managementdata.py
@@ -71,24 +71,22 @@ class ManagementData:
   #
 
   def registerObjId (self, objId):
-    boot = objId & 0x7FFF000000000000L
-    if boot == 0:
-      return
-    self.bootSequence = boot
+    if not objId in self.idBackMap:
+      self.idBackMap[objId]   = self.nextId
+      self.idMap[self.nextId] = objId
+      self.nextId += 1
 
   def displayObjId (self, objId):
-    bank = (objId & 0x0000FFFFFF000000L) >> 24
-    id   =  objId & 0x0000000000FFFFFFL
-    return bank * 10000 + id
+    if objId in self.idBackMap:
+      return self.idBackMap[objId]
+    else:
+      return 0
 
   def rawObjId (self, displayId):
-    bank  = displayId / 10000
-    id    = displayId % 10000
-    if bank < 5:
-      objId = (bank << 24) + id
+    if displayId in self.idMap:
+      return self.idMap[displayId]
     else:
-      objId = self.bootSequence + (bank << 24) + id
-    return objId
+      return 0
 
   def displayClassName (self, cls):
     (packageName, className, hash) = cls
@@ -201,6 +199,9 @@ class ManagementData:
     self.mclient.schemaListener (self.schemaHandler)
     self.mch = self.mclient.addChannel (self.conn.session(self.sessionId))
     self.operational = True
+    self.idMap = {}
+    self.idBackMap = {}
+    self.nextId = 101
 
   def close (self):
     pass