X-Git-Url: https://git.teslayout.com/public/public/public/?a=blobdiff_plain;f=example%2Fdiameter%2Flauncher%2FLauncher.cpp;h=4219399813e82a6fe06745cf1463b0bdabc9de64;hb=ec48516a195faabbb514298ad743520b3fdb7ee4;hp=0968b8d40f1ddca33f62f3b6816294e4f574403b;hpb=0df06e9ac54caeec9d29bb11e0b61befec83110b;p=anna.git diff --git a/example/diameter/launcher/Launcher.cpp b/example/diameter/launcher/Launcher.cpp index 0968b8d..4219399 100644 --- a/example/diameter/launcher/Launcher.cpp +++ b/example/diameter/launcher/Launcher.cpp @@ -1340,15 +1340,6 @@ std::string Launcher::help() const throw() { result += "\n Test cases reports are not dumped on process context (too many information in general)."; result += "\n The report contains context information in every moment: this operation acts as a snapshot."; result += "\n"; - result += "\n test|report[|[yes]|no] Every time a test case is finished, its xml representation will be dump on a file under"; - result += "\n the execution directory (or the one configured in process command-line 'tmDir') with"; - result += "\n the name 'cycle-.testcase-.xml'. This option is disabled by"; - result += "\n default reducing IO. ADML process context won't show test manager whole information"; - result += "\n because it could be a huge amount of data to write. Anyway, you could use the 'look'"; - result += "\n operation to see the desired report(s)."; - result += "\n"; - result += "\n test|report-hex[|[yes]|no] Reports could include the diameter messages in hexadecimal format. Disabled by default."; - result += "\n"; result += "\n test|interact|amount|id Makes interactive a specific test case id. The amount is the margin of execution steps"; result += "\n to be done. Normally, we will execute 'test|interact|0|', which means that"; result += "\n the test case is selected to be interactive, but no step is executed. Then you have to"; @@ -1373,7 +1364,24 @@ std::string Launcher::help() const throw() { result += "\n"; result += "\n test|summary Test manager general report (number of test cases, counts by state, global configuration,"; result += "\n forced in-progress limitation, reports visibility, etc.). Be careful when you have reports"; - result += "\n dumps enabled because all the programmed test cases will be dump and that could be heavy."; + result += "\n enabled because the programmed test cases dumps could be heavy (anyway you could enable the"; + result += "\n dumps separately, for any of the possible states: Initialized, InProgress, Failed, Success)."; + result += "\n"; + result += "\n test|report|[|[yes]|no]"; + result += "\n"; + result += "\n Enables/disables report generation for a certain test case state: initialized, in-progress,"; + result += "\n failed or success. This applies to report summary (former described operation) and automatic"; + result += "\n dumps during testing where only failed or success states will appear: every time a test case"; + result += "\n is finished its xml representation will be dump on a file under the execution directory (or"; + result += "\n the one configured in process command-line 'tmDir') with the name:"; + result += "\n"; + result += "\n 'cycle-.testcase-.xml'."; + result += "\n"; + result += "\n By default, all the states are disabled to avoid IO overload. In most of cases not all the"; + result += "\n tests are going to fail and you could enable only such failed dumps, but you can enable all"; + result += "\n the types if you want (use reserved word 'all' for this)."; + result += "\n"; + result += "\n test|report-hex[|[yes]|no] Reports could include the diameter messages in hexadecimal format. Disabled by default."; result += "\n"; result += "\n"; result += "\nUSING OPERATIONS INTERFACE"; @@ -1769,19 +1777,20 @@ void Launcher::eventOperation(const std::string &operation, std::string &respons } } else if((opType == "test")) { - // test||[|parameters] Add a new step to the test case ... - // test|ttps| Starts/resume the provided number of time ticks per second (ttps). The ADML starts ... - // test|next[|] Forces the execution of the next test case(s) without waiting for test manager tick ... - // test|ip-limit[|amount] In-progress limit of test cases. No new test cases will be launched over this value ... - // test|repeats| Restarts the whole programmed test list when finished the amount number of times ... - // test|report[|[yes]|no] Every time a test case is finished a report file in xml format will be created under ... - // test|report-hex[|[yes]|no] Reports could include the diameter messages in hexadecimal format. Disabled by default. - // test|goto| Updates current test pointer position. - // test|look[|id] Show programmed test case for id provided, current when missing ... - // test|interact|amount|id Makes interactive a specific test case id. The amount is the margin of execution steps ... - // test|reset|[|id] Reset the test case for id provided, all the tests when missing ... - // test|clear Clears all the programmed test cases. - // test|summary Test manager general report (number of test cases, counts by state ... + // test||[|parameters] Add a new step to the test case ... + // test|ttps| Starts/resume the provided number of time ticks per second (ttps). The ADML starts ... + // test|next[|] Forces the execution of the next test case(s) without waiting for test manager tick ... + // test|ip-limit[|amount] In-progress limit of test cases. No new test cases will be launched over this value ... + // test|repeats| Restarts the whole programmed test list when finished the amount number of times ... + // test|report|[|[yes]|no] + // Enables/disables report generation for a certain test case state: initialized, in-progress ... + // test|report-hex[|[yes]|no] Reports could include the diameter messages in hexadecimal format. Disabled by default. + // test|goto| Updates current test pointer position. + // test|look[|id] Show programmed test case for id provided, current when missing ... + // test|interact|amount|id Makes interactive a specific test case id. The amount is the margin of execution steps ... + // test|reset|[|id] Reset the test case for id provided, all the tests when missing ... + // test|clear Clears all the programmed test cases. + // test|summary Test manager general report (number of test cases, counts by state ... if(param1 == "ttps") { @@ -1844,12 +1853,30 @@ void Launcher::eventOperation(const std::string &operation, std::string &respons opt_response_content += anna::functions::asString("Pool repeats: %d%s (current cycle: %d)", repeats, nolimit.c_str(), testManager.getPoolCycle()); } else if(param1 == "report") { - if (numParams > 2) + if (numParams > 3) throw anna::RuntimeException("Wrong body content format on HTTP Request. Use 'help' management command to see more information.", ANNA_FILE_LOCATION); - if(param2 == "") param2 = "yes"; - testManager.setDumpReports((param2 == "yes")); - opt_response_content += (testManager.getDumpReports() ? "report enabled" : "report disabled"); + if(param2 != "initialized" && param2 != "in-progress" && param2 != "failed" && param2 != "success" && param2 != "all") + throw anna::RuntimeException("Wrong body content format on HTTP Request. Use 'help' management command to see more information.", ANNA_FILE_LOCATION); + + if(param3 == "") param3 = "yes"; + bool enable = (param3 == "yes"); + + if(param2 == "initialized") + testManager.setDumpInitializedReports(enable); + else if(param2 == "in-progress") + testManager.setDumpInProgressReports(enable); + else if(param2 == "failed") + testManager.setDumpFailedReports(enable); + else if(param2 == "success") + testManager.setDumpSuccessReports(enable); + else // all + testManager.setDumpAllReports(enable); + + opt_response_content += (enable ? "report enabled " : "report disabled "); + opt_response_content += "for tests in '"; + opt_response_content += param2; + opt_response_content += "' state"; } else if(param1 == "report-hex") { if (numParams > 2)