diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-04-07 00:29:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-04-07 00:29:47 +0000 |
| commit | a660e30bb80b2082644d5824735b123aeec7df74 (patch) | |
| tree | 4820aa119e02bee499a224f892e1c47a59e08f71 /nova/api | |
| parent | 24582abf82842cbb922e38c78e281eda56f981e2 (diff) | |
| parent | 9254403281fad200f871c5e6ff052dc79c739d6e (diff) | |
| download | nova-a660e30bb80b2082644d5824735b123aeec7df74.tar.gz nova-a660e30bb80b2082644d5824735b123aeec7df74.tar.xz nova-a660e30bb80b2082644d5824735b123aeec7df74.zip | |
Merge "Correct network uuid field for os-network extension "
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/compute/contrib/os_networks.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nova/api/openstack/compute/contrib/os_networks.py b/nova/api/openstack/compute/contrib/os_networks.py index 2cea0e081..e8a5263aa 100644 --- a/nova/api/openstack/compute/contrib/os_networks.py +++ b/nova/api/openstack/compute/contrib/os_networks.py @@ -47,8 +47,9 @@ def network_dict(context, network): if context.is_admin: fields += admin_fields result = dict((field, network.get(field)) for field in fields) - if 'uuid' in network: - result['id'] = network['uuid'] + uuid = network.get('uuid') + if uuid: + result['id'] = uuid return result else: return {} |