diff options
| author | fett0 <fernando.gmaidana@gmail.com> | 2023-01-19 19:22:57 +0000 |
|---|---|---|
| committer | fett0 <fernando.gmaidana@gmail.com> | 2023-01-19 19:22:57 +0000 |
| commit | 8f8976d3c55eccfc68efd019bac88664f9792f80 (patch) | |
| tree | f0d6e86d639352fb6e47541a6678ed259691760e | |
| parent | ed0da146529c5a38c32ac346335138baab428bac (diff) | |
| download | vyos-1x-8f8976d3c55eccfc68efd019bac88664f9792f80.tar.gz vyos-1x-8f8976d3c55eccfc68efd019bac88664f9792f80.zip | |
T4939: VRRP startup delay for bonding fix
| -rw-r--r-- | data/templates/high-availability/<tagNode name="global-parameter">.xml | 38 | ||||
| -rw-r--r-- | interface-definitions/high-availability.xml.in | 2 | ||||
| -rwxr-xr-x | smoketest/scripts/cli/test_ha_vrrp.py | 3 |
3 files changed, 42 insertions, 1 deletions
diff --git a/data/templates/high-availability/<tagNode name="global-parameter">.xml b/data/templates/high-availability/<tagNode name="global-parameter">.xml new file mode 100644 index 000000000..e7e009625 --- /dev/null +++ b/data/templates/high-availability/<tagNode name="global-parameter">.xml @@ -0,0 +1,38 @@ + <tagNode name="global-parameter"> + <properties> + <help>VRRP Globas parameters</help> + </properties> + <children> + <leafNode name="startup-delay"> + <properties> + <help>Time VRRP startup process (in seconds)</help> + <valueHelp> + <format>u32:1-600</format> + <description>Interval in seconds</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1-3600"/> + </constraint> + </properties>> + </leafNode> + </children> + + <node name="global-parameter"> + <properties> + <help>VRRP Globas parameters</help> + </properties> + <children> + <leafNode name="startup-delay"> + <properties> + <help>Time vrrp startup process (in seconds)</help> + <valueHelp> + <format>u32:1-600</format> + <description>Interval in seconds</description> + </valueHelp> + <constraint> + <validator name="numeric" argument="--range 1-3600"/> + </constraint> + </properties>> + </leafNode> + </children> + </node>
\ No newline at end of file diff --git a/interface-definitions/high-availability.xml.in b/interface-definitions/high-availability.xml.in index 09ebfdf39..9436035d8 100644 --- a/interface-definitions/high-availability.xml.in +++ b/interface-definitions/high-availability.xml.in @@ -18,7 +18,7 @@ <children> <leafNode name="startup-delay"> <properties> - <help>Time vrrp startup process (in seconds)</help> + <help>Time VRRP startup process (in seconds)</help> <valueHelp> <format>u32:1-600</format> <description>Interval in seconds</description> diff --git a/smoketest/scripts/cli/test_ha_vrrp.py b/smoketest/scripts/cli/test_ha_vrrp.py index fba1f4687..f18a4ab86 100755 --- a/smoketest/scripts/cli/test_ha_vrrp.py +++ b/smoketest/scripts/cli/test_ha_vrrp.py @@ -137,6 +137,9 @@ class TestVRRP(VyOSUnitTestSHIM.TestCase): # Authentication self.assertIn(f'auth_pass "{group}"', config) self.assertIn(f'auth_type PASS', config) + # Global parameters + config = getConfig(f'global_defs') + self.assertIn(f'vrrp_startup_delay {startup_delay}', config) def test_03_sync_group(self): sync_group = 'VyOS' |