[#931] addressed review comments

diff --git a/src/bin/perfdhcp/command_options.cc b/src/bin/perfdhcp/command_options.cc
index d7c8be38e26a1fb7c0fd3de2350eb047a8996421..d63cb68403d834295e82e3274c3b666ae2b4cd62 100644 (file)
--- a/src/bin/perfdhcp/command_options.cc
+++ b/src/bin/perfdhcp/command_options.cc
@@ -227,6 +227,7 @@ CommandOptions::initialize(int argc, char** argv, bool print_cmd_line) {
     std::ostringstream stream;
     stream << "perfdhcp";
     int num_mac_list_files = 0;
+    int num_subnet_list_files = 0;
 
     struct option long_options[] = {
         {"scenario", required_argument, 0, LONG_OPT_SCENARIO},
@@ -378,6 +379,8 @@ CommandOptions::initialize(int argc, char** argv, bool print_cmd_line) {
             break;
 
         case 'J':
+            check(num_subnet_list_files >= 1, "only one -J option can be specified");
+            num_subnet_list_files++;
             giaddr_list_file_ = std::string(optarg);
             loadGiaddr();
             break;
@@ -408,7 +411,7 @@ CommandOptions::initialize(int argc, char** argv, bool print_cmd_line) {
             break;
 
         case 'M':
-            check(num_mac_list_files >= 1, "only -M option can be specified");
+            check(num_mac_list_files >= 1, "only one -M option can be specified");
             num_mac_list_files++;
             mac_list_file_ = std::string(optarg);
             loadMacs();

diff --git a/src/bin/perfdhcp/command_options.h b/src/bin/perfdhcp/command_options.h
index c8e1cadfa708eaf17bdfc488b93b79d9d73f72f6..1efc39271156fe3a4bb8f5b7af67efe4e93e2b2a 100644 (file)
--- a/src/bin/perfdhcp/command_options.h
+++ b/src/bin/perfdhcp/command_options.h
@@ -387,7 +387,7 @@ public:
 
     /// \brief Check if multi subnet mode is enabled
     ///
-    /// \return true if multisubnet mode is enabled.
+    /// \return true if multi subnet mode is enabled.
     bool checkMultiSubnet() { return multi_subnet_; }
 
     /// \brief Find if diagnostic flag has been set.
@@ -543,7 +543,7 @@ private:
     /// mac_list_ vector.
     bool decodeMacString(const std::string& line);
 
-    /// \brief Opens the text file containgin list of addresses (one per line).
+    /// \brief Opens the text file containing list of addresses (one per line).
     void loadGiaddr();
 
     /// \brief Checks if loaded giaddr from text file are correct,
@@ -669,8 +669,10 @@ private:
     /// List of MAC addresses loaded from a file.
     std::vector<std::vector<uint8_t> > mac_list_;
 
+    /// Location of a file containing a list of subnet addresses, one per line.
     std::string giaddr_list_file_;
 
+    /// List of validated subnet addresses.
     std::vector<std::string> giaddr_list_;
 
     bool multi_subnet_;

diff --git a/src/bin/perfdhcp/test_control.cc b/src/bin/perfdhcp/test_control.cc
index ce28140a0f3ecb205a2a82f953e1f95538392c9f..da22012e9325d40591dd66101b6d02a96894405c 100644 (file)
--- a/src/bin/perfdhcp/test_control.cc
+++ b/src/bin/perfdhcp/test_control.cc
@@ -1237,6 +1237,9 @@ TestControl::sendRequestFromAck() {
     Pkt4Ptr msg = createRequestFromAck(ack);
     setDefaults4(msg);
 
+    // Override relay address
+    msg->setGiaddr(ack->getGiaddr());
+
     // Add any extra options that user may have specified.
     addExtraOpts(msg);
 

diff --git a/src/bin/perfdhcp/tests/command_options_unittest.cc b/src/bin/perfdhcp/tests/command_options_unittest.cc
index 677090425142556f5b7dd0131d098e74c2b5e57e..4647b98468d1ea9748335a89304c67422b9c8eab 100644 (file)
--- a/src/bin/perfdhcp/tests/command_options_unittest.cc
+++ b/src/bin/perfdhcp/tests/command_options_unittest.cc
@@ -834,7 +834,7 @@ TEST_F(CommandOptionsTest, LoadMacsFromFile) {
 
 TEST_F(CommandOptionsTest, LoadGiaddrFromFile) {
     CommandOptions opt;
-    std::string giaddr_list_full_path = getFullPath("giaddr");
+    std::string giaddr_list_full_path = getFullPath("giaddr.txt");
     std::ostringstream cmd;
     cmd << "perfdhcp -J " << giaddr_list_full_path << " abc";
     EXPECT_NO_THROW(process(opt, cmd.str()));

diff --git a/src/bin/perfdhcp/tests/testdata/Makefile.am b/src/bin/perfdhcp/tests/testdata/Makefile.am
index 1505af7bcf2520200bcc464bfcb58da07b2c5989..256eb0a57c5356e9c4bcc04bf9d644922747843c 100644 (file)
--- a/src/bin/perfdhcp/tests/testdata/Makefile.am
+++ b/src/bin/perfdhcp/tests/testdata/Makefile.am
@@ -2,4 +2,4 @@ SUBDIRS = .
 
 EXTRA_DIST = discover-example.hex request4-example.hex
 EXTRA_DIST += solicit-example.hex request6-example.hex
-EXTRA_DIST += mac-list.txt giaddr
+EXTRA_DIST += mac-list.txt giaddr.txt

diff --git a/src/bin/perfdhcp/tests/testdata/giaddr.txt b/src/bin/perfdhcp/tests/testdata/giaddr.txt
new file mode 100644 (file)
index 0000000..6d3db81
--- /dev/null
+++ b/src/bin/perfdhcp/tests/testdata/giaddr.txt
@@ -0,0 +1,5 @@
+100.95.0.1
+20.86.12.1
+101.64.4.1
+1.86.0.1
+92.86.238.1