Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings
This repository was archived by the owner on Aug 11, 2020. It is now read-only.

Commit 256406a

Browse filesBrowse files
rinickrinick
authored
Merge pull request #96 from iot-dsa-v2/feature/158071_node_name_naming_convention
Feature/158071 node name naming convention
2 parents dbd820b + 06e8b68 commit 256406a
Copy full SHA for 256406a

36 files changed

+349
-349
lines changed

‎benchmark/broker_throughput.cc

Copy file name to clipboardExpand all lines: benchmark/broker_throughput.cc
+2-2Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,7 @@ int main(int argc, const char* argv[]) {
167167
message_receive_count.emplace_back(0);
168168

169169
WrapperStrand strand = get_client_wrapper_strand(
170-
app, "Benchmark" + std::to_string(i), protocol);
170+
app, "benchmark" + std::to_string(i), protocol);
171171
auto client = make_shared_<Client>(strand);
172172
auto root_node = make_ref_<BenchmarkNodeRoot>(strand.strand, point_count);
173173
root_nodes.emplace_back(root_node);
@@ -179,7 +179,7 @@ int main(int argc, const char* argv[]) {
179179
SubscribeOptions options;
180180
options.qos = QosLevel::_1;
181181
for (int a = 0; a < client_count; ++a) {
182-
string_ node_path = "Downstream/Benchmark" + std::to_string(a);
182+
string_ node_path = "downstream/benchmark" + std::to_string(a);
183183
for (int b = 0; b < point_count; ++b) {
184184
string_ point_path = node_path + "/v" + std::to_string(b);
185185
client->get_session().subscribe(

‎src/broker/module/authorizer/broker_authorizer.cc

Copy file name to clipboardExpand all lines: src/broker/module/authorizer/broker_authorizer.cc
+6-6Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ void BrokerAuthorizer::check_permission(const string_& id, const string_& role,
4545
void BrokerAuthorizer::create_nodes(NodeModel& sys_node,
4646
BrokerPubRoot& pub_root) {
4747
pub_root.register_standard_profile_function(
48-
"Broker/Permission_Role/Add_Rule",
48+
"broker/permission-role/add-rule",
4949
CAST_LAMBDA(SimpleInvokeNode::FullCallback)[this, keepref = get_ref()](
5050
Var && v, SimpleInvokeNode&, OutgoingInvokeStream & stream,
5151
ref_<NodeState> && parent) {
@@ -70,7 +70,7 @@ void BrokerAuthorizer::create_nodes(NodeModel& sys_node,
7070

7171
auto rule = make_ref_<PermissionRuleNode>(
7272
_strand, role->get_ref(),
73-
_strand->stream_acceptor().get_profile("Broker/Permission_Rule",
73+
_strand->stream_acceptor().get_profile("broker/permission-rule",
7474
true));
7575
rule->_path = path;
7676
rule->_level = permisison_level;
@@ -88,7 +88,7 @@ void BrokerAuthorizer::create_nodes(NodeModel& sys_node,
8888
});
8989

9090
pub_root.register_standard_profile_function(
91-
"Broker/Permission_Role/Remove",
91+
"broker/permission-role/remove",
9292
CAST_LAMBDA(SimpleInvokeNode::FullCallback)[this, keepref = get_ref()](
9393
Var && v, SimpleInvokeNode&, OutgoingInvokeStream & stream,
9494
ref_<NodeState> && parent) {
@@ -106,7 +106,7 @@ void BrokerAuthorizer::create_nodes(NodeModel& sys_node,
106106
});
107107

108108
pub_root.register_standard_profile_function(
109-
"Broker/Permission_Rule/Remove",
109+
"broker/permission-rule/remove",
110110
CAST_LAMBDA(SimpleInvokeNode::FullCallback)[this, keepref = get_ref()](
111111
Var && v, SimpleInvokeNode&, OutgoingInvokeStream & stream,
112112
ref_<NodeState> && parent) {
@@ -131,7 +131,7 @@ void BrokerAuthorizer::create_nodes(NodeModel& sys_node,
131131

132132
_permission_root.reset(new PermissionRoleRootNode(_strand));
133133
_permission_root->add_list_child(
134-
"Add_Role",
134+
"add-role",
135135
make_ref_<SimpleInvokeNode>(
136136
_strand, [ this, keepref = get_ref() ](Var && v)->Var {
137137
if (_permission_root != nullptr && v.is_map()) {
@@ -149,7 +149,7 @@ void BrokerAuthorizer::create_nodes(NodeModel& sys_node,
149149
auto role = make_ref_<PermissionRoleNode>(
150150
_strand, _permission_root->get_ref(),
151151
_strand->stream_acceptor().get_profile(
152-
"Broker/Permission_Role", true));
152+
"broker/permission-role", true));
153153
_permission_root->add_list_child(name, std::move(role));
154154
return Var(Status::DONE);
155155
} else {

‎src/broker/module/authorizer/permission_nodes.cc

Copy file name to clipboardExpand all lines: src/broker/module/authorizer/permission_nodes.cc
+9-9Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -11,11 +11,11 @@
1111

1212
namespace dsa {
1313

14-
static const string_ DEFAULT_ROLE_NAME = "Default";
14+
static const string_ DEFAULT_ROLE_NAME = "default";
1515

1616
PermissionRoleRootNode::PermissionRoleRootNode(const LinkStrandRef &strand)
1717
: NodeModel(strand),
18-
_storage(_strand->storage().get_strand_bucket("Roles", _strand)) {}
18+
_storage(_strand->storage().get_strand_bucket("roles", _strand)) {}
1919

2020
void PermissionRoleRootNode::destroy_impl() {
2121
_storage.reset();
@@ -43,7 +43,7 @@ void PermissionRoleRootNode::initialize() {
4343
} else {
4444
child = make_ref_<PermissionRoleNode>(
4545
_strand, get_ref(),
46-
_strand->stream_acceptor().get_profile("Broker/Permission_Role",
46+
_strand->stream_acceptor().get_profile("broker/permission-role",
4747
true));
4848
}
4949
child->load(map.get_map());
@@ -84,12 +84,12 @@ void PermissionRoleRootNode::init_default_role_node() {
8484
// copy a profile node into list children
8585
// since the profile node is already in state tree
8686
// its state will still be the original one under Pub node
87-
_default_role->add_list_child("Add_Rule",
87+
_default_role->add_list_child("add-rule",
8888
_strand->stream_acceptor().get_profile(
89-
"Broker/Permission_Role/Add_Rule", true));
89+
"broker/permission-role/add-rule", true));
9090

9191
// remove fallback node
92-
_default_role->remove_list_child("Fallback");
92+
_default_role->remove_list_child("fallback");
9393
}
9494

9595
PermissionRoleNode::PermissionRoleNode(const LinkStrandRef &strand,
@@ -111,7 +111,7 @@ PermissionRoleNode::PermissionRoleNode(const LinkStrandRef &strand,
111111
}
112112
return Status::INVALID_PARAMETER;
113113
}));
114-
add_list_child("Fallback", std::move(_fallback_name_node));
114+
add_list_child("fallback", std::move(_fallback_name_node));
115115
}
116116
PermissionRoleNode::~PermissionRoleNode() = default;
117117

@@ -218,7 +218,7 @@ void PermissionRoleNode::load_extra(VarMap &map) {
218218
// create a rule node for it
219219
auto rule = make_ref_<PermissionRuleNode>(
220220
_strand, get_ref(),
221-
_strand->stream_acceptor().get_profile("Broker/Permission_Rule",
221+
_strand->stream_acceptor().get_profile("broker/permission-rule",
222222
true));
223223
rule->_path = it.first;
224224
rule->_level = level;
@@ -259,4 +259,4 @@ StatusDetail PermissionRuleNode::on_set_value(MessageValue &&value) {
259259
}
260260
return Status::INVALID_PARAMETER;
261261
}
262-
} // namespace dsa
262+
} // namespace dsa

‎src/broker/module/client/broker_client_manager.cc

Copy file name to clipboardExpand all lines: src/broker/module/client/broker_client_manager.cc
+12-12Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ void BrokerClientManager::create_nodes(NodeModel& module_node,
7979
.check_state(Path(DOWNSTREAM_NAME));
8080

8181
pub_root.register_standard_profile_function(
82-
"Broker/Client/Remove",
82+
"broker/client/remove",
8383
[ this, keepref = get_ref() ](Var&&, SimpleInvokeNode&,
8484
OutgoingInvokeStream & stream,
8585
ref_<NodeState> && parent) {
@@ -106,7 +106,7 @@ void BrokerClientManager::create_nodes(NodeModel& module_node,
106106
});
107107

108108
pub_root.register_standard_profile_function(
109-
"Broker/Client/Detach_Token",
109+
"broker/client/detach-token",
110110
CAST_LAMBDA(SimpleInvokeNode::FullCallback)[this, keepref = get_ref()](
111111
Var&&, SimpleInvokeNode&, OutgoingInvokeStream & stream,
112112
ref_<NodeState> && parent) {
@@ -122,7 +122,7 @@ void BrokerClientManager::create_nodes(NodeModel& module_node,
122122
});
123123

124124
pub_root.register_standard_profile_function(
125-
"Broker/Quarantine_Client/Authorize",
125+
"broker/quarantine-client/authorize",
126126
CAST_LAMBDA(SimpleInvokeNode::FullCallback)[this, keepref = get_ref()](
127127
Var && v, SimpleInvokeNode&, OutgoingInvokeStream & stream,
128128
ref_<NodeState> && parent) {
@@ -172,7 +172,7 @@ void BrokerClientManager::create_nodes(NodeModel& module_node,
172172

173173
auto child = make_ref_<BrokerClientNode>(
174174
_strand, _clients_root->get_ref(),
175-
_strand->stream_acceptor().get_profile("Broker/Client", true),
175+
_strand->stream_acceptor().get_profile("broker/client", true),
176176
dsid);
177177
child->set_client_info(std::move(info));
178178

@@ -190,7 +190,7 @@ void BrokerClientManager::create_nodes(NodeModel& module_node,
190190
});
191191

192192
pub_root.register_standard_profile_function(
193-
"Broker/Token/Remove",
193+
"broker/token/remove",
194194
CAST_LAMBDA(SimpleInvokeNode::FullCallback)[this, keepref = get_ref()](
195195
Var&&, SimpleInvokeNode&, OutgoingInvokeStream & stream,
196196
ref_<NodeState> && parent) {
@@ -209,7 +209,7 @@ void BrokerClientManager::create_nodes(NodeModel& module_node,
209209
}
210210
});
211211
pub_root.register_standard_profile_function(
212-
"Broker/Token/Remove_All_Clients",
212+
"broker/token/remove-all-clients",
213213
CAST_LAMBDA(SimpleInvokeNode::FullCallback)[this, keepref = get_ref()](
214214
Var&&, SimpleInvokeNode&, OutgoingInvokeStream & stream,
215215
ref_<NodeState> && parent) {
@@ -223,7 +223,7 @@ void BrokerClientManager::create_nodes(NodeModel& module_node,
223223
}
224224
});
225225
pub_root.register_standard_profile_function(
226-
"Broker/Token/Regenerate",
226+
"broker/token/regenerate",
227227
CAST_LAMBDA(SimpleInvokeNode::FullCallback)[this, keepref = get_ref()](
228228
Var&&, SimpleInvokeNode&, OutgoingInvokeStream & stream,
229229
ref_<NodeState> && parent) {
@@ -243,7 +243,7 @@ void BrokerClientManager::create_nodes(NodeModel& module_node,
243243

244244
_clients_root
245245
->add_list_child(
246-
"Allow_All",
246+
"allow-all",
247247
make_ref_<ValueNodeModel>(
248248
_strand, "bool",
249249
[ this, keepref = get_ref() ](const Var& v)->StatusDetail {
@@ -258,7 +258,7 @@ void BrokerClientManager::create_nodes(NodeModel& module_node,
258258

259259
_quarantine_root
260260
->add_list_child(
261-
"Enabled",
261+
"enabled",
262262
make_ref_<ValueNodeModel>(
263263
_strand, "bool",
264264
[ this, keepref = get_ref() ](const Var& v)->StatusDetail {
@@ -350,7 +350,7 @@ void BrokerClientManager::get_client(const string_& id,
350350
// add to downstream
351351
auto child = make_ref_<BrokerClientNode>(
352352
_strand, _clients_root->get_ref(),
353-
_strand->stream_acceptor().get_profile("Broker/Client", true), id);
353+
_strand->stream_acceptor().get_profile("broker/client", true), id);
354354
child->temporary_client = true;
355355
child->set_client_info(std::move(info));
356356

@@ -406,7 +406,7 @@ void BrokerClientManager::get_client(const string_& id,
406406
// add to downstream
407407
auto child = make_ref_<BrokerClientNode>(
408408
_strand, _clients_root->get_ref(),
409-
_strand->stream_acceptor().get_profile("Broker/Client", true),
409+
_strand->stream_acceptor().get_profile("broker/client", true),
410410
id);
411411
child->set_client_info(std::move(info));
412412

@@ -429,7 +429,7 @@ void BrokerClientManager::get_client(const string_& id,
429429
// add to downstream
430430
auto child = make_ref_<BrokerClientNode>(
431431
_strand, _clients_root->get_ref(),
432-
_strand->stream_acceptor().get_profile("Broker/Client", true),
432+
_strand->stream_acceptor().get_profile("broker/client", true),
433433
id);
434434
child->set_client_info(std::move(info));
435435

‎src/broker/module/client/broker_client_nodes.cc

Copy file name to clipboardExpand all lines: src/broker/module/client/broker_client_nodes.cc
+7-7Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ BrokerClientsRoot::BrokerClientsRoot(const LinkStrandRef& strand,
1616
ref_<BrokerClientManager>&& manager)
1717
: NodeModel(strand),
1818
_manager(std::move(manager)),
19-
_storage(_strand->storage().get_strand_bucket("Clients", _strand)){};
19+
_storage(_strand->storage().get_strand_bucket("clients", _strand)){};
2020

2121
void BrokerClientsRoot::initialize() {
2222
NodeModel::initialize();
@@ -36,7 +36,7 @@ void BrokerClientsRoot::initialize() {
3636
// add a child dslink node
3737
auto child = make_ref_<BrokerClientNode>(
3838
_strand, get_ref(),
39-
_strand->stream_acceptor().get_profile("Broker/Client", true),
39+
_strand->stream_acceptor().get_profile("broker/client", true),
4040
key);
4141
child->load(map.get_map());
4242

@@ -80,7 +80,7 @@ BrokerClientNode::BrokerClientNode(const LinkStrandRef& strand,
8080
return Status::INVALID_PARAMETER;
8181
},
8282
PermissionLevel::CONFIG));
83-
add_list_child("Role", _role_node->get_ref());
83+
add_list_child("role", _role_node->get_ref());
8484

8585
_path_node.reset(new ValueNodeModel(
8686
_strand, "string",
@@ -106,20 +106,20 @@ BrokerClientNode::BrokerClientNode(const LinkStrandRef& strand,
106106
return Status::INVALID_PARAMETER;
107107
},
108108
PermissionLevel::CONFIG));
109-
add_list_child("Path", _path_node->get_ref());
109+
add_list_child("path", _path_node->get_ref());
110110

111111
_from_token_node.reset(new NodeModel(_strand));
112112
_from_token_node->update_property("$type", Var("string"));
113-
add_list_child("From_Token", _from_token_node->get_ref());
113+
add_list_child("from-token", _from_token_node->get_ref());
114114

115115
// TODO make writable
116116
_max_session_node.reset(new NodeModel(_strand));
117117
_max_session_node->update_property("$type", Var("number"));
118-
add_list_child("Max_Session", _max_session_node->get_ref());
118+
add_list_child("max-session", _max_session_node->get_ref());
119119

120120
_current_session_node.reset(new NodeModel(_strand));
121121
_current_session_node->update_property("$type", Var("number"));
122-
add_list_child("Current_Session", _current_session_node->get_ref());
122+
add_list_child("current-session", _current_session_node->get_ref());
123123
}
124124
BrokerClientNode::~BrokerClientNode() = default;
125125

‎src/broker/module/client/quaratine_node.cpp

Copy file name to clipboardExpand all lines: src/broker/module/client/quaratine_node.cpp
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ QuaratineRemoteRoot::QuaratineRemoteRoot(const LinkStrandRef &strand,
2323

2424
void QuaratineRemoteRoot::initialize() {
2525
auto profile =
26-
_strand->stream_acceptor().get_profile("Broker/Quarantine_Client", true);
26+
_strand->stream_acceptor().get_profile("broker/quarantine-client", true);
2727

2828
if (profile != nullptr) {
2929
set_override_meta(

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.