openstack/dragonflow
Code Issues Proposed changes

Merge "Create FIP: use conversion function"

Browse Source
This commit is contained in:
Zuul 2017-10-26 11:13:30 +00:00 committed by Gerrit Code Review
commit 8462237ce8
1 changed files with 6 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
dragonflow/neutron/services/l3_router_plugin.py
View File

@ -40,7 +40,6 @@ from dragonflow.common import exceptions as df_exceptions
from dragonflow.db.models import l2
from dragonflow.db.models import l3
from dragonflow.db.neutron import lockedobjects_db as lock_db
from dragonflow.neutron.common import constants as df_const
from dragonflow.neutron.db.models import l3 as neutron_l3
from dragonflow.neutron.services import mixins
@ -171,19 +170,13 @@ class DFL3AgentlessRouterPlugin(service_base.ServicePluginBase,
floatingip_port = self._get_floatingip_port(
context, floatingip_dict['id'])
self.nb_api.create(
l3.FloatingIp(
id=floatingip_dict['id'],
topic=floatingip_dict['tenant_id'],
name=floatingip_dict.get('name', df_const.DF_FIP_DEFAULT_NAME),
version=floatingip_dict['revision_number'],
floating_ip_address=floatingip_dict['floating_ip_address'],
fixed_ip_address=floatingip_dict['fixed_ip_address'],
lrouter=floatingip_dict['router_id'],
lport=floatingip_dict['port_id'],
floating_lport=floatingip_port['id'],
),
nb_fip = neutron_l3.build_floating_ip_from_neutron_floating_ip(
floatingip_dict,
)
nb_fip.floating_lport = floatingip_port['id']
nb_fip.floating_ip_address = floatingip_dict['floating_ip_address']
self.nb_api.create(nb_fip)
return floatingip_dict
@lock_db.wrap_db_lock(lock_db.RESOURCE_FIP_UPDATE_OR_DELETE)