Skip to content
Draft
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
72 changes: 70 additions & 2 deletions src/firecracker/src/api_server/parsed_request.rs
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ impl TryFrom<&Request> for ParsedRequest {

match (request.method(), path, request.body.as_ref()) {
(Method::Get, "", None) => parse_get_instance_info(),
(Method::Get, "balloon", None) => parse_get_balloon(path_tokens.next()),
(Method::Get, "balloon", None) => parse_get_balloon(path_tokens),
(Method::Get, "version", None) => parse_get_version(),
(Method::Get, "vm", None) if path_tokens.next() == Some("config") => {
Ok(ParsedRequest::new_sync(VmmAction::GetFullVmConfig))
Expand All @@ -104,7 +104,7 @@ impl TryFrom<&Request> for ParsedRequest {
(Method::Put, "vsock", Some(body)) => parse_put_vsock(body),
(Method::Put, "entropy", Some(body)) => parse_put_entropy(body),
(Method::Put, _, None) => method_to_error(Method::Put),
(Method::Patch, "balloon", Some(body)) => parse_patch_balloon(body, path_tokens.next()),
(Method::Patch, "balloon", body) => parse_patch_balloon(body, path_tokens),
(Method::Patch, "drives", Some(body)) => parse_patch_drive(body, path_tokens.next()),
(Method::Patch, "machine-config", Some(body)) => parse_patch_machine_config(body),
(Method::Patch, "mmds", Some(body)) => parse_patch_mmds(body),
Expand Down Expand Up @@ -175,6 +175,9 @@ impl ParsedRequest {
Self::success_response_with_data(balloon_config)
}
VmmData::BalloonStats(stats) => Self::success_response_with_data(stats),
VmmData::HintingStatus(hinting_status) => {
Self::success_response_with_data(hinting_status)
}
VmmData::InstanceInformation(info) => Self::success_response_with_data(info),
VmmData::VmmVersion(version) => Self::success_response_with_data(
&serde_json::json!({ "firecracker_version": version.as_str() }),
Expand Down Expand Up @@ -474,6 +477,17 @@ pub mod tests {
&parsed_request,
Err(RequestError::Generic(StatusCode::BadRequest, s)) if s == "Empty PATCH request.",
));

sender
.write_all(http_request("PATCH", "/balloon", None).as_bytes())
.unwrap();
connection.try_read().unwrap();
let req = connection.pop_parsed_request().unwrap();
let parsed_request = ParsedRequest::try_from(&req);
assert!(matches!(
&parsed_request,
Err(RequestError::Generic(StatusCode::BadRequest, s)) if s == "Empty PATCH request.",
));
}

#[test]
Expand Down Expand Up @@ -559,6 +573,9 @@ pub mod tests {
VmmData::BalloonStats(stats) => {
http_response(&serde_json::to_string(stats).unwrap(), 200)
}
VmmData::HintingStatus(status) => {
http_response(&serde_json::to_string(status).unwrap(), 200)
}
VmmData::Empty => http_response("", 204),
VmmData::FullVmConfig(cfg) => {
http_response(&serde_json::to_string(cfg).unwrap(), 200)
Expand Down Expand Up @@ -642,6 +659,18 @@ pub mod tests {
ParsedRequest::try_from(&req).unwrap();
}

#[test]
fn test_try_from_get_balloon_hinting() {
let (mut sender, receiver) = UnixStream::pair().unwrap();
let mut connection = HttpConnection::new(receiver);
sender
.write_all(http_request("GET", "/balloon/hinting/status", None).as_bytes())
.unwrap();
connection.try_read().unwrap();
let req = connection.pop_parsed_request().unwrap();
ParsedRequest::try_from(&req).unwrap();
}

#[test]
fn test_try_from_get_machine_config() {
let (mut sender, receiver) = UnixStream::pair().unwrap();
Expand Down Expand Up @@ -910,13 +939,52 @@ pub mod tests {
connection.try_read().unwrap();
let req = connection.pop_parsed_request().unwrap();
ParsedRequest::try_from(&req).unwrap();

let body = "{ \"stats_polling_interval_s\": 1 }";
sender
.write_all(http_request("PATCH", "/balloon/statistics", Some(body)).as_bytes())
.unwrap();
connection.try_read().unwrap();
let req = connection.pop_parsed_request().unwrap();
ParsedRequest::try_from(&req).unwrap();

let body = "{ \"acknowledge_on_stop\": true }";
sender
.write_all(http_request("PATCH", "/balloon/hinting/start", Some(body)).as_bytes())
.unwrap();
connection.try_read().unwrap();
let req = connection.pop_parsed_request().unwrap();
ParsedRequest::try_from(&req).unwrap();

let body = "{}";
sender
.write_all(http_request("PATCH", "/balloon/hinting/start", Some(body)).as_bytes())
.unwrap();
connection.try_read().unwrap();
let req = connection.pop_parsed_request().unwrap();
ParsedRequest::try_from(&req).unwrap();

sender
.write_all(http_request("PATCH", "/balloon/hinting/start", None).as_bytes())
.unwrap();
connection.try_read().unwrap();
let req = connection.pop_parsed_request().unwrap();
ParsedRequest::try_from(&req).unwrap();

let body = "";
sender
.write_all(http_request("PATCH", "/balloon/hinting/stop", Some(body)).as_bytes())
.unwrap();
connection.try_read().unwrap();
let req = connection.pop_parsed_request().unwrap();
ParsedRequest::try_from(&req).unwrap();

sender
.write_all(http_request("PATCH", "/balloon/hinting/stop", None).as_bytes())
.unwrap();
connection.try_read().unwrap();
let req = connection.pop_parsed_request().unwrap();
ParsedRequest::try_from(&req).unwrap();
}

#[test]
Expand Down
Loading