← Back to branch summary

~rackspace-titan/nova/rescue_fix_admin_pass

« back to all changes in this revision

Viewing changes to nova/tests/api/openstack/test_flavors.py

  • Committer: Dan Prince
  • Date: 2011-09-16 18:30:40 UTC
  • mfrom: (1523.1.58 nova)
  • Revision ID: dan.prince@rackspace.com-20110916183040-gqghm5mzcfwjb021
Merge w/ trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/tests/api/openstack/test_flavors.py
112
112
                "name": "flavor 1",
113
113
                "ram": "256",
114
114
                "disk": "10",
 
115
                "rxtx_cap": "",
 
116
                "rxtx_quota": "",
 
117
                "swap": "",
 
118
                "vcpus": "",
115
119
            },
116
120
            {
117
121
                "id": "2",
118
122
                "name": "flavor 2",
119
123
                "ram": "256",
120
124
                "disk": "10",
 
125
                "rxtx_cap": "",
 
126
                "rxtx_quota": "",
 
127
                "swap": "",
 
128
                "vcpus": "",
121
129
            },
122
130
        ]
123
131
        self.assertEqual(flavors, expected)
132
140
            "name": "flavor 12",
133
141
            "ram": "256",
134
142
            "disk": "10",
 
143
            "rxtx_cap": "",
 
144
            "rxtx_quota": "",
 
145
            "swap": "",
 
146
            "vcpus": "",
135
147
        }
136
148
        self.assertEqual(flavor, expected)
137
149
 
154
166
                "name": "flavor 12",
155
167
                "ram": "256",
156
168
                "disk": "10",
 
169
                "rxtx_cap": "",
 
170
                "rxtx_quota": "",
 
171
                "swap": "",
 
172
                "vcpus": "",
157
173
                "links": [
158
174
                    {
159
175
                        "rel": "self",
221
237
                    "name": "flavor 1",
222
238
                    "ram": "256",
223
239
                    "disk": "10",
 
240
                    "rxtx_cap": "",
 
241
                    "rxtx_quota": "",
 
242
                    "swap": "",
 
243
                    "vcpus": "",
224
244
                    "links": [
225
245
                        {
226
246
                            "rel": "self",
237
257
                    "name": "flavor 2",
238
258
                    "ram": "256",
239
259
                    "disk": "10",
 
260
                    "rxtx_cap": "",
 
261
                    "rxtx_quota": "",
 
262
                    "swap": "",
 
263
                    "vcpus": "",
240
264
                    "links": [
241
265
                        {
242
266
                            "rel": "self",
276
300
                "name": "asdf",
277
301
                "ram": "256",
278
302
                "disk": "10",
 
303
                "rxtx_cap": "",
 
304
                "rxtx_quota": "",
 
305
                "swap": "",
 
306
                "vcpus": "",
279
307
                "links": [
280
308
                    {
281
309
                        "rel": "self",
303
331
                "name": "asdf",
304
332
                "ram": "256",
305
333
                "disk": "10",
 
334
                "rxtx_cap": "",
 
335
                "rxtx_quota": "",
 
336
                "swap": "",
 
337
                "vcpus": "",
306
338
                "links": [
307
339
                    {
308
340
                        "rel": "self",
340
372
                "name": "asdf",
341
373
                "ram": 256,
342
374
                "disk": 10,
 
375
                "rxtx_cap": "",
 
376
                "rxtx_quota": "",
 
377
                "swap": "",
 
378
                "vcpus": "",
343
379
                "links": [
344
380
                    {
345
381
                        "rel": "self",
378
414
                    "name": "flavor 23",
379
415
                    "ram": "512",
380
416
                    "disk": "20",
 
417
                    "rxtx_cap": "",
 
418
                    "rxtx_quota": "",
 
419
                    "swap": "",
 
420
                    "vcpus": "",
381
421
                    "links": [
382
422
                        {
383
423
                            "rel": "self",
393
433
                    "name": "flavor 13",
394
434
                    "ram": "256",
395
435
                    "disk": "10",
 
436
                    "rxtx_cap": "",
 
437
                    "rxtx_quota": "",
 
438
                    "swap": "",
 
439
                    "vcpus": "",
396
440
                    "links": [
397
441
                        {
398
442
                            "rel": "self",
435
479
                    "name": "flavor 23",
436
480
                    "ram": "512",
437
481
                    "disk": "20",
 
482
                    "rxtx_cap": "",
 
483
                    "rxtx_quota": "",
 
484
                    "swap": "",
 
485
                    "vcpus": "",
438
486
                    "links": [
439
487
                        {
440
488
                            "rel": "self",
450
498
                    "name": "flavor 13",
451
499
                    "ram": "256",
452
500
                    "disk": "10",
 
501
                    "rxtx_cap": "",
 
502
                    "rxtx_quota": "",
 
503
                    "swap": "",
 
504
                    "vcpus": "",
453
505
                    "links": [
454
506
                        {
455
507
                            "rel": "self",