[153-netconf-control-socket] Addressed review comments

diff --git a/src/bin/netconf/http_control_socket.h b/src/bin/netconf/http_control_socket.h
index 752f13b0ec6862908ecd6f7ee10251379b68a039..48023733cefc1aa5dfed638cc08697c541bb7b36 100644 (file)
--- a/src/bin/netconf/http_control_socket.h
+++ b/src/bin/netconf/http_control_socket.h
@@ -63,7 +63,10 @@ public:
                                             const std::string& service);
 
 private:
-    /// @brief Preform the actual communication.
+    /// @brief Perform the actual communication.
+    ///
+    /// @todo Use persistent connections (vs. a new connection per call)
+    /// as the HTTP library supports them.
     ///
     /// @param command The command to send.
     /// @return The answer.

diff --git a/src/bin/netconf/stdout_control_socket.cc b/src/bin/netconf/stdout_control_socket.cc
index d0219016e0b8eccee575477334a367e4cd7e18af..0477ea2f48dfa90397383606975863edae43c71c 100644 (file)
--- a/src/bin/netconf/stdout_control_socket.cc
+++ b/src/bin/netconf/stdout_control_socket.cc
@@ -50,9 +50,6 @@ StdoutControlSocket::configTest(ConstElementPtr /*config*/,
 ConstElementPtr
 StdoutControlSocket::configSet(ConstElementPtr config,
                                const string& service) {
-    output_ << "//////////////// "
-            << service << " configuration "
-            << "////////////////" << endl;
     prettyPrint(config, output_);
     output_ << endl;
     return (createAnswer());

diff --git a/src/bin/netconf/tests/control_socket_unittests.cc b/src/bin/netconf/tests/control_socket_unittests.cc
index ba8491496afb96ca6d594513c80c3dbe52d00eb1..0bd2f81c7cecdc84ac89b2f042d950c20a72d16d 100644 (file)
--- a/src/bin/netconf/tests/control_socket_unittests.cc
+++ b/src/bin/netconf/tests/control_socket_unittests.cc
@@ -119,8 +119,7 @@ TEST(StdoutControlSocketTest, configSet) {
     EXPECT_EQ("{ \"result\": 0 }", answer->str());
 
     // Check output.
-    string expected = "//////////////// foo configuration ////////////////\n"
-        "{\n  \"bar\": 1\n}\n";
+    string expected = "{\n  \"bar\": 1\n}\n";
     EXPECT_EQ(expected, os.str());
 }
 

diff --git a/src/bin/netconf/unix_control_socket.cc b/src/bin/netconf/unix_control_socket.cc
index 2553371e8a8b6ecce3a3846a9fe84e81bb581c9a..93a807eb1d69dadb09ac401a0fbce237d7fd4b5b 100644 (file)
--- a/src/bin/netconf/unix_control_socket.cc
+++ b/src/bin/netconf/unix_control_socket.cc
@@ -56,6 +56,7 @@ UnixControlSocket::configSet(ConstElementPtr config,
 
 ConstElementPtr
 UnixControlSocket::sendCommand(ConstElementPtr command) {
+    // We are using our own IO service because this method is synchronous.
     IOServicePtr io_service(new IOService());
     ClientConnection conn(*io_service);
     boost::system::error_code received_ec;

diff --git a/src/bin/netconf/unix_control_socket.h b/src/bin/netconf/unix_control_socket.h
index 08c95897653eecee82f0c6d7d5d2ec47967c4da2..09fe7c1e99521128ed20780b9ead6b2352e8eed8 100644 (file)
--- a/src/bin/netconf/unix_control_socket.h
+++ b/src/bin/netconf/unix_control_socket.h
@@ -63,7 +63,10 @@ public:
                                             const std::string& service);
 
 private:
-    /// @brief Preform the actual communication.
+    /// @brief Perform the actual communication.
+    ///
+    /// @note This method is synchronous, i.e. it blocks until it finishes
+    /// and returns.
     ///
     /// @param command The command to send.
     /// @return The answer.