← Back to branch summary

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

« 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
  • 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/api/openstack/compute/views/flavors.py
27
27
            "flavor": {
28
28
                "id": flavor["flavorid"],
29
29
                "name": flavor["name"],
30
 
                "links": self._get_links(request, flavor["flavorid"]),
 
30
                "links": self._get_links(request,
 
31
                                         flavor["flavorid"],
 
32
                                         self._collection_name),
31
33
            },
32
34
        }
33
35
 
41
43
                "vcpus": flavor.get("vcpus") or "",
42
44
                "swap": flavor.get("swap") or "",
43
45
                "rxtx_factor": flavor.get("rxtx_factor") or "",
44
 
                "links": self._get_links(request, flavor["flavorid"]),
 
46
                "links": self._get_links(request,
 
47
                                         flavor["flavorid"],
 
48
                                         self._collection_name),
45
49
            },
46
50
        }
47
51
 
58
62
        flavor_list = [func(request, flavor)["flavor"] for flavor in flavors]
59
63
        flavors_links = self._get_collection_links(request,
60
64
                                                   flavors,
 
65
                                                   self._collection_name,
61
66
                                                   "flavorid")
62
67
        flavors_dict = dict(flavors=flavor_list)
63
68