Skip to content

Remove extra params wrapper for network_interfaces in instance create api #875

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

Merged
merged 1 commit into from
Apr 5, 2022
Merged

Remove extra params wrapper for network_interfaces in instance create api #875

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
7 changes: 1 addition & 6 deletions nexus/src/external_api/params.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ pub struct NetworkInterfaceCreate {
#[serde(tag = "type", content = "params")]
pub enum InstanceNetworkInterfaceAttachment {
/// Create one or more `NetworkInterface`s for the `Instance`
Create(InstanceNetworkInterfaceCreate),
Create(Vec<NetworkInterfaceCreate>),

/// Default networking setup, which creates a single interface with an
/// auto-assigned IP address from project's "default" VPC and "default" VPC
Expand All @@ -105,11 +105,6 @@ pub enum InstanceNetworkInterfaceAttachment {
None,
}

#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
pub struct InstanceNetworkInterfaceCreate {
pub params: Vec<NetworkInterfaceCreate>,
}

impl Default for InstanceNetworkInterfaceAttachment {
fn default() -> Self {
Self::Default
Expand Down
12 changes: 4 additions & 8 deletions nexus/src/sagas.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ async fn sic_allocate_network_interface_ids(
params::InstanceNetworkInterfaceAttachment::Create(
ref create_params,
) => {
if create_params.params.len()
if create_params.len()
> crate::nexus::MAX_NICS_PER_INSTANCE.try_into().unwrap()
{
return Err(ActionError::action_failed(
Expand All @@ -287,8 +287,8 @@ async fn sic_allocate_network_interface_ids(
),
));
}
let mut ids = Vec::with_capacity(create_params.params.len());
for _ in 0..create_params.params.len() {
let mut ids = Vec::with_capacity(create_params.len());
for _ in 0..create_params.len() {
ids.push(Uuid::new_v4());
}
Ok(ids)
Expand All @@ -307,11 +307,7 @@ async fn sic_create_network_interfaces(
params::InstanceNetworkInterfaceAttachment::Create(
ref create_params,
) => {
sic_create_custom_network_interfaces(
&sagactx,
&create_params.params,
)
.await
sic_create_custom_network_interfaces(&sagactx, &create_params).await
}
}
}
Expand Down
47 changes: 22 additions & 25 deletions nexus/tests/integration_tests/instances.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,11 +549,10 @@ async fn test_instance_create_saga_removes_instance_database_record(
subnet_name: default_name.clone(),
ip: Some(requested_address),
};
let interface_params = params::InstanceNetworkInterfaceAttachment::Create(
params::InstanceNetworkInterfaceCreate {
params: vec![if0_params.clone()],
},
);
let interface_params =
params::InstanceNetworkInterfaceAttachment::Create(vec![
if0_params.clone()
]);

// Create the parameters for the instance itself, and create it.
let instance_params = params::InstanceCreate {
Expand Down Expand Up @@ -611,11 +610,10 @@ async fn test_instance_create_saga_removes_instance_database_record(
subnet_name: default_name.clone(),
ip: Some(requested_address),
};
let interface_params = params::InstanceNetworkInterfaceAttachment::Create(
params::InstanceNetworkInterfaceCreate {
params: vec![if0_params.clone()],
},
);
let interface_params =
params::InstanceNetworkInterfaceAttachment::Create(vec![
if0_params.clone()
]);
let instance_params = params::InstanceCreate {
network_interfaces: interface_params,
..instance_params.clone()
Expand Down Expand Up @@ -657,11 +655,10 @@ async fn test_instance_with_single_explicit_ip_address(
subnet_name: default_name.clone(),
ip: Some(requested_address),
};
let interface_params = params::InstanceNetworkInterfaceAttachment::Create(
params::InstanceNetworkInterfaceCreate {
params: vec![if0_params.clone()],
},
);
let interface_params =
params::InstanceNetworkInterfaceAttachment::Create(vec![
if0_params.clone()
]);

// Create the parameters for the instance itself, and create it.
let instance_params = params::InstanceCreate {
Expand Down Expand Up @@ -773,11 +770,11 @@ async fn test_instance_with_new_custom_network_interfaces(
subnet_name: non_default_subnet_name.clone(),
ip: None,
};
let interface_params = params::InstanceNetworkInterfaceAttachment::Create(
params::InstanceNetworkInterfaceCreate {
params: vec![if0_params.clone(), if1_params.clone()],
},
);
let interface_params =
params::InstanceNetworkInterfaceAttachment::Create(vec![
if0_params.clone(),
if1_params.clone(),
]);

// Create the parameters for the instance itself, and create it.
let instance_params = params::InstanceCreate {
Expand Down Expand Up @@ -1049,11 +1046,11 @@ async fn test_instance_with_multiple_nics_unwinds_completely(
subnet_name: default_name.clone(),
ip: Some("172.30.0.6".parse().unwrap()),
};
let interface_params = params::InstanceNetworkInterfaceAttachment::Create(
params::InstanceNetworkInterfaceCreate {
params: vec![if0_params.clone(), if1_params.clone()],
},
);
let interface_params =
params::InstanceNetworkInterfaceAttachment::Create(vec![
if0_params.clone(),
if1_params.clone(),
]);

// Create the parameters for the instance itself, and create it.
let instance_params = params::InstanceCreate {
Expand Down
19 changes: 4 additions & 15 deletions openapi/nexus.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5423,7 +5423,10 @@
"type": "object",
"properties": {
"params": {
"$ref": "#/components/schemas/InstanceNetworkInterfaceCreate"
"type": "array",
"items": {
"$ref": "#/components/schemas/NetworkInterfaceCreate"
}
},
"type": {
"type": "string",
Expand Down Expand Up @@ -5469,20 +5472,6 @@
}
]
},
"InstanceNetworkInterfaceCreate": {
"type": "object",
"properties": {
"params": {
"type": "array",
"items": {
"$ref": "#/components/schemas/NetworkInterfaceCreate"
}
}
},
"required": [
"params"
]
},
"InstanceResultsPage": {
"description": "A single page of results",
"type": "object",
Expand Down