You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by mf...@apache.org on 2012/11/22 14:45:58 UTC
[4/32] git commit: RHEV-M: Fixed VCR fixtures to reflect recent
changes in reporting MAC address
RHEV-M: Fixed VCR fixtures to reflect recent changes in reporting MAC address
Project: http://git-wip-us.apache.org/repos/asf/deltacloud/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltacloud/commit/e68c0b7c
Tree: http://git-wip-us.apache.org/repos/asf/deltacloud/tree/e68c0b7c
Diff: http://git-wip-us.apache.org/repos/asf/deltacloud/diff/e68c0b7c
Branch: refs/heads/master
Commit: e68c0b7c03cb2e66705defbd8fe3ad3743ca8f09
Parents: bb38e35
Author: Michal Fojtik <mf...@redhat.com>
Authored: Thu Nov 22 13:14:57 2012 +0100
Committer: Michal fojtik <mf...@redhat.com>
Committed: Thu Nov 22 13:14:57 2012 +0100
----------------------------------------------------------------------
server/tests/drivers/rhevm/common.rb | 1 +
.../test_0002_must_return_list_of_images.yml | 274 +-
.../test_0002_must_return_list_of_instances.yml | 1918 ++-
.../test_0002_must_return_list_of_realms.yml | 110 +-
...must_support_listing_of_available_providers.yml | 122 +-
.../test_0003_must_allow_to_filter_images.yml | 262 +-
.../test_0003_must_allow_to_filter_instances.yml | 7994 +++++++--
.../test_0003_must_allow_to_filter_realms.yml | 272 +-
...s_when_switching_between_different_clusters.yml | 194 +-
...0004_must_allow_to_retrieve_single_instance.yml | 4994 +++++-
...st_0004_must_allow_to_retrieve_single_realm.yml | 164 +-
..._to_create_a_new_instance_and_destroy_it-10.yml | 968 +-
...w_to_create_a_new_instance_and_destroy_it-9.yml | 968 +-
...te_a_new_instance_and_destroy_it-destroy-10.yml | 1115 +-
...ate_a_new_instance_and_destroy_it-destroy-9.yml | 1202 ++
...low_to_create_a_new_instance_and_destroy_it.yml |12206 ++++++++++---
...reate_a_new_instance_and_make_it_running-10.yml | 968 +-
...create_a_new_instance_and_make_it_running-9.yml | 968 +-
...new_instance_and_make_it_running-destroy-10.yml | 966 +-
..._new_instance_and_make_it_running-destroy-9.yml | 904 +-
...a_new_instance_and_make_it_running-start-10.yml | 970 +-
..._a_new_instance_and_make_it_running-start-4.yml | 966 +-
..._a_new_instance_and_make_it_running-start-5.yml | 966 +-
..._a_new_instance_and_make_it_running-start-6.yml | 966 +-
..._a_new_instance_and_make_it_running-start-7.yml | 966 +-
..._a_new_instance_and_make_it_running-start-8.yml | 966 +-
..._a_new_instance_and_make_it_running-start-9.yml | 966 +-
..._a_new_instance_and_make_it_running-stop-10.yml | 966 +-
...e_a_new_instance_and_make_it_running-stop-6.yml | 969 +-
...e_a_new_instance_and_make_it_running-stop-7.yml | 966 +-
...e_a_new_instance_and_make_it_running-stop-8.yml | 966 +-
...e_a_new_instance_and_make_it_running-stop-9.yml | 966 +-
...o_create_a_new_instance_and_make_it_running.yml |14718 ++++++++++++---
server/tests/drivers/rhevm/instance_test.rb | 14 +-
34 files changed, 52112 insertions(+), 10789 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/e68c0b7c/server/tests/drivers/rhevm/common.rb
----------------------------------------------------------------------
diff --git a/server/tests/drivers/rhevm/common.rb b/server/tests/drivers/rhevm/common.rb
index 7246633..1437659 100644
--- a/server/tests/drivers/rhevm/common.rb
+++ b/server/tests/drivers/rhevm/common.rb
@@ -19,5 +19,6 @@ VCR.configure do |c|
c.cassette_library_dir = File.join(File.dirname(__FILE__), 'fixtures')
c.hook_into :webmock
# Set this to :new_episodes when you want to 're-record'
+ #c.default_cassette_options = { :record => :new_episodes }
c.default_cassette_options = { :record => :none }
end
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/e68c0b7c/server/tests/drivers/rhevm/fixtures/test_0002_must_return_list_of_images.yml
----------------------------------------------------------------------
diff --git a/server/tests/drivers/rhevm/fixtures/test_0002_must_return_list_of_images.yml b/server/tests/drivers/rhevm/fixtures/test_0002_must_return_list_of_images.yml
index 3f19a89..0dc62fb 100644
--- a/server/tests/drivers/rhevm/fixtures/test_0002_must_return_list_of_images.yml
+++ b/server/tests/drivers/rhevm/fixtures/test_0002_must_return_list_of_images.yml
@@ -1,5 +1,5 @@
---
-recorded_with: VCR 2.2.5
+recorded_with: VCR 2.3.0
http_interactions:
- request:
method: get
@@ -7,33 +7,33 @@ http_interactions:
body:
string: ""
headers:
- Accept:
- - application/xml
Content-Type:
- application/xml
Accept-Encoding:
- gzip, deflate
+ Accept:
+ - application/xml
response:
status:
code: 200
message: OK
headers:
- Date:
- - Fri, 09 Nov 2012 08:56:08 GMT
- Connection:
- - close
- Pragma:
- - No-cache
+ Cache-Control:
+ - no-cache
Content-Length:
- "828"
Set-Cookie:
- - JSESSIONID=FI2nRi+JxYbcqRtrzPO+UF0l; Path=/api; Secure
+ - JSESSIONID=OJn2u3cFhULQw9UZTwhhGKLh; Path=/api; Secure
Content-Type:
- application/xml
- Cache-Control:
- - no-cache
+ Pragma:
+ - No-cache
+ Date:
+ - Thu, 22 Nov 2012 11:38:26 GMT
Expires:
- Thu, 01 Jan 1970 01:00:00 CET
+ Connection:
+ - close
body:
string: |
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
@@ -55,40 +55,40 @@ http_interactions:
</data_center>
http_version:
- recorded_at: Fri, 09 Nov 2012 08:56:09 GMT
+ recorded_at: Thu, 22 Nov 2012 11:38:26 GMT
- request:
method: get
uri: https://admin%40internal:redhat@dell-per610-02.lab.eng.brq.redhat.com/api/templates?search=datacenter=Default
body:
string: ""
headers:
- Accept:
- - application/xml
Content-Type:
- application/xml
Accept-Encoding:
- gzip, deflate
+ Accept:
+ - application/xml
response:
status:
code: 200
message: OK
headers:
- Date:
- - Fri, 09 Nov 2012 08:56:09 GMT
- Connection:
- - close
- Pragma:
- - No-cache
- Content-Length:
- - "6750"
+ Cache-Control:
+ - no-cache
Set-Cookie:
- - JSESSIONID=5dNTawPQTXql13P62Gd8VB0l; Path=/api; Secure
+ - JSESSIONID=FFM4fDToibZuyTHhq32lp6BC; Path=/api; Secure
Content-Type:
- application/xml
- Cache-Control:
- - no-cache
+ Pragma:
+ - No-cache
+ Date:
+ - Thu, 22 Nov 2012 11:38:26 GMT
Expires:
- Thu, 01 Jan 1970 01:00:00 CET
+ Connection:
+ - close
+ Transfer-Encoding:
+ - chunked
body:
string: |
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
@@ -131,6 +131,47 @@ http_interactions:
<enabled>false</enabled>
</usb>
</template>
+ <template href="/api/templates/d0083bdc-74d5-464e-8907-31ab4d7788e0" id="d0083bdc-74d5-464e-8907-31ab4d7788e0">
+ <actions>
+ <link href="/api/templates/d0083bdc-74d5-464e-8907-31ab4d7788e0/export" rel="export"/>
+ </actions>
+ <name>centos63</name>
+ <link href="/api/templates/d0083bdc-74d5-464e-8907-31ab4d7788e0/disks" rel="disks"/>
+ <link href="/api/templates/d0083bdc-74d5-464e-8907-31ab4d7788e0/nics" rel="nics"/>
+ <link href="/api/templates/d0083bdc-74d5-464e-8907-31ab4d7788e0/cdroms" rel="cdroms"/>
+ <link href="/api/templates/d0083bdc-74d5-464e-8907-31ab4d7788e0/permissions" rel="permissions"/>
+ <type>server</type>
+ <status>
+ <state>ok</state>
+ </status>
+ <memory>2147483648</memory>
+ <cpu>
+ <topology sockets="1" cores="1"/>
+ </cpu>
+ <os type="rhel_6x64">
+ <boot dev="cdrom"/>
+ <boot dev="hd"/>
+ <kernel></kernel>
+ <initrd></initrd>
+ <cmdline></cmdline>
+ </os>
+ <cluster href="/api/clusters/99408929-82cf-4dc7-a532-9d998063fa95" id="99408929-82cf-4dc7-a532-9d998063fa95"/>
+ <creation_time>2012-11-09T14:35:55.488+01:00</creation_time>
+ <origin>rhev</origin>
+ <high_availability>
+ <enabled>false</enabled>
+ <priority>1</priority>
+ </high_availability>
+ <display>
+ <type>spice</type>
+ <monitors>1</monitors>
+ <allow_override>false</allow_override>
+ </display>
+ <stateless>false</stateless>
+ <usb>
+ <enabled>false</enabled>
+ </usb>
+ </template>
<template href="/api/templates/fe9dcb11-a035-4d80-89b4-a4092a892505" id="fe9dcb11-a035-4d80-89b4-a4092a892505">
<actions>
<link href="/api/templates/fe9dcb11-a035-4d80-89b4-a4092a892505/export" rel="export"/>
@@ -174,7 +215,7 @@ http_interactions:
<actions>
<link href="/api/templates/645d60b1-9555-4b15-8e2e-01d408572c4e/export" rel="export"/>
</actions>
- <name>fedora17-minimal-03</name>
+ <name>f17-minimal</name>
<link href="/api/templates/645d60b1-9555-4b15-8e2e-01d408572c4e/disks" rel="disks"/>
<link href="/api/templates/645d60b1-9555-4b15-8e2e-01d408572c4e/nics" rel="nics"/>
<link href="/api/templates/645d60b1-9555-4b15-8e2e-01d408572c4e/cdroms" rel="cdroms"/>
@@ -210,6 +251,47 @@ http_interactions:
<enabled>false</enabled>
</usb>
</template>
+ <template href="/api/templates/ce7de898-38cb-4851-b5dc-1f4f0940a329" id="ce7de898-38cb-4851-b5dc-1f4f0940a329">
+ <actions>
+ <link href="/api/templates/ce7de898-38cb-4851-b5dc-1f4f0940a329/export" rel="export"/>
+ </actions>
+ <name>mrgqe6i_template</name>
+ <description>MRGQE RHEL6/i386 template</description>
+ <link href="/api/templates/ce7de898-38cb-4851-b5dc-1f4f0940a329/disks" rel="disks"/>
+ <link href="/api/templates/ce7de898-38cb-4851-b5dc-1f4f0940a329/nics" rel="nics"/>
+ <link href="/api/templates/ce7de898-38cb-4851-b5dc-1f4f0940a329/cdroms" rel="cdroms"/>
+ <link href="/api/templates/ce7de898-38cb-4851-b5dc-1f4f0940a329/permissions" rel="permissions"/>
+ <type>server</type>
+ <status>
+ <state>ok</state>
+ </status>
+ <memory>805306368</memory>
+ <cpu>
+ <topology sockets="1" cores="1"/>
+ </cpu>
+ <os type="rhel_6">
+ <boot dev="hd"/>
+ <kernel></kernel>
+ <initrd></initrd>
+ <cmdline></cmdline>
+ </os>
+ <cluster href="/api/clusters/99408929-82cf-4dc7-a532-9d998063fa95" id="99408929-82cf-4dc7-a532-9d998063fa95"/>
+ <creation_time>2012-11-21T19:41:41.462+01:00</creation_time>
+ <origin>rhev</origin>
+ <high_availability>
+ <enabled>false</enabled>
+ <priority>1</priority>
+ </high_availability>
+ <display>
+ <type>spice</type>
+ <monitors>1</monitors>
+ <allow_override>false</allow_override>
+ </display>
+ <stateless>false</stateless>
+ <usb>
+ <enabled>false</enabled>
+ </usb>
+ </template>
<template href="/api/templates/5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5" id="5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5">
<actions>
<link href="/api/templates/5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5/export" rel="export"/>
@@ -254,40 +336,40 @@ http_interactions:
</templates>
http_version:
- recorded_at: Fri, 09 Nov 2012 08:56:10 GMT
+ recorded_at: Thu, 22 Nov 2012 11:38:26 GMT
- request:
method: get
uri: https://admin%40internal:redhat@dell-per610-02.lab.eng.brq.redhat.com/api/datacenters/9df72b84-0234-11e2-9b87-9386d9b09d4a
body:
string: ""
headers:
- Accept:
- - application/xml
Content-Type:
- application/xml
Accept-Encoding:
- gzip, deflate
+ Accept:
+ - application/xml
response:
status:
code: 200
message: OK
headers:
- Date:
- - Fri, 09 Nov 2012 08:56:09 GMT
- Connection:
- - close
- Pragma:
- - No-cache
+ Cache-Control:
+ - no-cache
Content-Length:
- "828"
Set-Cookie:
- - JSESSIONID=6yXciQ6zSSsQXgUDlSAaOPZw; Path=/api; Secure
+ - JSESSIONID=HLqVbGbkN948892xqMFzL2kh; Path=/api; Secure
Content-Type:
- application/xml
- Cache-Control:
- - no-cache
+ Pragma:
+ - No-cache
+ Date:
+ - Thu, 22 Nov 2012 11:38:26 GMT
Expires:
- Thu, 01 Jan 1970 01:00:00 CET
+ Connection:
+ - close
body:
string: |
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
@@ -309,40 +391,40 @@ http_interactions:
</data_center>
http_version:
- recorded_at: Fri, 09 Nov 2012 08:56:10 GMT
+ recorded_at: Thu, 22 Nov 2012 11:38:26 GMT
- request:
method: get
uri: https://admin%40internal:redhat@dell-per610-02.lab.eng.brq.redhat.com/api/templates?search=datacenter=Default
body:
string: ""
headers:
- Accept:
- - application/xml
Content-Type:
- application/xml
Accept-Encoding:
- gzip, deflate
+ Accept:
+ - application/xml
response:
status:
code: 200
message: OK
headers:
- Date:
- - Fri, 09 Nov 2012 08:56:09 GMT
- Connection:
- - close
- Pragma:
- - No-cache
- Content-Length:
- - "6750"
+ Cache-Control:
+ - no-cache
Set-Cookie:
- - JSESSIONID=oBFJbUDcfByY3mqXxlnJeVat; Path=/api; Secure
+ - JSESSIONID=y9-pHpTiULHTYEd1BPwXjTjg; Path=/api; Secure
Content-Type:
- application/xml
- Cache-Control:
- - no-cache
+ Pragma:
+ - No-cache
+ Date:
+ - Thu, 22 Nov 2012 11:38:26 GMT
Expires:
- Thu, 01 Jan 1970 01:00:00 CET
+ Connection:
+ - close
+ Transfer-Encoding:
+ - chunked
body:
string: |
<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
@@ -385,6 +467,47 @@ http_interactions:
<enabled>false</enabled>
</usb>
</template>
+ <template href="/api/templates/d0083bdc-74d5-464e-8907-31ab4d7788e0" id="d0083bdc-74d5-464e-8907-31ab4d7788e0">
+ <actions>
+ <link href="/api/templates/d0083bdc-74d5-464e-8907-31ab4d7788e0/export" rel="export"/>
+ </actions>
+ <name>centos63</name>
+ <link href="/api/templates/d0083bdc-74d5-464e-8907-31ab4d7788e0/disks" rel="disks"/>
+ <link href="/api/templates/d0083bdc-74d5-464e-8907-31ab4d7788e0/nics" rel="nics"/>
+ <link href="/api/templates/d0083bdc-74d5-464e-8907-31ab4d7788e0/cdroms" rel="cdroms"/>
+ <link href="/api/templates/d0083bdc-74d5-464e-8907-31ab4d7788e0/permissions" rel="permissions"/>
+ <type>server</type>
+ <status>
+ <state>ok</state>
+ </status>
+ <memory>2147483648</memory>
+ <cpu>
+ <topology sockets="1" cores="1"/>
+ </cpu>
+ <os type="rhel_6x64">
+ <boot dev="cdrom"/>
+ <boot dev="hd"/>
+ <kernel></kernel>
+ <initrd></initrd>
+ <cmdline></cmdline>
+ </os>
+ <cluster href="/api/clusters/99408929-82cf-4dc7-a532-9d998063fa95" id="99408929-82cf-4dc7-a532-9d998063fa95"/>
+ <creation_time>2012-11-09T14:35:55.488+01:00</creation_time>
+ <origin>rhev</origin>
+ <high_availability>
+ <enabled>false</enabled>
+ <priority>1</priority>
+ </high_availability>
+ <display>
+ <type>spice</type>
+ <monitors>1</monitors>
+ <allow_override>false</allow_override>
+ </display>
+ <stateless>false</stateless>
+ <usb>
+ <enabled>false</enabled>
+ </usb>
+ </template>
<template href="/api/templates/fe9dcb11-a035-4d80-89b4-a4092a892505" id="fe9dcb11-a035-4d80-89b4-a4092a892505">
<actions>
<link href="/api/templates/fe9dcb11-a035-4d80-89b4-a4092a892505/export" rel="export"/>
@@ -428,7 +551,7 @@ http_interactions:
<actions>
<link href="/api/templates/645d60b1-9555-4b15-8e2e-01d408572c4e/export" rel="export"/>
</actions>
- <name>fedora17-minimal-03</name>
+ <name>f17-minimal</name>
<link href="/api/templates/645d60b1-9555-4b15-8e2e-01d408572c4e/disks" rel="disks"/>
<link href="/api/templates/645d60b1-9555-4b15-8e2e-01d408572c4e/nics" rel="nics"/>
<link href="/api/templates/645d60b1-9555-4b15-8e2e-01d408572c4e/cdroms" rel="cdroms"/>
@@ -464,6 +587,47 @@ http_interactions:
<enabled>false</enabled>
</usb>
</template>
+ <template href="/api/templates/ce7de898-38cb-4851-b5dc-1f4f0940a329" id="ce7de898-38cb-4851-b5dc-1f4f0940a329">
+ <actions>
+ <link href="/api/templates/ce7de898-38cb-4851-b5dc-1f4f0940a329/export" rel="export"/>
+ </actions>
+ <name>mrgqe6i_template</name>
+ <description>MRGQE RHEL6/i386 template</description>
+ <link href="/api/templates/ce7de898-38cb-4851-b5dc-1f4f0940a329/disks" rel="disks"/>
+ <link href="/api/templates/ce7de898-38cb-4851-b5dc-1f4f0940a329/nics" rel="nics"/>
+ <link href="/api/templates/ce7de898-38cb-4851-b5dc-1f4f0940a329/cdroms" rel="cdroms"/>
+ <link href="/api/templates/ce7de898-38cb-4851-b5dc-1f4f0940a329/permissions" rel="permissions"/>
+ <type>server</type>
+ <status>
+ <state>ok</state>
+ </status>
+ <memory>805306368</memory>
+ <cpu>
+ <topology sockets="1" cores="1"/>
+ </cpu>
+ <os type="rhel_6">
+ <boot dev="hd"/>
+ <kernel></kernel>
+ <initrd></initrd>
+ <cmdline></cmdline>
+ </os>
+ <cluster href="/api/clusters/99408929-82cf-4dc7-a532-9d998063fa95" id="99408929-82cf-4dc7-a532-9d998063fa95"/>
+ <creation_time>2012-11-21T19:41:41.462+01:00</creation_time>
+ <origin>rhev</origin>
+ <high_availability>
+ <enabled>false</enabled>
+ <priority>1</priority>
+ </high_availability>
+ <display>
+ <type>spice</type>
+ <monitors>1</monitors>
+ <allow_override>false</allow_override>
+ </display>
+ <stateless>false</stateless>
+ <usb>
+ <enabled>false</enabled>
+ </usb>
+ </template>
<template href="/api/templates/5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5" id="5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5">
<actions>
<link href="/api/templates/5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5/export" rel="export"/>
@@ -508,4 +672,4 @@ http_interactions:
</templates>
http_version:
- recorded_at: Fri, 09 Nov 2012 08:56:10 GMT
+ recorded_at: Thu, 22 Nov 2012 11:38:26 GMT