You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by ch...@apache.org on 2016/07/26 14:09:52 UTC
[2/3] qpid-dispatch git commit: DISPATCH-311: rename maxConnPerXxx to
maxConnectionsPerXxx
DISPATCH-311: rename maxConnPerXxx to maxConnectionsPerXxx
Project: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/repo
Commit: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/commit/7f51d589
Tree: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/tree/7f51d589
Diff: http://git-wip-us.apache.org/repos/asf/qpid-dispatch/diff/7f51d589
Branch: refs/heads/crolke-DISPATCH-311
Commit: 7f51d58943829e77a5176a18b42827a2e45ff19e
Parents: 68e0558
Author: Chuck Rolke <cr...@redhat.com>
Authored: Mon Jul 25 16:36:42 2016 -0400
Committer: Chuck Rolke <cr...@redhat.com>
Committed: Mon Jul 25 16:36:42 2016 -0400
----------------------------------------------------------------------
python/qpid_dispatch/management/qdrouter.json | 4 ++--
.../qpid_dispatch_internal/policy/policy_local.py | 6 +++---
tests/policy-1/management-access.json | 12 ++++++------
tests/policy-1/policy-boardwalk.json | 4 ++--
tests/policy-1/policy-safari.json | 4 ++--
tests/policy-2/test-router-with-policy.json.in | 16 ++++++++--------
tests/policy-3/test-sender-receiver-limits.json | 12 ++++++------
7 files changed, 29 insertions(+), 29 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7f51d589/python/qpid_dispatch/management/qdrouter.json
----------------------------------------------------------------------
diff --git a/python/qpid_dispatch/management/qdrouter.json b/python/qpid_dispatch/management/qdrouter.json
index 31e7d92..9c17241 100644
--- a/python/qpid_dispatch/management/qdrouter.json
+++ b/python/qpid_dispatch/management/qdrouter.json
@@ -1397,14 +1397,14 @@
"required": false,
"create": true
},
- "maxConnPerUser": {
+ "maxConnectionsPerUser": {
"type": "integer",
"default": 0,
"description": "Maximum number of concurrent client connections allowed for any single user. Zero implies no limit.",
"required": false,
"create": true
},
- "maxConnPerHost": {
+ "maxConnectionsPerHost": {
"type": "integer",
"default": 0,
"description": "Maximum number of concurrent client connections allowed for any remote host. Zero implies no limit.",
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7f51d589/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 8705048..d9af6a1 100644
--- a/python/qpid_dispatch_internal/policy/policy_local.py
+++ b/python/qpid_dispatch_internal/policy/policy_local.py
@@ -42,8 +42,8 @@ class PolicyKeys(object):
# Policy ruleset key words
KW_MAXCONN = "maxConnections"
- KW_MAXCONNPERHOST = "maxConnPerHost"
- KW_MAXCONNPERUSER = "maxConnPerUser"
+ KW_MAXCONNPERHOST = "maxConnectionsPerHost"
+ KW_MAXCONNPERUSER = "maxConnectionsPerUser"
KW_USER_GROUPS = "userGroups"
KW_INGRESS_HOST_GROUPS = "ingressHostGroups"
KW_INGRESS_POLICIES = "ingressPolicies"
@@ -729,7 +729,7 @@ class PolicyLocal(object):
Test function to load a policy.
@return:
"""
- 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 = '["policyAccessRuleset", {"vhostName": "photoserver","maxConnections": 50,"maxConnectionsPerUser": 5,"maxConnectionsPerHost": 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/7f51d589/tests/policy-1/management-access.json
----------------------------------------------------------------------
diff --git a/tests/policy-1/management-access.json b/tests/policy-1/management-access.json
index b58f1cb..d2b8132 100644
--- a/tests/policy-1/management-access.json
+++ b/tests/policy-1/management-access.json
@@ -26,8 +26,8 @@
["vhost", {
"vhostName": "",
"maxConnections": 50,
- "maxConnPerUser": 5,
- "maxConnPerHost": 20,
+ "maxConnectionsPerUser": 5,
+ "maxConnectionsPerHost": 20,
"connectionAllowDefault": true,
"settings": {
"default" : {
@@ -48,8 +48,8 @@
["vhost", {
"vhostName": "0.0.0.0",
"maxConnections": 50,
- "maxConnPerUser": 5,
- "maxConnPerHost": 20,
+ "maxConnectionsPerUser": 5,
+ "maxConnectionsPerHost": 20,
"connectionAllowDefault": true,
"settings": {
"default" : {
@@ -70,8 +70,8 @@
["vhost", {
"vhostName": "localhost",
"maxConnections": 50,
- "maxConnPerUser": 5,
- "maxConnPerHost": 20,
+ "maxConnectionsPerUser": 5,
+ "maxConnectionsPerHost": 20,
"connectionAllowDefault": true,
"settings": {
"default" : {
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7f51d589/tests/policy-1/policy-boardwalk.json
----------------------------------------------------------------------
diff --git a/tests/policy-1/policy-boardwalk.json b/tests/policy-1/policy-boardwalk.json
index e973e3f..d2cf4da 100644
--- a/tests/policy-1/policy-boardwalk.json
+++ b/tests/policy-1/policy-boardwalk.json
@@ -23,8 +23,8 @@
{
"vhostName": "boardwalk",
"maxConnections": 10,
- "maxConnPerUser": 2,
- "maxConnPerHost": 5,
+ "maxConnectionsPerUser": 2,
+ "maxConnectionsPerHost": 5,
"userGroups": {
"anonymous": "anonymous",
"users": "u1 u2 u3",
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7f51d589/tests/policy-1/policy-safari.json
----------------------------------------------------------------------
diff --git a/tests/policy-1/policy-safari.json b/tests/policy-1/policy-safari.json
index ac11ec6..5147335 100644
--- a/tests/policy-1/policy-safari.json
+++ b/tests/policy-1/policy-safari.json
@@ -22,8 +22,8 @@
{
"vhostName": "safari",
"maxConnections": 10,
- "maxConnPerUser": 2,
- "maxConnPerHost": 5,
+ "maxConnectionsPerUser": 2,
+ "maxConnectionsPerHost": 5,
"userGroups": {
"anonymous": "anonymous",
"clients": "moja mbili",
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7f51d589/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 0679489..197d604 100644
--- a/tests/policy-2/test-router-with-policy.json.in
+++ b/tests/policy-2/test-router-with-policy.json.in
@@ -32,8 +32,8 @@
["vhost", {
"vhostName": "photoserver",
"maxConnections": 50,
- "maxConnPerUser": 5,
- "maxConnPerHost": 20,
+ "maxConnectionsPerUser": 5,
+ "maxConnectionsPerHost": 20,
"userGroups": {
"anonymous": "anonymous",
"users": "u1, u2",
@@ -148,8 +148,8 @@
["vhost", {
"vhostName": "",
"maxConnections": 50,
- "maxConnPerUser": 5,
- "maxConnPerHost": 20,
+ "maxConnectionsPerUser": 5,
+ "maxConnectionsPerHost": 20,
"connectionAllowDefault": true,
"settings": {
"default" : {
@@ -170,8 +170,8 @@
["vhost", {
"vhostName": "0.0.0.0",
"maxConnections": 50,
- "maxConnPerUser": 5,
- "maxConnPerHost": 20,
+ "maxConnectionsPerUser": 5,
+ "maxConnectionsPerHost": 20,
"connectionAllowDefault": true,
"settings": {
"default" : {
@@ -192,8 +192,8 @@
["vhost", {
"vhostName": "localhost",
"maxConnections": 50,
- "maxConnPerUser": 5,
- "maxConnPerHost": 20,
+ "maxConnectionsPerUser": 5,
+ "maxConnectionsPerHost": 20,
"connectionAllowDefault": true,
"settings": {
"default" : {
http://git-wip-us.apache.org/repos/asf/qpid-dispatch/blob/7f51d589/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 c122e42..3e6145d 100644
--- a/tests/policy-3/test-sender-receiver-limits.json
+++ b/tests/policy-3/test-sender-receiver-limits.json
@@ -4,8 +4,8 @@
["vhost", {
"vhostName": "",
"maxConnections": 50,
- "maxConnPerUser": 2,
- "maxConnPerHost": 4,
+ "maxConnectionsPerUser": 2,
+ "maxConnectionsPerHost": 4,
"connectionAllowDefault": true,
"settings": {
"default" : {
@@ -26,8 +26,8 @@
["vhost", {
"vhostName": "0.0.0.0",
"maxConnections": 50,
- "maxConnPerUser": 2,
- "maxConnPerHost": 4,
+ "maxConnectionsPerUser": 2,
+ "maxConnectionsPerHost": 4,
"connectionAllowDefault": true,
"settings": {
"default" : {
@@ -48,8 +48,8 @@
["vhost", {
"vhostName": "localhost",
"maxConnections": 50,
- "maxConnPerUser": 2,
- "maxConnPerHost": 4,
+ "maxConnectionsPerUser": 2,
+ "maxConnectionsPerHost": 4,
"connectionAllowDefault": true,
"settings": {
"default" : {
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org