nutconf-related C++ sources: deprecate certain terminology and keywords [#840]

Signed-off-by: Jim Klimov <jimklimov+nut@gmail.com>

Author: jimklimov

common/nutconf.cpp

@@ -1190,7 +1190,7 @@ void UpsmonConfigParser::onParseDirective(const std::string& directiveName, char
 				monitor.powerValue = StringToSettableNumber<unsigned int>(*it++);
 				monitor.username = *it++;
 				monitor.password = *it++;
-				monitor.isMaster = (*it) == "master";
+				monitor.isMaster = (*it) == "primary";	// master for NUT v2.7.4 and older
 				_config->monitors.push_back(monitor);
 			}
 		}
@@ -1583,11 +1583,11 @@ UpsdUsersConfiguration::upsmon_mode_t UpsdUsersConfiguration::getUpsmonMode() co
 {
 	std::string mode_str = getStr("upsmon", "upsmon");
 
-	if ("master" == mode_str)
-		return UPSMON_MASTER;
+	if ("primary" == mode_str || "master" == mode_str)
+		return UPSMON_PRIMARY;
 
-	if ("slave" == mode_str)
-		return UPSMON_SLAVE;
+	if ("secondary" == mode_str || "slave" == mode_str)
+		return UPSMON_SECONDARY;
 
 	return UPSMON_UNDEF;
 }
@@ -1597,7 +1597,8 @@ void UpsdUsersConfiguration::setUpsmonMode(upsmon_mode_t mode)
 {
 	assert(UPSMON_UNDEF != mode);
 
-	setStr("upsmon", "upsmon", (UPSMON_MASTER == mode ? "master" : "slave"));
+	setStr("upsmon", "upsmon", (UPSMON_PRIMARY == mode ? "primary" : "secondary"));
+	/* NUT v2.7.4 and older: setStr("upsmon", "upsmon", (UPSMON_PRIMARY == mode ? "master" : "slave")); */
 }
 
 

common/nutwriter.cpp

@@ -398,8 +398,9 @@ static std::string serializeMonitor(const UpsmonConfiguration::Monitor & monitor
 	// Username & password
 	directive << monitor.username << ' ' << monitor.password << ' ';
 
-	// Master/slave
-	directive << (monitor.isMaster ? "master" : "slave");
+	// Primary/secondary (legacy master/slave)
+	directive << (monitor.isMaster ? "primary" : "secondary");
+	/* NUT v2.7.4 and older: directive << (monitor.isMaster ? "master" : "slave");*/
 
 	return directive.str();
 }

include/nutconf.hpp

@@ -1084,8 +1084,8 @@ class UpsdUsersConfiguration : public GenericConfiguration
 	/** upsmon mode */
 	typedef enum {
 		UPSMON_UNDEF = 0,  /**< Unknown mode */
-		UPSMON_MASTER,     /**< Master  mode */
-		UPSMON_SLAVE,      /**< Slave   mode */
+		UPSMON_PRIMARY,    /**< Primary   (legacy "Master") mode */
+		UPSMON_SECONDARY,  /**< Secondary (legacy "Slave")  mode */
 	} upsmon_mode_t;
 
 	/** User-specific configuration attributes getters and setters \{ */

tests/nutconf_ut.cpp

@@ -3,6 +3,7 @@
 
     Copyright (C)
         2012	Vaclav Krpec <VaclavKrpec@Eaton.com>
+        2024    Jim Klimov <jimklimov+nut@gmail.com>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -211,7 +212,7 @@ void NutConfigUnitTest::testUpsdUsersConfiguration() {
 	load(static_cast<nut::Serialisable *>(&config), ABS_TOP_SRCDIR "/conf/upsd.users.sample");
 
 	config.setPassword("upsmon", "ytrewq");
-	config.setUpsmonMode(nut::UpsdUsersConfiguration::UPSMON_MASTER);
+	config.setUpsmonMode(nut::UpsdUsersConfiguration::UPSMON_PRIMARY);
 
 	config.setPassword("admin", "qwerty=ui");
 	config.setActions("admin", nut::ConfigParamList(1, "SET"));
@@ -225,7 +226,7 @@ void NutConfigUnitTest::testUpsdUsersConfiguration() {
 		"\n"
 		"[upsmon]\n"
 		"\tpassword = ytrewq\n"
-		"\tupsmon master\n"
+		"\tupsmon primary\n"
 		"\n"
 	);
 }

tools/nutconf/nutconf-cli.cpp

@@ -128,7 +128,7 @@ const char * Usage::s_text[] = {
 	"",
 	"NUT modes: standalone, netserver, netclient, controlled, manual, none",
 	"Monitor is specified by the following sequence:",
-	"    <ups_ID> <host>[:<port>] <power_value> <user> <passwd> (\"master\"|\"slave\")",
+	"    <ups_ID> <host>[:<port>] <power_value> <user> <passwd> (\"primary\"|\"secondary\")",
 	"UPS device is specified by the following sequence:",
 	"    <ups_ID> <driver> <port> [<key>=<value>]*",
 	"Notification types:",
@@ -2090,7 +2090,7 @@ static nut::UpsmonConfiguration::Monitor monitor(
 	monitor.hostname   = host_port.substr(0, colon_idx);
 	monitor.port       = port;
 	monitor.powerValue = power_value;
-	monitor.isMaster   = "master" == mode;
+	monitor.isMaster   = ("primary" == mode || "master" == mode);
 
 	return monitor;
 }
@@ -2594,11 +2594,11 @@ static void setUsers(
 			nut::UpsdUsersConfiguration::upsmon_mode_t mode =
 				nut::UpsdUsersConfiguration::UPSMON_UNDEF;
 
-			if ("master" == upsmon_user->mode)
-				mode = nut::UpsdUsersConfiguration::UPSMON_MASTER;
+			if ("primary" == upsmon_user->mode || "master" == upsmon_user->mode)
+				mode = nut::UpsdUsersConfiguration::UPSMON_PRIMARY;
 
-			else if ("slave" == upsmon_user->mode)
-				mode = nut::UpsdUsersConfiguration::UPSMON_SLAVE;
+			else if ("secondary" == upsmon_user->mode || "slave" == upsmon_user->mode)
+				mode = nut::UpsdUsersConfiguration::UPSMON_SECONDARY;
 
 			else {
 				std::cerr