From: Swaminathan Vasudevan <swaminathan.vasudevan@hp.com>
Date: Fri, 2 Aug 2013 13:57:04 +0000 (-0700)
Subject: VPNaaS datamodel IKEPolicy lifetime unit typo
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ec2eb04e20a45485ddb1928f4bcabbe07fb1084c;p=openstack-build%2Fneutron-build.git

VPNaaS datamodel IKEPolicy lifetime unit typo

There was a typo in handling the IKEPolicy
lifetime, during the IKEPolicy creation time.

-Fixed the typo issue

Fixes bug 1207572

Change-Id: If8c56619c9a340a04e336b6b83d219df10b91e6c
---

diff --git a/neutron/db/vpn/vpn_db.py b/neutron/db/vpn/vpn_db.py
index 87298a4a9..1a309a51d 100644
--- a/neutron/db/vpn/vpn_db.py
+++ b/neutron/db/vpn/vpn_db.py
@@ -358,7 +358,7 @@ class VPNPluginDb(VPNPluginBase, base_db.CommonDbMixin):
         ike = ikepolicy['ikepolicy']
         tenant_id = self._get_tenant_id_for_create(context, ike)
         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)
 
         with context.session.begin(subtransactions=True):