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
445
Issues
445
List
Boards
Labels
Service Desk
Milestones
Merge Requests
71
Merge Requests
71
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
4b491c08
Commit
4b491c08
authored
Jun 13, 2019
by
Marcin Siodelski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[
#642
,
!373
] Check that it is possible to delete global param for server tag
parent
3b6df1cf
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
29 additions
and
1 deletion
+29
-1
src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc
src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc
+15
-1
src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc
src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc
+14
-0
No files found.
src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp4_unittest.cc
View file @
4b491c08
...
...
@@ -736,11 +736,25 @@ TEST_F(MySqlConfigBackendDHCPv4Test, globalParameters4WithServerTags) {
EXPECT_EQ
(
global_parameter3
->
getValue
(),
returned_global
->
getValue
());
EXPECT_EQ
(
"all"
,
returned_global
->
getServerTag
());
// Attempt to delete global parameter for server1.
uint64_t
deleted_num
=
0
;
EXPECT_NO_THROW
(
deleted_num
=
cbptr_
->
deleteGlobalParameter4
(
ServerSelector
::
ONE
(
"server1"
),
"global"
));
// No parameters should be deleted. In particular, the parameter for the logical
// server 'all' should not be deleted.
EXPECT_EQ
(
0
,
deleted_num
);
// Deleting the existing value for server2 should succeed.
EXPECT_NO_THROW
(
deleted_num
=
cbptr_
->
deleteGlobalParameter4
(
ServerSelector
::
ONE
(
"server2"
),
"global"
));
EXPECT_EQ
(
1
,
deleted_num
);
// Delete all servers, except 'all'.
EXPECT_NO_THROW
(
cbptr_
->
deleteAllServers4
());
EXPECT_NO_THROW
(
deleted_num
=
cbptr_
->
deleteAllServers4
());
EXPECT_NO_THROW
(
returned_globals
=
cbptr_
->
getAllGlobalParameters4
(
ServerSelector
::
ALL
())
);
EXPECT_EQ
(
1
,
deleted_num
);
ASSERT_EQ
(
1
,
returned_globals
.
size
());
returned_global
=
*
returned_globals
.
begin
();
// The common value for all servers should still be available because 'all'
...
...
src/hooks/dhcp/mysql_cb/tests/mysql_cb_dhcp6_unittest.cc
View file @
4b491c08
...
...
@@ -776,11 +776,25 @@ TEST_F(MySqlConfigBackendDHCPv6Test, globalParameters6WithServerTags) {
EXPECT_EQ
(
global_parameter3
->
getValue
(),
returned_global
->
getValue
());
EXPECT_EQ
(
"all"
,
returned_global
->
getServerTag
());
// Attempt to delete global parameter for server1.
uint64_t
deleted_num
=
0
;
EXPECT_NO_THROW
(
deleted_num
=
cbptr_
->
deleteGlobalParameter6
(
ServerSelector
::
ONE
(
"server1"
),
"global"
));
// No parameters should be deleted. In particular, the parameter for the logical
// server 'all' should not be deleted.
EXPECT_EQ
(
0
,
deleted_num
);
// Deleting the existing value for server2 should succeed.
EXPECT_NO_THROW
(
deleted_num
=
cbptr_
->
deleteGlobalParameter6
(
ServerSelector
::
ONE
(
"server2"
),
"global"
));
EXPECT_EQ
(
1
,
deleted_num
);
// Delete all servers, except 'all'.
EXPECT_NO_THROW
(
cbptr_
->
deleteAllServers6
());
EXPECT_NO_THROW
(
returned_globals
=
cbptr_
->
getAllGlobalParameters6
(
ServerSelector
::
ALL
())
);
EXPECT_EQ
(
1
,
deleted_num
);
ASSERT_EQ
(
1
,
returned_globals
.
size
());
returned_global
=
*
returned_globals
.
begin
();
// The common value for all servers should still be available because 'all'
...
...
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