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

« back to all changes in this revision

Viewing changes to nova/tests/db/fakes.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, James Page
  • Date: 2013-03-20 12:59:22 UTC
  • mfrom: (1.1.69)
  • Revision ID: package-import@ubuntu.com-20130320125922-ohvfav96lemn9wlz
Tags: 1:2013.1~rc1-0ubuntu1
[ Chuck Short ]
* New upstream release.
* debian/patches/avoid_setuptools_git_dependency.patch: Refreshed.
* debian/control: Clean up dependencies:
  - Dropped python-gflags no longer needed.
  - Dropped python-daemon no longer needed.
  - Dropped python-glance no longer needed.
  - Dropped python-lockfile no longer needed.
  - Dropped python-simplejson no longer needed.
  - Dropped python-tempita no longer needed.
  - Dropped python-xattr no longer needed.
  - Add sqlite3 required for the testsuite.

[ James Page ]
* d/watch: Update uversionmangle to deal with upstream versioning
  changes, remove tarballs.openstack.org. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
# vim: tabstop=4 shiftwidth=4 softtabstop=4
2
2
 
3
3
# Copyright (c) 2011 X.commerce, a business unit of eBay Inc.
4
 
# Copyright 2010 OpenStack, LLC
 
4
# Copyright 2010 OpenStack Foundation
5
5
# All Rights Reserved.
6
6
#
7
7
#    Licensed under the Apache License, Version 2.0 (the "License"); you may
331
331
 
332
332
    INSTANCE_TYPES = {
333
333
        'm1.tiny': dict(id=2,
 
334
                        name='m1.tiny',
334
335
                        memory_mb=512,
335
336
                        vcpus=1,
336
337
                        vcpu_weight=None,
337
338
                        root_gb=0,
338
339
                        ephemeral_gb=10,
339
340
                        flavorid=1,
340
 
                        rxtx_cap=1,
 
341
                        rxtx_factor=1.0,
341
342
                        swap=0),
342
343
        'm1.small': dict(id=5,
 
344
                         name='m1.small',
343
345
                         memory_mb=2048,
344
346
                         vcpus=1,
345
347
                         vcpu_weight=None,
346
348
                         root_gb=20,
347
349
                         ephemeral_gb=0,
348
350
                         flavorid=2,
349
 
                         rxtx_cap=2,
 
351
                         rxtx_factor=1.0,
350
352
                         swap=1024),
351
353
        'm1.medium':
352
354
            dict(id=1,
 
355
                 name='m1.medium',
353
356
                 memory_mb=4096,
354
357
                 vcpus=2,
355
358
                 vcpu_weight=None,
356
359
                 root_gb=40,
357
360
                 ephemeral_gb=40,
358
361
                 flavorid=3,
359
 
                 rxtx_cap=3,
 
362
                 rxtx_factor=1.0,
360
363
                 swap=0),
361
364
        'm1.large': dict(id=3,
 
365
                         name='m1.large',
362
366
                         memory_mb=8192,
363
367
                         vcpus=4,
364
368
                         vcpu_weight=None,
365
369
                         root_gb=80,
366
370
                         ephemeral_gb=80,
367
371
                         flavorid=4,
368
 
                         rxtx_cap=4,
 
372
                         rxtx_factor=1.0,
369
373
                         swap=0),
370
374
        'm1.xlarge':
371
375
            dict(id=4,
 
376
                 name='m1.xlarge',
372
377
                 memory_mb=16384,
373
378
                 vcpus=8,
374
379
                 vcpu_weight=None,
375
380
                 root_gb=160,
376
381
                 ephemeral_gb=160,
377
382
                 flavorid=5,
378
 
                 rxtx_cap=5,
 
383
                 rxtx_factor=1.0,
379
384
                 swap=0)}
380
385
 
381
386
    flat_network_fields = {'id': 'fake_flat',