← Back to branch summary

~ubuntu-branches/ubuntu/saucy/nova/saucy-proposed

« back to all changes in this revision

Viewing changes to nova/tests/api/openstack/compute/contrib/test_disk_config.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-05-24 13:12:53 UTC
  • mfrom: (1.1.55)
  • Revision ID: package-import@ubuntu.com-20120524131253-ommql08fg1en06ut
Tags: 2012.2~f1-0ubuntu1
https://launchpad.net/bugs/907197
* New upstream release.
* Prepare for quantal:
  - Dropped debian/patches/upstream/0006-Use-project_id-in-ec2.cloud._format_image.patch
  - Dropped debian/patches/upstream/0005-Populate-image-properties-with-project_id-again.patch
  - Dropped debian/patches/upstream/0004-Fixed-bug-962840-added-a-test-case.patch
  - Dropped debian/patches/upstream/0003-Allow-unprivileged-RADOS-users-to-access-rbd-volumes.patch
  - Dropped debian/patches/upstream/0002-Stop-libvirt-test-from-deleting-instances-dir.patch
  - Dropped debian/patches/upstream/0001-fix-bug-where-nova-ignores-glance-host-in-imageref.patch 
  - Dropped debian/patches/0001-fix-useexisting-deprecation-warnings.patch
* debian/control: Add python-keystone as a dependency. (LP: #907197)
* debian/patches/kombu_tests_timeout.patch: Refreshed.
* debian/nova.conf, debian/nova-common.postinst: Convert to new ini
  file configuration
* debian/patches/nova-manage_flagfile_location.patch: Refreshed

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/api/openstack/compute/contrib/test_disk_config.py
22
22
from nova.api.openstack import wsgi
23
23
import nova.db.api
24
24
from nova import flags
 
25
from nova.openstack.common import jsonutils
25
26
import nova.rpc
26
27
from nova import test
27
28
from nova.tests.api.openstack import fakes
28
 
from nova import utils
29
29
 
30
30
 
31
31
MANUAL_INSTANCE_UUID = fakes.FAKE_UUID
130
130
        req = fakes.HTTPRequest.blank(
131
131
            '/fake/servers/%s' % MANUAL_INSTANCE_UUID)
132
132
        res = req.get_response(self.app)
133
 
        server_dict = utils.loads(res.body)['server']
 
133
        server_dict = jsonutils.loads(res.body)['server']
134
134
        self.assertDiskConfig(server_dict, 'MANUAL')
135
135
 
136
136
        req = fakes.HTTPRequest.blank(
137
137
            '/fake/servers/%s' % AUTO_INSTANCE_UUID)
138
138
        res = req.get_response(self.app)
139
 
        server_dict = utils.loads(res.body)['server']
 
139
        server_dict = jsonutils.loads(res.body)['server']
140
140
        self.assertDiskConfig(server_dict, 'AUTO')
141
141
 
142
142
    def test_detail_servers(self):
143
143
        req = fakes.HTTPRequest.blank('/fake/servers/detail')
144
144
        res = req.get_response(self.app)
145
 
        server_dicts = utils.loads(res.body)['servers']
 
145
        server_dicts = jsonutils.loads(res.body)['servers']
146
146
 
147
147
        expectations = ['MANUAL', 'AUTO']
148
148
        for server_dict, expected in zip(server_dicts, expectations):
152
152
        req = fakes.HTTPRequest.blank(
153
153
            '/fake/images/a440c04b-79fa-479c-bed1-0b816eaec379')
154
154
        res = req.get_response(self.app)
155
 
        image_dict = utils.loads(res.body)['image']
 
155
        image_dict = jsonutils.loads(res.body)['image']
156
156
        self.assertDiskConfig(image_dict, 'MANUAL')
157
157
 
158
158
        req = fakes.HTTPRequest.blank(
159
159
            '/fake/images/70a599e0-31e7-49b7-b260-868f441e862b')
160
160
        res = req.get_response(self.app)
161
 
        image_dict = utils.loads(res.body)['image']
 
161
        image_dict = jsonutils.loads(res.body)['image']
162
162
        self.assertDiskConfig(image_dict, 'AUTO')
163
163
 
164
164
    def test_detail_image(self):
165
165
        req = fakes.HTTPRequest.blank('/fake/images/detail')
166
166
        res = req.get_response(self.app)
167
 
        image_dicts = utils.loads(res.body)['images']
 
167
        image_dicts = jsonutils.loads(res.body)['images']
168
168
 
169
169
        expectations = ['MANUAL', 'AUTO']
170
170
        for image_dict, expected in zip(image_dicts, expectations):
184
184
                  API_DISK_CONFIG: 'AUTO'
185
185
               }}
186
186
 
187
 
        req.body = utils.dumps(body)
 
187
        req.body = jsonutils.dumps(body)
188
188
        res = req.get_response(self.app)
189
 
        server_dict = utils.loads(res.body)['server']
 
189
        server_dict = jsonutils.loads(res.body)['server']
190
190
        self.assertDiskConfig(server_dict, 'AUTO')
191
191
 
192
192
    def test_create_server_override_manual(self):
200
200
                  API_DISK_CONFIG: 'MANUAL'
201
201
               }}
202
202
 
203
 
        req.body = utils.dumps(body)
 
203
        req.body = jsonutils.dumps(body)
204
204
        res = req.get_response(self.app)
205
 
        server_dict = utils.loads(res.body)['server']
 
205
        server_dict = jsonutils.loads(res.body)['server']
206
206
        self.assertDiskConfig(server_dict, 'MANUAL')
207
207
 
208
208
    def test_create_server_detect_from_image(self):
218
218
                  'flavorRef': '1',
219
219
               }}
220
220
 
221
 
        req.body = utils.dumps(body)
 
221
        req.body = jsonutils.dumps(body)
222
222
        res = req.get_response(self.app)
223
 
        server_dict = utils.loads(res.body)['server']
 
223
        server_dict = jsonutils.loads(res.body)['server']
224
224
        self.assertDiskConfig(server_dict, 'MANUAL')
225
225
 
226
226
        req = fakes.HTTPRequest.blank('/fake/servers')
232
232
                  'flavorRef': '1',
233
233
               }}
234
234
 
235
 
        req.body = utils.dumps(body)
 
235
        req.body = jsonutils.dumps(body)
236
236
        res = req.get_response(self.app)
237
 
        server_dict = utils.loads(res.body)['server']
 
237
        server_dict = jsonutils.loads(res.body)['server']
238
238
        self.assertDiskConfig(server_dict, 'AUTO')
239
239
 
240
240
    def test_update_server_invalid_disk_config(self):
244
244
        req.method = 'PUT'
245
245
        req.content_type = 'application/json'
246
246
        body = {'server': {API_DISK_CONFIG: 'server_test'}}
247
 
        req.body = utils.dumps(body)
 
247
        req.body = jsonutils.dumps(body)
248
248
        res = req.get_response(self.app)
249
249
        self.assertEqual(res.status_int, 400)
250
250
        expected_msg = ('{"badRequest": {"message": "%s must be either'