Merge lp:~corey.bryant/ubuntu/vivid/neutron-vpnaas/2015.1.1 into lp:ubuntu/vivid-updates/neutron-vpnaas

[Corey Bryant]

[Corey Bryant (corey.bryant)]

I've uploaded this to the archive and will let the Package Import Robot commit the branch changes.

Unmerged revisions

8. By Corey Bryant on 2015-08-04

* Resynchronize with stable/kilo (9c73c0c) (LP: #1481008):
  - [fb18c46] Set vpn agent's agent_state['binary'] attribute
  - [0ec1668] Fix failures for integration tests
  - [053fd30] VPNaaS: Fix breakage in status reporting
  - [5cc0613] Libreswan driver support in VPNaaS
  - [9c73c0c] Provide Fedora support for StrongSwan

=== modified file 'AUTHORS'
--- AUTHORS	2015-03-30 11:20:04 +0000
+++ AUTHORS	2015-08-04 15:46:24 +0000
@@ -147,6 +147,7 @@
 Tomoko Inoue <[e-mail]>
 Trinath Somanchi <[e-mail]>
 Tyler Smith <[e-mail]>
+Wei Hu <[e-mail]>
 Weidong Shao <[e-mail]>
 Wu Wenxiang <[e-mail]>
 YAMAMOTO Takashi <[e-mail]>
@@ -174,6 +175,7 @@
 johndavidge <[e-mail]>
 justin Lund <[e-mail]>
 lawrancejing <[e-mail]>
+leejian0612 <[e-mail]>
 liu-sheng <[e-mail]>
 liuqing <[e-mail]>
 llg8212 <[e-mail]>
@@ -187,6 +189,7 @@
 sridhargaddam <[e-mail]>
 sukhdev <[e-mail]>
 trinaths <[e-mail]>
+venkata anil <[e-mail]>
 vikas <[e-mail]>
 vinkesh banka <[e-mail]>
 zhhuabj <[e-mail]>
 
=== modified file 'ChangeLog'
--- ChangeLog	2015-04-30 18:32:31 +0000
+++ ChangeLog	2015-08-04 15:46:24 +0000
@@ -1,6 +1,17 @@
 CHANGES
 =======
 
+2015.1.1
+--------
+
+* Updated from global requirements
+* Set vpn agent's agent_state['binary'] attribute
+* Fix failures for integration tests
+* VPNaaS: Fix breakage in status reporting
+* Libreswan driver support in VPNaaS
+* Provide Fedora support for StrongSwan
+* Bump pre-release to 2015.1.1
+
 2015.1.0
 --------
 
 
=== modified file 'PKG-INFO'
--- PKG-INFO	2015-04-30 18:32:31 +0000
+++ PKG-INFO	2015-08-04 15:46:24 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: neutron-vpnaas
-Version: 2015.1.0
+Version: 2015.1.1
 Summary: OpenStack Networking VPN as a Service
 Home-page: http://www.openstack.org/
 Author: OpenStack
 
=== modified file 'debian/changelog'
--- debian/changelog	2015-04-30 18:32:31 +0000
+++ debian/changelog	2015-08-04 15:46:24 +0000
@@ -1,3 +1,14 @@
+neutron-vpnaas (1:2015.1.1-0ubuntu1) UNRELEASED; urgency=medium
+
+  * Resynchronize with stable/kilo (9c73c0c) (LP: #1481008):
+    - [fb18c46] Set vpn agent's agent_state['binary'] attribute
+    - [0ec1668] Fix failures for integration tests
+    - [053fd30] VPNaaS: Fix breakage in status reporting
+    - [5cc0613] Libreswan driver support in VPNaaS
+    - [9c73c0c] Provide Fedora support for StrongSwan
+
+ -- Corey Bryant <[e-mail]>  Tue, 04 Aug 2015 11:31:19 -0400
+
 neutron-vpnaas (1:2015.1.0-0ubuntu1) vivid; urgency=medium
 
   * New upstream release for OpenStack kilo. (LP: #1449744) 
 
=== modified file 'etc/neutron/rootwrap.d/vpnaas.filters'
--- etc/neutron/rootwrap.d/vpnaas.filters	2015-03-30 11:20:04 +0000
+++ etc/neutron/rootwrap.d/vpnaas.filters	2015-08-04 15:46:24 +0000
@@ -11,5 +11,6 @@
 ip: IpFilter, ip, root
 ip_exec: IpNetnsExecFilter, ip, root
 ipsec: CommandFilter, ipsec, root
+strongswan: CommandFilter, strongswan, root
 neutron_netns_wrapper: CommandFilter, neutron-vpn-netns-wrapper, root
 neutron_netns_wrapper_local: CommandFilter, /usr/local/bin/neutron-vpn-netns-wrapper, root
 
=== modified file 'etc/vpn_agent.ini'
--- etc/vpn_agent.ini	2015-03-30 11:20:04 +0000
+++ etc/vpn_agent.ini	2015-08-04 15:46:24 +0000
@@ -12,6 +12,8 @@
 # vpn_device_driver=neutron_vpnaas.services.vpn.device_drivers.cisco_ipsec.CiscoCsrIPsecDriver
 # vpn_device_driver=neutron_vpnaas.services.vpn.device_drivers.vyatta_ipsec.VyattaIPSecDriver
 # vpn_device_driver=neutron_vpnaas.services.vpn.device_drivers.strongswan_ipsec.StrongSwanDriver
+# vpn_device_driver=neutron_vpnaas.services.vpn.device_drivers.fedora_strongswan_ipsec.FedoraStrongSwanDriver
+# vpn_device_driver=neutron_vpnaas.services.vpn.device_drivers.libreswan_ipsec.LibreSwanDriver
 # vpn_device_driver=another_driver
 
 [ipsec]
 
=== modified file 'neutron_vpnaas.egg-info/PKG-INFO'
--- neutron_vpnaas.egg-info/PKG-INFO	2015-04-30 18:32:31 +0000
+++ neutron_vpnaas.egg-info/PKG-INFO	2015-08-04 15:46:24 +0000
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: neutron-vpnaas
-Version: 2015.1.0
+Version: 2015.1.1
 Summary: OpenStack Networking VPN as a Service
 Home-page: http://www.openstack.org/
 Author: OpenStack
 
=== modified file 'neutron_vpnaas.egg-info/SOURCES.txt'
--- neutron_vpnaas.egg-info/SOURCES.txt	2015-04-30 18:32:31 +0000
+++ neutron_vpnaas.egg-info/SOURCES.txt	2015-08-04 15:46:24 +0000
@@ -63,7 +63,9 @@
 neutron_vpnaas/services/vpn/device_drivers/__init__.py
 neutron_vpnaas/services/vpn/device_drivers/cisco_csr_rest_client.py
 neutron_vpnaas/services/vpn/device_drivers/cisco_ipsec.py
+neutron_vpnaas/services/vpn/device_drivers/fedora_strongswan_ipsec.py
 neutron_vpnaas/services/vpn/device_drivers/ipsec.py
+neutron_vpnaas/services/vpn/device_drivers/libreswan_ipsec.py
 neutron_vpnaas/services/vpn/device_drivers/strongswan_ipsec.py
 neutron_vpnaas/services/vpn/device_drivers/vyatta_ipsec.py
 neutron_vpnaas/services/vpn/device_drivers/template/openswan/ipsec.conf.template
 
=== modified file 'neutron_vpnaas.egg-info/pbr.json'
--- neutron_vpnaas.egg-info/pbr.json	2015-04-30 18:32:31 +0000
+++ neutron_vpnaas.egg-info/pbr.json	2015-08-04 15:46:24 +0000
@@ -1,1 +1,1 @@
-{"is_release": true, "git_version": "eca9e87"}
 \ No newline at end of file
+{"is_release": true, "git_version": "db6dfc8"}
 \ No newline at end of file
 
=== modified file 'neutron_vpnaas.egg-info/requires.txt'
--- neutron_vpnaas.egg-info/requires.txt	2015-04-10 10:27:42 +0000
+++ neutron_vpnaas.egg-info/requires.txt	2015-08-04 15:46:24 +0000
@@ -1,14 +1,14 @@
-pbr>=0.6,!=0.7,<1.0
-requests>=2.2.0,!=2.4.0
-Jinja2>=2.6  # BSD License3 clause
+pbr!=0.7,<1.0,>=0.6
+requests!=2.4.0,>=2.2.0
+Jinja2>=2.6 # BSD License3 clause
 netaddr>=0.7.12
-SQLAlchemy>=0.9.7,<=0.9.99
+SQLAlchemy<=0.9.99,>=0.9.7
 alembic>=0.7.2
 six>=1.9.0
-oslo.concurrency>=1.8.0,<1.9.0         # Apache-2.0
-oslo.config>=1.9.3,<1.10.0  # Apache-2.0
-oslo.db>=1.7.0,<1.8.0  # Apache-2.0
-oslo.log>=1.0.0,<1.1.0  # Apache-2.0
-oslo.messaging>=1.8.0,<1.9.0  # Apache-2.0
-oslo.serialization>=1.4.0,<1.5.0               # Apache-2.0
-oslo.utils>=1.4.0,<1.5.0                       # Apache-2.0
+oslo.concurrency<1.9.0,>=1.8.0 # Apache-2.0
+oslo.config<1.10.0,>=1.9.3 # Apache-2.0
+oslo.db<1.8.0,>=1.7.0 # Apache-2.0
+oslo.log<1.1.0,>=1.0.0 # Apache-2.0
+oslo.messaging<1.9.0,>=1.8.0 # Apache-2.0
+oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
 
=== modified file 'neutron_vpnaas/services/vpn/agent.py'
--- neutron_vpnaas/services/vpn/agent.py	2015-04-10 10:27:42 +0000
+++ neutron_vpnaas/services/vpn/agent.py	2015-08-04 15:46:24 +0000
@@ -34,6 +34,7 @@
     """VPNAgent class which can handle vpn service drivers."""
     def __init__(self, host, conf=None):
         super(VPNAgent, self).__init__(host=host, conf=conf)
+        self.agent_state['binary'] = 'neutron-vpn-agent'
         self.service = vpn_service.VPNService(self)
         self.device_drivers = self.service.load_device_drivers(host)
 
 
=== added file 'neutron_vpnaas/services/vpn/device_drivers/fedora_strongswan_ipsec.py'
--- neutron_vpnaas/services/vpn/device_drivers/fedora_strongswan_ipsec.py	1970-01-01 00:00:00 +0000
+++ neutron_vpnaas/services/vpn/device_drivers/fedora_strongswan_ipsec.py	2015-08-04 15:46:24 +0000
@@ -0,0 +1,107 @@
+# Copyright (c) 2015 IBM, Inc.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+
+import os
+
+from oslo_config import cfg
+from oslo_log import log as logging
+
+from neutron_vpnaas.services.vpn.device_drivers import ipsec
+from neutron_vpnaas.services.vpn.device_drivers import strongswan_ipsec
+
+LOG = logging.getLogger(__name__)
+TEMPLATE_PATH = os.path.dirname(os.path.abspath(__file__))
+
+cfg.CONF.set_default(name='default_config_area',
+                     default=os.path.join(
+                         TEMPLATE_PATH,
+                         '/usr/share/strongswan/templates/'
+                         'config/strongswan.d'),
+                     group='strongswan')
+
+
+class FedoraStrongSwanProcess(strongswan_ipsec.StrongSwanProcess):
+
+    binary = 'strongswan'
+    CONFIG_DIRS = [
+        'var/run',
+        'log',
+        'etc',
+        'etc/strongswan/ipsec.d/aacerts',
+        'etc/strongswan/ipsec.d/acerts',
+        'etc/strongswan/ipsec.d/cacerts',
+        'etc/strongswan/ipsec.d/certs',
+        'etc/strongswan/ipsec.d/crls',
+        'etc/strongswan/ipsec.d/ocspcerts',
+        'etc/strongswan/ipsec.d/policies',
+        'etc/strongswan/ipsec.d/private',
+        'etc/strongswan/ipsec.d/reqs',
+        'etc/pki/nssdb/'
+    ]
+    STATUS_NOT_RUNNING_RE = ('Command:.*[ipsec|strongswan].*status.*'
+                             'Exit code: [1|3] ')
+
+    def __init__(self, conf, process_id, vpnservice, namespace):
+        super(FedoraStrongSwanProcess, self).__init__(conf, process_id,
+                                                      vpnservice, namespace)
+
+    def ensure_configs(self):
+        """Generate config files which are needed for StrongSwan.
+
+        If there is no directory, this function will create
+        dirs.
+        """
+        self.ensure_config_dir(self.vpnservice)
+        self.ensure_config_file(
+            'ipsec.conf',
+            cfg.CONF.strongswan.ipsec_config_template,
+            self.vpnservice)
+        self.ensure_config_file(
+            'strongswan.conf',
+            cfg.CONF.strongswan.strongswan_config_template,
+            self.vpnservice)
+        self.ensure_config_file(
+            'ipsec.secrets',
+            cfg.CONF.strongswan.ipsec_secret_template,
+            self.vpnservice)
+        self.copy_and_overwrite(cfg.CONF.strongswan.default_config_area,
+                                self._get_config_filename('strongswan.d'))
+        # Fedora uses /usr/share/strongswan/templates/config/ as strongswan
+        # template directory. But /usr/share/strongswan/templates/config/
+        # strongswan.d does not include charon. Those configuration files
+        # are in /usr/share/strongswan/templates/config/plugins directory.
+        charon_dir = os.path.join(
+            cfg.CONF.strongswan.default_config_area,
+            'charon')
+        if not os.path.exists(charon_dir):
+            plugins_dir = os.path.join(
+                cfg.CONF.strongswan.default_config_area, '../plugins')
+            self.copy_and_overwrite(
+                plugins_dir,
+                self._get_config_filename('strongswan.d/charon'))
+
+    def _get_config_filename(self, kind):
+        config_dir = '%s/strongswan' % self.etc_dir
+        return os.path.join(config_dir, kind)
+
+
+class FedoraStrongSwanDriver(ipsec.IPsecDriver):
+
+    def create_process(self, process_id, vpnservice, namespace):
+        return FedoraStrongSwanProcess(
+            self.conf,
+            process_id,
+            vpnservice,
+            namespace)
 
=== modified file 'neutron_vpnaas/services/vpn/device_drivers/ipsec.py'
--- neutron_vpnaas/services/vpn/device_drivers/ipsec.py	2015-04-10 10:27:42 +0000
+++ neutron_vpnaas/services/vpn/device_drivers/ipsec.py	2015-08-04 15:46:24 +0000
@@ -298,16 +298,17 @@
                                            self.STATUS_MAP[status])
 
     def _record_connection_status(self, connection_id, status,
-                                  updated_pending_status=False):
-        if not self.connection_status.get(connection_id):
+                                  force_status_update=False):
+        conn_info = self.connection_status.get(connection_id)
+        if not conn_info:
             self.connection_status[connection_id] = {
                 'status': status,
-                'updated_pending_status': updated_pending_status
+                'updated_pending_status': force_status_update
             }
         else:
-            self.connection_status[connection_id]['status'] = status
-            self.connection_status[connection_id]['updated_pending_status'] = (
-                updated_pending_status)
+            conn_info['status'] = status
+            if force_status_update:
+                conn_info['updated_pending_status'] = True
 
 
 class OpenSwanProcess(BaseSwanProcess):
@@ -380,7 +381,7 @@
             ip_addr = self._resolve_fqdn(address)
             if not ip_addr:
                 self._record_connection_status(connection_id, constants.ERROR,
-                                               updated_pending_status=True)
+                                               force_status_update=True)
                 raise vpnaas.VPNPeerAddressNotResolved(peer_address=address)
         else:
             ip_addr = address
 
=== added file 'neutron_vpnaas/services/vpn/device_drivers/libreswan_ipsec.py'
--- neutron_vpnaas/services/vpn/device_drivers/libreswan_ipsec.py	1970-01-01 00:00:00 +0000
+++ neutron_vpnaas/services/vpn/device_drivers/libreswan_ipsec.py	2015-08-04 15:46:24 +0000
@@ -0,0 +1,50 @@
+# Copyright (c) 2015 Red Hat, Inc.
+# All Rights Reserved.
+#
+#    Licensed under the Apache License, Version 2.0 (the "License"); you may
+#    not use this file except in compliance with the License. You may obtain
+#    a copy of the License at
+#
+#         http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+#    WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+#    License for the specific language governing permissions and limitations
+#    under the License.
+from neutron_vpnaas.services.vpn.device_drivers import ipsec
+
+
+class LibreSwanProcess(ipsec.OpenSwanProcess):
+    """Libreswan Process manager class.
+
+    Libreswan needs nssdb initialised before running pluto daemon.
+    """
+    def __init__(self, conf, process_id, vpnservice, namespace):
+        super(LibreSwanProcess, self).__init__(conf, process_id,
+                                              vpnservice, namespace)
+
+    def ensure_configs(self):
+        """Generate config files which are needed for Libreswan.
+
+        Initialise the nssdb, otherwise pluto daemon will fail to run.
+        """
+        super(LibreSwanProcess, self).ensure_configs()
+        # Load the ipsec kernel module if not loaded
+        self._execute([self.binary, '_stackmanager', 'start'])
+        # checknss creates nssdb only if it is missing
+        # It is added in Libreswan version v3.10
+        # For prior versions use initnss
+        try:
+            self._execute([self.binary, 'checknss', self.etc_dir])
+        except RuntimeError:
+            self._execute([self.binary, 'initnss', self.etc_dir])
+
+
+class LibreSwanDriver(ipsec.IPsecDriver):
+    def create_process(self, process_id, vpnservice, namespace):
+        return LibreSwanProcess(
+            self.conf,
+            process_id,
+            vpnservice,
+            namespace)
 
=== modified file 'neutron_vpnaas/tests/unit/db/vpn/test_vpn_db.py'
--- neutron_vpnaas/tests/unit/db/vpn/test_vpn_db.py	2015-04-10 10:27:42 +0000
+++ neutron_vpnaas/tests/unit/db/vpn/test_vpn_db.py	2015-08-04 15:46:24 +0000
@@ -453,6 +453,16 @@
 
 class TestVpnaas(VPNPluginDbTestCase):
 
+    def setUp(self, **kwargs):
+        # TODO(armax): this is far from being a unit test case, as it tests
+        # that multiple parties (core + vpn) are integrated properly and
+        # should be replaced by API test that do not rely on so much mocking.
+        # NOTE(armax): make sure that the callbacks needed by this test are
+        # registered, as they may get wiped out depending by the order in
+        # which imports, subscriptions and mocks occur.
+        super(TestVpnaas, self).setUp(**kwargs)
+        vpn_db.subscribe()
+
     def _check_policy(self, policy, keys, lifetime):
         for k, v in keys:
             self.assertEqual(policy[k], v)
 
=== modified file 'neutron_vpnaas/tests/unit/services/vpn/device_drivers/test_ipsec.py'
--- neutron_vpnaas/tests/unit/services/vpn/device_drivers/test_ipsec.py	2015-04-10 10:27:42 +0000
+++ neutron_vpnaas/tests/unit/services/vpn/device_drivers/test_ipsec.py	2015-08-04 15:46:24 +0000
@@ -25,7 +25,9 @@
 from oslo_config import cfg
 
 from neutron_vpnaas.extensions import vpnaas
+from neutron_vpnaas.services.vpn.device_drivers import fedora_strongswan_ipsec
 from neutron_vpnaas.services.vpn.device_drivers import ipsec as ipsec_driver
+from neutron_vpnaas.services.vpn.device_drivers import libreswan_ipsec
 from neutron_vpnaas.services.vpn.device_drivers import strongswan_ipsec
 from neutron_vpnaas.tests import base
 
@@ -643,6 +645,36 @@
                          self.driver.connection_status)
 
 
+class TestLibreSwanProcess(base.BaseTestCase):
+    def setUp(self):
+        super(TestLibreSwanProcess, self).setUp()
+        self.ipsec_process = libreswan_ipsec.LibreSwanProcess(mock.ANY,
+                                                       'foo-process-id',
+                                                       FAKE_VPN_SERVICE,
+                                                       mock.ANY)
+
+    def test_ensure_configs(self):
+        ipsec_driver.OpenSwanProcess.ensure_configs = mock.Mock()
+        with mock.patch.object(self.ipsec_process, '_execute') as fake_execute:
+            self.ipsec_process.ensure_configs()
+            expected = [mock.call(['ipsec', '_stackmanager', 'start']),
+                        mock.call(['ipsec', 'checknss',
+                                   self.ipsec_process.etc_dir])]
+            fake_execute.assert_has_calls(expected)
+            self.assertEqual(fake_execute.call_count, 2)
+
+        with mock.patch.object(self.ipsec_process, '_execute') as fake_execute:
+            fake_execute.side_effect = [None, RuntimeError, None]
+            self.ipsec_process.ensure_configs()
+            expected = [mock.call(['ipsec', '_stackmanager', 'start']),
+                        mock.call(['ipsec', 'checknss',
+                                   self.ipsec_process.etc_dir]),
+                        mock.call(['ipsec', 'initnss',
+                                   self.ipsec_process.etc_dir])]
+            fake_execute.assert_has_calls(expected)
+            self.assertEqual(fake_execute.call_count, 3)
+
+
 class IPsecStrongswanDeviceDriverLegacy(IPSecDeviceLegacy):
     def setUp(self, driver=strongswan_ipsec.StrongSwanDriver,
               ipsec_process='strongswan_ipsec.StrongSwanProcess'):
@@ -738,3 +770,20 @@
               ipsec_process='strongswan_ipsec.StrongSwanProcess'):
         super(IPsecStrongswanDeviceDriverDVR, self).setUp(driver,
                                                           ipsec_process)
+
+
+class IPsecFedoraStrongswanDeviceDriverLegacy(
+    IPsecStrongswanDeviceDriverLegacy):
+
+    def setUp(self, driver=fedora_strongswan_ipsec.FedoraStrongSwanDriver,
+              ipsec_process=fedora_strongswan_ipsec.FedoraStrongSwanProcess):
+        super(IPsecFedoraStrongswanDeviceDriverLegacy,
+              self).setUp(driver, ipsec_process)
+
+
+class IPsecFedoraStrongswanDeviceDriverDVR(IPSecDeviceDVR):
+
+    def setUp(self, driver=fedora_strongswan_ipsec.FedoraStrongSwanDriver,
+              ipsec_process=fedora_strongswan_ipsec.FedoraStrongSwanProcess):
+        super(IPsecFedoraStrongswanDeviceDriverDVR, self).setUp(driver,
+                                                                ipsec_process)
 
=== modified file 'requirements.txt'
--- requirements.txt	2015-04-30 18:32:31 +0000
+++ requirements.txt	2015-08-04 15:46:24 +0000
@@ -1,21 +1,21 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-pbr>=0.6,!=0.7,<1.0
+pbr!=0.7,<1.0,>=0.6
 
-requests>=2.2.0,!=2.4.0
-Jinja2>=2.6  # BSD License (3 clause)
+requests!=2.4.0,>=2.2.0
+Jinja2>=2.6 # BSD License (3 clause)
 netaddr>=0.7.12
-SQLAlchemy>=0.9.7,<=0.9.99
+SQLAlchemy<=0.9.99,>=0.9.7
 alembic>=0.7.2
 six>=1.9.0
-oslo.concurrency>=1.8.0,<1.9.0         # Apache-2.0
-oslo.config>=1.9.3,<1.10.0  # Apache-2.0
-oslo.db>=1.7.0,<1.8.0  # Apache-2.0
-oslo.log>=1.0.0,<1.1.0  # Apache-2.0
-oslo.messaging>=1.8.0,<1.9.0  # Apache-2.0
-oslo.serialization>=1.4.0,<1.5.0               # Apache-2.0
-oslo.utils>=1.4.0,<1.5.0                       # Apache-2.0
+oslo.concurrency<1.9.0,>=1.8.0 # Apache-2.0
+oslo.config<1.10.0,>=1.9.3 # Apache-2.0
+oslo.db<1.8.0,>=1.7.0 # Apache-2.0
+oslo.log<1.1.0,>=1.0.0 # Apache-2.0
+oslo.messaging<1.9.0,>=1.8.0 # Apache-2.0
+oslo.serialization<1.5.0,>=1.4.0 # Apache-2.0
+oslo.utils<1.5.0,>=1.4.0 # Apache-2.0
 
 # This project does depend on neutron as a library, but the
 # openstack tooling does not play nicely with projects that
 
=== modified file 'setup.cfg'
--- setup.cfg	2015-03-30 11:20:04 +0000
+++ setup.cfg	2015-08-04 15:46:24 +0000
@@ -1,6 +1,6 @@
 [metadata]
 name = neutron-vpnaas
-version = 2015.1
+version = 2015.1.1
 summary = OpenStack Networking VPN as a Service
 description-file = 
 	README.rst
 
=== modified file 'setup.py'
--- setup.py	2015-01-14 11:23:12 +0000
+++ setup.py	2015-08-04 15:46:24 +0000
@@ -1,4 +1,3 @@
-#!/usr/bin/env python
 # Copyright (c) 2013 Hewlett-Packard Development Company, L.P.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 
=== modified file 'test-requirements.txt'
--- test-requirements.txt	2015-04-10 10:27:42 +0000
+++ test-requirements.txt	2015-08-04 15:46:24 +0000
@@ -1,22 +1,22 @@
 # The order of packages is significant, because pip processes them in the order
 # of appearance. Changing the order has an impact on the overall integration
 # process, which may cause wedges in the gate later.
-hacking>=0.10.0,<0.11
+hacking<0.11,>=0.10.0
 
-cliff>=1.10.0,<1.11.0  # Apache-2.0
+cliff<1.11.0,>=1.10.0 # Apache-2.0
 coverage>=3.6
 discover
-fixtures>=0.3.14
-mock>=1.0
+fixtures<1.3.0,>=0.3.14
+mock<1.1.0,>=1.0
 python-subunit>=0.0.18
-requests-mock>=0.6.0  # Apache-2.0
-sphinx>=1.1.2,!=1.2.0,!=1.3b1,<1.3
-oslosphinx>=2.5.0,<2.6.0  # Apache-2.0
+requests-mock>=0.6.0 # Apache-2.0
+sphinx!=1.2.0,!=1.3b1,<1.3,>=1.1.2
+oslosphinx<2.6.0,>=2.5.0 # Apache-2.0
 testrepository>=0.0.18
-testtools>=0.9.36,!=1.2.0
+testtools!=1.2.0,>=0.9.36
 testscenarios>=0.4
 WebOb>=1.2.3
 WebTest>=2.0
-oslotest>=1.5.1,<1.6.0  # Apache-2.0
+oslotest<1.6.0,>=1.5.1 # Apache-2.0
 psycopg2
 MySQL-python