Skip to content

feat(cvd): Inject netsim_args as environment variables into netsimd #2973

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
+21 −3
Open

feat(cvd): Inject netsim_args as environment variables into netsimd #2973

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
24 changes: 21 additions & 3 deletions base/cvd/cuttlefish/host/commands/run_cvd/launch/netsim_server.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,9 +138,27 @@ class NetsimServer : public CommandSource {
config_.netsim_connector_instance_num() + 1);
}

// Add parameters from passthrough option --netsim-args.
for (auto const& arg : config_.netsim_args()) {
netsimd.AddParameter(arg);
// Add parameters from passthrough option --netsim-args as environment
// variables.
std::vector<std::string> remaining_args;
for (const std::string& arg : config_.netsim_args()) {
if (android::base::StartsWith(arg, "NETSIM_NO_WEB_SERVER") ||
android::base::StartsWith(arg, "NETSIM_GRPC_PORT")) {
const std::string::size_type equals_pos = arg.find('=');
if (equals_pos != std::string::npos) {
const std::string env_key = arg.substr(0, equals_pos);
const std::string env_val = arg.substr(equals_pos + 1);
netsimd.AddEnvironmentVariable(env_key, env_val);
} else {
netsimd.AddEnvironmentVariable(arg, "1");
}
} else {
remaining_args.push_back(arg);
}
}
if (!remaining_args.empty()) {
netsimd.AddEnvironmentVariable("NETSIM_ARGS",
android::base::Join(remaining_args, " "));
}

// Add command for forwarding the HCI port to a vsock server.
Expand Down
Loading