Merge lp:~gandelman-a/ubuntu/saucy/quantum/stevedore into lp:~openstack-ubuntu-testing/neutron/havana

[Adam Gandelman]

Should fix tests that are now failing:

======================================================================
ERROR: quantum.tests.unit.ml2.test_security_group.TestMl2SecurityGroupsXML.test_create_security_group_rule_duplicate_rule_in_post (subunit.RemotedTestCase)
quantum.tests.unit.ml2.test_security_group.TestMl2SecurityGroupsXML.test_create_security_group_rule_duplicate_rule_in_post
----------------------------------------------------------------------
_StringException: Empty attachments:
  stderr
  stdout

pythonlogging:'': {{{2013-05-29 13:36:52,211 INFO [quantum.manager] Loading Plugin: quantum.plugins.ml2.plugin.Ml2Plugin}}}

Traceback (most recent call last):
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/tests/unit/ml2/test_security_group.py", line 44, in setUp
    super(Ml2SecurityGroupsTestCase, self).setUp(PLUGIN_NAME)
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/tests/unit/test_extension_security_group.py", line 241, in setUp
    super(SecurityGroupDBTestCase, self).setUp(plugin)
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/tests/unit/test_db_plugin.py", line 124, in setUp
    self.api = APIRouter()
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/api/v2/router.py", line 76, in __init__
    plugin = manager.QuantumManager.get_plugin()
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/manager.py", line 201, in get_plugin
    return cls.get_instance().plugin
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/manager.py", line 196, in get_instance
    cls._create_instance()
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/openstack/common/lockutils.py", line 246, in inner
    retval = f(*args, **kwargs)
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/manager.py", line 190, in _create_instance
    cls._instance = cls()
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/manager.py", line 115, in __init__
    plugin_klass = importutils.import_class(plugin_provider)
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/openstack/common/importutils.py", line 30, in import_class
    __import__(mod_str)
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/plugins/ml2/plugin.py", line 39, in <module>
    from quantum.plugins.ml2 import managers
  File "/��BUILDDIR��/quantum-2013.2+git201305291330~saucy/quantum/plugins/ml2/managers.py", line 19, in <module>
    import stevedore
ImportError: No module named stevedore

[Adam Gandelman (gandelman-a)]

The (>= 0.8) is important.

review: Needs Resubmitting

=== modified file 'debian/changelog'
--- debian/changelog	2013-05-21 16:07:46 +0000
+++ debian/changelog	2013-05-29 18:55:32 +0000
@@ -1,12 +1,16 @@
-quantum (1:2013.2.a606.g058d156-0ubuntu1) UNRELEASED; urgency=low
+quantum (1:2013.2.a606.g058d156-0ubuntu2) UNRELEASED; urgency=low
 
+  [ Chuck Short ]
   * New upstream release.
   * debian/patches/fix-quantum-configuration.patch: Refreshed
   * debian/control: Add testrepository.
   * debian/control: Add subunit.
   * debian/control: Add python-d21o1 and python-pbr as build-depends.
 
- -- Chuck Short <[e-mail]>  Tue, 30 Apr 2013 10:01:18 -0500
+  [ Adam Gandelman ]
+  * debian/control: Add python-stevedore (>= 0.8).
+
+ -- Adam Gandelman <[e-mail]>  Wed, 29 May 2013 11:54:06 -0700
 
 quantum (1:2013.1-0ubuntu2) raring; urgency=low
 

=== modified file 'debian/control'
--- debian/control	2013-05-21 16:07:46 +0000
+++ debian/control	2013-05-29 18:55:32 +0000
@@ -36,6 +36,7 @@
  python-setuptools,
  python-setuptools-git,
  python-simplejson,
+ python-stevedore (>= 0.8),
  python-sqlalchemy,
  python-testtools,
  python-webob,
@@ -385,6 +386,7 @@
  python-quantumclient (>= 1:0.1.0.1-0ubuntu1),
  python-routes,
  python-simplejson,
+ python-stevedore (>= 0.8),
  python-sqlalchemy,
  python-webob,
  ${misc:Depends},