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/12/06 17:20:36 UTC
svn commit: r1548580 - in /qpid/dispatch/trunk: src/amqp.c
tests/system_tests_one_router.py
Author: tross
Date: Fri Dec 6 16:20:36 2013
New Revision: 1548580
URL: http://svn.apache.org/r1548580
Log:
QPID-5403 - Renamed the annotation keys to avoid the reserved name space.
Modified:
qpid/dispatch/trunk/src/amqp.c
qpid/dispatch/trunk/tests/system_tests_one_router.py
Modified: qpid/dispatch/trunk/src/amqp.c
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/src/amqp.c?rev=1548580&r1=1548579&r2=1548580&view=diff
==============================================================================
--- qpid/dispatch/trunk/src/amqp.c (original)
+++ qpid/dispatch/trunk/src/amqp.c Fri Dec 6 16:20:36 2013
@@ -19,9 +19,9 @@
#include <qpid/dispatch/amqp.h>
-const char * const QD_DA_INGRESS = "qd.ingress";
-const char * const QD_DA_TRACE = "qd.trace";
-const char * const QD_DA_TO = "qd.to";
+const char * const QD_DA_INGRESS = "x-opt-qd.ingress";
+const char * const QD_DA_TRACE = "x-opt-qd.trace";
+const char * const QD_DA_TO = "x-opt-qd.to";
const char * const QD_CAPABILITY_ROUTER = "qd.router";
Modified: qpid/dispatch/trunk/tests/system_tests_one_router.py
URL: http://svn.apache.org/viewvc/qpid/dispatch/trunk/tests/system_tests_one_router.py?rev=1548580&r1=1548579&r2=1548580&view=diff
==============================================================================
--- qpid/dispatch/trunk/tests/system_tests_one_router.py (original)
+++ qpid/dispatch/trunk/tests/system_tests_one_router.py Fri Dec 6 16:20:36 2013
@@ -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['qd.ingress'], '0/Qpid.Dispatch.Router.A')
- self.assertEqual(da['qd.trace'], ['0/Qpid.Dispatch.Router.A'])
+ self.assertEqual(da['x-opt-qd.ingress'], '0/Qpid.Dispatch.Router.A')
+ self.assertEqual(da['x-opt-qd.trace'], ['0/Qpid.Dispatch.Router.A'])
##
## Pre-existing ingress
##
- tm.instructions = {'qd.ingress': 'ingress-router'}
+ tm.instructions = {'x-opt-qd.ingress': 'ingress-router'}
for i in range(10):
tm.body = {'number': i}
M1.put(tm)
@@ -441,13 +441,13 @@ class RouterTest(unittest.TestCase):
self.assertEqual(i, rm.body['number'])
da = rm.instructions
self.assertEqual(da.__class__, dict)
- self.assertEqual(da['qd.ingress'], 'ingress-router')
- self.assertEqual(da['qd.trace'], ['0/Qpid.Dispatch.Router.A'])
+ self.assertEqual(da['x-opt-qd.ingress'], 'ingress-router')
+ self.assertEqual(da['x-opt-qd.trace'], ['0/Qpid.Dispatch.Router.A'])
##
## Invalid trace type
##
- tm.instructions = {'qd.trace' : 45}
+ tm.instructions = {'x-opt-qd.trace' : 45}
for i in range(10):
tm.body = {'number': i}
M1.put(tm)
@@ -459,13 +459,13 @@ class RouterTest(unittest.TestCase):
self.assertEqual(i, rm.body['number'])
da = rm.instructions
self.assertEqual(da.__class__, dict)
- self.assertEqual(da['qd.ingress'], '0/Qpid.Dispatch.Router.A')
- self.assertEqual(da['qd.trace'], ['0/Qpid.Dispatch.Router.A'])
+ self.assertEqual(da['x-opt-qd.ingress'], '0/Qpid.Dispatch.Router.A')
+ self.assertEqual(da['x-opt-qd.trace'], ['0/Qpid.Dispatch.Router.A'])
##
## Empty trace
##
- tm.instructions = {'qd.trace' : []}
+ tm.instructions = {'x-opt-qd.trace' : []}
for i in range(10):
tm.body = {'number': i}
M1.put(tm)
@@ -477,13 +477,13 @@ class RouterTest(unittest.TestCase):
self.assertEqual(i, rm.body['number'])
da = rm.instructions
self.assertEqual(da.__class__, dict)
- self.assertEqual(da['qd.ingress'], '0/Qpid.Dispatch.Router.A')
- self.assertEqual(da['qd.trace'], ['0/Qpid.Dispatch.Router.A'])
+ self.assertEqual(da['x-opt-qd.ingress'], '0/Qpid.Dispatch.Router.A')
+ self.assertEqual(da['x-opt-qd.trace'], ['0/Qpid.Dispatch.Router.A'])
##
## Non-empty trace
##
- tm.instructions = {'qd.trace' : ['0/first.hop']}
+ tm.instructions = {'x-opt-qd.trace' : ['0/first.hop']}
for i in range(10):
tm.body = {'number': i}
M1.put(tm)
@@ -495,8 +495,8 @@ class RouterTest(unittest.TestCase):
self.assertEqual(i, rm.body['number'])
da = rm.instructions
self.assertEqual(da.__class__, dict)
- self.assertEqual(da['qd.ingress'], '0/Qpid.Dispatch.Router.A')
- self.assertEqual(da['qd.trace'], ['0/first.hop', '0/Qpid.Dispatch.Router.A'])
+ self.assertEqual(da['x-opt-qd.ingress'], '0/Qpid.Dispatch.Router.A')
+ self.assertEqual(da['x-opt-qd.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