Add tenant id in self link in /servers call for images

Fixes bug #990019

Change-Id: I0bf3c3c827090124a69205eaa1d5a6aa6568f21c
This commit is contained in:
Philip Knouff
2012-05-01 11:24:59 -04:00
committed by Brian Waldon
parent fea0ae767d
commit 6254523439
5 changed files with 74 additions and 43 deletions

View File

@@ -27,7 +27,9 @@ class ViewBuilder(common.ViewBuilder):
"flavor": {
"id": flavor["flavorid"],
"name": flavor["name"],
"links": self._get_links(request, flavor["flavorid"]),
"links": self._get_links(request,
flavor["flavorid"],
self._collection_name),
},
}
@@ -41,7 +43,9 @@ class ViewBuilder(common.ViewBuilder):
"vcpus": flavor.get("vcpus") or "",
"swap": flavor.get("swap") or "",
"rxtx_factor": flavor.get("rxtx_factor") or "",
"links": self._get_links(request, flavor["flavorid"]),
"links": self._get_links(request,
flavor["flavorid"],
self._collection_name),
},
}
@@ -58,6 +62,7 @@ class ViewBuilder(common.ViewBuilder):
flavor_list = [func(request, flavor)["flavor"] for flavor in flavors]
flavors_links = self._get_collection_links(request,
flavors,
self._collection_name,
"flavorid")
flavors_dict = dict(flavors=flavor_list)