QPID-5216 - Removed "area" from the configuration as it is not currently implemented

git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk@1534726 13f79535-47bb-0310-9956-ffa450edef68

8 files changed, 13 insertions, 20 deletions

diff --git a/qpid/extras/dispatch/etc/qpid-dispatch.conf b/qpid/extras/dispatch/etc/qpid-dispatch.conf
index 83fa98af60..bf25993130 100644
--- a/qpid/extras/dispatch/etc/qpid-dispatch.conf
+++ b/qpid/extras/dispatch/etc/qpid-dispatch.conf
@@ -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
 }
 
diff --git a/qpid/extras/dispatch/src/dispatch.c b/qpid/extras/dispatch/src/dispatch.c
index 20ba84afe0..46c256a603 100644
--- a/qpid/extras/dispatch/src/dispatch.c
+++ b/qpid/extras/dispatch/src/dispatch.c
@@ -57,7 +57,7 @@ dx_dispatch_t *dx_dispatch(const char *config_path)
     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 *config_path)
         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");
         }
     }
diff --git a/qpid/extras/dispatch/tests/config-2/A.conf b/qpid/extras/dispatch/tests/config-2/A.conf
index 0d00efdbd4..a3fb411018 100644
--- a/qpid/extras/dispatch/tests/config-2/A.conf
+++ b/qpid/extras/dispatch/tests/config-2/A.conf
@@ -55,6 +55,5 @@ listener {
 
 router {
     mode: interior
-    area: A
     router-id: QDR.A
 }
diff --git a/qpid/extras/dispatch/tests/config-2/B.conf b/qpid/extras/dispatch/tests/config-2/B.conf
index 8999c9878c..0950584c88 100644
--- a/qpid/extras/dispatch/tests/config-2/B.conf
+++ b/qpid/extras/dispatch/tests/config-2/B.conf
@@ -63,6 +63,5 @@ connector {
 
 router {
     mode: interior
-    area: A
     router-id: QDR.B
 }
diff --git a/qpid/extras/dispatch/tests/config-3-linear/A.conf b/qpid/extras/dispatch/tests/config-3-linear/A.conf
index 3f18ad668c..6f0f9abce8 100644
--- a/qpid/extras/dispatch/tests/config-3-linear/A.conf
+++ b/qpid/extras/dispatch/tests/config-3-linear/A.conf
@@ -62,7 +62,6 @@ connector {
 
 router {
     mode: interior
-    area: A
     router-id: QDR.A
 }
 
diff --git a/qpid/extras/dispatch/tests/config-3-linear/B.conf b/qpid/extras/dispatch/tests/config-3-linear/B.conf
index 10310306d6..85c146bd58 100644
--- a/qpid/extras/dispatch/tests/config-3-linear/B.conf
+++ b/qpid/extras/dispatch/tests/config-3-linear/B.conf
@@ -64,6 +64,5 @@ connector {
 
 router {
     mode: interior
-    area: A
     router-id: QDR.B
 }
diff --git a/qpid/extras/dispatch/tests/config-3-linear/C.conf b/qpid/extras/dispatch/tests/config-3-linear/C.conf
index 83c0ff603d..17971462bc 100644
--- a/qpid/extras/dispatch/tests/config-3-linear/C.conf
+++ b/qpid/extras/dispatch/tests/config-3-linear/C.conf
@@ -56,6 +56,5 @@ listener {
 
 router {
     mode: interior
-    area: A
     router-id: QDR.C
 }
diff --git a/qpid/extras/dispatch/tests/system_tests_one_router.py b/qpid/extras/dispatch/tests/system_tests_one_router.py
index 366c9896eb..59e2569eff 100644
--- a/qpid/extras/dispatch/tests/system_tests_one_router.py
+++ b/qpid/extras/dispatch/tests/system_tests_one_router.py
@@ -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()