← Back to branch summary

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

« back to all changes in this revision

Viewing changes to nova/tests/db/fakes.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/db/fakes.py
348
348
        'm1.tiny': dict(id=2,
349
349
                        memory_mb=512,
350
350
                        vcpus=1,
 
351
                        vcpu_weight=None,
351
352
                        root_gb=0,
352
353
                        ephemeral_gb=10,
353
354
                        flavorid=1,
356
357
        'm1.small': dict(id=5,
357
358
                         memory_mb=2048,
358
359
                         vcpus=1,
 
360
                         vcpu_weight=None,
359
361
                         root_gb=20,
360
362
                         ephemeral_gb=0,
361
363
                         flavorid=2,
365
367
            dict(id=1,
366
368
                 memory_mb=4096,
367
369
                 vcpus=2,
 
370
                 vcpu_weight=None,
368
371
                 root_gb=40,
369
372
                 ephemeral_gb=40,
370
373
                 flavorid=3,
373
376
        'm1.large': dict(id=3,
374
377
                         memory_mb=8192,
375
378
                         vcpus=4,
 
379
                         vcpu_weight=None,
376
380
                         root_gb=80,
377
381
                         ephemeral_gb=80,
378
382
                         flavorid=4,
382
386
            dict(id=4,
383
387
                 memory_mb=16384,
384
388
                 vcpus=8,
 
389
                 vcpu_weight=None,
385
390
                 root_gb=160,
386
391
                 ephemeral_gb=160,
387
392
                 flavorid=5,