fix query selector for bgp filters and communities (#6072)

oxidecomputer · Jul 12, 2024 · e4bcfee · e4bcfee
1 parent fe60eb9
commit e4bcfee
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/nexus/db-queries/src/db/datastore/bgp.rs b/nexus/db-queries/src/db/datastore/bgp.rs
@@ -572,14 +572,14 @@ impl DataStore {
         &self,
         opctx: &OpContext,
         port_settings_id: Uuid,
-        interface_name: &String,
+        interface_name: &str,
         addr: IpNetwork,
     ) -> ListResultVec<SwitchPortBgpPeerConfigCommunity> {
         use db::schema::switch_port_settings_bgp_peer_config_communities::dsl;
 
         let results = dsl::switch_port_settings_bgp_peer_config_communities
             .filter(dsl::port_settings_id.eq(port_settings_id))
-            .filter(dsl::interface_name.eq(interface_name.clone()))
+            .filter(dsl::interface_name.eq(interface_name.to_owned()))
             .filter(dsl::addr.eq(addr))
             .load_async(&*self.pool_connection_authorized(opctx).await?)
             .await
@@ -592,7 +592,7 @@ impl DataStore {
         &self,
         opctx: &OpContext,
         port_settings_id: Uuid,
-        interface_name: &String,
+        interface_name: &str,
         addr: IpNetwork,
     ) -> LookupResult<Option<Vec<SwitchPortBgpPeerConfigAllowExport>>> {
         use db::schema::switch_port_settings_bgp_peer_config as db_peer;
@@ -619,7 +619,8 @@ impl DataStore {
                     dsl::switch_port_settings_bgp_peer_config_allow_export
                         .filter(db_allow::port_settings_id.eq(port_settings_id))
                         .filter(
-                            db_allow::interface_name.eq(interface_name.clone()),
+                            db_allow::interface_name
+                                .eq(interface_name.to_owned()),
                         )
                         .filter(db_allow::addr.eq(addr))
                         .load_async(&conn)
@@ -637,7 +638,7 @@ impl DataStore {
         &self,
         opctx: &OpContext,
         port_settings_id: Uuid,
-        interface_name: &String,
+        interface_name: &str,
         addr: IpNetwork,
     ) -> LookupResult<Option<Vec<SwitchPortBgpPeerConfigAllowImport>>> {
         use db::schema::switch_port_settings_bgp_peer_config as db_peer;
@@ -664,7 +665,8 @@ impl DataStore {
                     dsl::switch_port_settings_bgp_peer_config_allow_import
                         .filter(db_allow::port_settings_id.eq(port_settings_id))
                         .filter(
-                            db_allow::interface_name.eq(interface_name.clone()),
+                            db_allow::interface_name
+                                .eq(interface_name.to_owned()),
                         )
                         .filter(db_allow::addr.eq(addr))
                         .load_async(&conn)

diff --git a/nexus/src/app/background/tasks/sync_switch_configuration.rs b/nexus/src/app/background/tasks/sync_switch_configuration.rs
@@ -63,6 +63,7 @@ use std::{
 };
 
 const DPD_TAG: Option<&'static str> = Some(OMICRON_DPD_TAG);
+const PHY0: &str = "phy0";
 
 // This is more of an implementation detail of the BGP implementation. It
 // defines the maximum time the peering engine will wait for external messages
@@ -999,7 +1000,7 @@ impl BackgroundTask for SwitchPortSettingsManager {
                             .communities_for_peer(
                                 opctx,
                                 port.port_settings_id.unwrap(),
-                                &peer.port,
+                                PHY0, //TODO https://github.com/oxidecomputer/omicron/issues/3062
                                 IpNetwork::from(IpAddr::from(peer.addr))
                             ).await {
                                 Ok(cs) => cs.iter().map(|c| c.community.0).collect(),
@@ -1017,7 +1018,7 @@ impl BackgroundTask for SwitchPortSettingsManager {
                         let allow_import = match self.datastore.allow_import_for_peer(
                             opctx,
                             port.port_settings_id.unwrap(),
-                            &peer.port,
+                            PHY0, //TODO https://github.com/oxidecomputer/omicron/issues/3062
                             IpNetwork::from(IpAddr::from(peer.addr)),
                         ).await {
                             Ok(cs) => cs,
@@ -1041,7 +1042,7 @@ impl BackgroundTask for SwitchPortSettingsManager {
                         let allow_export = match self.datastore.allow_export_for_peer(
                             opctx,
                             port.port_settings_id.unwrap(),
-                            &peer.port,
+                            PHY0, //TODO https://github.com/oxidecomputer/omicron/issues/3062
                             IpNetwork::from(IpAddr::from(peer.addr)),
                         ).await {
                             Ok(cs) => cs,