x/vmware-nsx
Code Issues Proposed changes

Merge "Don't rely on unique names to initialize default backend resources"

Browse Source
This commit is contained in:
Jenkins 2016-03-04 19:19:29 +00:00 committed by Gerrit Code Review
commit de9b2de472
1 changed files with 14 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
vmware_nsx/plugins/nsx_v/plugin.py
View File

@ -81,8 +81,6 @@ from vmware_nsx.plugins.nsx_v import managers
from vmware_nsx.plugins.nsx_v import md_proxy as nsx_v_md_proxy from vmware_nsx.plugins.nsx_v import md_proxy as nsx_v_md_proxy
from vmware_nsx.plugins.nsx_v.vshield.common import ( from vmware_nsx.plugins.nsx_v.vshield.common import (
constants as vcns_const) constants as vcns_const)
from vmware_nsx.plugins.nsx_v.vshield.common import (
exceptions as vsh_exc)
from vmware_nsx.plugins.nsx_v.vshield import edge_utils from vmware_nsx.plugins.nsx_v.vshield import edge_utils
from vmware_nsx.plugins.nsx_v.vshield import securitygroup_utils from vmware_nsx.plugins.nsx_v.vshield import securitygroup_utils
from vmware_nsx.plugins.nsx_v.vshield import vcns_driver from vmware_nsx.plugins.nsx_v.vshield import vcns_driver
@ -174,20 +172,16 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
def _create_security_group_container(self): def _create_security_group_container(self):
name = "OpenStack Security Group container" name = "OpenStack Security Group container"
container_id = self.nsx_v.vcns.get_security_group_id(name) with locking.LockManager.get_lock('security-group-container-init'):
if not container_id: container_id = self.nsx_v.vcns.get_security_group_id(name)
description = ("OpenStack Security Group Container, " if not container_id:
"managed by Neutron nsx-v plugin.") description = ("OpenStack Security Group Container, "
container = {"securitygroup": {"name": name, "managed by Neutron nsx-v plugin.")
"description": description}} container = {"securitygroup": {"name": name,
try: "description": description}}
h, container_id = ( h, container_id = (
self.nsx_v.vcns.create_security_group(container)) self.nsx_v.vcns.create_security_group(container))
except vsh_exc.RequestBad as e: return container_id
container_id = self.nsx_v.vcns.get_security_group_id(name)
LOG.debug("Security group container already exists (%s): %s",
container_id, e.response)
return container_id
def _find_router_driver(self, context, router_id): def _find_router_driver(self, context, router_id):
router_qry = context.session.query(l3_db.Router) router_qry = context.session.query(l3_db.Router)
@ -227,7 +221,6 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
def _create_cluster_default_fw_section(self): def _create_cluster_default_fw_section(self):
section_name = 'OS Cluster Security Group section' section_name = 'OS Cluster Security Group section'
section_id = self.nsx_v.vcns.get_section_id(section_name)
# Default cluster rules # Default cluster rules
rules = [{'name': 'Default DHCP rule for OS Security Groups', rules = [{'name': 'Default DHCP rule for OS Security Groups',
@ -258,11 +251,12 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
[self.sg_container_id], 'Block All', 'deny') [self.sg_container_id], 'Block All', 'deny')
rule_list.append(block_rule) rule_list.append(block_rule)
section = ( with locking.LockManager.get_lock('default-section-init'):
self.nsx_sg_utils.get_section_with_rules( section_id = self.nsx_v.vcns.get_section_id(section_name)
section_name, rule_list, section_id)) section = (
section_req_body = self.nsx_sg_utils.to_xml_string(section) self.nsx_sg_utils.get_section_with_rules(
try: section_name, rule_list, section_id))
section_req_body = self.nsx_sg_utils.to_xml_string(section)
if section_id: if section_id:
self.nsx_v.vcns.update_section_by_id( self.nsx_v.vcns.update_section_by_id(
section_id, 'ip', section_req_body) section_id, 'ip', section_req_body)
@ -270,11 +264,6 @@ class NsxVPluginV2(addr_pair_db.AllowedAddressPairsMixin,
h, c = self.nsx_v.vcns.create_section( h, c = self.nsx_v.vcns.create_section(
'ip', section_req_body) 'ip', section_req_body)
section_id = self.nsx_sg_utils.parse_and_get_section_id(c) section_id = self.nsx_sg_utils.parse_and_get_section_id(c)
except vsh_exc.RequestBad as e:
# Section already created, probably by other Neutron service.
LOG.debug("Could not create NSX fw section for clusters "
"%s: %s", cfg.CONF.nsxv.cluster_moid, e.response)
return section_id return section_id
def _create_dhcp_static_binding(self, context, neutron_port_db): def _create_dhcp_static_binding(self, context, neutron_port_db):