DISPATCH-311: replace 'vhostname' with 'id'
diff --git a/python/qpid_dispatch/management/qdrouter.json b/python/qpid_dispatch/management/qdrouter.json
index 63b6785..472efe5 100644
--- a/python/qpid_dispatch/management/qdrouter.json
+++ b/python/qpid_dispatch/management/qdrouter.json
@@ -1385,7 +1385,7 @@
"extends": "configurationEntity",
"operations": ["CREATE"],
"attributes": {
- "vhostName": {
+ "id": {
"type": "string",
"description": "The vhost name.",
"required": true
@@ -1431,7 +1431,7 @@
"description": "Virtual host connection and access statistics.",
"extends": "operationalEntity",
"attributes": {
- "vhostName": {
+ "id": {
"type": "string",
"description": "The vhost name."
},
diff --git a/python/qpid_dispatch_internal/management/agent.py b/python/qpid_dispatch_internal/management/agent.py
index 41b7064..83ee8e6 100644
--- a/python/qpid_dispatch_internal/management/agent.py
+++ b/python/qpid_dispatch_internal/management/agent.py
@@ -317,12 +317,12 @@
self._policy.create_ruleset(self.attributes)
def _identifier(self):
- return self.attributes.get('vhostName')
+ return self.attributes.get('id')
class PolicyStatsEntity(EntityAdapter):
def _identifier(self):
- return self.attributes.get('vhostName')
+ return self.attributes.get('id')
def _host_port_name_identifier(entity):
diff --git a/python/qpid_dispatch_internal/policy/policy_local.py b/python/qpid_dispatch_internal/policy/policy_local.py
index d5a9be4..b48aff3 100644
--- a/python/qpid_dispatch_internal/policy/policy_local.py
+++ b/python/qpid_dispatch_internal/policy/policy_local.py
@@ -39,7 +39,7 @@
KW_IGNORED_NAME = "name"
KW_IGNORED_IDENTITY = "identity"
KW_IGNORED_TYPE = "type"
- KW_VHOST_NAME = "vhostName"
+ KW_VHOST_NAME = "id"
# Policy ruleset key words
KW_MAXCONN = "maxConnections"
@@ -705,7 +705,7 @@
Test function to load a policy.
@return:
"""
- ruleset_str = '["vhost", {"vhostName": "photoserver", "maxConnections": 50, "maxConnectionsPerUser": 5, "maxConnectionsPerHost": 20, "allowUnknownUser": true,'
+ ruleset_str = '["vhost", {"id": "photoserver", "maxConnections": 50, "maxConnectionsPerUser": 5, "maxConnectionsPerHost": 20, "allowUnknownUser": true,'
ruleset_str += '"groups": {'
ruleset_str += '"anonymous": { "users": "anonymous", "remoteHosts": "*", "maxFrameSize": 111111, "maxMessageSize": 111111, "maxSessionWindow": 111111, "maxSessions": 1, "maxSenders": 11, "maxReceivers": 11, "allowDynamicSource": false, "allowAnonymousSender": false, "sources": "public", "targets": "" },'
ruleset_str += '"users": { "users": "u1, u2", "remoteHosts": "*", "maxFrameSize": 222222, "maxMessageSize": 222222, "maxSessionWindow": 222222, "maxSessions": 2, "maxSenders": 22, "maxReceivers": 22, "allowDynamicSource": false, "allowAnonymousSender": false, "sources": "public, private", "targets": "public" },'
diff --git a/tests/policy-1/management-access.json b/tests/policy-1/management-access.json
index b8bbcf1..aa19d28 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", {
- "vhostName": "",
+ "id": "",
"maxConnections": 50,
"maxConnectionsPerUser": 5,
"maxConnectionsPerHost": 20,
@@ -48,7 +48,7 @@
}
],
["vhost", {
- "vhostName": "0.0.0.0",
+ "id": "0.0.0.0",
"maxConnections": 50,
"maxConnectionsPerUser": 5,
"maxConnectionsPerHost": 20,
@@ -72,7 +72,7 @@
}
],
["vhost", {
- "vhostName": "localhost",
+ "id": "localhost",
"maxConnections": 50,
"maxConnectionsPerUser": 5,
"maxConnectionsPerHost": 20,
diff --git a/tests/policy-1/policy-boardwalk.json b/tests/policy-1/policy-boardwalk.json
index e29a405..1d17751 100644
--- a/tests/policy-1/policy-boardwalk.json
+++ b/tests/policy-1/policy-boardwalk.json
@@ -21,7 +21,7 @@
# The boardwalk policy ruleset
["vhost",
{
- "vhostName": "boardwalk",
+ "id": "boardwalk",
"maxConnections": 10,
"maxConnectionsPerUser": 2,
"maxConnectionsPerHost": 5,
diff --git a/tests/policy-1/policy-safari.json b/tests/policy-1/policy-safari.json
index 2fa99a1..613761e 100644
--- a/tests/policy-1/policy-safari.json
+++ b/tests/policy-1/policy-safari.json
@@ -20,7 +20,7 @@
# The safari policy ruleset
["vhost",
{
- "vhostName": "safari",
+ "id": "safari",
"maxConnections": 10,
"maxConnectionsPerUser": 2,
"maxConnectionsPerHost": 5,
diff --git a/tests/policy-2/test-router-with-policy.json.in b/tests/policy-2/test-router-with-policy.json.in
index 648c118..26405fd 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", {
- "vhostName": "photoserver",
+ "id": "photoserver",
"maxConnections": 50,
"maxConnectionsPerUser": 5,
"maxConnectionsPerHost": 20,
@@ -137,7 +137,7 @@
}
}],
["vhost", {
- "vhostName": "",
+ "id": "",
"maxConnections": 50,
"maxConnectionsPerUser": 5,
"maxConnectionsPerHost": 20,
@@ -161,7 +161,7 @@
}
],
["vhost", {
- "vhostName": "0.0.0.0",
+ "id": "0.0.0.0",
"maxConnections": 50,
"maxConnectionsPerUser": 5,
"maxConnectionsPerHost": 20,
@@ -185,7 +185,7 @@
}
],
["vhost", {
- "vhostName": "localhost",
+ "id": "localhost",
"maxConnections": 50,
"maxConnectionsPerUser": 5,
"maxConnectionsPerHost": 20,
diff --git a/tests/policy-3/test-sender-receiver-limits.json b/tests/policy-3/test-sender-receiver-limits.json
index f9535cb..9103a26 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", {
- "vhostName": "",
+ "id": "",
"maxConnections": 50,
"maxConnectionsPerUser": 2,
"maxConnectionsPerHost": 4,
@@ -26,7 +26,7 @@
}
],
["vhost", {
- "vhostName": "0.0.0.0",
+ "id": "0.0.0.0",
"maxConnections": 50,
"maxConnectionsPerUser": 2,
"maxConnectionsPerHost": 4,
@@ -50,7 +50,7 @@
}
],
["vhost", {
- "vhostName": "localhost",
+ "id": "localhost",
"maxConnections": 50,
"maxConnectionsPerUser": 2,
"maxConnectionsPerHost": 4,
