very rough VPC post endpoint

Author: david-crespo

omicron-common/src/api/model.rs

@@ -1341,6 +1341,16 @@ impl Object for VPC {
     }
 }
 
+/**
+ * Create-time parameters for a [`VPC`]
+ */
+#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
+#[serde(rename_all = "camelCase")]
+pub struct VPCCreateParams {
+    #[serde(flatten)]
+    pub identity: IdentityMetadataCreateParams,
+}
+
 /// An `Ipv4Net` represents a IPv4 subnetwork, including the address and network mask.
 #[derive(Clone, Copy, Debug, Deserialize, PartialEq, Serialize)]
 pub struct Ipv4Net(pub ipnet::Ipv4Net);

omicron-nexus/src/db/conversions.rs

@@ -17,6 +17,7 @@ use omicron_common::api::OximeterAssignment;
 use omicron_common::api::OximeterInfo;
 use omicron_common::api::ProducerEndpoint;
 use omicron_common::api::ProjectCreateParams;
+use omicron_common::api::VPCCreateParams;
 
 use super::sql::SqlSerialize;
 use super::sql::SqlValueSet;
@@ -83,6 +84,12 @@ impl SqlSerialize for DiskState {
     }
 }
 
+impl SqlSerialize for VPCCreateParams {
+    fn sql_serialize(&self, output: &mut SqlValueSet) {
+        self.identity.sql_serialize(output);
+    }
+}
+
 impl SqlSerialize for OximeterInfo {
     fn sql_serialize(&self, output: &mut SqlValueSet) {
         output.set("id", &self.collector_id);

omicron-nexus/src/db/datastore.rs

@@ -736,4 +736,32 @@ impl DataStore {
         >(&client, (project_id,), pagparams, VPC::ALL_COLUMNS)
         .await
     }
+
+    pub async fn project_create_vpc(
+        &self,
+        vpc_id: &Uuid,
+        project_id: &Uuid,
+        params: &api::VPCCreateParams,
+    ) -> Result<api::VPC, Error> {
+        let client = self.pool.acquire().await?;
+        let now = Utc::now();
+        let mut values = SqlValueSet::new();
+        values.set("id", vpc_id);
+        values.set("time_created", &now);
+        values.set("time_modified", &now);
+        values.set("project_id", project_id);
+        params.sql_serialize(&mut values);
+
+        let vpc =
+            sql_insert_unique_idempotent_and_fetch::<VPC, LookupByUniqueId>(
+                &client,
+                &values,
+                params.identity.name.as_str(),
+                "id",
+                (),
+                &vpc_id
+            )
+            .await?;
+        Ok(vpc)
+    }
 }

omicron-nexus/src/http_entrypoints_external.rs

@@ -44,6 +44,7 @@ use omicron_common::api::ProjectView;
 use omicron_common::api::RackView;
 use omicron_common::api::SagaView;
 use omicron_common::api::SledView;
+use omicron_common::api::VPCCreateParams;
 use omicron_common::api::VPCView;
 use schemars::JsonSchema;
 use serde::Deserialize;
@@ -83,6 +84,7 @@ pub fn external_api() -> NexusApiDescription {
         api.register(instance_disks_delete_disk)?;
 
         api.register(project_vpcs_get)?;
+        api.register(project_vpcs_post)?;
 
         api.register(hardware_racks_get)?;
         api.register(hardware_racks_get_rack)?;
@@ -681,6 +683,27 @@ async fn project_vpcs_get(
     Ok(HttpResponseOk(ScanById::results_page(&query, view_list)?))
 }
 
+/**
+ * Create a VPC in a project.
+ */
+#[endpoint {
+     method = POST,
+     path = "/projects/{project_name}/vpcs",
+ }]
+async fn project_vpcs_post(
+    rqctx: Arc<RequestContext<Arc<ServerContext>>>,
+    path_params: Path<ProjectPathParam>,
+    new_vpc: TypedBody<VPCCreateParams>,
+) -> Result<HttpResponseCreated<VPCView>, HttpError> {
+    let apictx = rqctx.context();
+    let nexus = &apictx.nexus;
+    let path = path_params.into_inner();
+    let project_name = &path.project_name;
+    let new_vpc_params = &new_vpc.into_inner();
+    let vpc = nexus.project_create_vpc(&project_name, &new_vpc_params).await?;
+    Ok(HttpResponseCreated(vpc.to_view()))
+}
+
 /*
  * Racks
  */

omicron-nexus/src/nexus.rs

@@ -42,6 +42,7 @@ use omicron_common::api::ResourceType;
 use omicron_common::api::SagaView;
 use omicron_common::api::Sled;
 use omicron_common::api::UpdateResult;
+use omicron_common::api::VPCCreateParams;
 use omicron_common::api::VPC;
 use omicron_common::bail_unless;
 use omicron_common::collection::collection_page;
@@ -1011,6 +1012,18 @@ impl Nexus {
         self.db_datastore.project_list_vpcs(&project_id, pagparams).await
     }
 
+    pub async fn project_create_vpc(
+        &self,
+        project_name: &Name,
+        params: &VPCCreateParams,
+    ) -> CreateResult<VPC> {
+        let project_id =
+            self.db_datastore.project_lookup_id_by_name(project_name).await?;
+        let id = Uuid::new_v4();
+        let vpc = self.db_datastore.project_create_vpc(&id, &project_id, params).await?;
+        Ok(vpc)
+    }
+
     /*
      * Racks.  We simulate just one for now.
      */

omicron-nexus/tests/test_vpcs.rs

@@ -1,15 +1,20 @@
+use http::method::Method;
+use http::StatusCode;
 use omicron_common::api::IdentityMetadataCreateParams;
 use omicron_common::api::Name;
 use omicron_common::api::ProjectCreateParams;
 use omicron_common::api::ProjectView;
+use omicron_common::api::VPCCreateParams;
 use omicron_common::api::VPCView;
 use std::convert::TryFrom;
 
+use dropshot::test_util::object_get;
 use dropshot::test_util::objects_list_page;
 use dropshot::test_util::objects_post;
 use dropshot::test_util::ClientTestContext;
 
 pub mod common;
+use common::identity_eq;
 use common::test_setup;
 
 #[macro_use]
@@ -40,8 +45,72 @@ async fn test_vpcs() {
     /* List vpcs.  There aren't any yet. */
     let vpcs = vpcs_list(&client, &vpcs_url).await;
     assert_eq!(vpcs.len(), 0);
+
+    // /* Make sure we get a 404 if we fetch one. */
+    let vpc_url = format!("{}/just-rainsticks", vpcs_url);
+
+    // let error = client
+    //     .make_request_error(Method::GET, &vpc_url, StatusCode::NOT_FOUND)
+    //     .await;
+    // assert_eq!(
+    //     error.message,
+    //     "not found: vpc with name \"just-rainsticks\""
+    // );
+
+    // /* Ditto if we try to delete one. */
+    // let error = client
+    //     .make_request_error(
+    //         Method::DELETE,
+    //         &vpc_url,
+    //         StatusCode::NOT_FOUND,
+    //     )
+    //     .await;
+    // assert_eq!(
+    //     error.message,
+    //     "not found: vpc with name \"just-rainsticks\""
+    // );
+
+    /* Create a VPC. */
+    let new_vpc = VPCCreateParams {
+        identity: IdentityMetadataCreateParams {
+            name: Name::try_from("just-rainsticks").unwrap(),
+            description: String::from("sells rainsticks"),
+        },
+    };
+    let vpc: VPCView = objects_post(&client, &vpcs_url, new_vpc.clone()).await;
+    assert_eq!(vpc.identity.name, "just-rainsticks");
+    assert_eq!(vpc.identity.description, "sells rainsticks");
+
+    /* Attempt to create a second VPC with a conflicting name. */
+    // let error = client
+    //     .make_request_error_body(
+    //         Method::POST,
+    //         &vpcs_url,
+    //         new_vpc,
+    //         StatusCode::BAD_REQUEST,
+    //     )
+    //     .await;
+    // assert_eq!(error.message, "already exists: instance \"just-rainsticks\"");
+
+    /* List VPCs again and expect to find the one we just created. */
+    let vpcs = vpcs_list(&client, &vpcs_url).await;
+    assert_eq!(vpcs.len(), 1);
+    vpcs_eq(&vpcs[0], &vpc);
+
+    /* Fetch the VPC and expect it to match. */
+    // let vpc = vpc_get(&client, &vpc_url).await;
+    // vpcs_eq(&vpcs[0], &vpc);
 }
 
 async fn vpcs_list(client: &ClientTestContext, vpcs_url: &str) -> Vec<VPCView> {
     objects_list_page::<VPCView>(client, vpcs_url).await.items
 }
+
+async fn vpc_get(client: &ClientTestContext, vpc_url: &str) -> VPCView {
+    object_get::<VPCView>(client, vpc_url).await
+}
+
+fn vpcs_eq(vpc1: &VPCView, vpc2: &VPCView) {
+    identity_eq(&vpc1.identity, &vpc2.identity);
+    assert_eq!(vpc1.project_id, vpc2.project_id);
+}

tools/oxapi_demo

@@ -245,6 +245,13 @@ function cmd_disk_delete
 	do_curl "/projects/$1/disks/$2" -X DELETE
 }
 
+function cmd_vpc_create_demo
+{
+	[[ $# != 2 ]] && usage "expected PROJECT_NAME VPC_NAME"
+	mkjson name="$2" description="a disk called $2" |
+	    do_curl "/projects/$1/vpcs" -X POST -T -
+}
+
 function cmd_racks_list
 {
 	[[ $# != 0 ]] && usage "expected no arguments"