x/vmware-nsx
Code Issues Proposed changes

Merge "NSX|P: Fix router interface segment id"

Browse Source
This commit is contained in:
Zuul 2018-12-11 07:42:03 +00:00 committed by Gerrit Code Review
commit 32dd3390c0
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
vmware_nsx/plugins/nsx_p/plugin.py
View File

@ -1085,7 +1085,7 @@ class NsxPolicyPlugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
net = self._get_network(context, network_id) net = self._get_network(context, network_id)
net_name = utils.get_name_and_uuid( net_name = utils.get_name_and_uuid(
net['name'] or 'network', network_id) net['name'] or 'network', network_id)
segment_id = self._get_network_nsx_id(context, network_id) segment_id = self._get_network_nsx_segment_id(context, network_id)
subnet = self.get_subnet(context, info['subnet_ids'][0]) subnet = self.get_subnet(context, info['subnet_ids'][0])
pol_subnet = policy_defs.Subnet( pol_subnet = policy_defs.Subnet(
gateway_address=("%s/32" % subnet.get('gateway_ip'))) gateway_address=("%s/32" % subnet.get('gateway_ip')))
@ -1141,7 +1141,7 @@ class NsxPolicyPlugin(agentschedulers_db.AZDhcpAgentSchedulerDbMixin,
net = self._get_network(context, network_id) net = self._get_network(context, network_id)
net_name = utils.get_name_and_uuid( net_name = utils.get_name_and_uuid(
net['name'] or 'network', network_id) net['name'] or 'network', network_id)
segment_id = self._get_network_nsx_id(context, network_id) segment_id = self._get_network_nsx_segment_id(context, network_id)
self.nsxpolicy.segment.update(segment_id, name=net_name, self.nsxpolicy.segment.update(segment_id, name=net_name,
tier1_id=None) tier1_id=None)