From 0ade1dae0f24a674eeb4161d3bbbea65b2a86936 Mon Sep 17 00:00:00 2001 From: Thomas Markwalder Date: Wed, 2 Apr 2025 15:27:40 -0400 Subject: [PATCH] [#3811] Addressed review comments Changes to be committed: modified: changelog_unreleased/3811-include-the-shared-network-name-in-the-subnetx-list-response modified: src/hooks/dhcp/subnet_cmds/tests/subnet4_cmds_unittest.cc modified: src/hooks/dhcp/subnet_cmds/tests/subnet6_cmds_unittest.cc modified: src/hooks/dhcp/subnet_cmds/tests/subnet_cmds_unittest.h --- ...clude-the-shared-network-name-in-the-subnetx-list-response | 2 +- src/hooks/dhcp/subnet_cmds/tests/subnet4_cmds_unittest.cc | 3 +-- src/hooks/dhcp/subnet_cmds/tests/subnet6_cmds_unittest.cc | 4 ++-- src/hooks/dhcp/subnet_cmds/tests/subnet_cmds_unittest.h | 2 +- 4 files changed, 5 insertions(+), 6 deletions(-) diff --git a/changelog_unreleased/3811-include-the-shared-network-name-in-the-subnetx-list-response b/changelog_unreleased/3811-include-the-shared-network-name-in-the-subnetx-list-response index 1ac451f6fa..bdc58843de 100644 --- a/changelog_unreleased/3811-include-the-shared-network-name-in-the-subnetx-list-response +++ b/changelog_unreleased/3811-include-the-shared-network-name-in-the-subnetx-list-response @@ -1,6 +1,6 @@ [func] tmark The subnet commands hook library was modified such that the subnet's shared network name is now included for each - subnet returned by the subnet4-list and subnet6-list + subnet returned by the subnet4-list and subnet6-list commands. (Gitlab #3811) diff --git a/src/hooks/dhcp/subnet_cmds/tests/subnet4_cmds_unittest.cc b/src/hooks/dhcp/subnet_cmds/tests/subnet4_cmds_unittest.cc index 0e1f1d45d2..1eeb581770 100644 --- a/src/hooks/dhcp/subnet_cmds/tests/subnet4_cmds_unittest.cc +++ b/src/hooks/dhcp/subnet_cmds/tests/subnet4_cmds_unittest.cc @@ -1758,8 +1758,7 @@ TEST_F(Subnet4CmdsTest, subnet4List) { CONTROL_RESULT_SUCCESS, "3 IPv4 subnets found"); - // Verify that the response has appropriate structure and returned - // the expected arguments. + // Verify that the returned response has the expected subnets. std::string exp_args=R"( { "subnets": [ diff --git a/src/hooks/dhcp/subnet_cmds/tests/subnet6_cmds_unittest.cc b/src/hooks/dhcp/subnet_cmds/tests/subnet6_cmds_unittest.cc index cfb6b0ffe3..54f1e584fe 100644 --- a/src/hooks/dhcp/subnet_cmds/tests/subnet6_cmds_unittest.cc +++ b/src/hooks/dhcp/subnet_cmds/tests/subnet6_cmds_unittest.cc @@ -2449,8 +2449,7 @@ TEST_F(Subnet6CmdsTest, subnet6List) { CONTROL_RESULT_SUCCESS, "3 IPv6 subnets found"); - // Verify that the response has appropriate structure and returned - // the expected arguments. + // Verify that the returned response has the expected subnets. std::string exp_args=R"( { "subnets": [ @@ -2483,6 +2482,7 @@ TEST_F(Subnet6CmdsTest, noSubnet6List) { ConstElementPtr response = testCommand("{ \"command\": \"subnet6-list\" }", CONTROL_RESULT_EMPTY, "0 IPv6 subnets found"); + // Verify that the response has appropriate structure and no subnets // are included. std::string exp_args=R"( diff --git a/src/hooks/dhcp/subnet_cmds/tests/subnet_cmds_unittest.h b/src/hooks/dhcp/subnet_cmds/tests/subnet_cmds_unittest.h index bba2c253b8..d31733e924 100644 --- a/src/hooks/dhcp/subnet_cmds/tests/subnet_cmds_unittest.h +++ b/src/hooks/dhcp/subnet_cmds/tests/subnet_cmds_unittest.h @@ -491,7 +491,7 @@ public: } } - /// @brief Verifies that the content of the "args" element in the response. + /// @brief Verifies the content of the "args" element in the response. /// /// @param answer Server's response to a command. /// @param exp_args JSON map of the expected arguments contents.