Modified: incubator/qpid/trunk/qpid/python/commands/qpid-route URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/commands/qpid-route?rev=655563&r1=655562&r2=655563&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/python/commands/qpid-route (original) +++ incubator/qpid/trunk/qpid/python/commands/qpid-route Mon May 12 10:04:07 2008 @@ -83,7 +83,7 @@ def getLink (self): links = self.mclient.syncGetObjects (self.mch, "link") for link in links: - if link.address == self.src.name (): + if "%s:%d" % (link.host, link.port) == self.src.name (): return link return None @@ -100,8 +100,13 @@ print "Inter-broker link not found, creating..." connectArgs = {} - connectArgs["host"] = self.src.host - connectArgs["port"] = self.src.port + connectArgs["host"] = self.src.host + connectArgs["port"] = self.src.port + connectArgs["useSsl"] = False + connectArgs["durable"] = False + connectArgs["authMechanism"] = "ANONYMOUS" + connectArgs["username"] = "" + connectArgs["password"] = "" res = mc.syncCallMethod (self.mch, broker.id, broker.classKey, "connect", connectArgs) if _verbose: print "Connect method returned:", res.status, res.statusText @@ -122,6 +127,7 @@ if _verbose: print "Creating inter-broker binding..." bridgeArgs = {} + bridgeArgs["durable"] = 0 bridgeArgs["src"] = exchange bridgeArgs["dest"] = exchange bridgeArgs["key"] = routingKey @@ -180,7 +186,7 @@ myLink = link break if myLink != None: - print "%s %s %s %s" % (self.dest.name(), myLink.address, bridge.dest, bridge.key) + print "%s %s:%d %s %s" % (self.dest.name(), myLink.host, myLink.port, bridge.dest, bridge.key) def LoadRoutes (self, inFile): pass @@ -198,7 +204,7 @@ myLink = link break if myLink != None: - print "Deleting Bridge: %s %s %s... " % (myLink.address, bridge.dest, bridge.key), + print "Deleting Bridge: %s:%d %s %s... " % (myLink.host, myLink.port, bridge.dest, bridge.key), res = mc.syncCallMethod (self.mch, bridge.id, bridge.classKey, "close") if res.status != 0: print "Error: %d - %s" % (res.status, res.statusText) @@ -208,7 +214,7 @@ links = mc.syncGetObjects (self.mch, "link") for link in links: if _verbose: - print "Deleting Link: %s... " % link.address, + print "Deleting Link: %s:%d... " % (link.host, link.port), res = mc.syncCallMethod (self.mch, link.id, link.classKey, "close") if res.status != 0: print "Error: %d - %s" % (res.status, res.statusText)
Modified: incubator/qpid/trunk/qpid/python/qpid/management.py URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/qpid/management.py?rev=655563&r1=655562&r2=655563&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/python/qpid/management.py (original) +++ incubator/qpid/trunk/qpid/python/qpid/management.py Mon May 12 10:04:07 2008 @@ -281,7 +281,13 @@ hdr = self.checkHeader (codec) if hdr == None: raise ValueError ("outer header invalid"); - self.parse (ch, codec, hdr[0], hdr[1]) + + if hdr[0] == 'p': + self.handlePackageInd (ch, codec) + elif hdr[0] == 'q': + self.handleClassInd (ch, codec) + else: + self.parse (ch, codec, hdr[0], hdr[1]) ch.accept(msg) def replyCb (self, ch, msg): Modified: incubator/qpid/trunk/qpid/python/qpid/managementdata.py URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/python/qpid/managementdata.py?rev=655563&r1=655562&r2=655563&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/python/qpid/managementdata.py (original) +++ incubator/qpid/trunk/qpid/python/qpid/managementdata.py Mon May 12 10:04:07 2008 @@ -84,7 +84,7 @@ def rawObjId (self, displayId): bank = displayId / 1000 id = displayId % 1000 - if bank < 3: + if bank < 5: objId = (bank << 24) + id else: objId = self.bootSequence + (bank << 24) + id Modified: incubator/qpid/trunk/qpid/specs/management-schema.xml URL: http://svn.apache.org/viewvc/incubator/qpid/trunk/qpid/specs/management-schema.xml?rev=655563&r1=655562&r2=655563&view=diff ============================================================================== --- incubator/qpid/trunk/qpid/specs/management-schema.xml (original) +++ incubator/qpid/trunk/qpid/specs/management-schema.xml Mon May 12 10:04:07 2008 @@ -86,8 +86,13 @@ </method> <method name="connect" desc="Establish a connection to another broker"> - <arg name="host" dir="I" type="sstr" default=""/> - <arg name="port" dir="I" type="uint32" default="0"/> + <arg name="host" dir="I" type="sstr"/> + <arg name="port" dir="I" type="uint32"/> + <arg name="useSsl" dir="I" type="bool"/> + <arg name="durable" dir="I" type="bool"/> + <arg name="authMechanism" dir="I" type="sstr"/> + <arg name="username" dir="I" type="sstr"/> + <arg name="password" dir="I" type="sstr"/> </method> </class> @@ -97,7 +102,10 @@ =============================================================== --> <class name="agent"> - <configElement name="id" type="uuid" access="RO" index="y" desc="Agent ID"/> + <configElement name="sessionId" type="uuid" access="RO" index="y" desc="Session ID for Agent"/> + <configElement name="label" type="sstr" access="RO" desc="Label for agent"/> + <configElement name="registeredTo" type="objId" access="RO" desc="Broker agent is registered to"/> + <configElement name="sysId" type="uuid" access="RO" desc="Identifier of system where agent resides"/> </class> <!-- @@ -164,6 +172,7 @@ <configElement name="vhostRef" type="objId" access="RC" index="y" parentRef="y"/> <configElement name="name" type="sstr" access="RC" index="y"/> <configElement name="type" type="sstr" access="RO"/> + <configElement name="durable" type="bool" access="RC"/> <instElement name="producers" type="hilo32" desc="Current producers on exchange"/> <instElement name="bindings" type="hilo32" desc="Current bindings"/> @@ -197,6 +206,7 @@ <class name="client"> <configElement name="vhostRef" type="objId" access="RC" index="y" parentRef="y"/> <configElement name="address" type="sstr" access="RC" index="y"/> + <configElement name="incoming" type="bool" access="RC"/> <instElement name="closing" type="bool" desc="This client is closing by management request"/> <instElement name="authIdentity" type="sstr"/> @@ -217,19 +227,19 @@ This class represents an inter-broker connection. - <configElement name="vhostRef" type="objId" access="RC" index="y" parentRef="y"/> - <configElement name="address" type="sstr" access="RC" index="y"/> - <configElement name="authIdentity" type="sstr" access="RO"/> - - <instElement name="closing" type="bool" desc="This link is closing by management request"/> - <instElement name="framesFromPeer" type="count64"/> - <instElement name="framesToPeer" type="count64"/> - <instElement name="bytesFromPeer" type="count64"/> - <instElement name="bytesToPeer" type="count64"/> + <configElement name="vhostRef" type="objId" access="RC" index="y" parentRef="y"/> + <configElement name="host" type="sstr" access="RC" index="y"/> + <configElement name="port" type="uint16" access="RC" index="y"/> + <configElement name="useSsl" type="bool" access="RC"/> + <configElement name="durable" type="bool" access="RC"/> + + <instElement name="state" type="sstr" desc="Operational state of the link"/> + <instElement name="lastError" type="sstr" desc="Reason link is not operational"/> <method name="close"/> <method name="bridge" desc="Bridge messages over the link"> + <arg name="durable" dir="I" type="bool"/> <arg name="src" dir="I" type="sstr"/> <arg name="dest" dir="I" type="sstr"/> <arg name="key" dir="I" type="sstr" default=""/> @@ -247,13 +257,13 @@ =============================================================== --> <class name="bridge"> - <configElement name="linkRef" type="objId" access="RC" index="y" parentRef="y"/> - <configElement name="channelId" type="uint16" access="RC" index="y"/> - <configElement name="src" type="sstr" access="RC"/> - <configElement name="dest" type="sstr" access="RC"/> - <configElement name="key" type="sstr" access="RC"/> - <configElement name="src_is_queue" type="bool" access="RC"/> - <configElement name="src_is_local" type="bool" access="RC"/> + <configElement name="linkRef" type="objId" access="RC" index="y" parentRef="y"/> + <configElement name="channelId" type="uint16" access="RC" index="y"/> + <configElement name="src" type="sstr" access="RC"/> + <configElement name="dest" type="sstr" access="RC"/> + <configElement name="key" type="sstr" access="RC"/> + <configElement name="src_is_queue" type="bool" access="RC"/> + <configElement name="src_is_local" type="bool" access="RC"/> <method name="close"/> </class>
