Skip to content

Commit 722581d

Browse files
ahlahl
committed
update networking subcommands
1 parent eccd90c commit 722581d

5 files changed

Lines changed: 145 additions & 90 deletions

File tree

‎cli/docs/cli.json‎

Lines changed: 80 additions & 40 deletions
Original file line numberDiff line numberDiff line change
@@ -657,7 +657,7 @@
657657
"subcommands": [
658658
{
659659
"name": "create",
660-
"about": "Create a new support bundle",
660+
"about": "Create support bundle",
661661
"args": [
662662
{
663663
"long": "json-body",
@@ -680,7 +680,7 @@
680680
},
681681
{
682682
"name": "delete",
683-
"about": "Delete an existing support bundle",
683+
"about": "Delete support bundle",
684684
"long_about": "May also be used to cancel a support bundle which is currently being collected, or to remove metadata for a support bundle that has failed.",
685685
"args": [
686686
{
@@ -764,7 +764,7 @@
764764
},
765765
{
766766
"name": "update",
767-
"about": "Update a support bundle",
767+
"about": "Update support bundle",
768768
"args": [
769769
{
770770
"long": "bundle-id",
@@ -818,7 +818,7 @@
818818
"subcommands": [
819819
{
820820
"name": "create",
821-
"about": "Create new system-wide x.509 certificate",
821+
"about": "Create system-wide x.509 certificate",
822822
"long_about": "This certificate is automatically used by the Oxide Control plane to serve external connections.",
823823
"args": [
824824
{
@@ -2149,7 +2149,7 @@
21492149
"subcommands": [
21502150
{
21512151
"name": "attach",
2152-
"about": "Attach an external subnet to an instance",
2152+
"about": "Attach external subnet to instance",
21532153
"args": [
21542154
{
21552155
"long": "external-subnet",
@@ -2180,7 +2180,7 @@
21802180
},
21812181
{
21822182
"name": "create",
2183-
"about": "Create an external subnet",
2183+
"about": "Create external subnet",
21842184
"args": [
21852185
{
21862186
"long": "description"
@@ -2209,7 +2209,7 @@
22092209
},
22102210
{
22112211
"name": "delete",
2212-
"about": "Delete an external subnet",
2212+
"about": "Delete external subnet",
22132213
"args": [
22142214
{
22152215
"long": "external-subnet",
@@ -2228,7 +2228,7 @@
22282228
},
22292229
{
22302230
"name": "detach",
2231-
"about": "Detach an external subnet from an instance",
2231+
"about": "Detach external subnet from instance",
22322232
"args": [
22332233
{
22342234
"long": "external-subnet",
@@ -2247,7 +2247,7 @@
22472247
},
22482248
{
22492249
"name": "list",
2250-
"about": "List external subnets in a project",
2250+
"about": "List external subnets",
22512251
"args": [
22522252
{
22532253
"long": "limit",
@@ -2274,7 +2274,7 @@
22742274
},
22752275
{
22762276
"name": "update",
2277-
"about": "Update an external subnet",
2277+
"about": "Update external subnet",
22782278
"args": [
22792279
{
22802280
"long": "description"
@@ -2307,7 +2307,7 @@
23072307
},
23082308
{
23092309
"name": "view",
2310-
"about": "Fetch an external subnet",
2310+
"about": "Fetch external subnet",
23112311
"args": [
23122312
{
23132313
"long": "external-subnet",
@@ -2377,7 +2377,7 @@
23772377
},
23782378
{
23792379
"name": "create",
2380-
"about": "Create a floating IP",
2380+
"about": "Create floating IP",
23812381
"long_about": "A specific IP address can be reserved, or an IP can be auto-allocated from a specific pool or the silo's default pool.",
23822382
"args": [
23832383
{
@@ -5049,7 +5049,7 @@
50495049
"subcommands": [
50505050
{
50515051
"name": "list",
5052-
"about": "Lists resource quotas for all silos",
5052+
"about": "List resource quotas for all silos",
50535053
"args": [
50545054
{
50555055
"long": "limit",
@@ -5595,7 +5595,7 @@
55955595
},
55965596
{
55975597
"name": "status",
5598-
"about": "Retrieve the rack cluster membership status",
5598+
"about": "Fetch rack cluster membership status",
55995599
"long_about": "Returns the status for the most recent change, or a specific version if one is specified.",
56005600
"args": [
56015601
{
@@ -5862,8 +5862,12 @@
58625862
"help": "A rack id to use when selecting switch ports."
58635863
},
58645864
{
5865-
"long": "switch-location",
5866-
"help": "A switch location to use when selecting switch ports."
5865+
"long": "switch-slot",
5866+
"values": [
5867+
"switch0",
5868+
"switch1"
5869+
],
5870+
"help": "The slot of the switch within the rack to use when selecting switch ports."
58675871
}
58685872
]
58695873
},
@@ -5885,8 +5889,12 @@
58855889
"help": "A rack id to use when selecting switch ports."
58865890
},
58875891
{
5888-
"long": "switch-location",
5889-
"help": "A switch location to use when selecting switch ports."
5892+
"long": "switch-slot",
5893+
"values": [
5894+
"switch0",
5895+
"switch1"
5896+
],
5897+
"help": "The slot of the switch within the rack to use when selecting switch ports."
58905898
}
58915899
]
58925900
},
@@ -5944,8 +5952,12 @@
59445952
"help": "A rack id to use when selecting switch ports."
59455953
},
59465954
{
5947-
"long": "switch-location",
5948-
"help": "A switch location to use when selecting switch ports."
5955+
"long": "switch-slot",
5956+
"values": [
5957+
"switch0",
5958+
"switch1"
5959+
],
5960+
"help": "The slot of the switch within the rack to use when selecting switch ports."
59495961
}
59505962
]
59515963
}
@@ -6329,8 +6341,12 @@
63296341
"help": "Address of the remote peer to disable a BFD session for."
63306342
},
63316343
{
6332-
"long": "switch",
6333-
"help": "The switch to enable this session on. Must be `switch0` or `switch1`."
6344+
"long": "switch-slot",
6345+
"values": [
6346+
"switch0",
6347+
"switch1"
6348+
],
6349+
"help": "The slot of the switch within the rack to disable this session on."
63346350
}
63356351
]
63366352
},
@@ -6376,8 +6392,12 @@
63766392
"help": "The minimum interval, in microseconds, between received BFD Control packets that this system requires"
63776393
},
63786394
{
6379-
"long": "switch",
6380-
"help": "The switch to enable this session on. Must be `switch0` or `switch1`."
6395+
"long": "switch-slot",
6396+
"values": [
6397+
"switch0",
6398+
"switch1"
6399+
],
6400+
"help": "The slot of the switch within the rack to enable this session on."
63816401
}
63826402
]
63836403
},
@@ -6620,7 +6640,7 @@
66206640
"subcommands": [
66216641
{
66226642
"name": "create",
6623-
"about": "Create new BGP configuration",
6643+
"about": "Create BGP configuration",
66246644
"args": [
66256645
{
66266646
"long": "asn",
@@ -7844,7 +7864,7 @@
78447864
"subcommands": [
78457865
{
78467866
"name": "neighbors",
7847-
"about": "Fetch the LLDP neighbors seen on a switch port",
7867+
"about": "Fetch LLDP neighbors for switch port",
78487868
"args": [
78497869
{
78507870
"long": "limit",
@@ -7870,14 +7890,18 @@
78707890
]
78717891
},
78727892
{
7873-
"long": "switch-location",
7874-
"help": "A switch location to use when selecting switch ports."
7893+
"long": "switch-slot",
7894+
"values": [
7895+
"switch0",
7896+
"switch1"
7897+
],
7898+
"help": "The slot of the switch within the rack to use when selecting switch ports."
78757899
}
78767900
]
78777901
},
78787902
{
78797903
"name": "update",
7880-
"about": "Update the LLDP configuration for a switch port",
7904+
"about": "Update LLDP configuration for switch port",
78817905
"args": [
78827906
{
78837907
"long": "chassis-id",
@@ -7929,8 +7953,12 @@
79297953
"help": "A rack id to use when selecting switch ports."
79307954
},
79317955
{
7932-
"long": "switch-location",
7933-
"help": "A switch location to use when selecting switch ports."
7956+
"long": "switch-slot",
7957+
"values": [
7958+
"switch0",
7959+
"switch1"
7960+
],
7961+
"help": "The slot of the switch within the rack to use when selecting switch ports."
79347962
},
79357963
{
79367964
"long": "system-description",
@@ -7944,7 +7972,7 @@
79447972
},
79457973
{
79467974
"name": "view",
7947-
"about": "Fetch the LLDP configuration for a switch port",
7975+
"about": "Fetch LLDP configuration for switch port",
79487976
"args": [
79497977
{
79507978
"long": "port",
@@ -7960,8 +7988,12 @@
79607988
"help": "A rack id to use when selecting switch ports."
79617989
},
79627990
{
7963-
"long": "switch-location",
7964-
"help": "A switch location to use when selecting switch ports."
7991+
"long": "switch-slot",
7992+
"values": [
7993+
"switch0",
7994+
"switch1"
7995+
],
7996+
"help": "The slot of the switch within the rack to use when selecting switch ports."
79657997
}
79667998
]
79677999
}
@@ -8019,8 +8051,12 @@
80198051
"help": "The rack containing the switch this loopback address will be configured on."
80208052
},
80218053
{
8022-
"long": "switch-location",
8023-
"help": "The location of the switch within the rack this loopback address will be configured on."
8054+
"long": "switch-slot",
8055+
"values": [
8056+
"switch0",
8057+
"switch1"
8058+
],
8059+
"help": "The slot of the switch within the rack this loopback address will be configured on."
80248060
}
80258061
]
80268062
},
@@ -8046,8 +8082,12 @@
80468082
"help": "The IP address and subnet mask to use when selecting the loopback address."
80478083
},
80488084
{
8049-
"long": "switch-location",
8050-
"help": "The switch location to use when selecting the loopback address."
8085+
"long": "switch-slot",
8086+
"values": [
8087+
"switch0",
8088+
"switch1"
8089+
],
8090+
"help": "The slot of the switch within the rack to use when selecting the loopback address."
80518091
}
80528092
]
80538093
},
@@ -8759,8 +8799,8 @@
87598799
"subcommands": [
87608800
{
87618801
"name": "recovery-finish",
8762-
"about": "Instructs the system that a system recovery operation (\"mupdate\") was",
8763-
"long_about": "completed using the software in the specified release\n\nThe system recovery operation is used to bypass the control plane to deploy known-working software when the control plane itself is not functioning or otherwise unable to update itself. When the control plane detects this, it stops making any changes to deployed software to avoid reverting the recovery itself. This operation puts the control plane back in charge of determining what software should be deployed, instructing it that the specified software (which is also what's currently running) is what's supposed to be deployed.\n\nIf the provided version does not match what's currently running, the control plane will continue to avoid changing deployed software until this operation is invoked with the correct version.\n\nThis endpoint should only be called at the direction of Oxide support.",
8802+
"about": "Clear system recovery status",
8803+
"long_about": "Instructs the system that a system recovery operation (\"mupdate\") was completed using the software in the specified release.\n\nThe system recovery operation is used to bypass the control plane to deploy known-working software when the control plane itself is not functioning or otherwise unable to update itself. When the control plane detects this, it stops making any changes to deployed software to avoid reverting the recovery itself. This operation puts the control plane back in charge of determining what software should be deployed, instructing it that the specified software (which is also what's currently running) is what's supposed to be deployed.\n\nIf the provided version does not match what's currently running, the control plane will continue to avoid changing deployed software until this operation is invoked with the correct version.\n\nThis endpoint should only be called at the direction of Oxide support.",
87648804
"args": [
87658805
{
87668806
"long": "json-body",

‎cli/src/cmd_auth.rs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -424,8 +424,7 @@ impl CmdAuthLogin {
424424
id,
425425
silo_id,
426426
silo_name,
427-
fleet_viewer: _,
428-
silo_admin: _,
427+
..
429428
} = &user;
430429

431430
writeln!(io::stdout(), "Login successful")?;

0 commit comments

Comments
 (0)