airship
/
drydock
Code Issues Proposed changes

[CRITICAL] Fix link bonding configuration 

This PS is critical to support ongoing lab
deployments

- Fix string for round robin to 'balance-rr'
- Support specifying monitor, up and down delays for
  round-robin and active/standby bonds

Change-Id: I0aa58805d5ddd91395668fc8ba5662289027186f
This commit is contained in:
Scott Hussey 2018-01-17 10:43:25 -06:00
parent 9f1c5eba82
commit b70f920b53
3 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
drydock_provisioner/ingester/plugins/deckhand.py
View File

@ -253,13 +253,18 @@ class DeckhandIngester(IngesterPlugin):
model.bonding_mode = bonding.get(
'mode', hd_fields.NetworkLinkBondingMode.Disabled)
if model.bonding_mode == hd_fields.NetworkLinkBondingMode.LACP:
model.bonding_xmit_hash = bonding.get('hash', 'layer3+4')
model.bonding_peer_rate = bonding.get('peer_rate', 'fast')
if model.bonding_mode in \
(hd_fields.NetworkLinkBondingMode.LACP,
hd_fields.NetworkLinkBondingMode.RoundRobin,
hd_fields.NetworkLinkBondingMode.Standby):
model.bonding_mon_rate = bonding.get('mon_rate', '100')
model.bonding_up_delay = bonding.get('up_delay', '200')
model.bonding_down_delay = bonding.get('down_delay', '200')
if model.bonding_mode == hd_fields.NetworkLinkBondingMode.LACP:
model.bonding_xmit_hash = bonding.get('hash', 'layer3+4')
model.bonding_peer_rate = bonding.get('peer_rate', 'fast')
model.mtu = data.get('mtu', None)
model.linkspeed = data.get('linkspeed', None)

11
drydock_provisioner/ingester/plugins/yaml.py
View File

@ -253,13 +253,18 @@ class YamlIngester(IngesterPlugin):
model.bonding_mode = bonding.get(
'mode', hd_fields.NetworkLinkBondingMode.Disabled)
if model.bonding_mode == hd_fields.NetworkLinkBondingMode.LACP:
model.bonding_xmit_hash = bonding.get('hash', 'layer3+4')
model.bonding_peer_rate = bonding.get('peer_rate', 'fast')
if model.bonding_mode in \
(hd_fields.NetworkLinkBondingMode.LACP,
hd_fields.NetworkLinkBondingMode.RoundRobin,
hd_fields.NetworkLinkBondingMode.Standby):
model.bonding_mon_rate = bonding.get('mon_rate', '100')
model.bonding_up_delay = bonding.get('up_delay', '200')
model.bonding_down_delay = bonding.get('down_delay', '200')
if model.bonding_mode == hd_fields.NetworkLinkBondingMode.LACP:
model.bonding_xmit_hash = bonding.get('hash', 'layer3+4')
model.bonding_peer_rate = bonding.get('peer_rate', 'fast')
model.mtu = data.get('mtu', None)
model.linkspeed = data.get('linkspeed', None)

2
drydock_provisioner/objects/fields.py
View File

@ -168,7 +168,7 @@ class NodeStatusField(fields.BaseEnumField):
class NetworkLinkBondingMode(BaseDrydockEnum):
Disabled = 'disabled'
LACP = '802.3ad'
RoundRobin = 'balanced-rr'
RoundRobin = 'balance-rr'
Standby = 'active-backup'
ALL = (Disabled, LACP, RoundRobin, Standby)