x/vmware-nsx
Code Issues Proposed changes

NSXv| Use the current DVS when creating a teaming policy

Browse Source 
When the portgroup teaming policy is updated, the current DVS of
the portgroup should be used, instead of the default one.

Change-Id: Id78542650f58627313050c427543f33417f7c43c
This commit is contained in:
Adit Sarfaty 2017-01-30 11:58:29 +02:00
parent 3756e8bd6f
commit d81f2f51a5
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vmware_nsx/dvs/dvs.py
View File

@ -448,6 +448,19 @@ class DvsManager(object):
"config.hardware.device") "config.hardware.device")
return hardware_devices return hardware_devices
def _get_dvs_moref_from_teaming_data(self, teaming_data):
"""Get the moref dvs that belongs to the teaming data
If not found: return the default one
"""
dvs_moref = self._dvs_moref
if 'switchObj' in teaming_data:
if 'objectId' in teaming_data['switchObj']:
dvs_id = teaming_data['switchObj']['objectId']
dvs_moref = vim_util.get_moref(
dvs_id, 'VmwareDistributedVirtualSwitch')
return dvs_moref
def update_port_group_spec_teaming(self, pg_spec, teaming_data): def update_port_group_spec_teaming(self, pg_spec, teaming_data):
mapping = {'FAILOVER_ORDER': 'failover_explicit', mapping = {'FAILOVER_ORDER': 'failover_explicit',
'ETHER_CHANNEL': 'loadbalance_ip', 'ETHER_CHANNEL': 'loadbalance_ip',
@ -457,6 +470,7 @@ class DvsManager(object):
'LOADBALANCE_SRCID': 'loadbalance_srcid', 'LOADBALANCE_SRCID': 'loadbalance_srcid',
'LOADBALANCE_SRCMAC': 'loadbalance_srcmac', 'LOADBALANCE_SRCMAC': 'loadbalance_srcmac',
'LOADBALANCE_LOADBASED': 'loadbalance_loadbased'} 'LOADBALANCE_LOADBASED': 'loadbalance_loadbased'}
dvs_moref = self._get_dvs_moref_from_teaming_data(teaming_data)
port_conf = pg_spec.defaultPortConfig port_conf = pg_spec.defaultPortConfig
policy = port_conf.uplinkTeamingPolicy policy = port_conf.uplinkTeamingPolicy
policy.inherited = False policy.inherited = False
@ -469,7 +483,7 @@ class DvsManager(object):
uplinks = self._session.invoke_api(vim_util, uplinks = self._session.invoke_api(vim_util,
"get_object_property", "get_object_property",
self._session.vim, self._session.vim,
self._dvs_moref, dvs_moref,
"config.uplinkPortPolicy") "config.uplinkPortPolicy")
standby = list(set(uplinks.uplinkPortName) - set(ports)) standby = list(set(uplinks.uplinkPortName) - set(ports))
policy.uplinkPortOrder.standbyUplinkPort = standby policy.uplinkPortOrder.standbyUplinkPort = standby