Merge "remove unneeded param from _create_port_at_the_backend"
This commit is contained in:
commit
1f3a7e3e3e
@ -684,9 +684,8 @@ class NsxV3Plugin(addr_pair_db.AllowedAddressPairsMixin,
|
|||||||
name = port_data['name']
|
name = port_data['name']
|
||||||
return name
|
return name
|
||||||
|
|
||||||
def _create_port_at_the_backend(self, context, neutron_db,
|
def _create_port_at_the_backend(self, context, port_data,
|
||||||
port_data, l2gw_port_check,
|
l2gw_port_check, psec_is_on):
|
||||||
psec_is_on):
|
|
||||||
device_owner = port_data.get('device_owner')
|
device_owner = port_data.get('device_owner')
|
||||||
device_id = port_data.get('device_id')
|
device_id = port_data.get('device_id')
|
||||||
if device_owner == const.DEVICE_OWNER_DHCP:
|
if device_owner == const.DEVICE_OWNER_DHCP:
|
||||||
@ -746,8 +745,8 @@ class NsxV3Plugin(addr_pair_db.AllowedAddressPairsMixin,
|
|||||||
# TODO(salv-orlando): The logical switch identifier in the
|
# TODO(salv-orlando): The logical switch identifier in the
|
||||||
# mapping object is not necessary anymore.
|
# mapping object is not necessary anymore.
|
||||||
nsx_db.add_neutron_nsx_port_mapping(
|
nsx_db.add_neutron_nsx_port_mapping(
|
||||||
context.session, neutron_db['id'],
|
context.session, port_data['id'],
|
||||||
neutron_db['network_id'], result['id'])
|
port_data['network_id'], result['id'])
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def _validate_address_pairs(self, address_pairs):
|
def _validate_address_pairs(self, address_pairs):
|
||||||
@ -833,8 +832,7 @@ class NsxV3Plugin(addr_pair_db.AllowedAddressPairsMixin,
|
|||||||
if not is_external_net:
|
if not is_external_net:
|
||||||
try:
|
try:
|
||||||
lport = self._create_port_at_the_backend(
|
lport = self._create_port_at_the_backend(
|
||||||
context, neutron_db, port_data,
|
context, port_data, l2gw_port_check, is_psec_on)
|
||||||
l2gw_port_check, is_psec_on)
|
|
||||||
|
|
||||||
if sgids:
|
if sgids:
|
||||||
security.update_lport_with_security_groups(
|
security.update_lport_with_security_groups(
|
||||||
|
Loading…
Reference in New Issue
Block a user