← 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/contrib/test_quotas.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/contrib/test_quotas.py
25
25
 
26
26
 
27
27
def quota_set(id):
28
 
    return {'quota_set': {'id': id, 'metadata_items': 128, 'volumes': 10,
29
 
            'gigabytes': 1000, 'ram': 51200, 'floating_ips': 10,
 
28
    return {'quota_set': {'id': id, 'metadata_items': 128,
 
29
            'ram': 51200, 'floating_ips': 10,
30
30
            'instances': 10, 'injected_files': 5, 'cores': 20,
31
31
            'injected_file_content_bytes': 10240,
32
32
            'security_groups': 10, 'security_group_rules': 20,
44
44
            'instances': 10,
45
45
            'cores': 20,
46
46
            'ram': 51200,
47
 
            'volumes': 10,
48
47
            'floating_ips': 10,
49
48
            'metadata_items': 128,
50
 
            'gigabytes': 1000,
51
49
            'injected_files': 5,
52
50
            'injected_file_path_bytes': 255,
53
51
            'injected_file_content_bytes': 10240,
63
61
        self.assertEqual(qs['instances'], 10)
64
62
        self.assertEqual(qs['cores'], 20)
65
63
        self.assertEqual(qs['ram'], 51200)
66
 
        self.assertEqual(qs['volumes'], 10)
67
 
        self.assertEqual(qs['gigabytes'], 1000)
68
64
        self.assertEqual(qs['floating_ips'], 10)
69
65
        self.assertEqual(qs['metadata_items'], 128)
70
66
        self.assertEqual(qs['injected_files'], 5)
85
81
                    'instances': 10,
86
82
                    'cores': 20,
87
83
                    'ram': 51200,
88
 
                    'volumes': 10,
89
 
                    'gigabytes': 1000,
90
84
                    'floating_ips': 10,
91
85
                    'metadata_items': 128,
92
86
                    'injected_files': 5,
113
107
 
114
108
    def test_quotas_update_as_admin(self):
115
109
        body = {'quota_set': {'instances': 50, 'cores': 50,
116
 
                              'ram': 51200, 'volumes': 10,
117
 
                              'gigabytes': 1000, 'floating_ips': 10,
 
110
                              'ram': 51200, 'floating_ips': 10,
118
111
                              'metadata_items': 128, 'injected_files': 5,
119
112
                              'injected_file_content_bytes': 10240,
120
113
                              'injected_file_path_bytes': 255,
130
123
 
131
124
    def test_quotas_update_as_user(self):
132
125
        body = {'quota_set': {'instances': 50, 'cores': 50,
133
 
                              'ram': 51200, 'volumes': 10,
134
 
                              'gigabytes': 1000, 'floating_ips': 10,
 
126
                              'ram': 51200, 'floating_ips': 10,
135
127
                              'metadata_items': 128, 'injected_files': 5,
136
128
                              'injected_file_content_bytes': 10240,
137
129
                              'security_groups': 10,
144
136
 
145
137
    def test_quotas_update_invalid_limit(self):
146
138
        body = {'quota_set': {'instances': -2, 'cores': -2,
147
 
                              'ram': -2, 'volumes': -2,
148
 
                              'gigabytes': -2, 'floating_ips': -2,
 
139
                              'ram': -2, 'floating_ips': -2,
149
140
                              'metadata_items': -2, 'injected_files': -2,
150
141
                              'injected_file_content_bytes': -2}}
151
142
 
167
158
                metadata_items=10,
168
159
                injected_file_path_bytes=255,
169
160
                injected_file_content_bytes=20,
170
 
                volumes=30,
171
 
                gigabytes=40,
172
161
                ram=50,
173
162
                floating_ips=60,
174
163
                instances=70,
193
182
        exemplar = dict(quota_set=dict(
194
183
                metadata_items='10',
195
184
                injected_file_content_bytes='20',
196
 
                volumes='30',
197
 
                gigabytes='40',
198
185
                ram='50',
199
186
                floating_ips='60',
200
187
                instances='70',
208
195
                  '<metadata_items>10</metadata_items>'
209
196
                  '<injected_file_content_bytes>20'
210
197
                  '</injected_file_content_bytes>'
211
 
                  '<volumes>30</volumes>'
212
 
                  '<gigabytes>40</gigabytes>'
213
198
                  '<ram>50</ram>'
214
199
                  '<floating_ips>60</floating_ips>'
215
200
                  '<instances>70</instances>'