deltacloud-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mfoj...@apache.org
Subject [35/35] RHEV-M: Fix VCR fixtures to reflect changes in rbovirt gem.
Date Wed, 07 Nov 2012 15:36:36 GMT
http://git-wip-us.apache.org/repos/asf/deltacloud/blob/fd603d92/server/tests/drivers/rhevm/fixtures/test_0006_must_support_destroying_images.yml
----------------------------------------------------------------------
diff --git a/server/tests/drivers/rhevm/fixtures/test_0006_must_support_destroying_images.yml
b/server/tests/drivers/rhevm/fixtures/test_0006_must_support_destroying_images.yml
index 207154a..3c8ed24 100644
--- a/server/tests/drivers/rhevm/fixtures/test_0006_must_support_destroying_images.yml
+++ b/server/tests/drivers/rhevm/fixtures/test_0006_must_support_destroying_images.yml
@@ -2,7 +2,7 @@
 http_interactions:
 - request:
     method: get
-    uri: https://vdcadmin%40rhev.lab.eng.brq.redhat.com:123456@rhev30-dc.lab.eng.brq.redhat.com:8443/api/templates/354455c9-d075-46f7-bf41-7df48d0fe925
+    uri: https://admin%40internal:redhat@dell-per610-02.lab.eng.brq.redhat.com/api/templates/a90de8a2-0619-4625-b72e-db0ff65ef927
     body:
       encoding: US-ASCII
       string: ''
@@ -20,17 +20,17 @@ http_interactions:
       code: 404
       message: Not Found
     headers:
-      Server:
-      - Apache-Coyote/1.1
+      Date:
+      - Wed, 07 Nov 2012 15:12:09 GMT
       Content-Type:
       - text/html;charset=utf-8
       Content-Length:
-      - '950'
-      Date:
-      - Wed, 25 Jul 2012 11:51:54 GMT
+      - '976'
+      Connection:
+      - close
     body:
       encoding: US-ASCII
-      string: ! '<html><head><title>JBoss Web/2.1.11.GA - Error report</title><style><!--H1
+      string: ! '<html><head><title>JBoss Web/7.0.16..Final-redhat-1 -
Error report</title><style><!--H1
         {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:22px;}
         H2 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:16px;}
         H3 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:14px;}
@@ -40,12 +40,12 @@ http_interactions:
         {color : black;}A.name {color : black;}HR {color : #525D76;}--></style>
</head><body><h1>HTTP
         Status 404 - </h1><HR size="1" noshade="noshade"><p><b>type</b>
Status report</p><p><b>message</b>
         <u></u></p><p><b>description</b> <u>The
requested resource () is not available.</u></p><HR
-        size="1" noshade="noshade"><h3>JBoss Web/2.1.11.GA</h3></body></html>'
+        size="1" noshade="noshade"><h3>JBoss Web/7.0.16..Final-redhat-1</h3></body></html>'
     http_version: 
-  recorded_at: Mon, 23 Jul 2012 12:21:00 GMT
+  recorded_at: Wed, 07 Nov 2012 15:12:10 GMT
 - request:
     method: get
-    uri: https://vdcadmin%40rhev.lab.eng.brq.redhat.com:123456@rhev30-dc.lab.eng.brq.redhat.com:8443/api/templates/a90de8a2-0619-4625-b72e-db0ff65ef927
+    uri: https://admin%40internal:redhat@dell-per610-02.lab.eng.brq.redhat.com/api/templates/6d0285c9-682d-4e0f-8cf8-abd3ac9530be
     body:
       encoding: US-ASCII
       string: ''
@@ -63,50 +63,47 @@ http_interactions:
       code: 200
       message: OK
     headers:
-      Server:
-      - Apache-Coyote/1.1
+      Date:
+      - Wed, 07 Nov 2012 15:14:34 GMT
       Pragma:
       - No-cache
       Cache-Control:
       - no-cache
       Expires:
       - Thu, 01 Jan 1970 01:00:00 CET
-      X-Powered-By:
-      - Servlet 2.5; JBoss-5.0/JBossWeb-2.1
+      Set-Cookie:
+      - JSESSIONID=Lyi7RciWtZZILEHgJh9p-+8p; Path=/api; Secure
       Content-Type:
       - application/xml
       Content-Length:
-      - '1809'
-      Date:
-      - Wed, 25 Jul 2012 11:54:53 GMT
+      - '1579'
+      Connection:
+      - close
     body:
       encoding: US-ASCII
       string: ! "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<template
-        id=\"a90de8a2-0619-4625-b72e-db0ff65ef927\" href=\"/api/templates/a90de8a2-0619-4625-b72e-db0ff65ef927\">\n
-        \   <name>6fd96121-1c8c-4bb6-8dbd-e33c470d7769</name>\n    <description>Template
-        by iwhd</description>\n    <actions>\n        <link rel=\"export\"
href=\"/api/templates/a90de8a2-0619-4625-b72e-db0ff65ef927/export\"/>\n
-        \   </actions>\n    <link rel=\"disks\" href=\"/api/templates/a90de8a2-0619-4625-b72e-db0ff65ef927/disks\"/>\n
-        \   <link rel=\"nics\" href=\"/api/templates/a90de8a2-0619-4625-b72e-db0ff65ef927/nics\"/>\n
-        \   <link rel=\"cdroms\" href=\"/api/templates/a90de8a2-0619-4625-b72e-db0ff65ef927/cdroms\"/>\n
-        \   <link rel=\"snapshots\" href=\"/api/templates/a90de8a2-0619-4625-b72e-db0ff65ef927/snapshots\"/>\n
-        \   <link rel=\"tags\" href=\"/api/templates/a90de8a2-0619-4625-b72e-db0ff65ef927/tags\"/>\n
-        \   <link rel=\"permissions\" href=\"/api/templates/a90de8a2-0619-4625-b72e-db0ff65ef927/permissions\"/>\n
-        \   <link rel=\"statistics\" href=\"/api/templates/a90de8a2-0619-4625-b72e-db0ff65ef927/statistics\"/>\n
-        \   <type>server</type>\n    <status>\n        <state>ok</state>\n
   </status>\n
-        \   <memory>536870912</memory>\n    <cpu>\n        <topology
cores=\"1\" sockets=\"1\"/>\n
-        \   </cpu>\n    <os type=\"other_linux\">\n        <boot dev=\"cdrom\"/>\n
-        \       <boot dev=\"hd\"/>\n    </os>\n    <cluster id=\"3c8af388-cff6-11e0-9267-52540013f702\"
-        href=\"/api/clusters/3c8af388-cff6-11e0-9267-52540013f702\"/>\n    <creation_time>2012-01-17T12:33:41.000+01:00</creation_time>\n
-        \   <origin>rhev</origin>\n    <high_availability>\n        <enabled>false</enabled>\n
-        \       <priority>0</priority>\n    </high_availability>\n    <display>\n
-        \       <type>vnc</type>\n        <monitors>1</monitors>\n
   </display>\n
-        \   <stateless>false</stateless>\n    <usb>\n        <enabled>true</enabled>\n
-        \   </usb>\n</template>\n"
+        href=\"/api/templates/6d0285c9-682d-4e0f-8cf8-abd3ac9530be\" id=\"6d0285c9-682d-4e0f-8cf8-abd3ac9530be\">\n
+        \   <actions>\n        <link href=\"/api/templates/6d0285c9-682d-4e0f-8cf8-abd3ac9530be/export\"
+        rel=\"export\"/>\n    </actions>\n    <name>thrcka</name>\n
   <link href=\"/api/templates/6d0285c9-682d-4e0f-8cf8-abd3ac9530be/disks\"
+        rel=\"disks\"/>\n    <link href=\"/api/templates/6d0285c9-682d-4e0f-8cf8-abd3ac9530be/nics\"
+        rel=\"nics\"/>\n    <link href=\"/api/templates/6d0285c9-682d-4e0f-8cf8-abd3ac9530be/cdroms\"
+        rel=\"cdroms\"/>\n    <link href=\"/api/templates/6d0285c9-682d-4e0f-8cf8-abd3ac9530be/permissions\"
+        rel=\"permissions\"/>\n    <type>server</type>\n    <status>\n
       <state>ok</state>\n
+        \   </status>\n    <memory>536870912</memory>\n    <cpu>\n
       <topology
+        sockets=\"1\" cores=\"1\"/>\n    </cpu>\n    <os type=\"unassigned\">\n
       <boot
+        dev=\"network\"/>\n        <boot dev=\"hd\"/>\n        <kernel></kernel>\n
+        \       <initrd></initrd>\n        <cmdline></cmdline>\n
   </os>\n    <cluster
+        href=\"/api/clusters/99408929-82cf-4dc7-a532-9d998063fa95\" id=\"99408929-82cf-4dc7-a532-9d998063fa95\"/>\n
+        \   <creation_time>2012-10-11T13:44:42.655+02:00</creation_time>\n  
 <origin>rhev</origin>\n
+        \   <high_availability>\n        <enabled>false</enabled>\n   
    <priority>1</priority>\n
+        \   </high_availability>\n    <display>\n        <type>spice</type>\n
       <monitors>1</monitors>\n
+        \       <allow_override>false</allow_override>\n    </display>\n
   <stateless>false</stateless>\n
+        \   <usb>\n        <enabled>false</enabled>\n    </usb>\n</template>\n"
     http_version: 
-  recorded_at: Wed, 25 Jul 2012 11:55:58 GMT
+  recorded_at: Wed, 07 Nov 2012 15:14:35 GMT
 - request:
     method: delete
-    uri: https://vdcadmin%40rhev.lab.eng.brq.redhat.com:123456@rhev30-dc.lab.eng.brq.redhat.com:8443/api/templates/a90de8a2-0619-4625-b72e-db0ff65ef927
+    uri: https://admin%40internal:redhat@dell-per610-02.lab.eng.brq.redhat.com/api/templates/6d0285c9-682d-4e0f-8cf8-abd3ac9530be
     body:
       encoding: US-ASCII
       string: ''
@@ -119,90 +116,33 @@ http_interactions:
       - Ruby
   response:
     status:
-      code: 204
-      message: No Content
-    headers:
-      Server:
-      - Apache-Coyote/1.1
-      Pragma:
-      - No-cache
-      Cache-Control:
-      - no-cache
-      Expires:
-      - Thu, 01 Jan 1970 01:00:00 CET
-      X-Powered-By:
-      - Servlet 2.5; JBoss-5.0/JBossWeb-2.1
-      Date:
-      - Wed, 25 Jul 2012 11:54:53 GMT
-    body:
-      encoding: US-ASCII
-      string: ''
-    http_version: 
-  recorded_at: Wed, 25 Jul 2012 11:55:58 GMT
-- request:
-    method: get
-    uri: https://vdcadmin%40rhev.lab.eng.brq.redhat.com:123456@rhev30-dc.lab.eng.brq.redhat.com:8443/api/templates/a90de8a2-0619-4625-b72e-db0ff65ef927
-    body:
-      encoding: US-ASCII
-      string: ''
-    headers:
-      Accept:
-      - application/xml
-      Accept-Encoding:
-      - gzip, deflate
-      Content-Type:
-      - application/xml
-      User-Agent:
-      - Ruby
-  response:
-    status:
       code: 200
       message: OK
     headers:
-      Server:
-      - Apache-Coyote/1.1
+      Date:
+      - Wed, 07 Nov 2012 15:14:35 GMT
       Pragma:
       - No-cache
       Cache-Control:
       - no-cache
       Expires:
       - Thu, 01 Jan 1970 01:00:00 CET
-      X-Powered-By:
-      - Servlet 2.5; JBoss-5.0/JBossWeb-2.1
-      Content-Type:
-      - application/xml
+      Set-Cookie:
+      - JSESSIONID=DBCsquEYD-l5J2LvDdoN8YUw; Path=/api; Secure
       Content-Length:
-      - '1813'
-      Date:
-      - Wed, 25 Jul 2012 11:54:53 GMT
+      - '0'
+      Connection:
+      - close
+      Content-Type:
+      - text/plain; charset=UTF-8
     body:
       encoding: US-ASCII
-      string: ! "<?xml version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"?>\n<template
-        id=\"a90de8a2-0619-4625-b72e-db0ff65ef927\" href=\"/api/templates/a90de8a2-0619-4625-b72e-db0ff65ef927\">\n
-        \   <name>6fd96121-1c8c-4bb6-8dbd-e33c470d7769</name>\n    <description>Template
-        by iwhd</description>\n    <actions>\n        <link rel=\"export\"
href=\"/api/templates/a90de8a2-0619-4625-b72e-db0ff65ef927/export\"/>\n
-        \   </actions>\n    <link rel=\"disks\" href=\"/api/templates/a90de8a2-0619-4625-b72e-db0ff65ef927/disks\"/>\n
-        \   <link rel=\"nics\" href=\"/api/templates/a90de8a2-0619-4625-b72e-db0ff65ef927/nics\"/>\n
-        \   <link rel=\"cdroms\" href=\"/api/templates/a90de8a2-0619-4625-b72e-db0ff65ef927/cdroms\"/>\n
-        \   <link rel=\"snapshots\" href=\"/api/templates/a90de8a2-0619-4625-b72e-db0ff65ef927/snapshots\"/>\n
-        \   <link rel=\"tags\" href=\"/api/templates/a90de8a2-0619-4625-b72e-db0ff65ef927/tags\"/>\n
-        \   <link rel=\"permissions\" href=\"/api/templates/a90de8a2-0619-4625-b72e-db0ff65ef927/permissions\"/>\n
-        \   <link rel=\"statistics\" href=\"/api/templates/a90de8a2-0619-4625-b72e-db0ff65ef927/statistics\"/>\n
-        \   <type>server</type>\n    <status>\n        <state>locked</state>\n
   </status>\n
-        \   <memory>536870912</memory>\n    <cpu>\n        <topology
cores=\"1\" sockets=\"1\"/>\n
-        \   </cpu>\n    <os type=\"other_linux\">\n        <boot dev=\"cdrom\"/>\n
-        \       <boot dev=\"hd\"/>\n    </os>\n    <cluster id=\"3c8af388-cff6-11e0-9267-52540013f702\"
-        href=\"/api/clusters/3c8af388-cff6-11e0-9267-52540013f702\"/>\n    <creation_time>2012-01-17T12:33:41.000+01:00</creation_time>\n
-        \   <origin>rhev</origin>\n    <high_availability>\n        <enabled>false</enabled>\n
-        \       <priority>0</priority>\n    </high_availability>\n    <display>\n
-        \       <type>vnc</type>\n        <monitors>1</monitors>\n
   </display>\n
-        \   <stateless>false</stateless>\n    <usb>\n        <enabled>true</enabled>\n
-        \   </usb>\n</template>\n"
+      string: ''
     http_version: 
-  recorded_at: Wed, 25 Jul 2012 11:55:58 GMT
+  recorded_at: Wed, 07 Nov 2012 15:14:36 GMT
 - request:
     method: get
-    uri: https://vdcadmin%40rhev.lab.eng.brq.redhat.com:123456@rhev30-dc.lab.eng.brq.redhat.com:8443/api/templates/a90de8a2-0619-4625-b72e-db0ff65ef927
+    uri: https://admin%40internal:redhat@dell-per610-02.lab.eng.brq.redhat.com/api/templates/6d0285c9-682d-4e0f-8cf8-abd3ac9530be
     body:
       encoding: US-ASCII
       string: ''
@@ -220,17 +160,17 @@ http_interactions:
       code: 404
       message: Not Found
     headers:
-      Server:
-      - Apache-Coyote/1.1
+      Date:
+      - Wed, 07 Nov 2012 15:14:35 GMT
       Content-Type:
       - text/html;charset=utf-8
       Content-Length:
-      - '950'
-      Date:
-      - Wed, 25 Jul 2012 11:55:03 GMT
+      - '976'
+      Connection:
+      - close
     body:
       encoding: US-ASCII
-      string: ! '<html><head><title>JBoss Web/2.1.11.GA - Error report</title><style><!--H1
+      string: ! '<html><head><title>JBoss Web/7.0.16..Final-redhat-1 -
Error report</title><style><!--H1
         {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:22px;}
         H2 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:16px;}
         H3 {font-family:Tahoma,Arial,sans-serif;color:white;background-color:#525D76;font-size:14px;}
@@ -240,7 +180,7 @@ http_interactions:
         {color : black;}A.name {color : black;}HR {color : #525D76;}--></style>
</head><body><h1>HTTP
         Status 404 - </h1><HR size="1" noshade="noshade"><p><b>type</b>
Status report</p><p><b>message</b>
         <u></u></p><p><b>description</b> <u>The
requested resource () is not available.</u></p><HR
-        size="1" noshade="noshade"><h3>JBoss Web/2.1.11.GA</h3></body></html>'
+        size="1" noshade="noshade"><h3>JBoss Web/7.0.16..Final-redhat-1</h3></body></html>'
     http_version: 
-  recorded_at: Wed, 25 Jul 2012 11:56:08 GMT
-recorded_with: VCR 2.1.1
+  recorded_at: Wed, 07 Nov 2012 15:14:37 GMT
+recorded_with: VCR 2.2.5

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/fd603d92/server/tests/drivers/rhevm/images_test.rb
----------------------------------------------------------------------
diff --git a/server/tests/drivers/rhevm/images_test.rb b/server/tests/drivers/rhevm/images_test.rb
index 25f8cdb..fda75eb 100644
--- a/server/tests/drivers/rhevm/images_test.rb
+++ b/server/tests/drivers/rhevm/images_test.rb
@@ -26,12 +26,12 @@ describe 'RhevmDriver Images' do
   end
 
   it 'must allow to filter images' do
-    @driver.images(:id => 'dfa924b7-83e8-4a5c-9d5c-1270fd0c0872').wont_be_empty
-    @driver.images(:id => 'dfa924b7-83e8-4a5c-9d5c-1270fd0c0872').must_be_kind_of Array
-    @driver.images(:id => 'dfa924b7-83e8-4a5c-9d5c-1270fd0c0872').size.must_equal 1
-    @driver.images(:id => 'dfa924b7-83e8-4a5c-9d5c-1270fd0c0872').first.id.must_equal
'dfa924b7-83e8-4a5c-9d5c-1270fd0c0872'
-    @driver.images(:owner_id => 'vdcadmin@rhev.lab.eng.brq.redhat.com').each do |img|
-      img.owner_id.must_equal 'vdcadmin@rhev.lab.eng.brq.redhat.com'
+    @driver.images(:id => '5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5').wont_be_empty
+    @driver.images(:id => '5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5').must_be_kind_of Array
+    @driver.images(:id => '5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5').size.must_equal 1
+    @driver.images(:id => '5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5').first.id.must_equal
'5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5'
+    @driver.images(:owner_id => 'admin@internal').each do |img|
+      img.owner_id.must_equal 'admin@internal'
     end
     @driver.images(:id => 'ami-aaaaaaaa').must_be_empty
     @driver.images(:id => 'unknown').must_be_empty
@@ -42,9 +42,9 @@ describe 'RhevmDriver Images' do
     # of YAML under Ruby 1.8.
     #
     if RUBY_VERSION =~ /^1\.9/
-      @driver.image(:id => 'dfa924b7-83e8-4a5c-9d5c-1270fd0c0872').wont_be_nil
-      @driver.image(:id => 'dfa924b7-83e8-4a5c-9d5c-1270fd0c0872').must_be_kind_of Image
-      @driver.image(:id => 'dfa924b7-83e8-4a5c-9d5c-1270fd0c0872').id.must_equal 'dfa924b7-83e8-4a5c-9d5c-1270fd0c0872'
+      @driver.image(:id => '5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5').wont_be_nil
+      @driver.image(:id => '5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5').must_be_kind_of Image
+      @driver.image(:id => '5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5').id.must_equal '5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5'
       @driver.image(:id => 'ami-aaaaaaaa').must_be_nil
       @driver.image(:id => 'unknown').must_be_nil
     end
@@ -52,7 +52,7 @@ describe 'RhevmDriver Images' do
 
   it 'must throw proper exception when destroying used image' do
     if RUBY_VERSION =~ /^1\.9/
-      image = @driver.image(:id => 'dfa924b7-83e8-4a5c-9d5c-1270fd0c0872')
+      image = @driver.image(:id => '5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5')
       image.wont_be_nil
       image.state.must_equal 'OK'
       Proc.new {
@@ -62,7 +62,7 @@ describe 'RhevmDriver Images' do
   end
 
   it 'must support destroying images' do
-    image = @driver.image(:id => 'a90de8a2-0619-4625-b72e-db0ff65ef927')
+    image = @driver.image(:id => '6d0285c9-682d-4e0f-8cf8-abd3ac9530be')
     image.wont_be_nil
     image.state.must_equal 'OK'
     @driver.destroy_image(image.id)

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/fd603d92/server/tests/drivers/rhevm/instance_test.rb
----------------------------------------------------------------------
diff --git a/server/tests/drivers/rhevm/instance_test.rb b/server/tests/drivers/rhevm/instance_test.rb
index 757ebf0..07257ee 100644
--- a/server/tests/drivers/rhevm/instance_test.rb
+++ b/server/tests/drivers/rhevm/instance_test.rb
@@ -26,29 +26,29 @@ describe 'RhevmDriver Instances' do
   end
 
   it 'must allow to filter instances' do
-    @driver.instances(:id => 'c63758d9-3db6-47ca-8412-4f517946910e').wont_be_empty
-    @driver.instances(:id => 'c63758d9-3db6-47ca-8412-4f517946910e').must_be_kind_of Array
-    @driver.instances(:id => 'c63758d9-3db6-47ca-8412-4f517946910e').size.must_equal 1
-    @driver.instances(:id => 'c63758d9-3db6-47ca-8412-4f517946910e').first.id.must_equal
'c63758d9-3db6-47ca-8412-4f517946910e'
-    @driver.instances(:owner_id => 'vdcadmin@rhev.lab.eng.brq.redhat.com').wont_be_empty
-    @driver.instances(:owner_id => 'vdcadmin@rhev.lab.eng.brq.redhat.com').each do |inst|
-      inst.owner_id.must_equal 'vdcadmin@rhev.lab.eng.brq.redhat.com'
+    @driver.instances(:id => 'de048029-c4f8-4e90-ac7b-67cf06102190').wont_be_empty
+    @driver.instances(:id => 'de048029-c4f8-4e90-ac7b-67cf06102190').must_be_kind_of Array
+    @driver.instances(:id => 'de048029-c4f8-4e90-ac7b-67cf06102190').size.must_equal 1
+    @driver.instances(:id => 'de048029-c4f8-4e90-ac7b-67cf06102190').first.id.must_equal
'de048029-c4f8-4e90-ac7b-67cf06102190'
+    @driver.instances(:owner_id => 'admin@internal').wont_be_empty
+    @driver.instances(:owner_id => 'admin@internal').each do |inst|
+      inst.owner_id.must_equal 'admin@internal'
     end
     @driver.instances(:id => 'i-00000000').must_be_empty
     @driver.instances(:id => 'unknown').must_be_empty
   end
 
   it 'must allow to retrieve single instance' do
-    @driver.instance(:id => 'c63758d9-3db6-47ca-8412-4f517946910e').wont_be_nil
-    @driver.instance(:id => 'c63758d9-3db6-47ca-8412-4f517946910e').must_be_kind_of Instance
-    @driver.instance(:id => 'c63758d9-3db6-47ca-8412-4f517946910e').id.must_equal 'c63758d9-3db6-47ca-8412-4f517946910e'
+    @driver.instance(:id => 'de048029-c4f8-4e90-ac7b-67cf06102190').wont_be_nil
+    @driver.instance(:id => 'de048029-c4f8-4e90-ac7b-67cf06102190').must_be_kind_of Instance
+    @driver.instance(:id => 'de048029-c4f8-4e90-ac7b-67cf06102190').id.must_equal 'de048029-c4f8-4e90-ac7b-67cf06102190'
     @driver.instance(:id => 'i-00000000').must_be_nil
     @driver.instance(:id => 'unknown').must_be_nil
   end
 
   it 'must allow to create a new instance and destroy it' do
-    instance = @driver.create_instance('dfa924b7-83e8-4a5c-9d5c-1270fd0c0872',
-                                       :realm_id => '3c8af388-cff6-11e0-9267-52540013f702',
+    instance = @driver.create_instance('5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5',
+                                       :realm_id => '99408929-82cf-4dc7-a532-9d998063fa95',
                                        :hwp_id => 'SERVER',
                                        :hwp_memory => '1024',
                                        :user_data => 'test user data'
@@ -61,9 +61,9 @@ describe 'RhevmDriver Instances' do
     @driver.instance(:id => instance.id).name.wont_be_nil
     @driver.instance(:id => instance.id).instance_profile.name.must_equal 'SERVER'
     @driver.instance(:id => instance.id).instance_profile.memory.must_equal 1024
-    @driver.instance(:id => instance.id).realm_id.must_equal '3c8af388-cff6-11e0-9267-52540013f702'
-    @driver.instance(:id => instance.id).image_id.must_equal 'dfa924b7-83e8-4a5c-9d5c-1270fd0c0872'
-    @driver.instance(:id => instance.id).owner_id.must_equal 'vdcadmin@rhev.lab.eng.brq.redhat.com'
+    @driver.instance(:id => instance.id).realm_id.must_equal '99408929-82cf-4dc7-a532-9d998063fa95'
+    @driver.instance(:id => instance.id).image_id.must_equal '5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5'
+    @driver.instance(:id => instance.id).owner_id.must_equal 'admin@internal'
     @driver.instance(:id => instance.id).state.must_equal 'STOPPED'
     @driver.instance(:id => instance.id).actions.must_include :start
     @driver.destroy_instance(instance.id)
@@ -71,8 +71,8 @@ describe 'RhevmDriver Instances' do
   end
 
   it 'must allow to create a new instance and make it running' do
-    instance = @driver.create_instance('5f411ae4-a3cf-48a8-8bca-d049ddd51f0b',
-                                       :realm_id => '3c8af388-cff6-11e0-9267-52540013f702',
+    instance = @driver.create_instance('5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5',
+                                       :realm_id => '99408929-82cf-4dc7-a532-9d998063fa95',
                                        :hwp_id => 'SERVER',
                                        :hwp_memory => '1024',
                                        :user_data => 'test user data'
@@ -85,9 +85,9 @@ describe 'RhevmDriver Instances' do
     @driver.instance(:id => instance.id).name.wont_be_nil
     @driver.instance(:id => instance.id).instance_profile.name.must_equal 'SERVER'
     @driver.instance(:id => instance.id).instance_profile.memory.must_equal 1024
-    @driver.instance(:id => instance.id).realm_id.must_equal '3c8af388-cff6-11e0-9267-52540013f702'
-    @driver.instance(:id => instance.id).image_id.must_equal '5f411ae4-a3cf-48a8-8bca-d049ddd51f0b'
-    @driver.instance(:id => instance.id).owner_id.must_equal 'vdcadmin@rhev.lab.eng.brq.redhat.com'
+    @driver.instance(:id => instance.id).realm_id.must_equal '99408929-82cf-4dc7-a532-9d998063fa95'
+    @driver.instance(:id => instance.id).image_id.must_equal '5558c5b6-9dd6-41b7-87f9-7cbce4fd40c5'
+    @driver.instance(:id => instance.id).owner_id.must_equal 'admin@internal'
     @driver.instance(:id => instance.id).state.must_equal 'STOPPED'
     @driver.instance(:id => instance.id).actions.must_include :start
     @driver.start_instance(instance.id)

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/fd603d92/server/tests/drivers/rhevm/provider_test.rb
----------------------------------------------------------------------
diff --git a/server/tests/drivers/rhevm/provider_test.rb b/server/tests/drivers/rhevm/provider_test.rb
index dd42ae3..bde6621 100644
--- a/server/tests/drivers/rhevm/provider_test.rb
+++ b/server/tests/drivers/rhevm/provider_test.rb
@@ -31,11 +31,11 @@ describe 'RHEV-M provider test' do
 
   it 'must switch realms when switching between different clusters' do
 
-    provider1 = @driver.provider(:id => 'aa585157-a098-48c3-8b5b-70a32e88c263')
+    provider1 = @driver.provider(:id => '9df72b84-0234-11e2-9b87-9386d9b09d4a')
     provider1.wont_be_nil
     provider1.url.wont_be_empty
 
-    provider2 = @driver.provider(:id => '645e425e-66fe-4ac9-8874-537bd10ef08d')
+    provider2 = @driver.provider(:id => '9df72b84-0234-11e2-9b87-9386d9b09d4a')
     provider2.wont_be_nil
     provider2.url.wont_be_empty
 

http://git-wip-us.apache.org/repos/asf/deltacloud/blob/fd603d92/server/tests/drivers/rhevm/realms_test.rb
----------------------------------------------------------------------
diff --git a/server/tests/drivers/rhevm/realms_test.rb b/server/tests/drivers/rhevm/realms_test.rb
index 6edb64d..577605d 100644
--- a/server/tests/drivers/rhevm/realms_test.rb
+++ b/server/tests/drivers/rhevm/realms_test.rb
@@ -26,16 +26,16 @@ describe 'RhevmDriver Realms' do
   end
 
   it 'must allow to filter realms' do
-    @driver.realms(:id => '3c8af388-cff6-11e0-9267-52540013f702').wont_be_empty
-    @driver.realms(:id => '3c8af388-cff6-11e0-9267-52540013f702').must_be_kind_of Array
-    @driver.realms(:id => '3c8af388-cff6-11e0-9267-52540013f702').size.must_equal 1
-    @driver.realms(:id => '3c8af388-cff6-11e0-9267-52540013f702').first.id.must_equal
'3c8af388-cff6-11e0-9267-52540013f702'
+    @driver.realms(:id => '99408929-82cf-4dc7-a532-9d998063fa95').wont_be_empty
+    @driver.realms(:id => '99408929-82cf-4dc7-a532-9d998063fa95').must_be_kind_of Array
+    @driver.realms(:id => '99408929-82cf-4dc7-a532-9d998063fa95').size.must_equal 1
+    @driver.realms(:id => '99408929-82cf-4dc7-a532-9d998063fa95').first.id.must_equal
'99408929-82cf-4dc7-a532-9d998063fa95'
     @driver.realms(:id => 'unknown').must_be_empty
   end
 
   it 'must allow to retrieve single realm' do
-    @driver.realm(:id => '3c8af388-cff6-11e0-9267-52540013f702').wont_be_nil
-    @driver.realm(:id => '3c8af388-cff6-11e0-9267-52540013f702').must_be_kind_of Realm
+    @driver.realm(:id => '99408929-82cf-4dc7-a532-9d998063fa95').wont_be_nil
+    @driver.realm(:id => '99408929-82cf-4dc7-a532-9d998063fa95').must_be_kind_of Realm
     @driver.realm(:id => 'unknown').must_be_nil
   end
 


Mime
View raw message