← Back to branch summary

~ubuntu-cloud-archive/ubuntu/precise/nova/trunk

« back to all changes in this revision

Viewing changes to nova/api/openstack/compute/views/flavors.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short, Chuck Short, Soren Hansen
  • Date: 2012-09-07 17:49:53 UTC
  • mfrom: (1.1.61)
  • Revision ID: package-import@ubuntu.com-20120907174953-oapuvix1jxm830he
Tags: 2012.2~rc1~20120907.15996-0ubuntu1
https://launchpad.net/bugs/995285
[ Chuck Short ]
* New upstream release.
* debian/nova-common.postinst: Drop nova_sudoers permission changing
  since we do it in the debian/rules. (LP: #995285)

[ Soren Hansen ]
* Update debian/watch to account for symbolically named tarballs and
  use newer URL.
* Fix Launchpad URLs in debian/watch.

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/openstack/compute/views/flavors.py
41
41
                "ram": flavor["memory_mb"],
42
42
                "disk": flavor["root_gb"],
43
43
                "vcpus": flavor.get("vcpus") or "",
44
 
                "swap": flavor.get("swap") or "",
45
 
                "rxtx_factor": flavor.get("rxtx_factor") or "",
46
44
                "links": self._get_links(request,
47
45
                                         flavor["flavorid"],
48
46
                                         self._collection_name),
49
47
            },
50
48
        }
51
49
 
52
 
        # NOTE(sirp): disabled attribute is namespaced for now for
53
 
        # compatability with the OpenStack API. This should ultimately be made
54
 
        # a first class attribute.
55
 
        flavor_dict["flavor"]["OS-FLV-DISABLED:disabled"] =\
56
 
                flavor.get("disabled", "")
57
 
 
58
50
        return flavor_dict
59
51
 
60
52
    def index(self, request, flavors):