womax/nova
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use actual fake timestamp in API templates"

Browse Source
This commit is contained in:
Jenkins
2014-04-30 22:48:20 +00:00
committed by Gerrit Code Review
parent 42aade4ed0 6d88be2049
commit 34b3441e14
5 changed files with 25 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nova/tests/integrated/api_samples/OS-DCF/image-get-resp.json.tpl
+2 -2
View File
@@ -1,7 +1,7 @@
{
"image": {
"OS-DCF:diskConfig": "AUTO",
"created": "%(timestamp)s",
"created": "2011-01-01T01:02:03Z",
"id": "%(image_id)s",
"links": [
{
@@ -29,6 +29,6 @@
"name": "fakeimage7",
"progress": 100,
"status": "ACTIVE",
"updated": "%(timestamp)s"
"updated": "2011-01-01T01:02:03Z"
}
}
nova/tests/integrated/api_samples/OS-DCF/image-list-resp.json.tpl
+14 -14
View File
@@ -2,7 +2,7 @@
"images": [
{
"OS-DCF:diskConfig": "AUTO",
"created": "%(timestamp)s",
"created": "2011-01-01T01:02:03Z",
"id": "%(id)s",
"links": [
{
@@ -30,10 +30,10 @@
"name": "fakeimage7",
"progress": 100,
"status": "ACTIVE",
"updated": "%(timestamp)s"
"updated": "2011-01-01T01:02:03Z"
},
{
"created": "%(timestamp)s",
"created": "2011-01-01T01:02:03Z",
"id": "%(id)s",
"links": [
{
@@ -60,10 +60,10 @@
"name": "fakeimage123456",
"progress": 100,
"status": "ACTIVE",
"updated": "%(timestamp)s"
"updated": "2011-01-01T01:02:03Z"
},
{
"created": "%(timestamp)s",
"created": "2011-01-01T01:02:03Z",
"id": "%(uuid)s",
"links": [
{
@@ -89,11 +89,11 @@
"name": "fakeimage123456",
"progress": 100,
"status": "ACTIVE",
"updated": "%(timestamp)s"
"updated": "2011-01-01T01:02:03Z"
},
{
"OS-DCF:diskConfig": "MANUAL",
"created": "%(timestamp)s",
"created": "2011-01-01T01:02:03Z",
"id": "%(uuid)s",
"links": [
{
@@ -121,10 +121,10 @@
"name": "fakeimage6",
"progress": 100,
"status": "ACTIVE",
"updated": "%(timestamp)s"
"updated": "2011-01-01T01:02:03Z"
},
{
"created": "%(timestamp)s",
"created": "2011-01-01T01:02:03Z",
"id": "%(id)s",
"links": [
{
@@ -150,10 +150,10 @@
"name": "fakeimage123456",
"progress": 100,
"status": "ACTIVE",
"updated": "%(timestamp)s"
"updated": "2011-01-01T01:02:03Z"
},
{
"created": "%(timestamp)s",
"created": "2011-01-01T01:02:03Z",
"id": "%(id)s",
"links": [
{
@@ -179,10 +179,10 @@
"name": "fakeimage123456",
"progress": 100,
"status": "ACTIVE",
"updated": "%(timestamp)s"
"updated": "2011-01-01T01:02:03Z"
},
{
"created": "%(timestamp)s",
"created": "2011-01-01T01:02:03Z",
"id": "%(id)s",
"links": [
{
@@ -208,7 +208,7 @@
"name": "fakeimage123456",
"progress": 100,
"status": "ACTIVE",
"updated": "%(timestamp)s"
"updated": "2011-01-01T01:02:03Z"
}
]
}
nova/tests/integrated/api_samples/OS-DCF/image-list-resp.xml.tpl
+7 -7
View File
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<images 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">
<image status="ACTIVE" updated="%(timestamp)s" name="fakeimage7" created="%(timestamp)s" minDisk="0" progress="100" minRam="0" id="%(id)s" OS-DCF:diskConfig="AUTO">
<image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage7" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="%(id)s" OS-DCF:diskConfig="AUTO">
<metadata>
<meta key="kernel_id">nokernel</meta>
<meta key="auto_disk_config">True</meta>
@@ -11,7 +11,7 @@
<atom:link href="%(host)s/openstack/images/%(id)s" rel="bookmark"/>
<atom:link href="%(glance_host)s/openstack/images/%(id)s" type="application/vnd.openstack.image" rel="alternate"/>
</image>
<image status="ACTIVE" updated="%(timestamp)s" name="fakeimage123456" created="%(timestamp)s" minDisk="0" progress="100" minRam="0" id="%(id)s">
<image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="%(id)s">
<metadata>
<meta key="kernel_id">nokernel</meta>
<meta key="ramdisk_id">nokernel</meta>
@@ -21,7 +21,7 @@
<atom:link href="%(host)s/openstack/images/%(id)s" rel="bookmark"/>
<atom:link href="%(glance_host)s/openstack/images/%(id)s" type="application/vnd.openstack.image" rel="alternate"/>
</image>
<image status="ACTIVE" updated="%(timestamp)s" name="fakeimage123456" created="%(timestamp)s" minDisk="0" progress="100" minRam="0" id="%(id)s">
<image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="%(id)s">
<metadata>
<meta key="kernel_id">nokernel</meta>
<meta key="ramdisk_id">nokernel</meta>
@@ -30,7 +30,7 @@
<atom:link href="%(host)s/openstack/images/%(id)s" rel="bookmark"/>
<atom:link href="%(glance_host)s/openstack/images/%(id)s" type="application/vnd.openstack.image" rel="alternate"/>
</image>
<image status="ACTIVE" updated="%(timestamp)s" name="fakeimage6" created="%(timestamp)s" minDisk="0" progress="100" minRam="0" id="%(id)s" OS-DCF:diskConfig="MANUAL">
<image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage6" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="%(id)s" OS-DCF:diskConfig="MANUAL">
<metadata>
<meta key="kernel_id">nokernel</meta>
<meta key="auto_disk_config">False</meta>
@@ -41,7 +41,7 @@
<atom:link href="%(host)s/openstack/images/%(id)s" rel="bookmark"/>
<atom:link href="%(glance_host)s/openstack/images/%(id)s" type="application/vnd.openstack.image" rel="alternate"/>
</image>
<image status="ACTIVE" updated="%(timestamp)s" name="fakeimage123456" created="%(timestamp)s" minDisk="0" progress="100" minRam="0" id="%(id)s">
<image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="%(id)s">
<metadata>
<meta key="kernel_id">%(id)s</meta>
<meta key="ramdisk_id">None</meta>
@@ -50,7 +50,7 @@
<atom:link href="%(host)s/openstack/images/%(id)s" rel="bookmark"/>
<atom:link href="%(glance_host)s/openstack/images/%(id)s" type="application/vnd.openstack.image" rel="alternate"/>
</image>
<image status="ACTIVE" updated="%(timestamp)s" name="fakeimage123456" created="%(timestamp)s" minDisk="0" progress="100" minRam="0" id="%(id)s">
<image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="%(id)s">
<metadata>
<meta key="kernel_id">nokernel</meta>
<meta key="ramdisk_id">nokernel</meta>
@@ -59,7 +59,7 @@
<atom:link href="%(host)s/openstack/images/%(id)s" rel="bookmark"/>
<atom:link href="%(glance_host)s/openstack/images/%(id)s" type="application/vnd.openstack.image" rel="alternate"/>
</image>
<image status="ACTIVE" updated="%(timestamp)s" name="fakeimage123456" created="%(timestamp)s" minDisk="0" progress="100" minRam="0" id="%(id)s">
<image status="ACTIVE" updated="2011-01-01T01:02:03Z" name="fakeimage123456" created="2011-01-01T01:02:03Z" minDisk="0" progress="100" minRam="0" id="%(id)s">
<metadata>
<meta key="kernel_id">nokernel</meta>
<meta key="ramdisk_id">nokernel</meta>
nova/tests/integrated/api_samples/OS-EXT-IMG-SIZE/image-get-resp.json.tpl
+1 -1
View File
@@ -29,6 +29,6 @@
"OS-EXT-IMG-SIZE:size": %(int)s,
"progress": 100,
"status": "ACTIVE",
"updated": "%(timestamp)s"
"updated": "2011-01-01T01:02:03Z"
}
}
nova/tests/integrated/api_samples/image-get-resp.json.tpl
+1 -1
View File
@@ -28,6 +28,6 @@
"name": "fakeimage7",
"progress": 100,
"status": "ACTIVE",
"updated": "%(timestamp)s"
"updated": "2011-01-01T01:02:03Z"
}
}