diff -Nru neutron-lbaas-8.2.0/AUTHORS neutron-lbaas-8.3.0/AUTHORS --- neutron-lbaas-8.2.0/AUTHORS 2016-08-29 18:16:52.000000000 +0000 +++ neutron-lbaas-8.3.0/AUTHORS 2016-10-11 17:26:40.000000000 +0000 @@ -236,6 +236,7 @@ armando-migliaccio armando-migliaccio berlin +chen, hao chenghang fishcried fujioka yuuichi diff -Nru neutron-lbaas-8.2.0/ChangeLog neutron-lbaas-8.3.0/ChangeLog --- neutron-lbaas-8.2.0/ChangeLog 2016-08-29 18:16:52.000000000 +0000 +++ neutron-lbaas-8.3.0/ChangeLog 2016-10-11 17:26:40.000000000 +0000 @@ -1,6 +1,15 @@ CHANGES ======= +8.3.0 +----- + +* Fixed lbaasv2 service plugin alias definition +* Updated from global requirements +* Set HTTP status code to 409 for LBs in PENDING* +* Allow setting "insecure" in neutron_lbaas.conf +* Allow tox to be run with python 3 + 8.2.0 ----- diff -Nru neutron-lbaas-8.2.0/debian/changelog neutron-lbaas-8.3.0/debian/changelog --- neutron-lbaas-8.2.0/debian/changelog 2016-09-27 12:31:07.000000000 +0000 +++ neutron-lbaas-8.3.0/debian/changelog 2016-10-13 19:32:27.000000000 +0000 @@ -1,3 +1,9 @@ +neutron-lbaas (2:8.3.0-0ubuntu1) xenial; urgency=medium + + * New upstream stable point release for OpenStack Mitaka (LP: #1633191). + + -- Corey Bryant Thu, 13 Oct 2016 15:32:27 -0400 + neutron-lbaas (2:8.2.0-0ubuntu1) xenial; urgency=medium * New upstream stable point release for OpenStack Mitaka (LP: #1619318). diff -Nru neutron-lbaas-8.2.0/neutron_lbaas/common/keystone.py neutron-lbaas-8.3.0/neutron_lbaas/common/keystone.py --- neutron-lbaas-8.2.0/neutron_lbaas/common/keystone.py 2016-08-29 18:14:28.000000000 +0000 +++ neutron-lbaas-8.3.0/neutron_lbaas/common/keystone.py 2016-10-11 17:23:13.000000000 +0000 @@ -76,6 +76,11 @@ 'endpoint_type', default='public', help=_('The endpoint_type to be used') + ), + cfg.BoolOpt( + 'insecure', + default=False, + help=_('Disable server certificate verification') ) ] @@ -92,6 +97,7 @@ if not _SESSION: auth_url = cfg.CONF.service_auth.auth_url + insecure = cfg.CONF.service_auth.insecure kwargs = {'auth_url': auth_url, 'username': cfg.CONF.service_auth.admin_user, 'password': cfg.CONF.service_auth.admin_password} @@ -111,7 +117,7 @@ try: kc = client.Password(**kwargs) - _SESSION = session.Session(auth=kc) + _SESSION = session.Session(auth=kc, verify=not insecure) except Exception: with excutils.save_and_reraise_exception(): LOG.exception(_LE("Error creating Keystone session.")) diff -Nru neutron-lbaas-8.2.0/neutron_lbaas/extensions/loadbalancerv2.py neutron-lbaas-8.3.0/neutron_lbaas/extensions/loadbalancerv2.py --- neutron-lbaas-8.2.0/neutron_lbaas/extensions/loadbalancerv2.py 2016-08-29 18:14:28.000000000 +0000 +++ neutron-lbaas-8.3.0/neutron_lbaas/extensions/loadbalancerv2.py 2016-10-11 17:23:13.000000000 +0000 @@ -80,7 +80,7 @@ message = _("Cannot change %(attribute)s if one already exists") -class StateInvalid(nexception.NeutronException): +class StateInvalid(nexception.Conflict): message = _("Invalid state %(state)s of loadbalancer resource %(id)s") diff -Nru neutron-lbaas-8.2.0/neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancerv2.py neutron-lbaas-8.3.0/neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancerv2.py --- neutron-lbaas-8.2.0/neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancerv2.py 2016-08-29 18:14:28.000000000 +0000 +++ neutron-lbaas-8.3.0/neutron_lbaas/tests/unit/db/loadbalancer/test_db_loadbalancerv2.py 2016-10-11 17:23:13.000000000 +0000 @@ -37,6 +37,7 @@ from neutron_lbaas._i18n import _ from neutron_lbaas.common.cert_manager import cert_manager from neutron_lbaas.common import exceptions +from neutron_lbaas.db.loadbalancer import loadbalancer_dbv2 from neutron_lbaas.db.loadbalancer import models from neutron_lbaas.drivers.logging_noop import driver as noop_driver import neutron_lbaas.extensions @@ -641,6 +642,20 @@ self.assertEqual(constants.ACTIVE, hm_status['provisioning_status']) + def test_assert_modification_allowed(self): + mock_lb = mock.MagicMock() + mock_lb.provisioning_status = constants.PENDING_UPDATE + mock_lb.id = uuidutils.generate_uuid() + LBPluginDBv2 = loadbalancer_dbv2.LoadBalancerPluginDbv2() + + self.assertRaises( + loadbalancerv2.StateInvalid, + LBPluginDBv2.assert_modification_allowed, mock_lb) + # Check that this is a sub-exception of conflict to return 409 + self.assertRaises( + n_exc.Conflict, + LBPluginDBv2.assert_modification_allowed, mock_lb) + class LbaasLoadBalancerTests(LbaasPluginDbTestCase): diff -Nru neutron-lbaas-8.2.0/neutron_lbaas.egg-info/entry_points.txt neutron-lbaas-8.3.0/neutron_lbaas.egg-info/entry_points.txt --- neutron-lbaas-8.2.0/neutron_lbaas.egg-info/entry_points.txt 2016-08-29 18:16:52.000000000 +0000 +++ neutron-lbaas-8.3.0/neutron_lbaas.egg-info/entry_points.txt 2016-10-11 17:26:40.000000000 +0000 @@ -16,7 +16,7 @@ neutron-lbaas = neutron_lbaas.db.migration:alembic_migrations [neutron.service_plugins] -lbaasv2 = neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2 +lbaasv2 = neutron_lbaas.services.loadbalancer.plugin:LoadBalancerPluginv2 [neutron_lbaas.cert_manager.backend] barbican = neutron_lbaas.common.cert_manager.barbican_cert_manager diff -Nru neutron-lbaas-8.2.0/neutron_lbaas.egg-info/pbr.json neutron-lbaas-8.3.0/neutron_lbaas.egg-info/pbr.json --- neutron-lbaas-8.2.0/neutron_lbaas.egg-info/pbr.json 2016-08-29 18:16:52.000000000 +0000 +++ neutron-lbaas-8.3.0/neutron_lbaas.egg-info/pbr.json 2016-10-11 17:26:40.000000000 +0000 @@ -1 +1 @@ -{"is_release": true, "git_version": "799b93e"} \ No newline at end of file +{"is_release": true, "git_version": "a610227"} \ No newline at end of file diff -Nru neutron-lbaas-8.2.0/neutron_lbaas.egg-info/PKG-INFO neutron-lbaas-8.3.0/neutron_lbaas.egg-info/PKG-INFO --- neutron-lbaas-8.2.0/neutron_lbaas.egg-info/PKG-INFO 2016-08-29 18:16:52.000000000 +0000 +++ neutron-lbaas-8.3.0/neutron_lbaas.egg-info/PKG-INFO 2016-10-11 17:26:40.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: neutron-lbaas -Version: 8.2.0 +Version: 8.3.0 Summary: OpenStack Networking Load Balancing as a Service Home-page: http://www.openstack.org/ Author: OpenStack diff -Nru neutron-lbaas-8.2.0/PKG-INFO neutron-lbaas-8.3.0/PKG-INFO --- neutron-lbaas-8.2.0/PKG-INFO 2016-08-29 18:16:53.000000000 +0000 +++ neutron-lbaas-8.3.0/PKG-INFO 2016-10-11 17:26:42.000000000 +0000 @@ -1,6 +1,6 @@ Metadata-Version: 1.1 Name: neutron-lbaas -Version: 8.2.0 +Version: 8.3.0 Summary: OpenStack Networking Load Balancing as a Service Home-page: http://www.openstack.org/ Author: OpenStack diff -Nru neutron-lbaas-8.2.0/setup.cfg neutron-lbaas-8.3.0/setup.cfg --- neutron-lbaas-8.2.0/setup.cfg 2016-08-29 18:16:53.000000000 +0000 +++ neutron-lbaas-8.3.0/setup.cfg 2016-10-11 17:26:42.000000000 +0000 @@ -44,7 +44,7 @@ neutron.services.loadbalancer.agent_scheduler.ChanceScheduler = neutron_lbaas.services.loadbalancer.agent_scheduler:ChanceScheduler neutron.services.loadbalancer.agent_scheduler.LeastPoolAgentScheduler = neutron_lbaas.services.loadbalancer.agent_scheduler:LeastPoolAgentScheduler neutron.service_plugins = - lbaasv2 = neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2 + lbaasv2 = neutron_lbaas.services.loadbalancer.plugin:LoadBalancerPluginv2 neutron.db.alembic_migrations = neutron-lbaas = neutron_lbaas.db.migration:alembic_migrations neutron_lbaas.cert_manager.backend = diff -Nru neutron-lbaas-8.2.0/test-requirements.txt neutron-lbaas-8.3.0/test-requirements.txt --- neutron-lbaas-8.2.0/test-requirements.txt 2016-08-29 18:14:28.000000000 +0000 +++ neutron-lbaas-8.3.0/test-requirements.txt 2016-10-11 17:23:13.000000000 +0000 @@ -21,4 +21,4 @@ WebTest>=2.0 # MIT reno>=0.1.1 # Apache2 # Needed to run DB commands in virtualenvs -PyMySQL>=0.6.2 # MIT License +PyMySQL!=0.7.7,>=0.6.2 # MIT License diff -Nru neutron-lbaas-8.2.0/tox.ini neutron-lbaas-8.3.0/tox.ini --- neutron-lbaas-8.2.0/tox.ini 2016-08-29 18:14:28.000000000 +0000 +++ neutron-lbaas-8.3.0/tox.ini 2016-10-11 17:23:13.000000000 +0000 @@ -55,7 +55,7 @@ # E126 continuation line over-indented for hanging indent # E128 continuation line under-indented for visual indent # E129 visually indented line with same indent as next logical line -# E265 block comment should start with ‘# ‘ +# E265 block comment should start with '# ' # H405 multi line docstring summary not separated with an empty line # TODO(marun) H404 multi line docstring should start with a summary # N324 contextlib.nested is deprecated