Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Kea
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
416
Issues
416
List
Boards
Labels
Service Desk
Milestones
Merge Requests
66
Merge Requests
66
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
ISC Open Source Projects
Kea
Commits
7efc0e2e
Commit
7efc0e2e
authored
Dec 13, 2019
by
Marcin Siodelski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[
#1041
] Renamed status get handler in HA
The new name is processStatusGet instead of generic commandProcessed
parent
104b3361
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
6 additions
and
6 deletions
+6
-6
src/hooks/dhcp/high_availability/ha_impl.cc
src/hooks/dhcp/high_availability/ha_impl.cc
+1
-1
src/hooks/dhcp/high_availability/ha_service.cc
src/hooks/dhcp/high_availability/ha_service.cc
+1
-1
src/hooks/dhcp/high_availability/ha_service.h
src/hooks/dhcp/high_availability/ha_service.h
+1
-1
src/hooks/dhcp/high_availability/tests/ha_service_unittest.cc
...hooks/dhcp/high_availability/tests/ha_service_unittest.cc
+3
-3
No files found.
src/hooks/dhcp/high_availability/ha_impl.cc
View file @
7efc0e2e
...
...
@@ -277,7 +277,7 @@ HAImpl::commandProcessed(hooks::CalloutHandle& callout_handle) {
// Add the ha servers info to arguments.
ElementPtr
mutable_resp_args
=
boost
::
const_pointer_cast
<
Element
>
(
resp_args
);
ConstElementPtr
ha_servers
=
service_
->
commandProcessed
();
ConstElementPtr
ha_servers
=
service_
->
processStatusGet
();
mutable_resp_args
->
set
(
"ha-servers"
,
ha_servers
);
}
}
...
...
src/hooks/dhcp/high_availability/ha_service.cc
View file @
7efc0e2e
...
...
@@ -953,7 +953,7 @@ HAService::logFailedLeaseUpdates(const PktPtr& query,
}
ConstElementPtr
HAService
::
commandProcessed
()
const
{
HAService
::
processStatusGet
()
const
{
ElementPtr
ha_servers
=
Element
::
createMap
();
// Local part
...
...
src/hooks/dhcp/high_availability/ha_service.h
View file @
7efc0e2e
...
...
@@ -511,7 +511,7 @@ public:
///
/// @c HAImpl::commandProcessed calls this to add HA servers info
/// into the status-get response.
data
::
ConstElementPtr
commandProcessed
()
const
;
data
::
ConstElementPtr
processStatusGet
()
const
;
protected:
...
...
src/hooks/dhcp/high_availability/tests/ha_service_unittest.cc
View file @
7efc0e2e
...
...
@@ -1066,7 +1066,7 @@ TEST_F(HAServiceTest, hotStandbyScopeSelectionThisPrimary) {
service
.
runModel
(
HAService
::
NOP_EVT
);
// Check the reported info about servers.
ConstElementPtr
ha_servers
=
service
.
commandProcessed
();
ConstElementPtr
ha_servers
=
service
.
processStatusGet
();
ASSERT_TRUE
(
ha_servers
);
std
::
string
expected
=
"{ "
"
\"
local
\"
: {
\"
role
\"
:
\"
primary
\"
, "
...
...
@@ -1104,7 +1104,7 @@ TEST_F(HAServiceTest, hotStandbyScopeSelectionThisStandby) {
TestHAService
service
(
io_service_
,
network_state_
,
config_storage
);
// Check the reported info about servers.
ConstElementPtr
ha_servers
=
service
.
commandProcessed
();
ConstElementPtr
ha_servers
=
service
.
processStatusGet
();
ASSERT_TRUE
(
ha_servers
);
std
::
string
expected
=
"{ "
"
\"
local
\"
: {
\"
role
\"
:
\"
standby
\"
, "
...
...
@@ -3044,7 +3044,7 @@ TEST_F(HAServiceStateMachineTest, waitingParterDownLoadBalancingPartnerDown) {
ASSERT_FALSE
(
isFailureDetected
());
// Check the reported info about servers.
ConstElementPtr
ha_servers
=
service_
->
commandProcessed
();
ConstElementPtr
ha_servers
=
service_
->
processStatusGet
();
ASSERT_TRUE
(
ha_servers
);
std
::
cout
<<
ha_servers
->
str
()
<<
"
\n
"
;
std
::
string
expected
=
"{ "
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment