Merge "Move vpn unittest code to neutronclient.tests"

Author: Jenkins

neutronclient/neutron/v2_0/vpn/ipsec_site_connection.py

@@ -20,6 +20,7 @@
 
 import logging
 
+from neutronclient.common import exceptions
 from neutronclient.common import utils
 from neutronclient.neutron import v2_0 as neutronv20
 from neutronclient.neutron.v2_0.vpn import utils as vpn_utils
@@ -128,7 +129,7 @@ def args2body(self, parsed_args):
         if int(parsed_args.mtu) < 68:
             message = _("Invalid MTU value: MTU must be "
                         "greater than or equal to 68")
-            raise ValueError(message)
+            raise exceptions.CommandError(message)
         body = {'ipsec_site_connection': {
             'vpnservice_id': _vpnservice_id,
             'ikepolicy_id': _ikepolicy_id,

neutronclient/neutron/v2_0/vpn/utils.py

@@ -51,12 +51,15 @@ def validate_dpd_dict(dpd_dict):
                     'supported_action': dpd_supported_actions}
             raise exceptions.CommandError(message)
         if key in ('interval', 'timeout'):
-            if int(value) <= 0:
+            try:
+                if int(value) <= 0:
+                    raise ValueError()
+            except ValueError:
                 message = _(
                     "DPD Dictionary ValueError: "
                     "Reason-Invalid positive integer value: "
-                    "'%(key)s' = %(value)i ") % {
-                        'key': key, 'value': int(value)}
+                    "'%(key)s' = %(value)s ") % {
+                        'key': key, 'value': value}
                 raise exceptions.CommandError(message)
             else:
                 dpd_dict[key] = int(value)
@@ -72,7 +75,7 @@ def validate_lifetime_dict(lifetime_dict):
                 "Reason-Invalid unit key : "
                 "'%(key)s' not in %(supported_key)s ") % {
                     'key': key, 'supported_key': lifetime_keys}
-            raise KeyError(message)
+            raise exceptions.CommandError(message)
         if key == 'units' and value not in lifetime_units:
             message = _(
                 "Lifetime Dictionary ValueError: "
@@ -81,13 +84,16 @@ def validate_lifetime_dict(lifetime_dict):
                     'key_value': key, 'supported_units': lifetime_units}
             raise exceptions.CommandError(message)
         if key == 'value':
-            if int(value) < 60:
+            try:
+                if int(value) < 60:
+                    raise ValueError()
+            except ValueError:
                 message = _(
                     "Lifetime Dictionary ValueError: "
                     "Reason-Invalid value should be at least 60:"
-                    "'%(key_value)s' = %(value)i ") % {
-                        'key_value': key, 'value': int(value)}
-                raise exceptions.CommandError(str(message))
+                    "'%(key_value)s' = %(value)s ") % {
+                        'key_value': key, 'value': value}
+                raise exceptions.CommandError(message)
             else:
                 lifetime_dict['value'] = int(value)
     return

tests/unit/vpn/__init__.py renamed to neutronclient/tests/unit/vpn/__init__.py

@@ -20,7 +20,7 @@
 import sys
 
 from neutronclient.neutron.v2_0.vpn import ikepolicy
-from tests.unit import test_cli20
+from neutronclient.tests.unit import test_cli20
 
 
 class CLITestV20VpnIkePolicyJSON(test_cli20.CLITestV20Base):

tests/unit/vpn/test_cli20_ikepolicy.py renamed to neutronclient/tests/unit/vpn/test_cli20_ikepolicy.py

@@ -21,7 +21,7 @@
 
 from neutronclient.common import exceptions
 from neutronclient.neutron.v2_0.vpn import ipsec_site_connection
-from tests.unit import test_cli20
+from neutronclient.tests.unit import test_cli20
 
 
 class CLITestV20IPsecSiteConnectionJSON(test_cli20.CLITestV20Base):
@@ -227,10 +227,6 @@ def test_create_ipsec_site_connection_with_invalid_dpd_values(self):
         dpd = 'action=hold,interval=30,timeout=-1'
         self._test_dpd_values(dpd)
 
-    def test_create_ipsec_site_connection_dpd_timeout_less_than_interval(self):
-        dpd = 'action=restart,interval=30,timeout=10'
-        self._test_dpd_values(dpd)
-
     def test_list_ipsec_site_connection(self):
         """ipsecsite-connection-list."""
         resources = "ipsec_site_connections"

tests/unit/vpn/test_cli20_ipsec_site_connection.py renamed to neutronclient/tests/unit/vpn/test_cli20_ipsec_site_connection.py

@@ -20,7 +20,7 @@
 import sys
 
 from neutronclient.neutron.v2_0.vpn import ipsecpolicy
-from tests.unit import test_cli20
+from neutronclient.tests.unit import test_cli20
 
 
 class CLITestV20VpnIpsecPolicyJSON(test_cli20.CLITestV20Base):

tests/unit/vpn/test_cli20_ipsecpolicy.py renamed to neutronclient/tests/unit/vpn/test_cli20_ipsecpolicy.py

@@ -20,7 +20,7 @@
 import sys
 
 from neutronclient.neutron.v2_0.vpn import vpnservice
-from tests.unit import test_cli20
+from neutronclient.tests.unit import test_cli20
 
 
 class CLITestV20VpnServiceJSON(test_cli20.CLITestV20Base):