Skip to content

Commit

Permalink
Change os-si-image-schedule extension to rax-si-image-schedule
Browse files Browse the repository at this point in the history
  • Loading branch information
ameade committed May 16, 2013
1 parent b6ce97b commit a8e5485
Show file tree
Hide file tree
Showing 48 changed files with 101 additions and 100 deletions.
4 changes: 2 additions & 2 deletions doc/api_samples/all_extensions/extensions-get-resp.json
Original file line number Diff line number Diff line change
Expand Up @@ -489,7 +489,7 @@
"updated": "2012-10-28T00:00:00-00:00"
},
{
"alias": "os-si-image-schedule",
"alias": "rax-si-image-schedule",
"description": "Enables automatic scheduled images to be taken of a server.",
"links": [],
"name": "ScheduledImages",
Expand Down Expand Up @@ -561,4 +561,4 @@
"updated": "2011-08-18T00:00:00+00:00"
}
]
}
}
4 changes: 2 additions & 2 deletions doc/api_samples/all_extensions/extensions-get-resp.xml
Original file line number Diff line number Diff line change
Expand Up @@ -201,7 +201,7 @@
<extension alias="os-services" updated="2012-10-28T00:00:00-00:00" namespace="http://docs.openstack.org/compute/ext/services/api/v2" name="Services">
<description>Services support.</description>
</extension>
<extension alias="os-si-image-schedule" updated="2013-03-20T00:00:00+00:00" namespace="http://docs.openstack.org/servers/api/ext/scheduled_images/v1.0" name="ScheduledImages">
<extension alias="rax-si-image-schedule" updated="2013-03-20T00:00:00+00:00" namespace="http://docs.openstack.org/servers/api/ext/scheduled_images/v1.0" name="ScheduledImages">
<description>Enables automatic scheduled images to be taken of a server.</description>
</extension>
<extension alias="os-simple-tenant-usage" updated="2011-08-19T00:00:00+00:00" namespace="http://docs.openstack.org/compute/ext/os-simple-tenant-usage/api/v1.1" name="SimpleTenantUsage">
Expand All @@ -228,4 +228,4 @@
<extension alias="rax-backup-schedule" updated="2011-08-18T00:00:00+00:00" namespace="http://docs.openstack.org/ext/backup-schedule/api/v1.1" name="Backup_schedule">
<description>Backup schedule support for instances.</description>
</extension>
</extensions>
</extensions>
4 changes: 2 additions & 2 deletions doc/api_samples/all_extensions/server-get-resp.xml
Original file line number Diff line number Diff line change
@@ -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-IPS-MAC="http://docs.openstack.org/compute/ext/extended_ips_mac/api/v1.1" xmlns:OS-EXT-IPS="http://docs.openstack.org/compute/ext/extended_ips/api/v1.1" 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:OS-EXT-STS="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:OS-SI="http://docs.openstack.org/servers/api/ext/scheduled_images/v1.0" xmlns:OS-EXT-AZ="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-04-15T18:57:51Z" hostId="fb02b127a9d6427807b10655fe73aca2fa1642eae2d3e1c963c26d83" name="new-server-test" created="2013-04-15T18:57:45Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="49ccbcba-fe53-4b5e-b61d-2df89558444d" 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="8c7a7d9ef74c429382ab6af349f288a2" OS-EXT-SRV-ATTR:hypervisor_hostname="null" OS-EXT-AZ:availability_zone="nova" OS-DCF:diskConfig="AUTO">
<server xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:OS-EXT-IPS-MAC="http://docs.openstack.org/compute/ext/extended_ips_mac/api/v1.1" xmlns:OS-EXT-IPS="http://docs.openstack.org/compute/ext/extended_ips/api/v1.1" 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:OS-EXT-STS="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:RAX-SI="http://docs.openstack.org/servers/api/ext/scheduled_images/v1.0" xmlns:OS-EXT-AZ="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-04-15T18:57:51Z" hostId="fb02b127a9d6427807b10655fe73aca2fa1642eae2d3e1c963c26d83" name="new-server-test" created="2013-04-15T18:57:45Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="49ccbcba-fe53-4b5e-b61d-2df89558444d" 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="8c7a7d9ef74c429382ab6af349f288a2" OS-EXT-SRV-ATTR:hypervisor_hostname="null" OS-EXT-AZ:availability_zone="nova" OS-DCF:diskConfig="AUTO">
<image id="70a599e0-31e7-49b7-b260-868f441e862b">
<atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
</image>
Expand All @@ -19,4 +19,4 @@
<security_groups>
<security_group name="default"/>
</security_groups>
</server>
</server>
4 changes: 2 additions & 2 deletions doc/api_samples/all_extensions/servers-details-resp.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?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-IPS-MAC="http://docs.openstack.org/compute/ext/extended_ips_mac/api/v1.1" xmlns:OS-EXT-IPS="http://docs.openstack.org/compute/ext/extended_ips/api/v1.1" 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:OS-EXT-STS="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:OS-SI="http://docs.openstack.org/servers/api/ext/scheduled_images/v1.0" xmlns:OS-EXT-AZ="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2" xmlns="http://docs.openstack.org/compute/api/v1.1">
<servers xmlns:OS-DCF="http://docs.openstack.org/compute/ext/disk_config/api/v1.1" xmlns:OS-EXT-IPS-MAC="http://docs.openstack.org/compute/ext/extended_ips_mac/api/v1.1" xmlns:OS-EXT-IPS="http://docs.openstack.org/compute/ext/extended_ips/api/v1.1" 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:OS-EXT-STS="http://docs.openstack.org/compute/ext/extended_status/api/v1.1" xmlns:RAX-SI="http://docs.openstack.org/servers/api/ext/scheduled_images/v1.0" xmlns:OS-EXT-AZ="http://docs.openstack.org/compute/ext/extended_availability_zone/api/v2" xmlns="http://docs.openstack.org/compute/api/v1.1">
<server status="ACTIVE" updated="2013-04-15T18:58:01Z" hostId="ebd512540c83aac93e82515102dd806763d39aa9f31ac19379d3a5f9" name="new-server-test" created="2013-04-15T18:57:57Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="673a57b0-3138-4dcb-ba4d-11fdcac7a1a6" 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="17a0acee1883497fbf5950e123f47979" OS-EXT-SRV-ATTR:hypervisor_hostname="null" OS-EXT-AZ:availability_zone="nova" OS-DCF:diskConfig="AUTO">
<image id="70a599e0-31e7-49b7-b260-868f441e862b">
<atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
Expand All @@ -21,4 +21,4 @@
<security_group name="default"/>
</security_groups>
</server>
</servers>
</servers>
4 changes: 2 additions & 2 deletions doc/api_samples/all_extensions/servers-list-resp.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<servers xmlns:OS-SI="http://docs.openstack.org/servers/api/ext/scheduled_images/v1.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
<servers xmlns:RAX-SI="http://docs.openstack.org/servers/api/ext/scheduled_images/v1.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
<server name="new-server-test" id="59a619a2-2374-477e-9d79-4febb191fa80">
<atom:link href="http://openstack.example.com/v2/openstack/servers/59a619a2-2374-477e-9d79-4febb191fa80" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/59a619a2-2374-477e-9d79-4febb191fa80" rel="bookmark"/>
</server>
</servers>
</servers>
10 changes: 0 additions & 10 deletions doc/api_samples/os-si-image-schedule/servers-list-resp.xml

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"server": {
"OS-SI:image_schedule": {
"RAX-SI:image_schedule": {
"retention": 7
},
"accessIPv4": "",
Expand All @@ -13,7 +13,7 @@
}
]
},
"created": "2013-03-29T19:52:15Z",
"created": "2013-04-30T22:33:33Z",
"flavor": {
"id": "1",
"links": [
Expand All @@ -23,8 +23,8 @@
}
]
},
"hostId": "adeb10e7956e335d42baeeb8cb747bcb8fad96bdf6a33242fc9d0f98",
"id": "af248c5a-9fbd-4657-8272-a4657b514ed8",
"hostId": "7dd45aea5976254f5d47640862a555a0214180823c1c6f642468ad5b",
"id": "3f1eb334-9b49-4835-89a7-8b4adc13ee30",
"image": {
"id": "70a599e0-31e7-49b7-b260-868f441e862b",
"links": [
Expand All @@ -36,11 +36,11 @@
},
"links": [
{
"href": "http://openstack.example.com/v2/openstack/servers/af248c5a-9fbd-4657-8272-a4657b514ed8",
"href": "http://openstack.example.com/v2/openstack/servers/3f1eb334-9b49-4835-89a7-8b4adc13ee30",
"rel": "self"
},
{
"href": "http://openstack.example.com/openstack/servers/af248c5a-9fbd-4657-8272-a4657b514ed8",
"href": "http://openstack.example.com/openstack/servers/3f1eb334-9b49-4835-89a7-8b4adc13ee30",
"rel": "bookmark"
}
],
Expand All @@ -51,7 +51,7 @@
"progress": 0,
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-03-29T19:52:16Z",
"updated": "2013-04-30T22:33:34Z",
"user_id": "fake"
}
}
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version='1.0' encoding='UTF-8'?>
<server xmlns:OS-SI="http://docs.openstack.org/servers/api/ext/scheduled_images/v1.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-03-29T19:52:18Z" hostId="5f024b3be61c5c10ed91dcba4311537b6b2781ae3dc0de573b8c62d3" name="new-server-test" created="2013-03-29T19:52:18Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="a872e20c-f0c2-4e25-a00d-7098deada335">
<server xmlns:RAX-SI="http://docs.openstack.org/servers/api/ext/scheduled_images/v1.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="2013-04-30T22:33:38Z" hostId="b5349b99f07df7e35826099dc56222a1e69de878160daf703642fdc9" name="new-server-test" created="2013-04-30T22:33:36Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="ebcd5074-36c5-44f3-8516-6560efa3c16e">
<image id="70a599e0-31e7-49b7-b260-868f441e862b">
<atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
</image>
Expand All @@ -14,9 +14,9 @@
<ip version="4" addr="192.168.0.3"/>
</network>
</addresses>
<atom:link href="http://openstack.example.com/v2/openstack/servers/a872e20c-f0c2-4e25-a00d-7098deada335" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/a872e20c-f0c2-4e25-a00d-7098deada335" rel="bookmark"/>
<OS-SI:image_schedule>
<atom:link href="http://openstack.example.com/v2/openstack/servers/ebcd5074-36c5-44f3-8516-6560efa3c16e" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/ebcd5074-36c5-44f3-8516-6560efa3c16e" rel="bookmark"/>
<RAX-SI:image_schedule>
<retention>7</retention>
</OS-SI:image_schedule>
</RAX-SI:image_schedule>
</server>
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"server": {
"adminPass": "Tgsbpya2Z8Ke",
"id": "af248c5a-9fbd-4657-8272-a4657b514ed8",
"adminPass": "jJEaP74e9XA5",
"id": "3f1eb334-9b49-4835-89a7-8b4adc13ee30",
"links": [
{
"href": "http://openstack.example.com/v2/openstack/servers/af248c5a-9fbd-4657-8272-a4657b514ed8",
"href": "http://openstack.example.com/v2/openstack/servers/3f1eb334-9b49-4835-89a7-8b4adc13ee30",
"rel": "self"
},
{
"href": "http://openstack.example.com/openstack/servers/af248c5a-9fbd-4657-8272-a4657b514ed8",
"href": "http://openstack.example.com/openstack/servers/3f1eb334-9b49-4835-89a7-8b4adc13ee30",
"rel": "bookmark"
}
]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?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" id="a872e20c-f0c2-4e25-a00d-7098deada335" adminPass="pr5wzDY2J6WE">
<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" id="ebcd5074-36c5-44f3-8516-6560efa3c16e" adminPass="D683juqaAhMv">
<metadata/>
<atom:link href="http://openstack.example.com/v2/openstack/servers/a872e20c-f0c2-4e25-a00d-7098deada335" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/a872e20c-f0c2-4e25-a00d-7098deada335" rel="bookmark"/>
<atom:link href="http://openstack.example.com/v2/openstack/servers/ebcd5074-36c5-44f3-8516-6560efa3c16e" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/ebcd5074-36c5-44f3-8516-6560efa3c16e" rel="bookmark"/>
</server>
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"servers": [
{
"OS-SI:image_schedule": {
"RAX-SI:image_schedule": {
"retention": 7
},
"accessIPv4": "",
Expand All @@ -14,7 +14,7 @@
}
]
},
"created": "2013-03-29T19:52:16Z",
"created": "2013-04-30T22:33:42Z",
"flavor": {
"id": "1",
"links": [
Expand All @@ -24,8 +24,8 @@
}
]
},
"hostId": "9e24c208f61e04166d4184ffa597e752515fd29074da86610f47182e",
"id": "35349e3d-f1b0-41ad-9c8b-e72abad39588",
"hostId": "d9bd3471cc6e7885a3344f8835467887bd19d15d2a5c40cc3ee0320a",
"id": "51c604cd-0efd-4a89-8b25-99d528f4c3e2",
"image": {
"id": "70a599e0-31e7-49b7-b260-868f441e862b",
"links": [
Expand All @@ -37,11 +37,11 @@
},
"links": [
{
"href": "http://openstack.example.com/v2/openstack/servers/35349e3d-f1b0-41ad-9c8b-e72abad39588",
"href": "http://openstack.example.com/v2/openstack/servers/51c604cd-0efd-4a89-8b25-99d528f4c3e2",
"rel": "self"
},
{
"href": "http://openstack.example.com/openstack/servers/35349e3d-f1b0-41ad-9c8b-e72abad39588",
"href": "http://openstack.example.com/openstack/servers/51c604cd-0efd-4a89-8b25-99d528f4c3e2",
"rel": "bookmark"
}
],
Expand All @@ -52,7 +52,7 @@
"progress": 0,
"status": "ACTIVE",
"tenant_id": "openstack",
"updated": "2013-03-29T19:52:17Z",
"updated": "2013-04-30T22:33:43Z",
"user_id": "fake"
}
]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version='1.0' encoding='UTF-8'?>
<servers xmlns:OS-SI="http://docs.openstack.org/servers/api/ext/scheduled_images/v1.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
<server status="ACTIVE" updated="2013-03-29T19:52:19Z" hostId="3f65e31c061e8877f54729114a8ba8a50df7a8ee8dcc4df556aad0bc" name="new-server-test" created="2013-03-29T19:52:19Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="4647993b-b0eb-4602-b84f-330c001de910">
<servers xmlns:RAX-SI="http://docs.openstack.org/servers/api/ext/scheduled_images/v1.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
<server status="ACTIVE" updated="2013-04-30T22:33:46Z" hostId="e5bb317b8517cbfb139ef370a101204d23dab3a9a9f1f76d52c661e4" name="new-server-test" created="2013-04-30T22:33:45Z" userId="fake" tenantId="openstack" accessIPv4="" accessIPv6="" progress="0" id="6466b48d-133b-4244-b8af-d1e1768546e7">
<image id="70a599e0-31e7-49b7-b260-868f441e862b">
<atom:link href="http://openstack.example.com/openstack/images/70a599e0-31e7-49b7-b260-868f441e862b" rel="bookmark"/>
</image>
Expand All @@ -15,10 +15,10 @@
<ip version="4" addr="192.168.0.3"/>
</network>
</addresses>
<atom:link href="http://openstack.example.com/v2/openstack/servers/4647993b-b0eb-4602-b84f-330c001de910" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/4647993b-b0eb-4602-b84f-330c001de910" rel="bookmark"/>
<OS-SI:image_schedule>
<atom:link href="http://openstack.example.com/v2/openstack/servers/6466b48d-133b-4244-b8af-d1e1768546e7" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/6466b48d-133b-4244-b8af-d1e1768546e7" rel="bookmark"/>
<RAX-SI:image_schedule>
<retention>7</retention>
</OS-SI:image_schedule>
</RAX-SI:image_schedule>
</server>
</servers>
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"servers": [
{
"OS-SI:image_schedule": {
"RAX-SI:image_schedule": {
"retention": 7
},
"id": "ef79c6b3-4580-4c0f-8370-652fc0b077d4",
"id": "70a30dd1-e1e2-4b75-8c8c-a233c3acf46a",
"links": [
{
"href": "http://openstack.example.com/v2/openstack/servers/ef79c6b3-4580-4c0f-8370-652fc0b077d4",
"href": "http://openstack.example.com/v2/openstack/servers/70a30dd1-e1e2-4b75-8c8c-a233c3acf46a",
"rel": "self"
},
{
"href": "http://openstack.example.com/openstack/servers/ef79c6b3-4580-4c0f-8370-652fc0b077d4",
"href": "http://openstack.example.com/openstack/servers/70a30dd1-e1e2-4b75-8c8c-a233c3acf46a",
"rel": "bookmark"
}
],
Expand Down
10 changes: 10 additions & 0 deletions doc/api_samples/rax-si-image-schedule/servers-list-resp.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
<?xml version='1.0' encoding='UTF-8'?>
<servers xmlns:RAX-SI="http://docs.openstack.org/servers/api/ext/scheduled_images/v1.0" xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1">
<server name="new-server-test" id="e76c99dc-236b-47a1-afc2-1fd5c2dbbe4d">
<atom:link href="http://openstack.example.com/v2/openstack/servers/e76c99dc-236b-47a1-afc2-1fd5c2dbbe4d" rel="self"/>
<atom:link href="http://openstack.example.com/openstack/servers/e76c99dc-236b-47a1-afc2-1fd5c2dbbe4d" rel="bookmark"/>
<RAX-SI:image_schedule>
<retention>7</retention>
</RAX-SI:image_schedule>
</server>
</servers>
Loading

0 comments on commit a8e5485

Please sign in to comment.