openstack
/
deb-networking-cisco
Code Issues Proposed changes

Merge "HSRP Default Priority change"

This commit is contained in:
Jenkins 2016-03-02 18:48:27 +00:00 committed by Gerrit Code Review
parent 881267937a b6047eecf0
commit 92e5bacea7
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
networking_cisco/plugins/cisco/db/l3/ha_db.py
View File

@ -59,8 +59,8 @@ DEVICE_OWNER_ROUTER_INTF = l3_constants.DEVICE_OWNER_ROUTER_INTF
DEVICE_OWNER_ROUTER_HA_INTF = l3_constants.DEVICE_OWNER_ROUTER_HA_INTF
ROUTER_ROLE_HA_REDUNDANCY = cisco_constants.ROUTER_ROLE_HA_REDUNDANCY
DEFAULT_MASTER_PRIORITY = 10
PRIORITY_INCREASE_STEP = 10
DEFAULT_MASTER_PRIORITY = 100
PRIORITY_INCREASE_STEP = -3
REDUNDANCY_ROUTER_SUFFIX = '_HA_backup_'
DEFAULT_PING_INTERVAL = 5
PROBE_TARGET_OPT_NAME = 'default_probe_target'

9
networking_cisco/tests/unit/cisco/l3/test_ha_l3_router_appliance_plugin.py
View File

@ -46,6 +46,7 @@ _uuid = uuidutils.generate_uuid
EXTERNAL_GW_INFO = l3.EXTERNAL_GW_INFO
CORE_PLUGIN_KLASS = device_manager_test_support.CORE_PLUGIN_KLASS
DEFAULT_PRIORITY = ha_db.DEFAULT_MASTER_PRIORITY
L3_PLUGIN_KLASS = (
"networking_cisco.tests.unit.cisco.l3.test_ha_l3_router_appliance_plugin."
"TestApplianceHAL3RouterServicePlugin")
@ -101,7 +102,7 @@ class HAL3RouterApplianceNamespaceTestCase(
class HAL3RouterTestsMixin(object):
def _get_ha_defaults(self, ha_enabled=None, ha_type=None,
redundancy_level=None, priority=10,
redundancy_level=None, priority=DEFAULT_PRIORITY,
state=ha.HA_ACTIVE, probing_enabled=None,
probe_target=None, probe_interval=None):
@ -272,7 +273,8 @@ class HAL3RouterApplianceVMTestCase(
with self.subnet() as s:
self._set_net_external(s['subnet']['network_id'])
ha_settings = self._get_ha_defaults(
ha_type=ha.HA_GLBP, priority=15, probing_enabled=True,
ha_type=ha.HA_GLBP, priority=DEFAULT_PRIORITY,
probing_enabled=True,
probe_interval=3, probe_target='10.5.5.2')
kwargs = {ha.DETAILS: ha_settings[ha.DETAILS],
l3.EXTERNAL_GW_INFO: {'network_id':
@ -283,7 +285,8 @@ class HAL3RouterApplianceVMTestCase(
def test_create_non_gw_ha_router_with_ha_specification(self):
ha_settings = self._get_ha_defaults(
ha_type=ha.HA_GLBP, priority=15, probing_enabled=True,
ha_type=ha.HA_GLBP, priority=DEFAULT_PRIORITY,
probing_enabled=True,
probe_interval=3, probe_target='10.5.5.2')
kwargs = {ha.DETAILS: ha_settings[ha.DETAILS]}
with self.router(arg_list=(ha.DETAILS,), **kwargs) as r: