Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
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
13 changes: 12 additions & 1 deletion nexus/db-model/src/ipv4net.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,20 @@ use diesel::sql_types;
use ipnetwork::IpNetwork;
use omicron_common::api::external;
use omicron_common::nexus_config::NUM_INITIAL_RESERVED_IP_ADDRESSES;
use serde::Deserialize;
use serde::Serialize;
use std::net::Ipv4Addr;

#[derive(Clone, Copy, Debug, PartialEq, AsExpression, FromSqlRow)]
#[derive(
Clone,
Copy,
Debug,
PartialEq,
AsExpression,
FromSqlRow,
Serialize,
Deserialize,
)]
#[diesel(sql_type = sql_types::Inet)]
pub struct Ipv4Net(pub external::Ipv4Net);

Expand Down
13 changes: 12 additions & 1 deletion nexus/db-model/src/vpc_subnet.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,10 +14,21 @@ use nexus_types::external_api::params;
use nexus_types::external_api::views;
use nexus_types::identity::Resource;
use omicron_common::api::external;
use serde::Deserialize;
use serde::Serialize;
use std::net::IpAddr;
use uuid::Uuid;

#[derive(Queryable, Insertable, Clone, Debug, Selectable, Resource)]
#[derive(
Queryable,
Insertable,
Clone,
Debug,
Selectable,
Resource,
Serialize,
Deserialize,
)]
#[diesel(table_name = vpc_subnet)]
pub struct VpcSubnet {
#[diesel(embed)]
Expand Down
Loading