Skip to content

Commit 9a8cb8c

Browse files
committed
[#3477] Changed write-config to config-write
1 parent 2933828 commit 9a8cb8c

File tree

6 files changed

+6
-6
lines changed

6 files changed

+6
-6
lines changed

src/bin/dhcp4/ctrl_dhcp4_srv.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -302,7 +302,7 @@ ControlledDhcpv4Srv::commandConfigWriteHandler(const string&,
302302
ConstElementPtr cfg = CfgMgr::instance().getCurrentCfg()->toElement();
303303
size = writeConfigFile(filename, cfg);
304304
} catch (const isc::Exception& ex) {
305-
return (createAnswer(CONTROL_RESULT_ERROR, string("Error during write-config: ")
305+
return (createAnswer(CONTROL_RESULT_ERROR, string("Error during config-write: ")
306306
+ ex.what()));
307307
}
308308
if (size == 0) {

src/bin/dhcp4/tests/ctrl_dhcp4_srv_unittest.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -312,7 +312,7 @@ class CtrlChannelDhcpv4SrvTest : public ::testing::Test {
312312
EXPECT_EQ(1, cnt) << "Command " << command << " not found";
313313
}
314314

315-
/// @brief Check if the answer for write-config command is correct.
315+
/// @brief Check if the answer for config-write command is correct.
316316
///
317317
/// @param response_txt response in text form (as read from
318318
/// the control socket)

src/bin/dhcp6/ctrl_dhcp6_srv.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -304,7 +304,7 @@ ControlledDhcpv6Srv::commandConfigWriteHandler(const string&,
304304
ConstElementPtr cfg = CfgMgr::instance().getCurrentCfg()->toElement();
305305
size = writeConfigFile(filename, cfg);
306306
} catch (const isc::Exception& ex) {
307-
return (createAnswer(CONTROL_RESULT_ERROR, string("Error during write-config: ")
307+
return (createAnswer(CONTROL_RESULT_ERROR, string("Error during config-write: ")
308308
+ ex.what()));
309309
}
310310
if (size == 0) {

src/bin/dhcp6/tests/ctrl_dhcp6_srv_unittest.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -337,7 +337,7 @@ class CtrlChannelDhcpv6SrvTest : public CtrlDhcpv6SrvTest {
337337
EXPECT_EQ(1, cnt) << "Command " << command << " not found";
338338
}
339339

340-
/// @brief Check if the answer for write-config command is correct.
340+
/// @brief Check if the answer for config-write command is correct.
341341
///
342342
/// @param response_txt response in text form (as read from
343343
/// the control socket)

src/lib/process/d_controller.cc

+1-1
Original file line numberDiff line numberDiff line change
@@ -518,7 +518,7 @@ DControllerBase::configWriteHandler(const std::string&,
518518
size = writeConfigFile(filename, cfg);
519519
} catch (const isc::Exception& ex) {
520520
return (createAnswer(CONTROL_RESULT_ERROR,
521-
std::string("Error during write-config:")
521+
std::string("Error during config-write:")
522522
+ ex.what()));
523523
}
524524
if (size == 0) {

src/lib/process/d_controller.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ class DControllerBase : public Daemon {
279279

280280
/// @brief handler for config-write command
281281
///
282-
/// This handle processes write-config command, which writes the
282+
/// This handle processes config-write command, which writes the
283283
/// current configuration to disk. This command takes one optional
284284
/// parameter called filename. If specified, the current configuration
285285
/// will be written to that file. If not specified, the file used during

0 commit comments

Comments
 (0)