You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by gm...@apache.org on 2019/08/29 17:58:42 UTC
[qpid-dispatch] branch master updated: DISPATCH-1374 - Executing
qdstat --all-routers will output qdstat --all-routers -g
This is an automated email from the ASF dual-hosted git repository.
gmurthy pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/qpid-dispatch.git
The following commit(s) were added to refs/heads/master by this push:
new b468642 DISPATCH-1374 - Executing qdstat --all-routers will output qdstat --all-routers -g
b468642 is described below
commit b468642f3ad8fb451e9126f06e542d6e97f89237
Author: Ganesh Murthy <gm...@apache.org>
AuthorDate: Thu Aug 29 13:58:10 2019 -0400
DISPATCH-1374 - Executing qdstat --all-routers will output qdstat --all-routers -g
---
tests/system_tests_edge_router.py | 19 +------------------
tools/qdstat.in | 6 +++---
2 files changed, 4 insertions(+), 21 deletions(-)
diff --git a/tests/system_tests_edge_router.py b/tests/system_tests_edge_router.py
index a33bdd0..e98c6ef 100644
--- a/tests/system_tests_edge_router.py
+++ b/tests/system_tests_edge_router.py
@@ -1233,23 +1233,13 @@ class RouterTest(TestCase):
def test_68_edge_qdstat_all_routers(self):
# Connects to an edge router and runs "qdstat --all-routers"
- # "qdstat --all-routers" is same as "qdstat --all-routers --all-entities"
+ # "qdstat --all-routers" is same as "qdstat --all-routers --g"
# Connecting to an edge router and running "qdstat --all-routers""will only yield the
# summary statostics of the edge router. It will not show statistics of the interior routers.
outs = self.run_qdstat(['--all-routers'],
address=self.routers[2].addresses[0])
- # Check if each entity section is showing
- self.assertEqual(outs.count("Router Links"), 1)
- self.assertEqual(outs.count("Router Addresses"), 1)
- self.assertEqual(outs.count("AutoLinks"), 1)
- self.assertEqual(outs.count("Auto Links"), 1)
- self.assertEqual(outs.count("Router Statistics"), 1)
- self.assertEqual(outs.count("Link Routes"), 2)
- self.assertEqual(outs.count("Types"), 1)
self.assertTrue("Router Id EA1" in outs)
- self.assertTrue("Types" in outs)
-
outs = self.run_qdstat(['--all-routers', '--all-entities'],
address=self.routers[2].addresses[0])
# Check if each entity section is showing
@@ -1292,14 +1282,7 @@ class RouterTest(TestCase):
# summary statostics of all the interior routers.
outs = self.run_qdstat(['--all-routers'],
address=self.routers[0].addresses[0])
- self.assertEqual(outs.count("Router Links"), 2)
- self.assertEqual(outs.count("Router Addresses"), 2)
- self.assertEqual(outs.count("Connections"), 4)
- self.assertEqual(outs.count("AutoLinks"), 2)
- self.assertEqual(outs.count("Auto Links"), 2)
- self.assertEqual(outs.count("Link Routes"), 4)
self.assertEqual(outs.count("Router Statistics"), 2)
- self.assertEqual(outs.count("Types"), 2)
outs = self.run_qdstat(['--all-routers', '-nv'],
address=self.routers[0].addresses[0])
diff --git a/tools/qdstat.in b/tools/qdstat.in
index 99d6052..b7e412f 100755
--- a/tools/qdstat.in
+++ b/tools/qdstat.in
@@ -78,6 +78,9 @@ def parse_args(argv):
if opts.all_entities and opts.show:
parser.error("--all-entities cannot be combined with specific entity option -" + opts.show)
+ if not opts.show and not opts.all_entities and opts.all_routers:
+ opts.show = u'g'
+
if not opts.all_routers and not opts.all_entities and not opts.show:
opts.show = u'g'
@@ -725,9 +728,6 @@ class BusManager(Node):
elif opts.all_routers and opts.all_entities:
print (str(datetime.now()))
self.all_routers_entities()
- elif opts.all_routers:
- print (str(datetime.now()))
- self.all_routers_entities()
elif opts.all_entities:
print (str(datetime.now()))
# Display all the relevant entities from the one router that
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org