diff options
| author | Alex Meade <alex.meade@rackspace.com> | 2011-07-28 20:58:57 +0000 |
|---|---|---|
| committer | Tarmac <> | 2011-07-28 20:58:57 +0000 |
| commit | 44bf6ac19c4700e8a269440477156827db44e631 (patch) | |
| tree | 9843aad71377e4297a31ed9583395903c05caefb /nova/api | |
| parent | 3c58da1a739c34d82f744692f0f9447453f3ff0a (diff) | |
| parent | b8183e11e56781fce27ec1af261c5e53bca78ca5 (diff) | |
Fixes bug 816604, which is the problem that timeformat in server responses for updated and created are incorrect. This fix just converts the datetime into the correct format.
Diffstat (limited to 'nova/api')
| -rw-r--r-- | nova/api/openstack/views/servers.py | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/nova/api/openstack/views/servers.py b/nova/api/openstack/views/servers.py index be25e1e40..659a43522 100644 --- a/nova/api/openstack/views/servers.py +++ b/nova/api/openstack/views/servers.py @@ -15,6 +15,7 @@ # License for the specific language governing permissions and limitations # under the License. +import datetime import hashlib import os @@ -149,8 +150,10 @@ class ViewBuilderV11(ViewBuilder): def _build_detail(self, inst): response = super(ViewBuilderV11, self)._build_detail(inst) - response['server']['created'] = inst['created_at'] - response['server']['updated'] = inst['updated_at'] + response['server']['created'] = \ + self._convert_timeformat(inst['created_at']) + response['server']['updated'] = \ + self._convert_timeformat(inst['updated_at']) if 'status' in response['server']: if response['server']['status'] == "ACTIVE": response['server']['progress'] = 100 @@ -221,3 +224,11 @@ class ViewBuilderV11(ViewBuilder): """Create an url that refers to a specific flavor id.""" return os.path.join(common.remove_version_from_href(self.base_url), "servers", str(server_id)) + + def _convert_timeformat(self, date_time): + """Converts the given time into the common time format + + :param date_time: the datetime object to convert + + """ + return date_time.strftime(utils.TIME_FORMAT) |
