diff options
| author | Mark McLoughlin <markmc@redhat.com> | 2014-04-29 12:28:32 +0100 |
|---|---|---|
| committer | Mark McLoughlin <markmc@redhat.com> | 2014-04-29 14:51:27 +0100 |
| commit | 71b78c71babaa300a688a638e491537e65a2e77e (patch) | |
| tree | 52a2a33fb5ffbefb97e8a3cd07368839ad8b8a9e /nova/tests | |
| parent | 2c3d2814cad49c70b207f2e4aaffb6b8bcb510f6 (diff) | |
| download | nova-71b78c71babaa300a688a638e491537e65a2e77e.tar.gz | |
Verify created/updated timestamps are isotime
We format these timestamps using timeutils.isotime() in the server
view builder, so we should check that in the API sample tests rather
than using the generic timestamp regexp.
Full context here:
http://lists.openstack.org/pipermail/openstack-dev/2014-April/033971.html
Change-Id: Id55f13d8163249275220151dd88c67b47e6176c9
Diffstat (limited to 'nova/tests')
94 files changed, 163 insertions, 163 deletions
diff --git a/nova/tests/integrated/api_samples/OS-DCF/list-servers-detail-get.json.tpl b/nova/tests/integrated/api_samples/OS-DCF/list-servers-detail-get.json.tpl index acb9bf5310..37c8e57dba 100644 --- a/nova/tests/integrated/api_samples/OS-DCF/list-servers-detail-get.json.tpl +++ b/nova/tests/integrated/api_samples/OS-DCF/list-servers-detail-get.json.tpl @@ -12,7 +12,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -50,7 +50,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } ] diff --git a/nova/tests/integrated/api_samples/OS-DCF/list-servers-detail-get.xml.tpl b/nova/tests/integrated/api_samples/OS-DCF/list-servers-detail-get.xml.tpl index 52e1a52034..36b53957c6 100644 --- a/nova/tests/integrated/api_samples/OS-DCF/list-servers-detail-get.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-DCF/list-servers-detail-get.xml.tpl @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <servers xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> - <server status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" OS-DCF:diskConfig="AUTO"> + <server status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" OS-DCF:diskConfig="AUTO"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-action-rebuild-resp.json.tpl b/nova/tests/integrated/api_samples/OS-DCF/server-action-rebuild-resp.json.tpl index 1608b9f6b0..9b9f188023 100644 --- a/nova/tests/integrated/api_samples/OS-DCF/server-action-rebuild-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-DCF/server-action-rebuild-resp.json.tpl @@ -12,7 +12,7 @@ ] }, "adminPass": "%(password)s", - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -50,7 +50,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-action-rebuild-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-DCF/server-action-rebuild-resp.xml.tpl index b760fe5ebe..5835392c31 100644 --- a/nova/tests/integrated/api_samples/OS-DCF/server-action-rebuild-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-DCF/server-action-rebuild-resp.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<server xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" adminPass="%(password)s" OS-DCF:diskConfig="AUTO"> +<server xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" adminPass="%(password)s" OS-DCF:diskConfig="AUTO"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-DCF/server-get-resp.json.tpl index 25e51a8780..d9cc795728 100644 --- a/nova/tests/integrated/api_samples/OS-DCF/server-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-DCF/server-get-resp.json.tpl @@ -11,7 +11,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -49,7 +49,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-DCF/server-get-resp.xml.tpl index 2671e2b514..b9e8a2b365 100644 --- a/nova/tests/integrated/api_samples/OS-DCF/server-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-DCF/server-get-resp.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<server xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" OS-DCF:diskConfig="AUTO"> +<server xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" OS-DCF:diskConfig="AUTO"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-update-put-resp.json.tpl b/nova/tests/integrated/api_samples/OS-DCF/server-update-put-resp.json.tpl index 25e51a8780..d9cc795728 100644 --- a/nova/tests/integrated/api_samples/OS-DCF/server-update-put-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-DCF/server-update-put-resp.json.tpl @@ -11,7 +11,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -49,7 +49,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/api_samples/OS-DCF/server-update-put-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-DCF/server-update-put-resp.xml.tpl index 3d565b0b34..cb8c662442 100644 --- a/nova/tests/integrated/api_samples/OS-DCF/server-update-put-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-DCF/server-update-put-resp.xml.tpl @@ -1,8 +1,8 @@ <?xml version='1.0' encoding='UTF-8'?> <server xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" - xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" - hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" + xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(isotime)s" + hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" OS-DCF:diskConfig="AUTO"> <image id="%(uuid)s"> diff --git a/nova/tests/integrated/api_samples/OS-EXT-AZ/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-AZ/server-get-resp.json.tpl index 413f3ce958..a852da1207 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-AZ/server-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-AZ/server-get-resp.json.tpl @@ -1,7 +1,7 @@ { "server": { - "updated": "%(timestamp)s", - "created": "%(timestamp)s", + "updated": "%(isotime)s", + "created": "%(isotime)s", "OS-EXT-AZ:availability_zone": "nova", "accessIPv4": "", "accessIPv6": "", diff --git a/nova/tests/integrated/api_samples/OS-EXT-AZ/server-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-EXT-AZ/server-get-resp.xml.tpl index 849b9b750f..2c4cdc07f2 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-AZ/server-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-AZ/server-get-resp.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<server xmlns:OS-EXT-AZ="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(uuid)s" OS-EXT-AZ:availability_zone="nova"> +<server xmlns:OS-EXT-AZ="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(uuid)s" OS-EXT-AZ:availability_zone="nova"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/OS-EXT-AZ/servers-detail-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-AZ/servers-detail-resp.json.tpl index 362c850851..b0ddc7c051 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-AZ/servers-detail-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-AZ/servers-detail-resp.json.tpl @@ -1,8 +1,8 @@ { "servers": [ { - "updated": "%(timestamp)s", - "created": "%(timestamp)s", + "updated": "%(isotime)s", + "created": "%(isotime)s", "OS-EXT-AZ:availability_zone": "nova", "accessIPv4": "", "accessIPv6": "", diff --git a/nova/tests/integrated/api_samples/OS-EXT-AZ/servers-detail-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-EXT-AZ/servers-detail-resp.xml.tpl index 9cd820cd02..35e1618678 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-AZ/servers-detail-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-AZ/servers-detail-resp.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<servers xmlns:OS-EXT-AZ="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> <server status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" OS-EXT-AZ:availability_zone="nova"> +<servers xmlns:OS-EXT-AZ="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> <server status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" OS-EXT-AZ:availability_zone="nova"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-get-resp.json.tpl index 600a063c3d..7b9f1ba519 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-get-resp.json.tpl @@ -11,7 +11,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -49,7 +49,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-get-resp.xml.tpl index 532720484b..49d8a8e2bf 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/server-get-resp.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<server xmlns:OS-EXT-IPS-MAC="http://docs.openstack.org/compute/ext/extended_ips_mac/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s"> +<server xmlns:OS-EXT-IPS-MAC="http://docs.openstack.org/compute/ext/extended_ips_mac/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json.tpl index 6b5901098a..743abc7c70 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.json.tpl @@ -2,7 +2,7 @@ "servers": [ { "status": "ACTIVE", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake", "addresses": { "private": [ @@ -23,7 +23,7 @@ "rel": "bookmark" } ], - "created": "%(timestamp)s", + "created": "%(isotime)s", "name": "new-server-test", "image": { "id": "%(uuid)s", diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.xml.tpl index 30902d4177..23dda7c583 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-IPS-MAC/servers-detail-resp.xml.tpl @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <servers xmlns:OS-EXT-IPS-MAC="http://docs.openstack.org/compute/ext/extended_ips_mac/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> - <server xmlns:OS-EXT-IPS-MAC="http://docs.openstack.org/compute/ext/extended_ips_mac/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s"> + <server xmlns:OS-EXT-IPS-MAC="http://docs.openstack.org/compute/ext/extended_ips_mac/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.json.tpl index bea96d4f62..acc784fb18 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.json.tpl @@ -11,7 +11,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -49,7 +49,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.xml.tpl index d3f14f6edd..aa78378f84 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-IPS/server-get-resp.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<server xmlns:OS-EXT-IPS="http://docs.openstack.org/compute/ext/extended_ips/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s"> +<server xmlns:OS-EXT-IPS="http://docs.openstack.org/compute/ext/extended_ips/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl index 27c6faa4ed..26d812ceb8 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.json.tpl @@ -2,7 +2,7 @@ "servers": [ { "status": "ACTIVE", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake", "addresses": { "private": [ @@ -23,7 +23,7 @@ "rel": "bookmark" } ], - "created": "%(timestamp)s", + "created": "%(isotime)s", "name": "new-server-test", "image": { "id": "%(uuid)s", diff --git a/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.xml.tpl index 5fc5c1f936..d3b5c524d3 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-IPS/servers-detail-resp.xml.tpl @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <servers xmlns:OS-EXT-IPS="http://docs.openstack.org/compute/ext/extended_ips/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> - <server xmlns:OS-EXT-IPS="http://docs.openstack.org/compute/ext/extended_ips/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s"> + <server xmlns:OS-EXT-IPS="http://docs.openstack.org/compute/ext/extended_ips/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json.tpl index c70192949a..398f0f7027 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.json.tpl @@ -13,7 +13,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -51,7 +51,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } }
\ No newline at end of file diff --git a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml.tpl index beec3a12a7..10495ff9d5 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/server-get-resp.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<server xmlns:OS-EXT-SRV-ATTR="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" OS-EXT-SRV-ATTR:instance_name="%(instance_name)s" OS-EXT-SRV-ATTR:host="%(compute_host)s" OS-EXT-SRV-ATTR:hypervisor_hostname="%(hypervisor_hostname)s"> +<server xmlns:OS-EXT-SRV-ATTR="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" OS-EXT-SRV-ATTR:instance_name="%(instance_name)s" OS-EXT-SRV-ATTR:host="%(compute_host)s" OS-EXT-SRV-ATTR:hypervisor_hostname="%(hypervisor_hostname)s"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json.tpl index 1fb8e1a47a..81f247192a 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.json.tpl @@ -14,7 +14,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -52,7 +52,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } ] diff --git a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml.tpl index 1811882a2e..f7da4086a3 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-SRV-ATTR/servers-detail-resp.xml.tpl @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <servers xmlns:OS-EXT-SRV-ATTR="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> - <server xmlns:OS-EXT-SRV-ATTR="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" OS-EXT-SRV-ATTR:instance_name="%(instance_name)s" OS-EXT-SRV-ATTR:host="%(compute_host)s" OS-EXT-SRV-ATTR:hypervisor_hostname="%(hypervisor_hostname)s"> + <server xmlns:OS-EXT-SRV-ATTR="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" OS-EXT-SRV-ATTR:instance_name="%(instance_name)s" OS-EXT-SRV-ATTR:host="%(compute_host)s" OS-EXT-SRV-ATTR:hypervisor_hostname="%(hypervisor_hostname)s"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.json.tpl index 7ac35024b8..fc48b73a4e 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.json.tpl @@ -13,7 +13,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -51,7 +51,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.xml.tpl index f594be1200..6b28dde2da 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-STS/server-get-resp.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<server xmlns:OS-EXT-STS="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" OS-EXT-STS:vm_state="active" OS-EXT-STS:task_state="None" OS-EXT-STS:power_state="1"> +<server xmlns:OS-EXT-STS="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" OS-EXT-STS:vm_state="active" OS-EXT-STS:task_state="None" OS-EXT-STS:power_state="1"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/OS-EXT-STS/servers-detail-resp.json.tpl b/nova/tests/integrated/api_samples/OS-EXT-STS/servers-detail-resp.json.tpl index a060332d47..94b3e2200c 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-STS/servers-detail-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-STS/servers-detail-resp.json.tpl @@ -2,7 +2,7 @@ "servers": [ { "status": "ACTIVE", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "OS-EXT-STS:task_state": null, "user_id": "fake", "addresses": { @@ -23,7 +23,7 @@ "rel": "bookmark" } ], - "created": "%(timestamp)s", + "created": "%(isotime)s", "name": "new-server-test", "image": { "id": "%(uuid)s", diff --git a/nova/tests/integrated/api_samples/OS-EXT-STS/servers-detail-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-EXT-STS/servers-detail-resp.xml.tpl index cf273a6bf6..89c3b9396e 100644 --- a/nova/tests/integrated/api_samples/OS-EXT-STS/servers-detail-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-EXT-STS/servers-detail-resp.xml.tpl @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <servers xmlns:OS-EXT-STS="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> - <server xmlns:OS-EXT-STS="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" OS-EXT-STS:vm_state="active" OS-EXT-STS:task_state="None" OS-EXT-STS:power_state="1" > + <server xmlns:OS-EXT-STS="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" OS-EXT-STS:vm_state="active" OS-EXT-STS:task_state="None" OS-EXT-STS:power_state="1" > <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/OS-SRV-USG/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/OS-SRV-USG/server-get-resp.json.tpl index e59dbeeefc..49e4a75122 100644 --- a/nova/tests/integrated/api_samples/OS-SRV-USG/server-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-SRV-USG/server-get-resp.json.tpl @@ -12,7 +12,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -50,7 +50,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/api_samples/OS-SRV-USG/server-get-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-SRV-USG/server-get-resp.xml.tpl index d258b03a46..3950b6918b 100644 --- a/nova/tests/integrated/api_samples/OS-SRV-USG/server-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-SRV-USG/server-get-resp.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<server xmlns:OS-SRV-USG="http://docs.openstack.org/compute/ext/server_usage/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" OS-SRV-USG:terminated_at="None" OS-SRV-USG:launched_at="%(timestamp)s"> +<server xmlns:OS-SRV-USG="http://docs.openstack.org/compute/ext/server_usage/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" OS-SRV-USG:terminated_at="None" OS-SRV-USG:launched_at="%(timestamp)s"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/OS-SRV-USG/servers-detail-resp.json.tpl b/nova/tests/integrated/api_samples/OS-SRV-USG/servers-detail-resp.json.tpl index cb431c6dba..561dcc66aa 100644 --- a/nova/tests/integrated/api_samples/OS-SRV-USG/servers-detail-resp.json.tpl +++ b/nova/tests/integrated/api_samples/OS-SRV-USG/servers-detail-resp.json.tpl @@ -2,7 +2,7 @@ "servers": [ { "status": "ACTIVE", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "OS-SRV-USG:launched_at": "%(timestamp)s", "user_id": "fake", "addresses": { @@ -23,7 +23,7 @@ "rel": "bookmark" } ], - "created": "%(timestamp)s", + "created": "%(isotime)s", "name": "new-server-test", "image": { "id": "%(uuid)s", diff --git a/nova/tests/integrated/api_samples/OS-SRV-USG/servers-detail-resp.xml.tpl b/nova/tests/integrated/api_samples/OS-SRV-USG/servers-detail-resp.xml.tpl index e01a508998..8869b45458 100644 --- a/nova/tests/integrated/api_samples/OS-SRV-USG/servers-detail-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/OS-SRV-USG/servers-detail-resp.xml.tpl @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <servers xmlns:OS-SRV-USG="http://docs.openstack.org/compute/ext/server_usage/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> - <server xmlns:OS-SRV-USG="http://docs.openstack.org/compute/ext/server_usage/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" OS-SRV-USG:launched_at="%(timestamp)s" OS-SRV-USG:terminated_at="None" > + <server xmlns:OS-SRV-USG="http://docs.openstack.org/compute/ext/server_usage/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" OS-SRV-USG:launched_at="%(timestamp)s" OS-SRV-USG:terminated_at="None" > <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild-resp.json.tpl b/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild-resp.json.tpl index 884be7549f..8705a8749c 100644 --- a/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild-resp.json.tpl +++ b/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild-resp.json.tpl @@ -12,7 +12,7 @@ ] }, "adminPass": "%(password)s", - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -50,7 +50,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild-resp.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild-resp.xml.tpl index 0ede362be2..6fa0505367 100644 --- a/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/all_extensions/server-action-rebuild-resp.xml.tpl @@ -7,8 +7,8 @@ name="%(name)s" hostId="%(hostid)s" progress="0" status="ACTIVE" adminPass="%(password)s" - created="%(timestamp)s" - updated="%(timestamp)s" + created="%(isotime)s" + updated="%(isotime)s" accessIPv4="%(ip)s" accessIPv6="%(ip6)s" OS-DCF:diskConfig="AUTO"> diff --git a/nova/tests/integrated/api_samples/all_extensions/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/all_extensions/server-get-resp.json.tpl index ca6967965d..8c6e7c980d 100644 --- a/nova/tests/integrated/api_samples/all_extensions/server-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/all_extensions/server-get-resp.json.tpl @@ -23,7 +23,7 @@ ] }, "config_drive": "", - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -67,7 +67,7 @@ ], "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake", "os-extended-volumes:volumes_attached": [] } diff --git a/nova/tests/integrated/api_samples/all_extensions/server-get-resp.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/server-get-resp.xml.tpl index e82dc92611..daa0bcf7ec 100644 --- a/nova/tests/integrated/api_samples/all_extensions/server-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/all_extensions/server-get-resp.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<server xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:OS-EXT-AZ="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2" xmlns:OS-EXT-SRV-ATTR="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:OS-EXT-IPS="http://docs.openstack.org/compute/ext/extended_ips/api/v1.1" xmlns:OS-EXT-IPS-MAC="http://docs.openstack.org/compute/ext/extended_ips_mac/api/v1.1" xmlns:OS-EXT-STS="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v1.1" xmlns:OS-SRV-USG="http://docs.openstack.org/compute/ext/server_usage/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" key_name="None" config_drive="" OS-EXT-SRV-ATTR:vm_state="active" OS-EXT-SRV-ATTR:task_state="None" OS-EXT-SRV-ATTR:power_state="1" OS-EXT-SRV-ATTR:instance_name="instance-00000001" OS-EXT-SRV-ATTR:host="%(compute_host)s" OS-EXT-SRV-ATTR:hypervisor_hostname="%(hypervisor_hostname)s" OS-EXT-AZ:availability_zone="nova" OS-DCF:diskConfig="AUTO" OS-SRV-USG:launched_at="%(timestamp)s" OS-SRV-USG:terminated_at="None"> +<server xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:OS-EXT-AZ="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2" xmlns:OS-EXT-SRV-ATTR="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:OS-EXT-IPS="http://docs.openstack.org/compute/ext/extended_ips/api/v1.1" xmlns:OS-EXT-IPS-MAC="http://docs.openstack.org/compute/ext/extended_ips_mac/api/v1.1" xmlns:OS-EXT-STS="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v1.1" xmlns:OS-SRV-USG="http://docs.openstack.org/compute/ext/server_usage/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" key_name="None" config_drive="" OS-EXT-SRV-ATTR:vm_state="active" OS-EXT-SRV-ATTR:task_state="None" OS-EXT-SRV-ATTR:power_state="1" OS-EXT-SRV-ATTR:instance_name="instance-00000001" OS-EXT-SRV-ATTR:host="%(compute_host)s" OS-EXT-SRV-ATTR:hypervisor_hostname="%(hypervisor_hostname)s" OS-EXT-AZ:availability_zone="nova" OS-DCF:diskConfig="AUTO" OS-SRV-USG:launched_at="%(timestamp)s" OS-SRV-USG:terminated_at="None"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.json.tpl b/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.json.tpl index a4e9c40db5..5a0e09bcf6 100644 --- a/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.json.tpl +++ b/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.json.tpl @@ -24,7 +24,7 @@ ] }, "config_drive": "", - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -68,7 +68,7 @@ ], "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake", "os-extended-volumes:volumes_attached": [] } diff --git a/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.xml.tpl b/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.xml.tpl index 67ced058cf..f8482431c9 100644 --- a/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/all_extensions/servers-details-resp.xml.tpl @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <servers xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:OS-EXT-AZ="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2" xmlns:OS-EXT-SRV-ATTR="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:OS-EXT-IPS="http://docs.openstack.org/compute/ext/extended_ips/api/v1.1" xmlns:OS-EXT-IPS-MAC="http://docs.openstack.org/compute/ext/extended_ips_mac/api/v1.1" xmlns:OS-EXT-STS="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v1.1" xmlns:OS-SRV-USG="http://docs.openstack.org/compute/ext/server_usage/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> - <server xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:OS-EXT-AZ="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2" xmlns:OS-EXT-SRV-ATTR="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:OS-EXT-IPS="http://docs.openstack.org/compute/ext/extended_ips/api/v1.1" xmlns:OS-EXT-STS="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" key_name="None" config_drive="" OS-EXT-SRV-ATTR:vm_state="active" OS-EXT-SRV-ATTR:task_state="None" OS-EXT-SRV-ATTR:power_state="1" OS-EXT-SRV-ATTR:instance_name="instance-00000001" OS-EXT-SRV-ATTR:host="%(compute_host)s" OS-EXT-SRV-ATTR:hypervisor_hostname="%(hypervisor_hostname)s" OS-EXT-AZ:availability_zone="nova" OS-DCF:diskConfig="AUTO" OS-SRV-USG:launched_at="%(timestamp)s" OS-SRV-USG:terminated_at="None"> + <server xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:OS-EXT-AZ="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2" xmlns:OS-EXT-SRV-ATTR="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:OS-EXT-IPS="http://docs.openstack.org/compute/ext/extended_ips/api/v1.1" xmlns:OS-EXT-STS="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" key_name="None" config_drive="" OS-EXT-SRV-ATTR:vm_state="active" OS-EXT-SRV-ATTR:task_state="None" OS-EXT-SRV-ATTR:power_state="1" OS-EXT-SRV-ATTR:instance_name="instance-00000001" OS-EXT-SRV-ATTR:host="%(compute_host)s" OS-EXT-SRV-ATTR:hypervisor_hostname="%(hypervisor_hostname)s" OS-EXT-AZ:availability_zone="nova" OS-DCF:diskConfig="AUTO" OS-SRV-USG:launched_at="%(timestamp)s" OS-SRV-USG:terminated_at="None"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl b/nova/tests/integrated/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl index ea47da06cf..723714bf73 100644 --- a/nova/tests/integrated/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl @@ -11,7 +11,7 @@ ] }, "config_drive": "%(cdrive)s", - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -49,7 +49,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/api_samples/os-config-drive/server-config-drive-get-resp.xml.tpl b/nova/tests/integrated/api_samples/os-config-drive/server-config-drive-get-resp.xml.tpl index c6fb338c78..6cd025045e 100644 --- a/nova/tests/integrated/api_samples/os-config-drive/server-config-drive-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/os-config-drive/server-config-drive-get-resp.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" config_drive="%(cdrive)s"> +<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" config_drive="%(cdrive)s"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl b/nova/tests/integrated/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl index 535d004109..f3ae979ecb 100644 --- a/nova/tests/integrated/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl +++ b/nova/tests/integrated/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl @@ -12,7 +12,7 @@ ] }, "config_drive": "%(cdrive)s", - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -50,7 +50,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } ] diff --git a/nova/tests/integrated/api_samples/os-config-drive/servers-config-drive-details-resp.xml.tpl b/nova/tests/integrated/api_samples/os-config-drive/servers-config-drive-details-resp.xml.tpl index c2b2fa3ba9..1882ba835a 100644 --- a/nova/tests/integrated/api_samples/os-config-drive/servers-config-drive-details-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/os-config-drive/servers-config-drive-details-resp.xml.tpl @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <servers xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> - <server status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" config_drive="%(cdrive)s"> + <server status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" config_drive="%(cdrive)s"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.json.tpl b/nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.json.tpl index 011ed6396e..d9a355319e 100755 --- a/nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.json.tpl +++ b/nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.json.tpl @@ -10,7 +10,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -47,7 +47,7 @@ "name": "new-server-test", "status": "%(status)s", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.xml.tpl b/nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.xml.tpl index d1d9b7c2cb..fee8326e0c 100755 --- a/nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.xml.tpl +++ b/nova/tests/integrated/api_samples/os-extended-rescue-with-image/server-get-resp-rescue.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="%(status)s" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" id="%(id)s"> +<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="%(status)s" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" id="%(id)s"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> @@ -16,4 +16,4 @@ </addresses> <atom:link href="%(host)s/v2/openstack/servers/%(id)s" rel="self"/> <atom:link href="%(host)s/openstack/servers/%(id)s" rel="bookmark"/> -</server>
\ No newline at end of file +</server> diff --git a/nova/tests/integrated/api_samples/os-extended-volumes/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/os-extended-volumes/server-get-resp.json.tpl index 19cdaa095b..70b1deabe2 100644 --- a/nova/tests/integrated/api_samples/os-extended-volumes/server-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/os-extended-volumes/server-get-resp.json.tpl @@ -10,7 +10,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -48,7 +48,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake", "os-extended-volumes:volumes_attached": [ {"id": "volume_id1"}, diff --git a/nova/tests/integrated/api_samples/os-extended-volumes/server-get-resp.xml.tpl b/nova/tests/integrated/api_samples/os-extended-volumes/server-get-resp.xml.tpl index 0a3cba701b..75a8fb10cc 100644 --- a/nova/tests/integrated/api_samples/os-extended-volumes/server-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/os-extended-volumes/server-get-resp.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<server xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s"> +<server xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/os-extended-volumes/servers-detail-resp.json.tpl b/nova/tests/integrated/api_samples/os-extended-volumes/servers-detail-resp.json.tpl index 3f59858bd9..1962d6a6af 100644 --- a/nova/tests/integrated/api_samples/os-extended-volumes/servers-detail-resp.json.tpl +++ b/nova/tests/integrated/api_samples/os-extended-volumes/servers-detail-resp.json.tpl @@ -2,7 +2,7 @@ "servers": [ { "status": "ACTIVE", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake", "addresses": { "private": [ @@ -22,7 +22,7 @@ "rel": "bookmark" } ], - "created": "%(timestamp)s", + "created": "%(isotime)s", "name": "new-server-test", "image": { "id": "%(uuid)s", diff --git a/nova/tests/integrated/api_samples/os-extended-volumes/servers-detail-resp.xml.tpl b/nova/tests/integrated/api_samples/os-extended-volumes/servers-detail-resp.xml.tpl index 9e63eabff1..a2ecf018eb 100644 --- a/nova/tests/integrated/api_samples/os-extended-volumes/servers-detail-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/os-extended-volumes/servers-detail-resp.xml.tpl @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <servers xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> - <server xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" > + <server xmlns:os-extended-volumes="http://docs.openstack.org/compute/ext/extended_volumes/api/v1.1" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s" > <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/os-hide-server-addresses/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/os-hide-server-addresses/server-get-resp.json.tpl index 86e39aedc6..4ac6374529 100644 --- a/nova/tests/integrated/api_samples/os-hide-server-addresses/server-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/os-hide-server-addresses/server-get-resp.json.tpl @@ -10,7 +10,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -48,7 +48,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/api_samples/os-hide-server-addresses/server-get-resp.xml.tpl b/nova/tests/integrated/api_samples/os-hide-server-addresses/server-get-resp.xml.tpl index adc8a5c1b7..cee28db35c 100644 --- a/nova/tests/integrated/api_samples/os-hide-server-addresses/server-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/os-hide-server-addresses/server-get-resp.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s"> +<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl b/nova/tests/integrated/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl index e244ea0dfa..81afe431c0 100644 --- a/nova/tests/integrated/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl +++ b/nova/tests/integrated/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl @@ -11,7 +11,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -49,7 +49,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } ] diff --git a/nova/tests/integrated/api_samples/os-hide-server-addresses/servers-details-resp.xml.tpl b/nova/tests/integrated/api_samples/os-hide-server-addresses/servers-details-resp.xml.tpl index 568807ecb3..da0472dbcf 100644 --- a/nova/tests/integrated/api_samples/os-hide-server-addresses/servers-details-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/os-hide-server-addresses/servers-details-resp.xml.tpl @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <servers xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> - <server status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s"> + <server status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.json.tpl b/nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.json.tpl index 9c16a15f05..cd7fdcf2d3 100644 --- a/nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.json.tpl +++ b/nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.json.tpl @@ -11,7 +11,7 @@ ] }, "adminPass": "%(password)s", - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -49,7 +49,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.xml.tpl b/nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.xml.tpl index d9e80f8c41..254745649c 100644 --- a/nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/os-preserve-ephemeral-rebuild/server-action-rebuild-resp.xml.tpl @@ -6,8 +6,8 @@ name="%(name)s" hostId="%(hostid)s" progress="0" status="ACTIVE" adminPass="%(password)s" - created="%(timestamp)s" - updated="%(timestamp)s" + created="%(isotime)s" + updated="%(isotime)s" accessIPv4="%(ip)s" accessIPv6="%(ip6)s"> <image id="%(uuid)s"> diff --git a/nova/tests/integrated/api_samples/os-rescue/server-get-resp-rescue.json.tpl b/nova/tests/integrated/api_samples/os-rescue/server-get-resp-rescue.json.tpl index 011ed6396e..d9a355319e 100644 --- a/nova/tests/integrated/api_samples/os-rescue/server-get-resp-rescue.json.tpl +++ b/nova/tests/integrated/api_samples/os-rescue/server-get-resp-rescue.json.tpl @@ -10,7 +10,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -47,7 +47,7 @@ "name": "new-server-test", "status": "%(status)s", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/api_samples/os-rescue/server-get-resp-rescue.xml.tpl b/nova/tests/integrated/api_samples/os-rescue/server-get-resp-rescue.xml.tpl index d1d9b7c2cb..5b134dcee0 100644 --- a/nova/tests/integrated/api_samples/os-rescue/server-get-resp-rescue.xml.tpl +++ b/nova/tests/integrated/api_samples/os-rescue/server-get-resp-rescue.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="%(status)s" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" id="%(id)s"> +<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="%(status)s" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" id="%(id)s"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/os-rescue/server-get-resp-unrescue.json.tpl b/nova/tests/integrated/api_samples/os-rescue/server-get-resp-unrescue.json.tpl index bc483c6dae..5a017d8da1 100644 --- a/nova/tests/integrated/api_samples/os-rescue/server-get-resp-unrescue.json.tpl +++ b/nova/tests/integrated/api_samples/os-rescue/server-get-resp-unrescue.json.tpl @@ -10,7 +10,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -48,7 +48,7 @@ "progress": 0, "status": "%(status)s", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/api_samples/os-rescue/server-get-resp-unrescue.xml.tpl b/nova/tests/integrated/api_samples/os-rescue/server-get-resp-unrescue.xml.tpl index e87ba47f10..145dd0be28 100644 --- a/nova/tests/integrated/api_samples/os-rescue/server-get-resp-unrescue.xml.tpl +++ b/nova/tests/integrated/api_samples/os-rescue/server-get-resp-unrescue.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="%(status)s" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s"> +<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="%(status)s" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/server-action-rebuild-resp.json.tpl b/nova/tests/integrated/api_samples/server-action-rebuild-resp.json.tpl index 9c16a15f05..cd7fdcf2d3 100644 --- a/nova/tests/integrated/api_samples/server-action-rebuild-resp.json.tpl +++ b/nova/tests/integrated/api_samples/server-action-rebuild-resp.json.tpl @@ -11,7 +11,7 @@ ] }, "adminPass": "%(password)s", - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -49,7 +49,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/api_samples/server-action-rebuild-resp.xml.tpl b/nova/tests/integrated/api_samples/server-action-rebuild-resp.xml.tpl index d9e80f8c41..254745649c 100644 --- a/nova/tests/integrated/api_samples/server-action-rebuild-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/server-action-rebuild-resp.xml.tpl @@ -6,8 +6,8 @@ name="%(name)s" hostId="%(hostid)s" progress="0" status="ACTIVE" adminPass="%(password)s" - created="%(timestamp)s" - updated="%(timestamp)s" + created="%(isotime)s" + updated="%(isotime)s" accessIPv4="%(ip)s" accessIPv6="%(ip6)s"> <image id="%(uuid)s"> diff --git a/nova/tests/integrated/api_samples/server-get-resp.json.tpl b/nova/tests/integrated/api_samples/server-get-resp.json.tpl index 86e39aedc6..4ac6374529 100644 --- a/nova/tests/integrated/api_samples/server-get-resp.json.tpl +++ b/nova/tests/integrated/api_samples/server-get-resp.json.tpl @@ -10,7 +10,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -48,7 +48,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/api_samples/server-get-resp.xml.tpl b/nova/tests/integrated/api_samples/server-get-resp.xml.tpl index adc8a5c1b7..cee28db35c 100644 --- a/nova/tests/integrated/api_samples/server-get-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/server-get-resp.xml.tpl @@ -1,5 +1,5 @@ <?xml version='1.0' encoding='UTF-8'?> -<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s"> +<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/api_samples/servers-details-resp.json.tpl b/nova/tests/integrated/api_samples/servers-details-resp.json.tpl index e244ea0dfa..81afe431c0 100644 --- a/nova/tests/integrated/api_samples/servers-details-resp.json.tpl +++ b/nova/tests/integrated/api_samples/servers-details-resp.json.tpl @@ -11,7 +11,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -49,7 +49,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } ] diff --git a/nova/tests/integrated/api_samples/servers-details-resp.xml.tpl b/nova/tests/integrated/api_samples/servers-details-resp.xml.tpl index 568807ecb3..da0472dbcf 100644 --- a/nova/tests/integrated/api_samples/servers-details-resp.xml.tpl +++ b/nova/tests/integrated/api_samples/servers-details-resp.xml.tpl @@ -1,6 +1,6 @@ <?xml version='1.0' encoding='UTF-8'?> <servers xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1"> - <server status="ACTIVE" updated="%(timestamp)s" hostId="%(hostid)s" name="new-server-test" created="%(timestamp)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s"> + <server status="ACTIVE" updated="%(isotime)s" hostId="%(hostid)s" name="new-server-test" created="%(isotime)s" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="%(id)s"> <image id="%(uuid)s"> <atom:link href="%(host)s/openstack/images/%(uuid)s" rel="bookmark"/> </image> diff --git a/nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.json.tpl index dc33f789de..fb101ec904 100644 --- a/nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/all_extensions/server-get-resp.json.tpl @@ -12,7 +12,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -69,7 +69,7 @@ ], "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.json.tpl b/nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.json.tpl index b307bc6c20..e76726d2c6 100644 --- a/nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/all_extensions/servers-details-resp.json.tpl @@ -13,7 +13,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -70,7 +70,7 @@ ], "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } ] diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl index 289f031ada..61dc8279f8 100644 --- a/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-access-ips/server-action-rebuild-resp.json.tpl @@ -11,7 +11,7 @@ ] }, "admin_password": "%(password)s", - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -49,7 +49,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake", "os-access-ips:access_ip_v4": "%(access_ip_v4)s", "os-access-ips:access_ip_v6": "%(access_ip_v6)s" diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/server-get-resp.json.tpl index 48d6991f14..24b097f18f 100644 --- a/nova/tests/integrated/v3/api_samples/os-access-ips/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-access-ips/server-get-resp.json.tpl @@ -12,7 +12,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -50,7 +50,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake", "key_name": null } diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-resp.json.tpl index 5f20a4270f..925a162c30 100644 --- a/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-access-ips/server-put-resp.json.tpl @@ -12,7 +12,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -50,7 +50,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/v3/api_samples/os-access-ips/servers-details-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-access-ips/servers-details-resp.json.tpl index 1ae3d94649..7a14faf6f0 100644 --- a/nova/tests/integrated/v3/api_samples/os-access-ips/servers-details-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-access-ips/servers-details-resp.json.tpl @@ -13,7 +13,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -51,7 +51,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake", "key_name": null } diff --git a/nova/tests/integrated/v3/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl index 76bf0d28ec..13f51f5875 100644 --- a/nova/tests/integrated/v3/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-config-drive/server-config-drive-get-resp.json.tpl @@ -11,7 +11,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -49,7 +49,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake", "key_name": null } diff --git a/nova/tests/integrated/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl index 1f612adf34..cc7fe80d46 100644 --- a/nova/tests/integrated/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-config-drive/servers-config-drive-details-resp.json.tpl @@ -12,7 +12,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -50,7 +50,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake", "key_name": null } diff --git a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-get-resp.json.tpl index 606d408ec3..e9852475e0 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/server-get-resp.json.tpl @@ -1,7 +1,7 @@ { "server": { - "updated": "%(timestamp)s", - "created": "%(timestamp)s", + "updated": "%(isotime)s", + "created": "%(isotime)s", "os-extended-availability-zone:availability_zone": "nova", "addresses": { "private": [ diff --git a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl index dcbfa9d2d7..1d69092b09 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-availability-zone/servers-detail-resp.json.tpl @@ -1,8 +1,8 @@ { "servers": [ { - "updated": "%(timestamp)s", - "created": "%(timestamp)s", + "updated": "%(isotime)s", + "created": "%(isotime)s", "os-extended-availability-zone:availability_zone": "nova", "addresses": { "private": [ diff --git a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-get-resp.json.tpl index f69436d021..acb0ed6c3d 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/server-get-resp.json.tpl @@ -3,8 +3,8 @@ "os-extended-server-attributes:host": "%(compute_host)s", "os-extended-server-attributes:hypervisor_hostname": "%(hypervisor_hostname)s", "os-extended-server-attributes:instance_name": "%(instance_name)s", - "updated": "%(timestamp)s", - "created": "%(timestamp)s", + "updated": "%(isotime)s", + "created": "%(isotime)s", "addresses": { "private": [ { @@ -55,4 +55,4 @@ "user_id": "fake", "key_name": null } -}
\ No newline at end of file +} diff --git a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl index d779cc12e9..115bba4df4 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-server-attributes/servers-detail-resp.json.tpl @@ -4,8 +4,8 @@ "os-extended-server-attributes:host": "%(compute_host)s", "os-extended-server-attributes:hypervisor_hostname": "%(hypervisor_hostname)s", "os-extended-server-attributes:instance_name": "%(instance_name)s", - "updated": "%(timestamp)s", - "created": "%(timestamp)s", + "updated": "%(isotime)s", + "created": "%(isotime)s", "addresses": { "private": [ { @@ -57,4 +57,4 @@ "key_name": null } ] -}
\ No newline at end of file +} diff --git a/nova/tests/integrated/v3/api_samples/os-extended-status/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-status/server-get-resp.json.tpl index fe7561d57c..a416cc6fc5 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-status/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-status/server-get-resp.json.tpl @@ -4,8 +4,8 @@ "os-extended-status:vm_state": "active", "os-extended-status:power_state": 1, "os-extended-status:locked_by": null, - "updated": "%(timestamp)s", - "created": "%(timestamp)s", + "updated": "%(isotime)s", + "created": "%(isotime)s", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-extended-status/servers-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-status/servers-detail-resp.json.tpl index 15f9acc54a..06eb488262 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-status/servers-detail-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-status/servers-detail-resp.json.tpl @@ -5,8 +5,8 @@ "os-extended-status:vm_state": "active", "os-extended-status:power_state": 1, "os-extended-status:locked_by": null, - "updated": "%(timestamp)s", - "created": "%(timestamp)s", + "updated": "%(isotime)s", + "created": "%(isotime)s", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-get-resp.json.tpl index 55dcf7f32b..b02b77b365 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-volumes/server-get-resp.json.tpl @@ -10,7 +10,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -48,7 +48,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake", "os-extended-volumes:volumes_attached": [ {"id": "volume_id1"}, diff --git a/nova/tests/integrated/v3/api_samples/os-extended-volumes/servers-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-extended-volumes/servers-detail-resp.json.tpl index 0abd50f786..3d6b230170 100644 --- a/nova/tests/integrated/v3/api_samples/os-extended-volumes/servers-detail-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-extended-volumes/servers-detail-resp.json.tpl @@ -1,8 +1,8 @@ { "servers": [ { - "updated": "%(timestamp)s", - "created": "%(timestamp)s", + "updated": "%(isotime)s", + "created": "%(isotime)s", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-get-resp.json.tpl index a18e0913fd..ab38bd53f5 100644 --- a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/server-get-resp.json.tpl @@ -2,7 +2,7 @@ "server": { "addresses": { }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -41,7 +41,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl index 4e8cbc7ca4..185905c922 100644 --- a/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-hide-server-addresses/servers-details-resp.json.tpl @@ -2,7 +2,7 @@ "servers": [ { "addresses": {}, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -41,7 +41,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } ] diff --git a/nova/tests/integrated/v3/api_samples/os-pci/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-pci/server-get-resp.json.tpl index 02eff6699f..920f9c8792 100644 --- a/nova/tests/integrated/v3/api_samples/os-pci/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-pci/server-get-resp.json.tpl @@ -10,7 +10,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -54,7 +54,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/v3/api_samples/os-pci/servers-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-pci/servers-detail-resp.json.tpl index 221460ddfe..265045ff7b 100644 --- a/nova/tests/integrated/v3/api_samples/os-pci/servers-detail-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-pci/servers-detail-resp.json.tpl @@ -11,7 +11,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -55,7 +55,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } ] diff --git a/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-rescue.json.tpl b/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-rescue.json.tpl index 9bdd2dec94..7eae80526d 100644 --- a/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-rescue.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-rescue.json.tpl @@ -10,7 +10,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -47,7 +47,7 @@ "name": "new-server-test", "status": "%(status)s", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake", "key_name": null } diff --git a/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-unrescue.json.tpl b/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-unrescue.json.tpl index dda3e9ea72..e56a1a5d77 100644 --- a/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-unrescue.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-rescue/server-get-resp-unrescue.json.tpl @@ -10,7 +10,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -48,7 +48,7 @@ "progress": 0, "status": "%(status)s", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake", "key_name": null } diff --git a/nova/tests/integrated/v3/api_samples/os-security-groups/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-security-groups/server-get-resp.json.tpl index 537ec397ff..fc3bd9ea1d 100644 --- a/nova/tests/integrated/v3/api_samples/os-security-groups/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-security-groups/server-get-resp.json.tpl @@ -10,7 +10,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -48,7 +48,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake", "os-security-groups:security_groups": [{"name": "test"}], "key_name": null diff --git a/nova/tests/integrated/v3/api_samples/os-security-groups/servers-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-security-groups/servers-detail-resp.json.tpl index de35aa4b0b..3306b40a9c 100644 --- a/nova/tests/integrated/v3/api_samples/os-security-groups/servers-detail-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-security-groups/servers-detail-resp.json.tpl @@ -1,8 +1,8 @@ { "servers": [ { - "updated": "%(timestamp)s", - "created": "%(timestamp)s", + "updated": "%(isotime)s", + "created": "%(isotime)s", "addresses": { "private": [ { diff --git a/nova/tests/integrated/v3/api_samples/os-server-usage/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-server-usage/server-get-resp.json.tpl index 5db0a0f065..6c66e06cd2 100644 --- a/nova/tests/integrated/v3/api_samples/os-server-usage/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-server-usage/server-get-resp.json.tpl @@ -12,7 +12,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -51,7 +51,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/v3/api_samples/os-server-usage/servers-detail-resp.json.tpl b/nova/tests/integrated/v3/api_samples/os-server-usage/servers-detail-resp.json.tpl index 8e641405f7..a5c07d2a68 100644 --- a/nova/tests/integrated/v3/api_samples/os-server-usage/servers-detail-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/os-server-usage/servers-detail-resp.json.tpl @@ -2,7 +2,7 @@ "servers": [ { "status": "ACTIVE", - "updated": "%(timestamp)s", + "created": "%(isotime)s", "os-server-usage:launched_at": "%(timestamp)s", "user_id": "fake", "addresses": { @@ -26,7 +26,7 @@ "rel": "bookmark" } ], - "created": "%(timestamp)s", + "updated": "%(isotime)s", "name": "new-server-test", "image": { "id": "%(uuid)s", diff --git a/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral-resp.json.tpl b/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral-resp.json.tpl index 51deae4eb4..68a5938ef2 100644 --- a/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-preserve-ephemeral-resp.json.tpl @@ -11,7 +11,7 @@ ] }, "admin_password": "%(password)s", - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -49,7 +49,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-resp.json.tpl b/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-resp.json.tpl index 51deae4eb4..68a5938ef2 100644 --- a/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/servers/server-action-rebuild-resp.json.tpl @@ -11,7 +11,7 @@ ] }, "admin_password": "%(password)s", - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -49,7 +49,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/v3/api_samples/servers/server-get-resp.json.tpl b/nova/tests/integrated/v3/api_samples/servers/server-get-resp.json.tpl index b3ed6fabf5..37cca80f1b 100644 --- a/nova/tests/integrated/v3/api_samples/servers/server-get-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/servers/server-get-resp.json.tpl @@ -10,7 +10,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -49,7 +49,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } } diff --git a/nova/tests/integrated/v3/api_samples/servers/servers-details-resp.json.tpl b/nova/tests/integrated/v3/api_samples/servers/servers-details-resp.json.tpl index cf159e0448..c72018e107 100644 --- a/nova/tests/integrated/v3/api_samples/servers/servers-details-resp.json.tpl +++ b/nova/tests/integrated/v3/api_samples/servers/servers-details-resp.json.tpl @@ -11,7 +11,7 @@ } ] }, - "created": "%(timestamp)s", + "created": "%(isotime)s", "flavor": { "id": "1", "links": [ @@ -50,7 +50,7 @@ "progress": 0, "status": "ACTIVE", "tenant_id": "openstack", - "updated": "%(timestamp)s", + "updated": "%(isotime)s", "user_id": "fake" } ] |