[#3435] some formatting in netconf

andrei-pavel · andrei-pavel · commit 4a1c295f664c · 2024-06-20T21:29:58.000+03:00
diff --git a/src/bin/netconf/control_socket.h b/src/bin/netconf/control_socket.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -19,8 +19,9 @@ namespace netconf {
 /// @brief Exception thrown when the error during communication.
 class ControlSocketError : public isc::Exception {
 public:
-    ControlSocketError(const char* file, size_t line, const char* what) :
-        isc::Exception(file, line, what) { }
+    ControlSocketError(const char* file, size_t line, const char* what)
+        : isc::Exception(file, line, what) {
+    }
 };  // ControlSocketError
 
 /// @brief Base class for control socket communication.
@@ -38,7 +39,7 @@ class ControlSocketBase {
     ControlSocketBase(CfgControlSocketPtr ctrl_sock) : socket_cfg_(ctrl_sock) {
         if (!ctrl_sock) {
             isc_throw(ControlSocketError, "ControlSocket constructor called "
-                      "with a null configuration");
+                                          "with a null configuration");
         }
     }
 
diff --git a/src/bin/netconf/http_control_socket.cc b/src/bin/netconf/http_control_socket.cc
@@ -130,4 +130,3 @@ HttpControlSocket::sendCommand(ConstElementPtr command) {
 
 }  // namespace netconf
 }  // namespace isc
-
diff --git a/src/bin/netconf/netconf.cc b/src/bin/netconf/netconf.cc
@@ -142,7 +142,7 @@ class NetconfAgentCallback {
     }
 };  // NetconfAgentCallback
 
-}  //anonymous namespace
+}  // anonymous namespace
 
 namespace isc {
 namespace netconf {
@@ -254,15 +254,15 @@ NetconfAgent::initSysrepo() {
         startup_sess_ = Connection{}.sessionStart();
         startup_sess_->switchDatastore(Datastore::Startup);
     } catch (exception const& ex) {
-        isc_throw(Unexpected, "Can't establish a sysrepo session: "
-                  << ex.what());
+        isc_throw(Unexpected, "Can't establish a sysrepo session: " << ex.what());
     }
 
     // Retrieve names and revisions of installed modules from sysrepo.
     getModules();
 }
 
-void NetconfAgent::getModules() {
+void
+NetconfAgent::getModules() {
     vector<Module> modules;
     try {
         Context context(running_sess_->getContext());
@@ -274,8 +274,7 @@ void NetconfAgent::getModules() {
     for (Module const& module : modules) {
         string const name(module.name());
         if (!module.revision()) {
-            isc_throw(Unexpected,
-                      "could not retrieve module revision for module " << name);
+            isc_throw(Unexpected, "could not retrieve module revision for module " << name);
         }
         string const revision(*module.revision());
         modules_.emplace(name, revision);
@@ -464,8 +463,7 @@ NetconfAgent::subscribeToDataChanges(const CfgServersMapPair& service_pair) {
     } catch (exception const& ex) {
         ostringstream msg;
         msg << "module change subscribe failed with " << ex.what();
-        msg << "change subscription for model " << model <<
-            " failed with: " << ex.what();
+        msg << "change subscription for model " << model << " failed with: " << ex.what();
         LOG_ERROR(netconf_logger, NETCONF_SUBSCRIBE_CONFIG_FAILED)
             .arg(server)
             .arg(configuration->getModel())
@@ -754,7 +752,8 @@ NetconfAgent::announceShutdown() const {
     }
 }
 
-bool NetconfAgent::shouldShutdown() const {
+bool
+NetconfAgent::shouldShutdown() const {
     return boost::dynamic_pointer_cast<NetconfController>(NetconfController::instance())
         ->getNetconfProcess()
         ->shouldShutdown();
diff --git a/src/bin/netconf/netconf.h b/src/bin/netconf/netconf.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -15,10 +15,10 @@
 #include <netconf/stdout_control_socket.h>
 #include <netconf/unix_control_socket.h>
 
-#include <sysrepo-cpp/Session.hpp>
-
 #include <map>
 
+#include <sysrepo-cpp/Session.hpp>
+
 namespace isc {
 namespace netconf {
 
@@ -69,8 +69,7 @@ class NetconfAgent {
     /// @param sess The sysrepo running datastore session.
     /// @param service_pair The service name and configuration pair.
     /// @return return code for sysrepo.
-    static sysrepo::ErrorCode
-    change(sysrepo::Session sess, const CfgServersMapPair& service_pair);
+    static sysrepo::ErrorCode change(sysrepo::Session sess, const CfgServersMapPair& service_pair);
 
     /// @brief Event::Done callback.
     ///
@@ -80,8 +79,7 @@ class NetconfAgent {
     /// @param sess The sysrepo running datastore session.
     /// @param service_pair The service name and configuration pair.
     /// @return return code for sysrepo.
-    static sysrepo::ErrorCode
-    done(sysrepo::Session sess, const CfgServersMapPair& service_pair);
+    static sysrepo::ErrorCode done(sysrepo::Session sess, const CfgServersMapPair& service_pair);
 
     /// @brief Log changes.
     ///
diff --git a/src/bin/netconf/netconf_cfg_mgr.cc b/src/bin/netconf/netconf_cfg_mgr.cc
@@ -135,11 +135,9 @@ NetconfCfgMgr::parse(isc::data::ConstElementPtr config_set,
     }
 
     if (check_only) {
-        answer = createAnswer(CONTROL_RESULT_SUCCESS,
-                              "Configuration check successful");
+        answer = createAnswer(CONTROL_RESULT_SUCCESS, "Configuration check successful");
     } else {
-        answer = createAnswer(CONTROL_RESULT_SUCCESS,
-                              "Configuration applied successfully.");
+        answer = createAnswer(CONTROL_RESULT_SUCCESS, "Configuration applied successfully.");
     }
 
     return (answer);
diff --git a/src/bin/netconf/netconf_cfg_mgr.h b/src/bin/netconf/netconf_cfg_mgr.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -30,7 +30,6 @@ using NetconfConfigPtr = boost::shared_ptr<NetconfConfig>;
 /// It is derived from the context base class, ConfigBase.
 class NetconfConfig : public process::ConfigBase {
 public:
-
     /// @brief Default constructor
     NetconfConfig();
 
@@ -93,7 +92,6 @@ class NetconfConfig : public process::ConfigBase {
     isc::data::ElementPtr toElement() const override final;
 
 private:
-
     /// @brief Private copy constructor
     ///
     /// It is private to forbid anyone outside of this class to make copies.
diff --git a/src/bin/netconf/netconf_config.cc b/src/bin/netconf/netconf_config.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -7,9 +7,9 @@
 #include <config.h>
 
 #include <asiolink/io_error.h>
+#include <exceptions/exceptions.h>
 #include <netconf/netconf_cfg_mgr.h>
 #include <netconf/netconf_log.h>
-#include <exceptions/exceptions.h>
 
 #include <sstream>
 #include <string>
@@ -89,7 +89,7 @@ CfgServer::toText() const {
             s << "UNIX:'" << control_socket_->getName() << "'";
             break;
         case CfgControlSocket::Type::HTTP:
-          s << "HTTP:'" << control_socket_->getUrl().toText() << "'";
+            s << "HTTP:'" << control_socket_->getUrl().toText() << "'";
             break;
         case CfgControlSocket::Type::STDOUT:
             s << "STDOUT";
diff --git a/src/bin/netconf/netconf_config.h b/src/bin/netconf/netconf_config.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,8 +14,7 @@
 #include <exceptions/exceptions.h>
 #include <http/url.h>
 
-#include <stdint.h>
-
+#include <cstdint>
 #include <string>
 #include <unordered_map>
 
diff --git a/src/bin/netconf/netconf_controller.h b/src/bin/netconf/netconf_controller.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -20,7 +20,6 @@ namespace netconf {
 /// NetconfProcess.
 class NetconfController : public process::DControllerBase {
 public:
-
     /// @brief Static singleton instance method.
     ///
     /// This method returns the base class singleton instance member.
@@ -59,7 +58,6 @@ class NetconfController : public process::DControllerBase {
     void processSignal(int signum) override final;
 
 private:
-
     /// @brief Creates an instance of the Netconf application process.
     ///
     /// This method is invoked during the process initialization step of
diff --git a/src/bin/netconf/netconf_log.cc b/src/bin/netconf/netconf_log.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -16,8 +16,7 @@ namespace netconf {
 
 extern const int NETCONF_DBG_TRACE = isc::log::DBGLVL_TRACE_BASIC;
 extern const int NETCONF_DBG_RESULTS = isc::log::DBGLVL_TRACE_BASIC_DATA;
-extern const int NETCONF_DBG_TRACE_DETAIL_DATA =
-    isc::log::DBGLVL_TRACE_DETAIL_DATA;
+extern const int NETCONF_DBG_TRACE_DETAIL_DATA = isc::log::DBGLVL_TRACE_DETAIL_DATA;
 
 const char* NETCONF_LOGGER_NAME = "netconf";
 
diff --git a/src/bin/netconf/netconf_process.cc b/src/bin/netconf/netconf_process.cc
@@ -57,8 +57,7 @@ NetconfProcess::run() {
         } catch (...) {
             // Ignore double errors
         }
-        isc_throw(DProcessBaseError,
-                  "Process run method failed: " << ex.what());
+        isc_throw(DProcessBaseError, "Process run method failed: " << ex.what());
     }
 
     LOG_DEBUG(netconf_logger, isc::log::DBGLVL_START_SHUT, NETCONF_RUN_EXIT);
@@ -95,8 +94,7 @@ NetconfProcess::configure(isc::data::ConstElementPtr config_set,
         IOServiceMgr::instance().pollIOServices();
     } catch (const std::exception& ex) {
         std::ostringstream err;
-        err << "Error initializing hooks: "
-            << ex.what();
+        err << "Error initializing hooks: " << ex.what();
         return (isc::config::createAnswer(CONTROL_RESULT_ERROR, err.str()));
     }
 
diff --git a/src/bin/netconf/netconf_process.h b/src/bin/netconf/netconf_process.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -79,14 +79,12 @@ class NetconfProcess : public process::DProcessBase {
     /// of an integer status value (0 means successful, non-zero means failure),
     /// and a string explanation of the outcome.
     isc::data::ConstElementPtr
-    configure(isc::data::ConstElementPtr config_set,
-              bool check_only = false) override final;
+    configure(isc::data::ConstElementPtr config_set, bool check_only = false) override final;
 
     /// @brief Returns a pointer to the configuration manager.
     NetconfCfgMgrPtr getNetconfCfgMgr();
 
 private:
-
     /// @brief Polls all ready handlers and then runs one handler if none
     /// handlers have been executed as a result of polling.
     ///
diff --git a/src/bin/netconf/parser_context_decl.h b/src/bin/netconf/parser_context_decl.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -14,7 +14,7 @@ namespace netconf {
 
 class ParserContext;
 
-}  // namespace dhcp
+}  // namespace netconf
 }  // namespace isc
 
 #endif
diff --git a/src/bin/netconf/stdout_control_socket.h b/src/bin/netconf/stdout_control_socket.h
@@ -1,4 +1,4 @@
-// Copyright (C) 2018-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
@@ -11,6 +11,7 @@
 #define STDOUT_CONTROL_SOCKET_H
 
 #include <netconf/control_socket.h>
+
 #include <iostream>
 
 namespace isc {
diff --git a/src/bin/netconf/tests/control_socket_unittests.cc b/src/bin/netconf/tests/control_socket_unittests.cc
@@ -6,8 +6,6 @@
 
 #include <config.h>
 
-#include <gtest/gtest.h>
-
 #include <asiolink/asio_wrapper.h>
 #include <asiolink/interval_timer.h>
 #include <asiolink/io_service.h>
@@ -29,6 +27,8 @@
 #include <sstream>
 #include <thread>
 
+#include <gtest/gtest.h>
+
 using namespace std;
 using namespace isc;
 using namespace isc::netconf;
diff --git a/src/bin/netconf/tests/get_config_unittest.cc b/src/bin/netconf/tests/get_config_unittest.cc
@@ -1,13 +1,11 @@
-// Copyright (C) 2018-2022 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2018-2024 Internet Systems Consortium, Inc. ("ISC")
 //
 // This Source Code Form is subject to the terms of the Mozilla Public
 // License, v. 2.0. If a copy of the MPL was not distributed with this
 // file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 #include <config.h>
 
-#include <gtest/gtest.h>
-
 #include <cc/command_interpreter.h>
 #include <cc/data.h>
 #include <netconf/netconf_cfg_mgr.h>
@@ -20,6 +18,8 @@
 #include <iostream>
 #include <string>
 
+#include <gtest/gtest.h>
+
 #include "test_data_files_config.h"
 #include "test_libraries.h"
 
diff --git a/src/bin/netconf/tests/netconf_cfg_mgr_unittests.cc b/src/bin/netconf/tests/netconf_cfg_mgr_unittests.cc
diff --git a/src/bin/netconf/tests/netconf_controller_unittests.cc b/src/bin/netconf/tests/netconf_controller_unittests.cc
diff --git a/src/bin/netconf/tests/netconf_process_unittests.cc b/src/bin/netconf/tests/netconf_process_unittests.cc
diff --git a/src/bin/netconf/tests/netconf_unittests.cc b/src/bin/netconf/tests/netconf_unittests.cc
diff --git a/src/bin/netconf/tests/parser_unittests.cc b/src/bin/netconf/tests/parser_unittests.cc
diff --git a/src/bin/netconf/tests/run_unittests.cc b/src/bin/netconf/tests/run_unittests.cc

Original file line number	Diff line number	Diff line change
`@@ -130,4 +130,3 @@ HttpControlSocket::sendCommand(ConstElementPtr command) {`
`130`	`130`
`131`	`131`	`} // namespace netconf`
`132`	`132`	`} // namespace isc`
`133`		`-`
Original file line number	Diff line number	Diff line change
`@@ -135,11 +135,9 @@ NetconfCfgMgr::parse(isc::data::ConstElementPtr config_set,`
`135`	`135`	`}`
`136`	`136`
`137`	`137`	`if (check_only) {`
`138`		`- answer = createAnswer(CONTROL_RESULT_SUCCESS,`
`139`		`- "Configuration check successful");`
	`138`	`+ answer = createAnswer(CONTROL_RESULT_SUCCESS, "Configuration check successful");`
`140`	`139`	`} else {`
`141`		`- answer = createAnswer(CONTROL_RESULT_SUCCESS,`
`142`		`- "Configuration applied successfully.");`
	`140`	`+ answer = createAnswer(CONTROL_RESULT_SUCCESS, "Configuration applied successfully.");`
`143`	`141`	`}`
`144`	`142`
`145`	`143`	`return (answer);`