Skip to content
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.

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

Various network fixes #4564

Merged
merged 6 commits into from
Nov 29, 2023
Merged

Various network fixes #4564

merged 6 commits into from
Nov 29, 2023

Conversation

@rcgoodfellow rcgoodfellow marked this pull request as ready for review November 28, 2023 09:02
@rcgoodfellow rcgoodfellow marked this pull request as draft November 28, 2023 09:58
@rcgoodfellow
Copy link
Contributor Author

Using the same RSS configuration:

Here is what we see from the API right after a rack is commissioned.

oxide system networking switch-port-settings viewport default-uplink0
success
SwitchPortSettingsView {
    addresses: [
        SwitchPortAddressConfig {
            address: V4(
                Ipv4Net(
                    "198.51.101.2/30",
                ),
            ),
            address_lot_block_id: ccf518cf-fae6-4687-97de-6654e2e0d010,
            interface_name: "phy0",
            port_settings_id: 70905d7e-7425-4fc8-b97b-e3b0ca29985e,
        },
    ],
    bgp_peers: [],
    groups: [],
    interfaces: [],
    link_lldp: [],
    links: [],
    port: SwitchPortConfig {
        geometry: Qsfp28x1,
    },
    routes: [],
    settings: SwitchPortSettings {
        description: "initial uplink configuration",
        id: 70905d7e-7425-4fc8-b97b-e3b0ca29985e,
        name: Name(
            "default-uplink0",
        ),
        time_created: 2023-11-28T03:26:52.109575Z,
        time_modified: 2023-11-28T03:26:52.109575Z,
    },
    vlan_interfaces: [],
}

Here is what it looks like with this PR. Note that the BGP peer info and link info are now present.

$ oxide system networking switch-port-settings viewport default-uplink0
ry@rymb:~$ oxide system networking switch-port-settings viewport default-uplink0
success
SwitchPortSettingsView {
    addresses: [
        SwitchPortAddressConfig {
            address: V4(
                Ipv4Net(
                    "198.51.101.2/30",
                ),
            ),
            address_lot_block_id: c8aa667b-7835-4dd7-907d-21706c758d9e,
            interface_name: "phy0",
            port_settings_id: 91df9f00-d35d-45eb-83cf-9d161432eff8,
        },
    ],
    bgp_peers: [
        SwitchPortBgpPeerConfig {
            addr: 198.51.101.1,
            bgp_config_id: d3bcc92a-adf3-4155-a44d-c5894daf3b3d,
            interface_name: "phy0",
            port_settings_id: 91df9f00-d35d-45eb-83cf-9d161432eff8,
        },
    ],
    groups: [],
    interfaces: [],
    link_lldp: [
        LldpServiceConfig {
            enabled: false,
            lldp_config: None,
        },
    ],
    links: [
        SwitchPortLinkConfig {
            link_name: "phy",
            lldp_service_config_id: e14453f9-6293-4cd3-96d5-b2564977d1bb,
            mtu: 1500,
            port_settings_id: 91df9f00-d35d-45eb-83cf-9d161432eff8,
        },
    ],
    port: SwitchPortConfig {
        geometry: Qsfp28x1,
    },
    routes: [],
    settings: SwitchPortSettings {
        description: "initial uplink configuration",
        id: 91df9f00-d35d-45eb-83cf-9d161432eff8,
        name: Name(
            "default-uplink0",
        ),
        time_created: 2023-11-28T22:27:40.087932Z,
        time_modified: 2023-11-28T22:27:40.087932Z,
    },
    vlan_interfaces: [],
}

@rcgoodfellow rcgoodfellow marked this pull request as ready for review November 28, 2023 22:40
@@ -0,0 +1,3 @@
#!/bin/bash

./target/debug/wicketd openapi > openapi/wicketd.json
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this a convenience script, or is it called from some of our build machinery?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Convenience script. There are others like it for nexus and sled agent.

Copy link
Contributor

@internet-diglett internet-diglett left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM!

@rcgoodfellow rcgoodfellow merged commit 3555b5d into main Nov 29, 2023
21 checks passed
@rcgoodfellow rcgoodfellow deleted the ntwk-fixes branch November 29, 2023 22:35
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
2 participants