Skip to content

VRRP: change skew_time & master_down_interval calculation & state retrieval #59

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

VRRP: change skew_time & master_down_interval calculation & state retrieval #59

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions holo-vrrp/src/northbound/configuration.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -401,8 +401,8 @@ impl Provider for Interface {
// ===== configuration helpers =====

impl InstanceCfg {
pub(crate) const fn master_down_interval(&self) -> u32 {
(3 * self.advertise_interval as u32) + self.skew_time() as u32
pub(crate) const fn master_down_interval(&self) -> f32 {
(3 * self.advertise_interval) as f32 + self.skew_time()
}

pub(crate) const fn skew_time(&self) -> f32 {
Expand Down
14 changes: 8 additions & 6 deletions holo-vrrp/src/northbound/state.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,9 +50,10 @@ fn load_callbacks() -> Callbacks<Interface> {
is_owner: None,
last_adv_source: instance.state.last_adv_src.as_ref().map(Cow::Borrowed).ignore_in_testing(),
up_datetime: instance.state.up_time.as_ref().map(Cow::Borrowed).ignore_in_testing(),
master_down_interval: instance.state.timer.as_master_down_timer().map(|task| task.remaining().as_millis() as u32 / 10).ignore_in_testing(),
// TODO
skew_time: None,
// `master_down_interval` multiplied by 100 since it's in centiseconds.
master_down_interval: Some((instance.config.master_down_interval() * 100.0) as u32),
// `skew_time` multiplied by 1000 since it's in microseconds.
skew_time: Some((instance.config.skew_time() * 1000.0) as u32),
last_event: Some(instance.state.last_event.to_yang()).ignore_in_testing(),
new_master_reason: Some(instance.state.new_master_reason.to_yang()),
})
Expand Down Expand Up @@ -89,9 +90,10 @@ fn load_callbacks() -> Callbacks<Interface> {
is_owner: None,
last_adv_source: instance.state.last_adv_src.as_ref().map(Cow::Borrowed).ignore_in_testing(),
up_datetime: instance.state.up_time.as_ref().map(Cow::Borrowed).ignore_in_testing(),
master_down_interval: instance.state.timer.as_master_down_timer().map(|task| task.remaining().as_millis() as u32 / 10).ignore_in_testing(),
// TODO
skew_time: None,
// `master_down_interval` multiplied by 100 since it's in centiseconds.
master_down_interval: Some((instance.config.master_down_interval() * 100.0) as u32),
// `skew_time` multiplied by 1000 since it's in microseconds.
skew_time: Some((instance.config.skew_time() * 1000.0) as u32),
last_event: Some(instance.state.last_event.to_yang()).ignore_in_testing(),
new_master_reason: Some(instance.state.new_master_reason.to_yang()),
})
Expand Down
Loading