Skip to content

Add netsim_args to cvd load config and plumb to launcher #2648

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
rmuthiah wants to merge 1 commit into
base: main
Choose a base branch
from
+544 −443
Open

Add netsim_args to cvd load config and plumb to launcher #2648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 27 additions & 0 deletions base/cvd/cuttlefish/host/commands/cvd/cli/parser/flags_parser_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,6 +175,33 @@ TEST(BootFlagsParserTest, ParseNetSimFlagEnabled) {
<< "netsim_uwb flag is missing or wrongly formatted";
}

TEST(BootFlagsParserTest, ParseNetSimArgs) {
const char* test_string = R""""(
{
"netsim_args": "--wifi-instance=1 --bt-instance=2",
"instances" :
[
{
"vm": {
"crosvm":{
}
}
}
]
}
)"""";

Json::Value json_configs;
std::string json_text(test_string);

EXPECT_TRUE(ParseJsonString(json_text, json_configs))
<< "Invalid Json string";
auto serialized_data = LaunchCvdParserTester(json_configs);
EXPECT_TRUE(serialized_data.ok()) << serialized_data.error().Trace();
Copy link
Copy Markdown
Member

@Databean Databean Jun 3, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

nit: this can use EXPECT_THAT(serialized_data, IsOk())

android-cuttlefish/base/cvd/cuttlefish/result/result_matchers.h

Lines 27 to 35 in 4f1f0a7

MATCHER(IsOk, "an ok result") {
auto& result = arg;
if (!result.ok()) {
*result_listener << "which is an error result with trace: "
<< result.error().Trace();
return false;
}
return true;
}

EXPECT_TRUE(FindConfig(*serialized_data, "--netsim_args=--wifi-instance=1 --bt-instance=2"))
<< "netsim_args flag is missing or wrongly formatted";
}

TEST(CvdLoadFlagsTest, CredentialSourceSetter) {
LoadFlags load_flags;

Expand Down
Loading
Loading