Skip to content

Fix error handling for invalid scenario names and numbers #8

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fix error handling for invalid scenario names and numbers #8

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
e76c5c0
Enhance scenario validation in AQM evaluation runner. Added checks fo…
davidlin2k Mar 21, 2025
31e0ae5
Update valid scenario names in error message for AQM evaluation runner
davidlin2k Mar 21, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
52 changes: 46 additions & 6 deletions src/aqm-eval-suite/examples/aqm-eval-suite-runner.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -204,25 +204,65 @@ int main (int argc, char *argv[])

if (scenarioName == "")
{
scenarioName = ScenarioNumberMapping[scenarioNumber];
auto it = ScenarioNumberMapping.find (scenarioNumber);

if (it != ScenarioNumberMapping.end ())
{
scenarioName = it->second;
}
else if (!scenarioNumber.empty ())
{
std::cout << "Error: Invalid scenario number \"" << scenarioNumber << "\"" << std::endl;
std::cout << "Valid scenario numbers are:";
for (const auto& mapping : ScenarioNumberMapping)
{
std::cout << " \"" << mapping.first << "\"";
}
std::cout << std::endl;
exit (-1);
}
}


// Check if scenarioName is valid (if it's not "All" or "RttFairness")
if (scenarioName != "All" && scenarioName != "RttFairness")
{
bool validScenarioName = false;

for (const auto& mapping : ScenarioNumberMapping)
{
if (mapping.second == scenarioName)
{
validScenarioName = true;
break;
}
}

if (!validScenarioName)
{
std::cout << "Error: Invalid scenario name \"" << scenarioName << "\"" << std::endl;
std::cout << "Valid scenario names are: \"All\"";
for (const auto& mapping : ScenarioNumberMapping)
{
std::cout << ", \"" << mapping.second << "\"";
}
std::cout << std::endl;
exit (-1);
}

RunOneScenario (scenarioName);
}
else if (scenarioName != "All" && scenarioName == "RttFairness")
else if (scenarioName == "RttFairness")
{
RunRttFairness (scenarioName);
}
else
{
RunRttFairness (scenarioName);
for (std::map<std::string, std::string>::iterator it = ScenarioNumberMapping.begin (); it != ScenarioNumberMapping.end (); ++it)
for (const auto& mapping : ScenarioNumberMapping)
{
if (it->second != "RttFairness")
if (mapping.second != "RttFairness")
{
RunOneScenario (it->second);
RunOneScenario (mapping.second);
}
}
}
Expand Down