Author: eallen
Date: Thu Jul 9 17:51:13 2015
New Revision: 1690130
URL: http://svn.apache.org/r1690130
Log:
DISPATCH-150 Adding graph property to schema
Modified:
qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json
qpid/dispatch/trunk/python/qpid_dispatch_internal/management/schema.py
Modified: qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json?rev=1690130&r1=1690129&r2=1690130&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json (original)
+++ qpid/dispatch/trunk/python/qpid_dispatch/management/qdrouter.json Thu Jul
9 17:51:13 2015
@@ -547,15 +547,18 @@
},
"addrCount": {
"type":
- "integer", "description":"Number of addresses known to the
router."
+ "integer", "description":"Number of addresses known to the
router.",
+ "graph": true
},
"linkCount": {
"type": "integer",
- "description":"Number of links attached to the router
node."
- },
+ "description":"Number of links attached to the router
node.",
+ "graph": true
+ },
"nodeCount": {
"type": "integer",
- "description":"Number of known peer router nodes."
+ "description":"Number of known peer router nodes.",
+ "graph": true
}
}
},
@@ -775,8 +778,8 @@
"linkType": {"type": ["endpoint", "waypoint", "inter-router",
"inter-area"]},
"linkDir": {"type": ["in", "out"]},
"owningAddr": {"type": "string"},
- "eventFifoDepth": {"type": "integer"},
- "msgFifoDepth": {"type": "integer"},
+ "eventFifoDepth": {"type": "integer", "graph": true},
+ "msgFifoDepth": {"type": "integer", "graph": true},
"remoteContainer": {"type": "string"}
}
},
@@ -786,13 +789,13 @@
"extends": "operationalEntity",
"attributes": {
"inProcess": {"type": "boolean"},
- "subscriberCount": {"type": "integer"},
- "remoteCount": {"type": "integer"},
- "deliveriesIngress": {"type": "integer"},
- "deliveriesEgress": {"type": "integer"},
- "deliveriesTransit": {"type": "integer"},
- "deliveriesToContainer": {"type": "integer"},
- "deliveriesFromContainer": {"type": "integer"},
+ "subscriberCount": {"type": "integer", "graph": true},
+ "remoteCount": {"type": "integer", "graph": true},
+ "deliveriesIngress": {"type": "integer", "graph": true},
+ "deliveriesEgress": {"type": "integer", "graph": true},
+ "deliveriesTransit": {"type": "integer", "graph": true},
+ "deliveriesToContainer": {"type": "integer", "graph": true},
+ "deliveriesFromContainer": {"type": "integer", "graph": true},
"key": {
"description": "Internal unique (to this router) key to
identify the address",
"type": "string"
@@ -874,13 +877,13 @@
"typeName": {"type": "string"},
"typeSize": {"type": "integer"},
"transferBatchSize": {"type": "integer"},
- "localFreeListMax": {"type": "integer"},
- "globalFreeListMax": {"type": "integer"},
- "totalAllocFromHeap": {"type": "integer"},
- "totalFreeToHeap": {"type": "integer"},
- "heldByThreads": {"type": "integer"},
- "batchesRebalancedToThreads": {"type": "integer"},
- "batchesRebalancedToGlobal": {"type": "integer"}
+ "localFreeListMax": {"type": "integer", "graph": true},
+ "globalFreeListMax": {"type": "integer", "graph": true},
+ "totalAllocFromHeap": {"type": "integer", "graph": true},
+ "totalFreeToHeap": {"type": "integer", "graph": true},
+ "heldByThreads": {"type": "integer", "graph": true},
+ "batchesRebalancedToThreads": {"type": "integer", "graph":
true},
+ "batchesRebalancedToGlobal": {"type": "integer", "graph": true}
}
},
Modified: qpid/dispatch/trunk/python/qpid_dispatch_internal/management/schema.py
URL:
http://svn.apache.org/viewvc/qpid/dispatch/trunk/python/qpid_dispatch_internal/management/schema.py?rev=1690130&r1=1690129&r2=1690130&view=diff
==============================================================================
--- qpid/dispatch/trunk/python/qpid_dispatch_internal/management/schema.py
(original)
+++ qpid/dispatch/trunk/python/qpid_dispatch_internal/management/schema.py Thu
Jul 9 17:51:13 2015
@@ -203,10 +203,11 @@ class AttributeType(object):
@ivar defined_in: Annotation or EntityType in which this attribute is
defined.
@ivar create: If true the attribute can be set by CREATE.
@ivar update: If true the attribute can be modified by UPDATE.
+ @ivar graph: If true the attribute could be graphed by a console.
"""
def __init__(self, name, type=None, defined_in=None, default=None,
required=False, unique=False,
- value=None, description="", create=False, update=False):
+ value=None, description="", create=False, update=False,
graph=False):
"""
See L{AttributeType} instance variables.
"""
@@ -224,6 +225,7 @@ class AttributeType(object):
self.name)
self.create=create
self.update=update
+ self.graph=graph
except:
ex, msg, trace = sys.exc_info()
raise ValidationError, "Attribute '%s': %s" % (name, msg), trace
@@ -273,7 +275,8 @@ class AttributeType(object):
('default', self.default),
('required', self.required),
('unique', self.unique),
- ('description', self.description)
+ ('description', self.description),
+ ('graph', self.graph)
])
def __str__(self):
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@qpid.apache.org
For additional commands, e-mail: commits-h...@qpid.apache.org
