Skip to content

Commit

Permalink
vrrp: fmt and clippy
Browse files Browse the repository at this point in the history
Signed-off-by: Paul Wekesa <paul1tw1@gmail.com>
  • Loading branch information
Paul-weqe committed Sep 19, 2024
1 parent 48670ed commit 89e57c8
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 8 deletions.
3 changes: 0 additions & 3 deletions holo-vrrp/src/instance.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,9 @@ use std::net::Ipv4Addr;
use std::time::Duration;

use chrono::{DateTime, Utc};
use holo_utils::ibus::IbusSender;
use holo_utils::task::{IntervalTask, TimeoutTask};
use ipnetwork::IpNetwork;

use crate::northbound::configuration::InstanceCfg;
use crate::southbound;

#[derive(Debug)]
pub struct Instance {
Expand Down
5 changes: 2 additions & 3 deletions holo-vrrp/src/northbound/configuration.rs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,6 @@
#![allow(clippy::derivable_impls)]

use std::collections::BTreeSet;
use std::net::Ipv4Addr;
use std::sync::LazyLock as Lazy;

use async_trait::async_trait;
Expand Down Expand Up @@ -132,10 +131,10 @@ fn load_callbacks() -> Callbacks<Interface> {
let addr = IpNetwork::V4(addr);
let _ = &interface.delete_instance_virtual_address(vrid, addr);
})
.lookup(|interface, list_entry, dnode| {
.lookup(|_interface, list_entry, dnode| {
let vrid = list_entry.into_vrid().unwrap();
let addr = dnode.get_prefix4_relative("ipv4-address").unwrap();
return ListEntry::VirtualIpv4Addr(vrid, addr)
ListEntry::VirtualIpv4Addr(vrid, addr)
})
.build()
}
Expand Down
4 changes: 2 additions & 2 deletions holo-vrrp/src/southbound.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ use holo_utils::southbound::{
AddressMsg, InterfaceIpAddRequestMsg, InterfaceIpDeleteRequestMsg,
InterfaceUpdateMsg, MacvlanCreateMsg,
};
use ipnetwork::{IpNetwork, Ipv4Network};
use ipnetwork::IpNetwork;

use crate::interface::Interface;

Expand Down Expand Up @@ -66,7 +66,7 @@ pub(crate) fn process_addr_add(iface: &mut Interface, msg: AddressMsg) {

if mvlan_iface.name == name {
if let IpNetwork::V4(addr) = msg.addr {
instance.config.virtual_addresses.insert(addr.clone());
instance.config.virtual_addresses.insert(addr);
mvlan_iface.system.addresses.insert(addr);
}
}
Expand Down

0 comments on commit 89e57c8

Please sign in to comment.