← Back to branch summary

~ubuntu-branches/ubuntu/raring/nova/raring-proposed

« back to all changes in this revision

Viewing changes to nova/tests/api/openstack/compute/test_image_metadata.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Adam Gandelman, Chuck Short
  • Date: 2012-11-23 09:04:58 UTC
  • mfrom: (1.1.66)
  • Revision ID: package-import@ubuntu.com-20121123090458-91565o7aev1i1h71
Tags: 2013.1~g1-0ubuntu1
https://launchpad.net/bugs/1073289
https://launchpad.net/bugs/1076442
[ Adam Gandelman ]
* debian/control: Ensure novaclient is upgraded with nova,
  require python-keystoneclient >= 1:2.9.0. (LP: #1073289)
* debian/patches/{ubuntu/*, rbd-security.patch}: Dropped, applied
  upstream.
* debian/control: Add python-testtools to Build-Depends.

[ Chuck Short ]
* New upstream version.
* Refreshed debian/patches/avoid_setuptools_git_dependency.patch.
* debian/rules: FTBFS if missing binaries.
* debian/nova-scheudler.install: Add missing rabbit-queues and
  nova-rpc-zmq-receiver.
* Remove nova-volume since it doesnt exist anymore, transition to cinder-*.
* debian/rules: install apport hook in the right place.
* debian/patches/ubuntu-show-tests.patch: Display test failures.
* debian/control: Add depends on genisoimage
* debian/control: Suggest guestmount.
* debian/control: Suggest websockify. (LP: #1076442)
* debian/nova.conf: Disable nova-volume service.
* debian/control: Depend on xen-system-* rather than the hypervisor.
* debian/control, debian/mans/nova-conductor.8, debian/nova-conductor.init,
  debian/nova-conductor.install, debian/nova-conductor.logrotate
  debian/nova-conductor.manpages, debian/nova-conductor.postrm
  debian/nova-conductor.upstart.in: Add nova-conductor service.
* debian/control: Add python-fixtures as a build deps.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/api/openstack/compute/test_image_metadata.py
18
18
import webob
19
19
 
20
20
from nova.api.openstack.compute import image_metadata
21
 
from nova import flags
 
21
from nova.openstack.common import cfg
22
22
from nova.openstack.common import jsonutils
23
23
from nova import test
24
24
from nova.tests.api.openstack import fakes
25
25
 
26
 
 
27
 
FLAGS = flags.FLAGS
 
26
CONF = cfg.CONF
28
27
 
29
28
 
30
29
class ImageMetaDataTest(test.TestCase):
134
133
        req = fakes.HTTPRequest.blank('/v2/fake/images/123/metadata/key1')
135
134
        req.method = 'PUT'
136
135
        overload = {}
137
 
        for num in range(FLAGS.quota_metadata_items + 1):
 
136
        for num in range(CONF.quota_metadata_items + 1):
138
137
            overload['key%s' % num] = 'value%s' % num
139
138
        body = {'meta': overload}
140
139
        req.body = jsonutils.dumps(body)
176
175
 
177
176
    def test_too_many_metadata_items_on_create(self):
178
177
        data = {"metadata": {}}
179
 
        for num in range(FLAGS.quota_metadata_items + 1):
 
178
        for num in range(CONF.quota_metadata_items + 1):
180
179
            data['metadata']['key%i' % num] = "blah"
181
180
        req = fakes.HTTPRequest.blank('/v2/fake/images/123/metadata')
182
181
        req.method = 'POST'