You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by tr...@apache.org on 2013/10/22 20:43:04 UTC
svn commit: r1534726 - in /qpid/trunk/qpid/extras/dispatch: etc/ src/ tests/
tests/config-2/ tests/config-3-linear/
Author: tross
Date: Tue Oct 22 18:43:03 2013
New Revision: 1534726
URL: http://svn.apache.org/r1534726
Log:
QPID-5216 - Removed "area" from the configuration as it is not currently implemented
Modified:
qpid/trunk/qpid/extras/dispatch/etc/qpid-dispatch.conf
qpid/trunk/qpid/extras/dispatch/src/dispatch.c
qpid/trunk/qpid/extras/dispatch/tests/config-2/A.conf
qpid/trunk/qpid/extras/dispatch/tests/config-2/B.conf
qpid/trunk/qpid/extras/dispatch/tests/config-3-linear/A.conf
qpid/trunk/qpid/extras/dispatch/tests/config-3-linear/B.conf
qpid/trunk/qpid/extras/dispatch/tests/config-3-linear/C.conf
qpid/trunk/qpid/extras/dispatch/tests/system_tests_one_router.py
Modified: qpid/trunk/qpid/extras/dispatch/etc/qpid-dispatch.conf
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/etc/qpid-dispatch.conf?rev=1534726&r1=1534725&r2=1534726&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/etc/qpid-dispatch.conf (original)
+++ qpid/trunk/qpid/extras/dispatch/etc/qpid-dispatch.conf Tue Oct 22 18:43:03 2013
@@ -143,10 +143,8 @@ router {
##
## For Interior router mode only.
##
- ## area and router-id - Each router is assigned an area name and a
- ## router-id that is unique within the area.
+ ## router-id - Each router is assigned a router-id that is unique.
##
- area: all
router-id: Router.A
}
Modified: qpid/trunk/qpid/extras/dispatch/src/dispatch.c
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/src/dispatch.c?rev=1534726&r1=1534725&r2=1534726&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/src/dispatch.c (original)
+++ qpid/trunk/qpid/extras/dispatch/src/dispatch.c Tue Oct 22 18:43:03 2013
@@ -57,7 +57,7 @@ dx_dispatch_t *dx_dispatch(const char *c
int thread_count = 0;
const char *container_name = 0;
const char *router_mode_str = 0;
- const char *router_area = 0;
+ const char *router_area = "0";
const char *router_id = 0;
dx_router_mode_t router_mode = DX_ROUTER_MODE_STANDALONE;
@@ -83,7 +83,7 @@ dx_dispatch_t *dx_dispatch(const char *c
count = dx_config_item_count(dx->config, CONF_ROUTER);
if (count == 1) {
router_mode_str = dx_config_item_value_string(dx->config, CONF_ROUTER, 0, "mode");
- router_area = dx_config_item_value_string(dx->config, CONF_ROUTER, 0, "area");
+ //router_area = dx_config_item_value_string(dx->config, CONF_ROUTER, 0, "0");
router_id = dx_config_item_value_string(dx->config, CONF_ROUTER, 0, "router-id");
}
}
Modified: qpid/trunk/qpid/extras/dispatch/tests/config-2/A.conf
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/tests/config-2/A.conf?rev=1534726&r1=1534725&r2=1534726&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/tests/config-2/A.conf (original)
+++ qpid/trunk/qpid/extras/dispatch/tests/config-2/A.conf Tue Oct 22 18:43:03 2013
@@ -55,6 +55,5 @@ listener {
router {
mode: interior
- area: A
router-id: QDR.A
}
Modified: qpid/trunk/qpid/extras/dispatch/tests/config-2/B.conf
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/tests/config-2/B.conf?rev=1534726&r1=1534725&r2=1534726&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/tests/config-2/B.conf (original)
+++ qpid/trunk/qpid/extras/dispatch/tests/config-2/B.conf Tue Oct 22 18:43:03 2013
@@ -63,6 +63,5 @@ connector {
router {
mode: interior
- area: A
router-id: QDR.B
}
Modified: qpid/trunk/qpid/extras/dispatch/tests/config-3-linear/A.conf
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/tests/config-3-linear/A.conf?rev=1534726&r1=1534725&r2=1534726&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/tests/config-3-linear/A.conf (original)
+++ qpid/trunk/qpid/extras/dispatch/tests/config-3-linear/A.conf Tue Oct 22 18:43:03 2013
@@ -62,7 +62,6 @@ connector {
router {
mode: interior
- area: A
router-id: QDR.A
}
Modified: qpid/trunk/qpid/extras/dispatch/tests/config-3-linear/B.conf
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/tests/config-3-linear/B.conf?rev=1534726&r1=1534725&r2=1534726&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/tests/config-3-linear/B.conf (original)
+++ qpid/trunk/qpid/extras/dispatch/tests/config-3-linear/B.conf Tue Oct 22 18:43:03 2013
@@ -64,6 +64,5 @@ connector {
router {
mode: interior
- area: A
router-id: QDR.B
}
Modified: qpid/trunk/qpid/extras/dispatch/tests/config-3-linear/C.conf
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/tests/config-3-linear/C.conf?rev=1534726&r1=1534725&r2=1534726&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/tests/config-3-linear/C.conf (original)
+++ qpid/trunk/qpid/extras/dispatch/tests/config-3-linear/C.conf Tue Oct 22 18:43:03 2013
@@ -56,6 +56,5 @@ listener {
router {
mode: interior
- area: A
router-id: QDR.C
}
Modified: qpid/trunk/qpid/extras/dispatch/tests/system_tests_one_router.py
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/extras/dispatch/tests/system_tests_one_router.py?rev=1534726&r1=1534725&r2=1534726&view=diff
==============================================================================
--- qpid/trunk/qpid/extras/dispatch/tests/system_tests_one_router.py (original)
+++ qpid/trunk/qpid/extras/dispatch/tests/system_tests_one_router.py Tue Oct 22 18:43:03 2013
@@ -369,8 +369,8 @@ class RouterTest(unittest.TestCase):
self.assertEqual(i, rm.body['number'])
da = rm.instructions
self.assertEqual(da.__class__, dict)
- self.assertEqual(da['qdx.ingress'], 'area/Qpid.Dispatch.Router.A')
- self.assertEqual(da['qdx.trace'], ['area/Qpid.Dispatch.Router.A'])
+ self.assertEqual(da['qdx.ingress'], '0/Qpid.Dispatch.Router.A')
+ self.assertEqual(da['qdx.trace'], ['0/Qpid.Dispatch.Router.A'])
##
## Pre-existing ingress
@@ -388,7 +388,7 @@ class RouterTest(unittest.TestCase):
da = rm.instructions
self.assertEqual(da.__class__, dict)
self.assertEqual(da['qdx.ingress'], 'ingress-router')
- self.assertEqual(da['qdx.trace'], ['area/Qpid.Dispatch.Router.A'])
+ self.assertEqual(da['qdx.trace'], ['0/Qpid.Dispatch.Router.A'])
##
## Invalid trace type
@@ -405,8 +405,8 @@ class RouterTest(unittest.TestCase):
self.assertEqual(i, rm.body['number'])
da = rm.instructions
self.assertEqual(da.__class__, dict)
- self.assertEqual(da['qdx.ingress'], 'area/Qpid.Dispatch.Router.A')
- self.assertEqual(da['qdx.trace'], ['area/Qpid.Dispatch.Router.A'])
+ self.assertEqual(da['qdx.ingress'], '0/Qpid.Dispatch.Router.A')
+ self.assertEqual(da['qdx.trace'], ['0/Qpid.Dispatch.Router.A'])
##
## Empty trace
@@ -423,13 +423,13 @@ class RouterTest(unittest.TestCase):
self.assertEqual(i, rm.body['number'])
da = rm.instructions
self.assertEqual(da.__class__, dict)
- self.assertEqual(da['qdx.ingress'], 'area/Qpid.Dispatch.Router.A')
- self.assertEqual(da['qdx.trace'], ['area/Qpid.Dispatch.Router.A'])
+ self.assertEqual(da['qdx.ingress'], '0/Qpid.Dispatch.Router.A')
+ self.assertEqual(da['qdx.trace'], ['0/Qpid.Dispatch.Router.A'])
##
## Non-empty trace
##
- tm.instructions = {'qdx.trace' : ['area/first.hop']}
+ tm.instructions = {'qdx.trace' : ['0/first.hop']}
for i in range(10):
tm.body = {'number': i}
M1.put(tm)
@@ -441,8 +441,8 @@ class RouterTest(unittest.TestCase):
self.assertEqual(i, rm.body['number'])
da = rm.instructions
self.assertEqual(da.__class__, dict)
- self.assertEqual(da['qdx.ingress'], 'area/Qpid.Dispatch.Router.A')
- self.assertEqual(da['qdx.trace'], ['area/first.hop', 'area/Qpid.Dispatch.Router.A'])
+ self.assertEqual(da['qdx.ingress'], '0/Qpid.Dispatch.Router.A')
+ self.assertEqual(da['qdx.trace'], ['0/first.hop', '0/Qpid.Dispatch.Router.A'])
M1.stop()
M2.stop()
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org