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 2016/05/25 12:09:18 UTC
[2/2] qpid-dispatch git commit: DISPATCH-342 - Remove the config
router.config from address, link route and auto link entities
DISPATCH-342 - Remove the config router.config from address, link route and auto link entities
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/42613e81
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/42613e81
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/42613e81
Branch: refs/heads/master
Commit: 42613e814cd3028a41a9b3bd94b41cdbab624a47
Parents: 8783d5e
Author: Ganesh Murthy <gm...@redhat.com>
Authored: Fri May 20 16:02:25 2016 -0400
Committer: Ted Ross <tr...@redhat.com>
Committed: Tue May 24 16:19:32 2016 -0400
----------------------------------------------------------------------
python/qpid_dispatch_internal/management/agent.py | 12 ++++++------
python/qpid_dispatch_internal/management/schema.py | 4 ++++
2 files changed, 10 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/42613e81/python/qpid_dispatch_internal/management/agent.py
----------------------------------------------------------------------
diff --git a/python/qpid_dispatch_internal/management/agent.py b/python/qpid_dispatch_internal/management/agent.py
index 99f3375..4197b0c 100644
--- a/python/qpid_dispatch_internal/management/agent.py
+++ b/python/qpid_dispatch_internal/management/agent.py
@@ -385,26 +385,26 @@ class LinkRoutePatternEntity(EntityAdapter):
def __str__(self):
return super(LinkRoutePatternEntity, self).__str__().replace("Entity(", "LinkRoutePatternEntity(")
-class RouterConfigAddressEntity(EntityAdapter):
+class AddressEntity(EntityAdapter):
def create(self):
self._qd.qd_dispatch_configure_address(self._dispatch, self)
def __str__(self):
- return super(RouterConfigAddressEntity, self).__str__().replace("Entity(", "RouterConfigAddressEntity(")
+ return super(AddressEntity, self).__str__().replace("Entity(", "AddressEntity(")
-class RouterConfigLinkrouteEntity(EntityAdapter):
+class LinkRouteEntity(EntityAdapter):
def create(self):
self._qd.qd_dispatch_configure_link_route(self._dispatch, self)
def __str__(self):
- return super(RouterConfigLinkrouteEntity, self).__str__().replace("Entity(", "RouterConfigLinkrouteEntity(")
+ return super(LinkRouteEntity, self).__str__().replace("Entity(", "LinkRouteEntity(")
-class RouterConfigAutolinkEntity(EntityAdapter):
+class AutoLinkEntity(EntityAdapter):
def create(self):
self._qd.qd_dispatch_configure_auto_link(self._dispatch, self)
def __str__(self):
- return super(RouterConfigAutolinkEntity, self).__str__().replace("Entity(", "RouterConfigAutolinkEntity(")
+ return super(AutoLinkEntity, self).__str__().replace("Entity(", "AutoLinkEntity(")
class ConsoleEntity(EntityAdapter):
def __str__(self):
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/42613e81/python/qpid_dispatch_internal/management/schema.py
----------------------------------------------------------------------
diff --git a/python/qpid_dispatch_internal/management/schema.py b/python/qpid_dispatch_internal/management/schema.py
index 32897f7..5fe6a75 100644
--- a/python/qpid_dispatch_internal/management/schema.py
+++ b/python/qpid_dispatch_internal/management/schema.py
@@ -333,6 +333,9 @@ class EntityType(object):
if fullName:
self.name = schema.long_name(name)
self.short_name = schema.short_name(name)
+
+ if self.short_name.startswith("router.config."):
+ self.short_name = self.short_name.replace("router.config.", "")
else:
self.name = self.short_name = name
self.attributes = OrderedDict((k, AttributeType(k, defined_in=self, **v))
@@ -507,6 +510,7 @@ class Schema(object):
self.annotations = parsedefs(Annotation, annotations)
self.entity_types = parsedefs(EntityType, entityTypes)
+
self.all_attributes = set()
for e in self.entity_types.itervalues():
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org