x/vmware-nsx
Code Issues Proposed changes

Merge "NSXv3: fix edge HA doesn't work"

Browse Source
This commit is contained in:
Jenkins 2015-12-17 19:08:10 +00:00 committed by Gerrit Code Review
commit 9595e99ad9
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
vmware_nsx/nsxlib/v3/router.py
View File

@ -32,6 +32,7 @@ LOG = log.getLogger(__name__)
# TODO(berlin): Remove this when we merges the edge node auto # TODO(berlin): Remove this when we merges the edge node auto
# placement feature. # placement feature.
MIN_EDGE_NODE_NUM = 1 MIN_EDGE_NODE_NUM = 1
MAX_EDGE_NODE_SELECT_NUM = 2
TIER0_ROUTER_LINK_PORT_NAME = "TIER0-RouterLinkPort" TIER0_ROUTER_LINK_PORT_NAME = "TIER0-RouterLinkPort"
TIER1_ROUTER_LINK_PORT_NAME = "TIER1-RouterLinkPort" TIER1_ROUTER_LINK_PORT_NAME = "TIER1-RouterLinkPort"
@ -48,8 +49,6 @@ class RouterLib(object):
self._router_port_client = router_port_client self._router_port_client = router_port_client
def validate_tier0(self, tier0_groups_dict, tier0_uuid): def validate_tier0(self, tier0_groups_dict, tier0_uuid):
if tier0_uuid in tier0_groups_dict:
return
err_msg = None err_msg = None
try: try:
lrouter = self._router_client.get(tier0_uuid) lrouter = self._router_client.get(tier0_uuid)
@ -71,7 +70,7 @@ class RouterLib(object):
err_msg = _("%(act_num)s edge members found in " err_msg = _("%(act_num)s edge members found in "
"edge_cluster %(cluster_id)s, however we " "edge_cluster %(cluster_id)s, however we "
"require at least %(exp_num)s edge nodes " "require at least %(exp_num)s edge nodes "
"in edge cluster for HA use.") % { "in edge cluster for use.") % {
'act_num': len(member_index_list), 'act_num': len(member_index_list),
'exp_num': MIN_EDGE_NODE_NUM, 'exp_num': MIN_EDGE_NODE_NUM,
'cluster_id': edge_cluster_uuid} 'cluster_id': edge_cluster_uuid}
@ -90,8 +89,9 @@ class RouterLib(object):
logical_port_id=None, logical_port_id=None,
address_groups=None) address_groups=None)
linked_logical_port_id = tier0_link_port['id'] linked_logical_port_id = tier0_link_port['id']
edge_select_number = min(len(edge_members), MAX_EDGE_NODE_SELECT_NUM)
edge_cluster_member_index = random.sample( edge_cluster_member_index = random.sample(
edge_members, MIN_EDGE_NODE_NUM) edge_members, edge_select_number)
# Create Tier1 logical router link port # Create Tier1 logical router link port
self._router_port_client.create( self._router_port_client.create(
tier1_uuid, display_name=TIER1_ROUTER_LINK_PORT_NAME, tier1_uuid, display_name=TIER1_ROUTER_LINK_PORT_NAME,