← Back to branch summary

~ubuntu-branches/ubuntu/quantal/nova/quantal-proposed

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2012-08-16 14:04:11 UTC
  • mto: This revision was merged to the branch mainline in revision 84.
  • Revision ID: package-import@ubuntu.com-20120816140411-0mr4n241wmk30t9l
Tags: upstream-2012.2~f3
Import upstream version 2012.2~f3

Show diffs side-by-side

added added

removed removed

Lines of Context:
nova/api/openstack/compute/views/servers.py
104
104
                "addresses": self._get_addresses(request, instance),
105
105
                "accessIPv4": instance.get("access_ip_v4") or "",
106
106
                "accessIPv6": instance.get("access_ip_v6") or "",
107
 
                "key_name": instance.get("key_name") or "",
108
 
                "config_drive": instance.get("config_drive"),
109
107
                "links": self._get_links(request,
110
108
                                         instance["uuid"],
111
109
                                         self._collection_name),