Repository: qpid-dispatch Updated Branches: refs/heads/crolke-DISPATCH-311 e30c85021 -> 9d82b839f
DISPATCH-311: Rename applicationName to vhostName Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/68e05589 Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/68e05589 Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/68e05589 Branch: refs/heads/crolke-DISPATCH-311 Commit: 68e05589f4df6969368813c323216326e520eb2f Parents: e30c850 Author: Chuck Rolke <[email protected]> Authored: Mon Jul 25 16:33:01 2016 -0400 Committer: Chuck Rolke <[email protected]> Committed: Mon Jul 25 16:33:01 2016 -0400 ---------------------------------------------------------------------- python/qpid_dispatch/management/qdrouter.json | 12 ++++++------ python/qpid_dispatch_internal/management/agent.py | 4 ++-- python/qpid_dispatch_internal/policy/policy_local.py | 10 +++++----- tests/policy-1/management-access.json | 6 +++--- tests/policy-1/policy-boardwalk.json | 2 +- tests/policy-1/policy-safari.json | 2 +- tests/policy-2/test-router-with-policy.json.in | 8 ++++---- tests/policy-3/test-sender-receiver-limits.json | 6 +++--- 8 files changed, 25 insertions(+), 25 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/68e05589/python/qpid_dispatch/management/qdrouter.json ---------------------------------------------------------------------- diff --git a/python/qpid_dispatch/management/qdrouter.json b/python/qpid_dispatch/management/qdrouter.json index 37f7a3c..31e7d92 100644 --- a/python/qpid_dispatch/management/qdrouter.json +++ b/python/qpid_dispatch/management/qdrouter.json @@ -1381,13 +1381,13 @@ }, "vhost": { - "description": "Per application definition of the locations from which users may connect and the groups to which users belong.", + "description": "AMQP virtual host policy definition of users, user groups, allowed remote hosts, and AMQP restrictions.", "extends": "configurationEntity", "operations": ["CREATE"], "attributes": { - "applicationName": { + "vhostName": { "type": "string", - "description": "The application name.", + "description": "The vhost name.", "required": true }, "maxConnections": { @@ -1446,12 +1446,12 @@ }, "policyStats": { - "description": "Per application connection and access statistics.", + "description": "Virtual host connection and access statistics.", "extends": "operationalEntity", "attributes": { - "applicationName": { + "vhostName": { "type": "string", - "description": "The application name." + "description": "The vhost name." }, "connectionsApproved": {"type": "integer", "graph": true}, "connectionsDenied": {"type": "integer", "graph": true}, http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/68e05589/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 01f52cb..41b7064 100644 --- a/python/qpid_dispatch_internal/management/agent.py +++ b/python/qpid_dispatch_internal/management/agent.py @@ -317,12 +317,12 @@ class VhostEntity(EntityAdapter): self._policy.create_ruleset(self.attributes) def _identifier(self): - return self.attributes.get('applicationName') + return self.attributes.get('vhostName') class PolicyStatsEntity(EntityAdapter): def _identifier(self): - return self.attributes.get('applicationName') + return self.attributes.get('vhostName') def _host_port_name_identifier(entity): http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/68e05589/python/qpid_dispatch_internal/policy/policy_local.py ---------------------------------------------------------------------- diff --git a/python/qpid_dispatch_internal/policy/policy_local.py b/python/qpid_dispatch_internal/policy/policy_local.py index 52339ca..8705048 100644 --- a/python/qpid_dispatch_internal/policy/policy_local.py +++ b/python/qpid_dispatch_internal/policy/policy_local.py @@ -38,7 +38,7 @@ class PolicyKeys(object): KW_IGNORED_NAME = "name" KW_IGNORED_IDENTITY = "identity" KW_IGNORED_TYPE = "type" - KW_APPLICATION_NAME = "applicationName" + KW_VHOST_NAME = "vhostName" # Policy ruleset key words KW_MAXCONN = "maxConnections" @@ -100,7 +100,7 @@ class PolicyCompiler(object): PolicyKeys.KW_IGNORED_NAME, PolicyKeys.KW_IGNORED_IDENTITY, PolicyKeys.KW_IGNORED_TYPE, - PolicyKeys.KW_APPLICATION_NAME, + PolicyKeys.KW_VHOST_NAME, PolicyKeys.KW_MAXCONN, PolicyKeys.KW_MAXCONNPERHOST, PolicyKeys.KW_MAXCONNPERUSER, @@ -410,7 +410,7 @@ class AppStats(object): def refresh_entity(self, attributes): """Refresh management attributes""" entitymap = {} - entitymap[PolicyKeys.KW_APPLICATION_NAME] = self.my_id + entitymap[PolicyKeys.KW_VHOST_NAME] = self.my_id entitymap[PolicyKeys.KW_CONNECTIONS_APPROVED] = self.conn_mgr.connections_approved entitymap[PolicyKeys.KW_CONNECTIONS_DENIED] = self.conn_mgr.connections_denied entitymap[PolicyKeys.KW_CONNECTIONS_CURRENT] = self.conn_mgr.connections_active @@ -503,7 +503,7 @@ class PolicyLocal(object): warnings = [] diag = [] candidate = {} - name = attributes[PolicyKeys.KW_APPLICATION_NAME] + name = attributes[PolicyKeys.KW_VHOST_NAME] result = self._policy_compiler.compile_access_ruleset(name, attributes, candidate, warnings, diag) if not result: raise PolicyError( "Policy '%s' is invalid: %s" % (name, diag[0]) ) @@ -729,7 +729,7 @@ class PolicyLocal(object): Test function to load a policy. @return: """ - ruleset_str = '["policyAccessRuleset", {"applicationName": "photoserver","maxConnections": 50,"maxConnPerUser": 5,"maxConnPerHost": 20,"userGroups": {"anonymous": "anonymous","users": "u1, u2","paidsubscribers": "p1, p2","test": "zeke, ynot","admin": "alice, bob","superuser": "ellen"},"ingressHostGroups": {"Ten18": "10.18.0.0-10.18.255.255","EllensWS": "72.135.2.9","TheLabs": "10.48.0.0-10.48.255.255, 192.168.100.0-192.168.100.255","localhost": "127.0.0.1, ::1","TheWorld": "*"},"ingressPolicies": {"anonymous": "TheWorld","users": "TheWorld","paidsubscribers": "TheWorld","test": "TheLabs","admin": "Ten18, TheLabs, localhost","superuser": "EllensWS, localhost"},"connectionAllowDefault": true,' + ruleset_str = '["policyAccessRuleset", {"vhostName": "photoserver","maxConnections": 50,"maxConnPerUser": 5,"maxConnPerHost": 20,"userGroups": {"anonymous": "anonymous","users": "u1, u2","paidsubscribers": "p1, p2","test": "zeke, ynot","admin": "alice, bob","superuser": "ellen"},"ingressHostGroups": {"Ten18": "10.18.0.0-10.18.255.255","EllensWS": "72.135.2.9","TheLabs": "10.48.0.0-10.48.255.255, 192.168.100.0-192.168.100.255","localhost": "127.0.0.1, ::1","TheWorld": "*"},"ingressPolicies": {"anonymous": "TheWorld","users": "TheWorld","paidsubscribers": "TheWorld","test": "TheLabs","admin": "Ten18, TheLabs, localhost","superuser": "EllensWS, localhost"},"connectionAllowDefault": true,' ruleset_str += '"settings": {' ruleset_str += '"anonymous": {"maxFrameSize": 111111,"maxMessageSize": 111111,"maxSessionWindow": 111111,"maxSessions": 1,"maxSenders": 11,"maxReceivers": 11,"allowDynamicSrc": false,"allowAnonymousSender": false,"sources": "public", "targets": ""},' ruleset_str += '"users": {"maxFrameSize": 222222,"maxMessageSize": 222222,"maxSessionWindow": 222222,"maxSessions": 2,"maxSenders": 22,"maxReceivers": 22,"allowDynamicSrc": false,"allowAnonymousSender": false,"sources": "public, private", "targets": "public"},' http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/68e05589/tests/policy-1/management-access.json ---------------------------------------------------------------------- diff --git a/tests/policy-1/management-access.json b/tests/policy-1/management-access.json index 48e544a..b58f1cb 100644 --- a/tests/policy-1/management-access.json +++ b/tests/policy-1/management-access.json @@ -24,7 +24,7 @@ # unnamed host- proton 0.13 [ ["vhost", { - "applicationName": "", + "vhostName": "", "maxConnections": 50, "maxConnPerUser": 5, "maxConnPerHost": 20, @@ -46,7 +46,7 @@ } ], ["vhost", { - "applicationName": "0.0.0.0", + "vhostName": "0.0.0.0", "maxConnections": 50, "maxConnPerUser": 5, "maxConnPerHost": 20, @@ -68,7 +68,7 @@ } ], ["vhost", { - "applicationName": "localhost", + "vhostName": "localhost", "maxConnections": 50, "maxConnPerUser": 5, "maxConnPerHost": 20, http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/68e05589/tests/policy-1/policy-boardwalk.json ---------------------------------------------------------------------- diff --git a/tests/policy-1/policy-boardwalk.json b/tests/policy-1/policy-boardwalk.json index d5c611a..e973e3f 100644 --- a/tests/policy-1/policy-boardwalk.json +++ b/tests/policy-1/policy-boardwalk.json @@ -21,7 +21,7 @@ # The boardwalk policy ruleset ["vhost", { - "applicationName": "boardwalk", + "vhostName": "boardwalk", "maxConnections": 10, "maxConnPerUser": 2, "maxConnPerHost": 5, http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/68e05589/tests/policy-1/policy-safari.json ---------------------------------------------------------------------- diff --git a/tests/policy-1/policy-safari.json b/tests/policy-1/policy-safari.json index be28e96..ac11ec6 100644 --- a/tests/policy-1/policy-safari.json +++ b/tests/policy-1/policy-safari.json @@ -20,7 +20,7 @@ # The safari policy ruleset ["vhost", { - "applicationName": "safari", + "vhostName": "safari", "maxConnections": 10, "maxConnPerUser": 2, "maxConnPerHost": 5, http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/68e05589/tests/policy-2/test-router-with-policy.json.in ---------------------------------------------------------------------- diff --git a/tests/policy-2/test-router-with-policy.json.in b/tests/policy-2/test-router-with-policy.json.in index a38608f..0679489 100644 --- a/tests/policy-2/test-router-with-policy.json.in +++ b/tests/policy-2/test-router-with-policy.json.in @@ -30,7 +30,7 @@ }], # Some ruleset ["vhost", { - "applicationName": "photoserver", + "vhostName": "photoserver", "maxConnections": 50, "maxConnPerUser": 5, "maxConnPerHost": 20, @@ -146,7 +146,7 @@ } }], ["vhost", { - "applicationName": "", + "vhostName": "", "maxConnections": 50, "maxConnPerUser": 5, "maxConnPerHost": 20, @@ -168,7 +168,7 @@ } ], ["vhost", { - "applicationName": "0.0.0.0", + "vhostName": "0.0.0.0", "maxConnections": 50, "maxConnPerUser": 5, "maxConnPerHost": 20, @@ -190,7 +190,7 @@ } ], ["vhost", { - "applicationName": "localhost", + "vhostName": "localhost", "maxConnections": 50, "maxConnPerUser": 5, "maxConnPerHost": 20, http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/68e05589/tests/policy-3/test-sender-receiver-limits.json ---------------------------------------------------------------------- diff --git a/tests/policy-3/test-sender-receiver-limits.json b/tests/policy-3/test-sender-receiver-limits.json index 7a30aaf..c122e42 100644 --- a/tests/policy-3/test-sender-receiver-limits.json +++ b/tests/policy-3/test-sender-receiver-limits.json @@ -2,7 +2,7 @@ # Ruleset with differing number of senders and receivers # so tests can determine that correct limit is matched. ["vhost", { - "applicationName": "", + "vhostName": "", "maxConnections": 50, "maxConnPerUser": 2, "maxConnPerHost": 4, @@ -24,7 +24,7 @@ } ], ["vhost", { - "applicationName": "0.0.0.0", + "vhostName": "0.0.0.0", "maxConnections": 50, "maxConnPerUser": 2, "maxConnPerHost": 4, @@ -46,7 +46,7 @@ } ], ["vhost", { - "applicationName": "localhost", + "vhostName": "localhost", "maxConnections": 50, "maxConnPerUser": 2, "maxConnPerHost": 4, --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
