diff options
| author | Jenkins <jenkins@review.openstack.org> | 2013-09-10 16:44:44 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2013-09-10 16:44:44 +0000 |
| commit | b05eef9201ee78ee72d5a0d5bdb0579cd4a5cf3e (patch) | |
| tree | 0d6786a169a4f618ca7dbd0262fd9c9337ad85f7 /nova/tests/integrated | |
| parent | 1533bb2270a1cf04fd9b87af13dc143cf220f263 (diff) | |
| parent | 350d6f533753c82099bc33156ece095bc5670372 (diff) | |
| download | nova-b05eef9201ee78ee72d5a0d5bdb0579cd4a5cf3e.tar.gz | |
Merge "Makes v3 API keypairs extension core"
Diffstat (limited to 'nova/tests/integrated')
4 files changed, 4 insertions, 2 deletions
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 6e31aae6f6..afb281c5bd 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 @@ -33,6 +33,7 @@ } ] }, + "key_name": null, "links": [ { "href": "%(host)s/v3/servers/%(uuid)s", diff --git a/nova/tests/integrated/v3/api_samples/servers/server-get-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/servers/server-get-resp.xml.tpl index 5cfb01fa52..8286f6ceda 100644 --- a/nova/tests/integrated/v3/api_samples/servers/server-get-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/servers/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" user_id="fake" name="new-server-test" created="%(timestamp)s" tenant_id="openstack" access_ip_v4="" progress="0" host_id="%(hostid)s" id="%(id)s" access_ip_v6=""> +<server xmlns:atom="http://www.w3.org/2005/Atom" xmlns="http://docs.openstack.org/compute/api/v1.1" status="ACTIVE" updated="%(timestamp)s" user_id="fake" name="new-server-test" created="%(timestamp)s" tenant_id="openstack" access_ip_v4="" progress="0" host_id="%(hostid)s" id="%(id)s" access_ip_v6="" key_name="None"> <image id="%(uuid)s"> <atom:link href="%(glance_host)s/images/%(uuid)s" rel="bookmark"/> </image> 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 dce3ded800..cbbb57bc7d 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 @@ -34,6 +34,7 @@ } ] }, + "key_name": null, "links": [ { "href": "%(host)s/v3/servers/%(uuid)s", diff --git a/nova/tests/integrated/v3/api_samples/servers/servers-details-resp.xml.tpl b/nova/tests/integrated/v3/api_samples/servers/servers-details-resp.xml.tpl index d9e0234e78..f7b5006ba6 100644 --- a/nova/tests/integrated/v3/api_samples/servers/servers-details-resp.xml.tpl +++ b/nova/tests/integrated/v3/api_samples/servers/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" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" access_ip_v4="" access_ip_v6="" progress="0" id="%(id)s"> + <server status="ACTIVE" updated="%(timestamp)s" host_id="%(hostid)s" name="new-server-test" created="%(timestamp)s" user_id="fake" tenant_id="openstack" access_ip_v4="" access_ip_v6="" key_name="None" progress="0" id="%(id)s"> <image id="%(uuid)s"> <atom:link href="%(glance_host)s/images/%(uuid)s" rel="bookmark"/> </image> |