Skip to content

Commit

Permalink
Bump dependencies, progenitor to 789c4b66, oxide.json to omicron:5736…
Browse files Browse the repository at this point in the history 
…dabf (#899)
  • Loading branch information
@oxide-reflector-bot
oxide-reflector-bot[bot] authored Nov 5, 2024
1 parent b3f2bfd commit 50d6ffc
Show file tree
Hide file tree
Showing 7 changed files with 451 additions and 42 deletions.
20 changes: 10 additions & 10 deletions Cargo.lock
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions cli/docs/cli.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1410,7 +1410,7 @@
"never",
"best_effort"
],
"help": "The auto-restart policy for this instance.\n\nThis indicates whether the instance should be automatically restarted by the control plane on failure. If this is `null`, no auto-restart policy has been configured for this instance by the user."
"help": "The auto-restart policy for this instance.\n\nThis policy determines whether the instance should be automatically restarted by the control plane on failure. If this is `null`, no auto-restart policy will be explicitly configured for this instance, and the control plane will select the default policy when determining whether the instance can be automatically restarted.\n\nCurrently, the global default auto-restart policy is \"best-effort\", so instances with `null` auto-restart policies will be automatically restarted. However, in the future, the default policy may be configurable through other mechanisms, such as on a per-project basis. In that case, any configured default policy will be used if this is `null`."
},
{
"long": "description"
Expand Down Expand Up @@ -2122,7 +2122,7 @@
"never",
"best_effort"
],
"help": "The auto-restart policy for this instance.\n\nIf not provided, unset the instance's auto-restart policy."
"help": "Sets the auto-restart policy for this instance.\n\nThis policy determines whether the instance should be automatically restarted by the control plane on failure. If this is `null`, any explicitly configured auto-restart policy will be unset, and the control plane will select the default policy when determining whether the instance can be automatically restarted.\n\nCurrently, the global default auto-restart policy is \"best-effort\", so instances with `null` auto-restart policies will be automatically restarted. However, in the future, the default policy may be configurable through other mechanisms, such as on a per-project basis. In that case, any configured default policy will be used if this is `null`."
},
{
"long": "boot-disk",
Expand Down
2 changes: 2 additions & 0 deletions cli/src/cmd_net.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ impl AuthenticatedCmd for CmdLinkAdd {
system_description: None,
management_ip: None,
},
tx_eq: None,
};
match settings.links.get(PHY0) {
Some(_) => {
Expand Down Expand Up @@ -1732,6 +1733,7 @@ async fn create_current(settings_id: Uuid, client: &Client) -> Result<SwitchPort
system_description: None,
management_ip: None,
},
tx_eq: None,
},
)
})
Expand Down
28 changes: 22 additions & 6 deletions cli/src/generated_cli.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1436,10 +1436,17 @@ impl<T: CliConfig> Cli<T> {
))
.required(false)
.help(
"The auto-restart policy for this instance.\n\nThis indicates whether the \
instance should be automatically restarted by the control plane on \
failure. If this is `null`, no auto-restart policy has been configured \
for this instance by the user.",
"The auto-restart policy for this instance.\n\nThis policy determines \
whether the instance should be automatically restarted by the control \
plane on failure. If this is `null`, no auto-restart policy will be \
explicitly configured for this instance, and the control plane will \
select the default policy when determining whether the instance can be \
automatically restarted.\n\nCurrently, the global default auto-restart \
policy is \"best-effort\", so instances with `null` auto-restart \
policies will be automatically restarted. However, in the future, the \
default policy may be configurable through other mechanisms, such as on \
a per-project basis. In that case, any configured default policy will be \
used if this is `null`.",
),
)
.arg(
Expand Down Expand Up @@ -1550,8 +1557,17 @@ impl<T: CliConfig> Cli<T> {
))
.required(false)
.help(
"The auto-restart policy for this instance.\n\nIf not provided, unset the \
instance's auto-restart policy.",
"Sets the auto-restart policy for this instance.\n\nThis policy \
determines whether the instance should be automatically restarted by the \
control plane on failure. If this is `null`, any explicitly configured \
auto-restart policy will be unset, and the control plane will select the \
default policy when determining whether the instance can be \
automatically restarted.\n\nCurrently, the global default auto-restart \
policy is \"best-effort\", so instances with `null` auto-restart \
policies will be automatically restarted. However, in the future, the \
default policy may be configurable through other mechanisms, such as on \
a per-project basis. In that case, any configured default policy will be \
used if this is `null`.",
),
)
.arg(
Expand Down
4 changes: 4 additions & 0 deletions cli/tests/test_net.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -171,6 +171,7 @@ fn test_port_config() {
mtu: 1500,
port_settings_id: switch1_qsfp0_settings_id,
speed: LinkSpeed::Speed100G,
tx_eq_config_id: None,
}],
port: SwitchPortConfig {
geometry: SwitchPortGeometry2::Qsfp28x1,
Expand All @@ -192,6 +193,7 @@ fn test_port_config() {
time_modified: Utc.with_ymd_and_hms(2024, 7, 8, 9, 10, 11).unwrap(),
},
vlan_interfaces: Vec::new(),
tx_eq: vec![None],
};
let switch1_qsfp0_view = SwitchPortSettingsView {
addresses: vec![
Expand Down Expand Up @@ -263,6 +265,7 @@ fn test_port_config() {
mtu: 1500,
port_settings_id: switch1_qsfp0_settings_id,
speed: LinkSpeed::Speed100G,
tx_eq_config_id: None,
}],
port: SwitchPortConfig {
geometry: SwitchPortGeometry2::Qsfp28x1,
Expand All @@ -277,6 +280,7 @@ fn test_port_config() {
time_modified: Utc.with_ymd_and_hms(2024, 7, 8, 9, 10, 11).unwrap(),
},
vlan_interfaces: Vec::new(),
tx_eq: vec![None],
};

let mock_switch0_qsfp0_settings_view =
Expand Down
70 changes: 67 additions & 3 deletions oxide.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15816,7 +15816,7 @@
},
"auto_restart_policy": {
"nullable": true,
"description": "The auto-restart policy configured for this instance, or `None` if no explicit policy is configured.\n\nIf this is not present, then this instance uses the default auto-restart policy, which may or may not allow it to be restarted. The `auto_restart_enabled` field indicates whether the instance will be automatically restarted.",
"description": "The auto-restart policy configured for this instance, or `null` if no explicit policy has been configured.\n\nThis policy determines whether the instance should be automatically restarted by the control plane on failure. If this is `null`, the control plane will use the default policy when determining whether or not to automatically restart this instance, which may or may not allow it to be restarted. The value of the `auto_restart_enabled` field indicates whether the instance will be auto-restarted, based on its current policy or the default if it has no configured policy.",
"allOf": [
{
"$ref": "#/components/schemas/InstanceAutoRestartPolicy"
Expand Down Expand Up @@ -15941,7 +15941,7 @@
"properties": {
"auto_restart_policy": {
"nullable": true,
"description": "The auto-restart policy for this instance.\n\nThis indicates whether the instance should be automatically restarted by the control plane on failure. If this is `null`, no auto-restart policy has been configured for this instance by the user.",
"description": "The auto-restart policy for this instance.\n\nThis policy determines whether the instance should be automatically restarted by the control plane on failure. If this is `null`, no auto-restart policy will be explicitly configured for this instance, and the control plane will select the default policy when determining whether the instance can be automatically restarted.\n\nCurrently, the global default auto-restart policy is \"best-effort\", so instances with `null` auto-restart policies will be automatically restarted. However, in the future, the default policy may be configurable through other mechanisms, such as on a per-project basis. In that case, any configured default policy will be used if this is `null`.",
"default": null,
"allOf": [
{
Expand Down Expand Up @@ -16476,7 +16476,7 @@
"properties": {
"auto_restart_policy": {
"nullable": true,
"description": "The auto-restart policy for this instance.\n\nIf not provided, unset the instance's auto-restart policy.",
"description": "Sets the auto-restart policy for this instance.\n\nThis policy determines whether the instance should be automatically restarted by the control plane on failure. If this is `null`, any explicitly configured auto-restart policy will be unset, and the control plane will select the default policy when determining whether the instance can be automatically restarted.\n\nCurrently, the global default auto-restart policy is \"best-effort\", so instances with `null` auto-restart policies will be automatically restarted. However, in the future, the default policy may be configurable through other mechanisms, such as on a per-project basis. In that case, any configured default policy will be used if this is `null`.",
"allOf": [
{
"$ref": "#/components/schemas/InstanceAutoRestartPolicy"
Expand Down Expand Up @@ -17194,6 +17194,15 @@
"$ref": "#/components/schemas/LinkSpeed"
}
]
},
"tx_eq": {
"nullable": true,
"description": "Optional tx_eq settings",
"allOf": [
{
"$ref": "#/components/schemas/TxEqConfig"
}
]
}
},
"required": [
Expand Down Expand Up @@ -20436,6 +20445,12 @@
"$ref": "#/components/schemas/LinkSpeed"
}
]
},
"tx_eq_config_id": {
"nullable": true,
"description": "The tx_eq configuration id for this link.",
"type": "string",
"format": "uuid"
}
},
"required": [
Expand Down Expand Up @@ -20736,6 +20751,18 @@
}
]
},
"tx_eq": {
"description": "TX equalization settings. These are optional, and most links will not need them.",
"type": "array",
"items": {
"nullable": true,
"allOf": [
{
"$ref": "#/components/schemas/TxEqConfig"
}
]
}
},
"vlan_interfaces": {
"description": "Vlan interface settings.",
"type": "array",
Expand All @@ -20754,6 +20781,7 @@
"port",
"routes",
"settings",
"tx_eq",
"vlan_interfaces"
]
},
Expand Down Expand Up @@ -20940,6 +20968,42 @@
"items"
]
},
"TxEqConfig": {
"description": "Per-port tx-eq overrides. This can be used to fine-tune the transceiver equalization settings to improve signal integrity.",
"type": "object",
"properties": {
"main": {
"nullable": true,
"description": "Main tap",
"type": "integer",
"format": "int32"
},
"post1": {
"nullable": true,
"description": "Post-cursor tap1",
"type": "integer",
"format": "int32"
},
"post2": {
"nullable": true,
"description": "Post-cursor tap2",
"type": "integer",
"format": "int32"
},
"pre1": {
"nullable": true,
"description": "Pre-cursor tap1",
"type": "integer",
"format": "int32"
},
"pre2": {
"nullable": true,
"description": "Pre-cursor tap2",
"type": "integer",
"format": "int32"
}
}
},
"UninitializedSled": {
"description": "A sled that has not been added to an initialized rack yet",
"type": "object",
Expand Down
Loading

0 comments on commit 50d6ffc

Please sign in to comment.