[rhmessaging-commits] rhmessaging commits: r4302 - in mgmt/newdata/cumin/python/cumin: messaging and 1 other directory.

[rhmessaging-commits at lists.jboss.org]

Author: eallen
Date: 2010-09-17 08:29:06 -0400 (Fri, 17 Sep 2010)
New Revision: 4302

Modified:
   mgmt/newdata/cumin/python/cumin/messaging/brokerlink.py
   mgmt/newdata/cumin/python/cumin/session.py
Log:
Fix 234180: The method name for removing a broker link is "close" not remove.
The attribute values used to construct the object id for v1 object need to be converted to strings before they are joined. 

Modified: mgmt/newdata/cumin/python/cumin/messaging/brokerlink.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/messaging/brokerlink.py	2010-09-16 19:10:21 UTC (rev 4301)
+++ mgmt/newdata/cumin/python/cumin/messaging/brokerlink.py	2010-09-17 12:29:06 UTC (rev 4302)
@@ -37,7 +37,7 @@
         self.app.main_page.main.messaging.broker.view.show(session)
 
     def do_invoke(self, invoc, link):
-        self.qmf_call(invoc, link, "remove")
+        self.qmf_call(invoc, link, "close")
 
 class BrokerLinkSelector(ObjectSelector):
     def __init__(self, app, name, vhost):
@@ -67,7 +67,7 @@
         return "Remove"
 
     def do_invoke(self, invoc, link):
-        self.qmf_call(invoc, link, "remove")
+        self.qmf_call(invoc, link, "close")
 
 class RouteSelector(ObjectSelector):
     def __init__(self, app, name, link):

Modified: mgmt/newdata/cumin/python/cumin/session.py
===================================================================
--- mgmt/newdata/cumin/python/cumin/session.py	2010-09-16 19:10:21 UTC (rev 4301)
+++ mgmt/newdata/cumin/python/cumin/session.py	2010-09-17 12:29:06 UTC (rev 4302)
@@ -84,7 +84,7 @@
 
                 key = obj.name
             else:
-                key_args = [getattr(obj, x.name)
+                key_args = [str(getattr(obj, x.name))
                             for x in obj._class._attributes
                             if x.index and not x.references]
                 key = ",".join(key_args)