[5115] Removed -r mandatory presence for certain command line options

src/bin/perfdhcp
    CommandOptions::validate()
        removed -r checks for -t, -n, -p and -D

    perfdhcp.xml
        updated doc

    tests/command_options_unittest.cc
        updated unit tests

diff --git a/src/bin/perfdhcp/command_options.cc b/src/bin/perfdhcp/command_options.cc
index 3a12cc247c1d28ecc41e8d0f9795f9a686d08f5c..50d9f1f606c0035ea73f0a32827390b0983aeac5 100644 (file)
--- a/src/bin/perfdhcp/command_options.cc
+++ b/src/bin/perfdhcp/command_options.cc
@@ -1,4 +1,4 @@
-// Copyright (C) 2012-2017 Internet Systems Consortium, Inc. ("ISC")
+// Copyright (C) 2012-2018 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
@@ -794,15 +794,6 @@ CommandOptions::validate() const {
           "-F<release-rate> is not compatible with -i");
     check((getExchangeMode() != DO_SA) && (isRapidCommit() != 0),
           "-i must be set to use -c");
-    check((getRate() == 0) && (getReportDelay() != 0),
-          "-r<rate> must be set to use -t<report>");
-    check((getRate() == 0) && (getNumRequests().size() > 0),
-          "-r<rate> must be set to use -n<num-request>");
-    check((getRate() == 0) && (getPeriod() != 0),
-          "-r<rate> must be set to use -p<test-period>");
-    check((getRate() == 0) &&
-          ((getMaxDrop().size() > 0) || getMaxDropPercentage().size() > 0),
-          "-r<rate> must be set to use -D<max-drop>");
     check((getRate() != 0) && (getRenewRate() + getReleaseRate() > getRate()),
           "The sum of Renew rate (-f<renew-rate>) and Release rate"
           " (-F<release-rate>) must not be greater than the exchange"
@@ -1107,7 +1098,7 @@ CommandOptions::usage() const {
         "    traffic is an equivalent of the traffic passing through a single\n"
         "    relay agent.\n"
         "\n"
-        "The remaining options are used only in conjunction with -r:\n"
+        "The remaining options are typically used in conjunction with -r:\n"
         "\n"
         "-D<max-drop>: Abort the test immediately if max-drop requests have\n"
         "    been dropped.  max-drop must be a positive integer. If max-drop\n"

diff --git a/src/bin/perfdhcp/perfdhcp.xml b/src/bin/perfdhcp/perfdhcp.xml
index 8102647b5f4814111fcb240338cadcf8b3b77b0f..47afadeea2603b59ccb641a4d8f375b4cb480261 100644 (file)
--- a/src/bin/perfdhcp/perfdhcp.xml
+++ b/src/bin/perfdhcp/perfdhcp.xml
@@ -713,11 +713,6 @@
 
         <refsect2>
             <title>Options Controlling a Test</title>
-            <para>
-                The following options may only be used in conjunction with
-                <option>-r</option> and control both the length of the test
-                and the frequency of reports.
-            </para>
 
             <variablelist>
 

diff --git a/src/bin/perfdhcp/tests/command_options_unittest.cc b/src/bin/perfdhcp/tests/command_options_unittest.cc
index 607a395712cd205ed69d8b133100b3c8a6a71468..8551c592e084ccd690b543aef9826c5dfece9812 100644 (file)
--- a/src/bin/perfdhcp/tests/command_options_unittest.cc
+++ b/src/bin/perfdhcp/tests/command_options_unittest.cc
@@ -342,6 +342,7 @@ TEST_F(CommandOptionsTest, Rate) {
     // Rate must not be 0
     EXPECT_THROW(process("perfdhcp -4 -r 0 -l ethx all"),
                  isc::InvalidParameter);
+#if 0
     // -r must be specified to use -n, -p and -D
     EXPECT_THROW(process("perfdhcp -6 -t 5 -l ethx all"),
                  isc::InvalidParameter);
@@ -351,6 +352,7 @@ TEST_F(CommandOptionsTest, Rate) {
                  isc::InvalidParameter);
     EXPECT_THROW(process("perfdhcp -4 -D 1400 -l ethx all"),
                  isc::InvalidParameter);
+#endif
 }
 
 TEST_F(CommandOptionsTest, RenewRate) {
@@ -447,16 +449,16 @@ TEST_F(CommandOptionsTest, ReleaseRenew) {
 
 TEST_F(CommandOptionsTest, ReportDelay) {
     CommandOptions& opt = CommandOptions::instance();
-    EXPECT_NO_THROW(process("perfdhcp -r 100 -t 17 -l ethx all"));
+    EXPECT_NO_THROW(process("perfdhcp -t 17 -l ethx all"));
     EXPECT_EQ(17, opt.getReportDelay());
 
     // Negative test cases
     // -t must be positive integer
-    EXPECT_THROW(process("perfdhcp -r 10 -t -8 -l ethx all"),
+    EXPECT_THROW(process("perfdhcp -t -8 -l ethx all"),
                  isc::InvalidParameter);
-    EXPECT_THROW(process("perfdhcp -r 10 -t 0 -l ethx all"),
+    EXPECT_THROW(process("perfdhcp -t 0 -l ethx all"),
                  isc::InvalidParameter);
-    EXPECT_THROW(process("perfdhcp -r 10 -t s -l ethx all"),
+    EXPECT_THROW(process("perfdhcp -t s -l ethx all"),
                  isc::InvalidParameter);
 }
 
@@ -724,64 +726,64 @@ TEST_F(CommandOptionsTest, Aggressivity) {
 
 TEST_F(CommandOptionsTest, MaxDrop) {
     CommandOptions& opt = CommandOptions::instance();
-    EXPECT_NO_THROW(process("perfdhcp -D 25 -l ethx -r 10 all"));
+    EXPECT_NO_THROW(process("perfdhcp -D 25 -l ethx all"));
     EXPECT_EQ(25, opt.getMaxDrop()[0]);
-    EXPECT_NO_THROW(process("perfdhcp -D 25 -l ethx -D 15 -r 10 all"));
+    EXPECT_NO_THROW(process("perfdhcp -D 25 -l ethx -D 15 all"));
     EXPECT_EQ(25, opt.getMaxDrop()[0]);
     EXPECT_EQ(15, opt.getMaxDrop()[1]);
 
-    EXPECT_NO_THROW(process("perfdhcp -D 15% -l ethx -r 10 all"));
+    EXPECT_NO_THROW(process("perfdhcp -D 15% -l ethx all"));
     EXPECT_EQ(15, opt.getMaxDropPercentage()[0]);
-    EXPECT_NO_THROW(process("perfdhcp -D 15% -D25% -l ethx -r 10 all"));
+    EXPECT_NO_THROW(process("perfdhcp -D 15% -D25% -l ethx all"));
     EXPECT_EQ(15, opt.getMaxDropPercentage()[0]);
     EXPECT_EQ(25, opt.getMaxDropPercentage()[1]);
-    EXPECT_NO_THROW(process("perfdhcp -D 1% -D 99% -l ethx -r 10 all"));
+    EXPECT_NO_THROW(process("perfdhcp -D 1% -D 99% -l ethx all"));
     EXPECT_EQ(1, opt.getMaxDropPercentage()[0]);
     EXPECT_EQ(99, opt.getMaxDropPercentage()[1]);
 
     // Negative test cases
     // Too many -D<value> options
-    EXPECT_THROW(process("perfdhcp -D 0% -D 1 -l ethx -r20 -D 3 all"),
+    EXPECT_THROW(process("perfdhcp -D 0% -D 1 -l ethx -D 3 all"),
                  isc::InvalidParameter);
     // Too many -D<value%> options
-    EXPECT_THROW(process("perfdhcp -D 99% -D 13% -l ethx -r20 -D 10% all"),
+    EXPECT_THROW(process("perfdhcp -D 99% -D 13% -l ethx -D 10% all"),
                  isc::InvalidParameter);
     // Percentage is out of bounds
-    EXPECT_THROW(process("perfdhcp -D101% -D 13% -l ethx -r20 all"),
+    EXPECT_THROW(process("perfdhcp -D101% -D 13% -l ethx all"),
                  isc::InvalidParameter);
-    EXPECT_THROW(process("perfdhcp -D0% -D 13% -l ethx -r20 all"),
+    EXPECT_THROW(process("perfdhcp -D0% -D 13% -l ethx all"),
                  isc::InvalidParameter);
 }
 
 TEST_F(CommandOptionsTest, NumRequest) {
     CommandOptions& opt = CommandOptions::instance();
-    EXPECT_NO_THROW(process("perfdhcp -n 1000 -r 10 -l ethx all"));
+    EXPECT_NO_THROW(process("perfdhcp -n 1000 -l ethx all"));
     EXPECT_EQ(1000, opt.getNumRequests()[0]);
-    EXPECT_NO_THROW(process("perfdhcp -n 5 -r 10 -n 500 -l ethx all"));
+    EXPECT_NO_THROW(process("perfdhcp -n 5 -n 500 -l ethx all"));
     EXPECT_EQ(5, opt.getNumRequests()[0]);
     EXPECT_EQ(500, opt.getNumRequests()[1]);
 
     // Negative test cases
     // Too many -n<value> parameters, expected maximum 2
-    EXPECT_THROW(process("perfdhcp -n 1 -n 2 -l ethx -n3 -r 20 all"),
+    EXPECT_THROW(process("perfdhcp -n 1 -n 2 -l ethx -n3 all"),
                  isc::InvalidParameter);
     // Num request must be positive integer
-    EXPECT_THROW(process("perfdhcp -n 1 -n -22 -l ethx -r 10 all"),
+    EXPECT_THROW(process("perfdhcp -n 1 -n -22 -l ethx all"),
                  isc::InvalidParameter);
-    EXPECT_THROW(process("perfdhcp -n 0 -l ethx -r 10 all"),
+    EXPECT_THROW(process("perfdhcp -n 0 -l ethx all"),
                  isc::InvalidParameter);
 }
 
 TEST_F(CommandOptionsTest, Period) {
     CommandOptions& opt = CommandOptions::instance();
-    EXPECT_NO_THROW(process("perfdhcp -p 120 -l ethx -r 100 all"));
+    EXPECT_NO_THROW(process("perfdhcp -p 120 -l ethx all"));
     EXPECT_EQ(120, opt.getPeriod());
 
     // Negative test cases
     // Test period must be positive integer
-    EXPECT_THROW(process("perfdhcp -p 0 -l ethx -r 50 all"),
+    EXPECT_THROW(process("perfdhcp -p 0 -l ethx all"),
                  isc::InvalidParameter);
-    EXPECT_THROW(process("perfdhcp -p -3 -l ethx -r 50 all"),
+    EXPECT_THROW(process("perfdhcp -p -3 -l ethx all"),
                  isc::InvalidParameter);
 }