Merge "Add test_cisco_ipsec.py module for py34 support"

neutron_vpnaas/services/vpn/device_drivers/cisco_ipsec.py

@@ -235,7 +235,7 @@ class CiscoCsrIPsecDriver(device_drivers.DeviceDriver):
         """Remove connections that are not known by service driver."""
         service_count = 0
         connection_count = 0
-        for vpn_service_id, vpn_service in self.service_state.items():
+        for vpn_service_id, vpn_service in list(self.service_state.items()):
             dirty = [c_id for c_id, c in vpn_service.conn_state.items()
                      if c.is_dirty]
             vpn_service.connections_removed = len(dirty) > 0

neutron_vpnaas/tests/unit/services/vpn/device_drivers/test_cisco_ipsec.py

@@ -13,7 +13,6 @@
 #    under the License.
 
 import copy
-import httplib
 import operator
 
 import mock
@@ -26,6 +25,12 @@ from neutron_vpnaas.services.vpn.device_drivers import (
 from neutron_vpnaas.services.vpn.device_drivers \
     import cisco_ipsec as ipsec_driver
 from neutron_vpnaas.tests import base
+import six
+
+if six.PY3:
+    from http import client as httplib
+else:
+    import httplib
 
 _uuid = uuidutils.generate_uuid
 FAKE_HOST = 'fake_host'

tox.ini

@@ -93,6 +93,7 @@ commands = python -m testtools.run \
     neutron_vpnaas.tests.unit.services.vpn.common.test_netns_wrapper \
     neutron_vpnaas.tests.unit.extensions.test_vpnaas \
     neutron_vpnaas.tests.unit.services.vpn.device_drivers.test_ipsec \
+    neutron_vpnaas.tests.unit.services.vpn.device_drivers.test_cisco_ipsec \
     neutron_vpnaas.tests.unit.services.vpn.test_vpn_service \
     neutron_vpnaas.tests.unit.services.vpn.test_vyatta_vpn_service \
     neutron_vpnaas.tests.unit.services.vpn.service_drivers.test_vyatta_ipsec \