diff options
Diffstat (limited to 'trove/instance/views.py')
| -rw-r--r-- | trove/instance/views.py | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/trove/instance/views.py b/trove/instance/views.py index e08368f2..a79b27b8 100644 --- a/trove/instance/views.py +++ b/trove/instance/views.py @@ -37,10 +37,14 @@ class InstanceView(object): "status": self.instance.status, "links": self._build_links(), "flavor": self._build_flavor_info(), - "datastore": {"type": self.instance.datastore.name, - "version": self.instance.datastore_version.name}, + "datastore": {"type": None, "version": None}, "region": self.instance.region_name } + if self.instance.datastore_version: + instance_dict['datastore'] = { + "type": self.instance.datastore.name, + "version": self.instance.datastore_version.name + } if self.context.is_admin: instance_dict['tenant_id'] = self.instance.tenant_id if self.instance.volume_support: @@ -94,8 +98,10 @@ class InstanceDetailView(InstanceView): result['instance']['service_status_updated'] = (self.instance. service_status_updated) - result['instance']['datastore']['version'] = (self.instance. - datastore_version.name) + result['instance']['datastore']['version'] = None + if self.instance.datastore_version: + result['instance']['datastore']['version'] = \ + self.instance.datastore_version.name if self.instance.fault: result['instance']['fault'] = self._build_fault_info() |