openstack/neutron
Code Issues Proposed changes

Merge "VPNaaS datamodel IKEPolicy lifetime unit typo"

Browse Source
This commit is contained in:
Jenkins 2013-08-04 06:45:22 +00:00 committed by Gerrit Code Review
commit c607bafbe5
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
neutron/db/vpn/vpn_db.py
View File

@ -358,7 +358,7 @@ class VPNPluginDb(VPNPluginBase, base_db.CommonDbMixin):
ike = ikepolicy['ikepolicy'] ike = ikepolicy['ikepolicy']
tenant_id = self._get_tenant_id_for_create(context, ike) tenant_id = self._get_tenant_id_for_create(context, ike)
lifetime_info = ike.get('lifetime', []) lifetime_info = ike.get('lifetime', [])
lifetime_units = lifetime_info.get('unit', 'seconds') lifetime_units = lifetime_info.get('units', 'seconds')
lifetime_value = lifetime_info.get('value', 3600) lifetime_value = lifetime_info.get('value', 3600)
with context.session.begin(subtransactions=True): with context.session.begin(subtransactions=True):