diff options
| author | Alex Meade <alex.meade@rackspace.com> | 2011-07-26 16:42:16 -0400 |
|---|---|---|
| committer | Alex Meade <alex.meade@rackspace.com> | 2011-07-26 16:42:16 -0400 |
| commit | 2e652f4cc72976ecc471a6c6f3b48afb3eb5a420 (patch) | |
| tree | ff8ffbab3218777325e9c7f6a66bb997180c3a0e /nova/api | |
| parent | b45fa225f9477f4bae11cd379288db459d4b3c02 (diff) | |
Updated test stubs to contain the correct data
Updated created and updated in responses to use correct time 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..c90801724 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, time): + """Converts the given time into the common time format + + :param time: should be a datetime + + """ + return time.strftime(utils.TIME_FORMAT) |
