deltacloud-core 0.4.1 → 0.5.0

data/tests/drivers/rackspace/setup.rb

@@ -1,6 +1,6 @@
 ENV['API_DRIVER']   = "rackspace"
-ENV['API_USER']     = 'michalfojtik'
-ENV['API_PASSWORD'] = '47de1170d57eb8f11dba2f6e7fd26838'
+ENV['API_USER']     = 'mandreou'
+ENV['API_PASSWORD'] = 'a4d531ef02a37dd32cac1e8e516df9eb'
 
 require 'vcr'
 
@@ -9,6 +9,6 @@ DeltacloudTestCommon::record!
 VCR.config do |c|
   c.cassette_library_dir = "#{File.dirname(__FILE__)}/../../../tests/drivers/rackspace/fixtures/"
   c.stub_with :webmock
-  c.default_cassette_options = { :record => :none }
+  c.default_cassette_options = { :record => :new_episodes }
 end
 

data/tests/drivers/rhevm/api_test.rb

@@ -21,7 +21,7 @@ module RHEVMTest
       features = (last_xml_response/'/api/link[@rel="instances"]/feature').collect { |f| f[:name] }
       features.include?('user_name').should == true
       features.include?('hardware_profiles').should == true
-      features.length.should == 2
+      features.length.should == 3
     end
 
     def test_03_it_has_rhevm_collections

data/tests/drivers/rhevm/images_test.rb

@@ -32,9 +32,9 @@ module RHEVMTest
     end
 
     def test_03_it_returns_single_image
-      get_auth_url '/api;driver=rhevm/images/bb2e79bd-fd73-46a1-b391-a390b1998f03'
+      get_auth_url '/api;driver=rhevm/images/3e82e2d5-913f-4095-ae72-ebcfa9d0571d'
       (last_xml_response/'image').length.should == 1
-      (last_xml_response/'image/name').text.should == 'F14-Minimal-Srv'
+      (last_xml_response/'image/name').text.should == 'f15-minimal-2'
       (last_xml_response/'image/state').text.should == 'OK'
     end
 

data/tests/drivers/rhevm/instances_test.rb

@@ -12,8 +12,8 @@ module RHEVMTest
 
     def test_01_01_it_can_create_instance_without_hardware_profile
       params = {
-        :image_id => 'bb2e79bd-fd73-46a1-b391-a390b1998f03',
-        :name => 'mock-test1',
+        :image_id => '3e82e2d5-913f-4095-ae72-ebcfa9d0571d',
+        :name => 'dc-webmock-1',
         :'api[driver]' => 'rhevm',
       }
       post_url '/api/instances', params
@@ -21,7 +21,7 @@ module RHEVMTest
       @@instance = last_xml_response
       (@@instance/'instance').length.should > 0
       (@@instance/'instance/name').first.text.should_not == nil
-      (@@instance/'instance/name').first.text.should == 'mock-test1'
+      (@@instance/'instance/name').first.text.should == 'dc-webmock-1'
       (@@instance/'instance/owner_id').first.text.should_not == ''
       (@@instance/'instance/owner_id').first.text.should == ENV['API_USER']
       (@@instance/'instance/state').first.text.should == 'PENDING'
@@ -29,8 +29,8 @@ module RHEVMTest
 
     def test_01_02_it_can_create_instance_with_hardware_profile
       params = {
-        :image_id => 'bb2e79bd-fd73-46a1-b391-a390b1998f03',
-        :name => 'mock-test2',
+        :image_id => '3e82e2d5-913f-4095-ae72-ebcfa9d0571d',
+        :name => 'dc-webmock-2',
         :hwp_id => 'SERVER',
         :'api[driver]' => 'rhevm',
       }
@@ -39,7 +39,7 @@ module RHEVMTest
       @@instance2 = last_xml_response
       (@@instance2/'instance').length.should > 0
       (@@instance2/'instance/name').first.text.should_not == nil
-      (@@instance2/'instance/name').first.text.should == 'mock-test2'
+      (@@instance2/'instance/name').first.text.should == 'dc-webmock-2'
       (@@instance2/'instance/owner_id').first.text.should_not == ''
       (@@instance2/'instance/owner_id').first.text.should == ENV['API_USER']
       (@@instance2/'instance/state').first.text.should == 'PENDING'
@@ -154,11 +154,10 @@ module RHEVMTest
       last_response.status.should == 204
       20.times do |tick|
         get_auth_url "/api;driver=rhevm/instances/#{(@@instance/'instance').first[:id]}", { :tick => tick}
-        #last_response.status.should_not == 500
-        break if last_response.status == 500
+        break if last_response.status == 404
         sleep(5)
       end
-      last_response.status.should == 500
+      last_response.status.should == 404
     end
 
     def test_06_02_created_instance_can_be_destroyed
@@ -169,11 +168,10 @@ module RHEVMTest
       last_response.status.should == 204
       20.times do |tick|
         get_auth_url "/api;driver=rhevm/instances/#{(@@instance2/'instance').first[:id]}", { :tick => tick}
-        #last_response.status.should_not == 500
-        break if last_response.status == 500
+        break if last_response.status == 404
         sleep(5)
       end
-      last_response.status.should == 500
+      last_response.status.should == 404
     end
   end
 end

data/tests/drivers/rhevm/realms_test.rb

@@ -20,14 +20,14 @@ module RHEVMTest
       (last_xml_response/'realms/realm').each do |profile|
         (profile/'name').text.should_not == nil
         (profile/'name').text.should_not == ''
-        (profile/'name').text.should == 'Default'
+        (profile/'name').text.should_not == 'Default'
       end
     end
 
     def test_03_it_returns_single_realm
-      get_auth_url '/api;driver=rhevm/realms/us'
-      (last_xml_response/'realm').first[:id].should == '0'
-      (last_xml_response/'realm/name').first.text.should == 'Default'
+      get_auth_url '/api;driver=rhevm/realms/3c8af388-cff6-11e0-9267-52540013f702'
+      (last_xml_response/'realm').first[:id].should == '3c8af388-cff6-11e0-9267-52540013f702'
+      (last_xml_response/'realm/name').first.text.should == 'engops-nfs'
       (last_xml_response/'realm/state').first.text.should == 'AVAILABLE'
     end
 

data/tests/drivers/rhevm/setup.rb

@@ -1,6 +1,6 @@
-ENV['API_USER']     = 'rhev-m@deltacloud.local'
-ENV['API_PASSWORD'] = 'RedHat001'
-ENV['API_PROVIDER'] = 'https://rhev-dc.lab.eng.brq.redhat.com:8443/rhevm-api-powershell'
+ENV['API_USER']     = 'vdcadmin@rhev.lab.eng.brq.redhat.com'
+ENV['API_PASSWORD'] = '123456'
+ENV['API_PROVIDER'] = 'https://rhev30-dc.lab.eng.brq.redhat.com:8443/rhevm-api;645e425e-66fe-4ac9-8874-537bd10ef08d'
 
 require 'vcr'
 

data/tests/rabbit_test.rb

@@ -44,7 +44,7 @@ module DeltacloudUnitTest
       features.should =~ [:hardware_profiles, :user_name, :authentication_key, :user_data]
 
       op = @app.collections[:instances].operations[:create]
-      op.effective_params(@driver).keys.should =~ [:image_id, :hwp_memory, :hwp_id, :keyname, :name, :hwp_storage, :realm_id, :user_data]
+      op.effective_params(@driver).keys.should =~ [:image_id, :hwp_memory, :hwp_id, :keyname, :name, :hwp_storage, :realm_id, :user_data, :hwp_architecture, :hwp_cpu]
 
       op.params.keys =~ [:realm_id, :image_id, :hwp_id]
     end

data/views/api/show.html.haml

@@ -5,3 +5,16 @@
   %ul{ :'data-role' => :listview, :'data-inset' => 'true'}
     - @collections.sort_by { |k| k.to_s }.each do |key|
       %li= link_to key.to_s.gsub('_', ' ').titlecase, api_url_for(key), :'data-icon' => "arrow-r", :'data-ajax' => false
+
+- if @providers.size > 1
+  %div{ :'data-role' => :footer, :'data-theme' => 'a'}
+    %form{ :action => settings.root_url, :method => :post, :'data-ajax' => 'false'}
+      - if @driver_name
+        %input{ :name => :driver, :type => :hidden, :value => @driver_name }/
+      %div{ :'data-role' => :footer, :'data-theme' => 'a' , :class => 'middle-dialog'}
+        %label{ :for => :provider, :class => 'ui-input-text'}
+        %select{:name => 'provider', :'data-native-menu' => "true" }
+          %option{ :value => 'default'} default
+          - @providers.each do |provider|
+            %option{ :value => provider } #{provider}
+        %button{ :type => :submit} Change Provider

data/views/cimi/cloudEntryPoint/index.html.haml

@@ -0,0 +1,5 @@
+
+- @collections.each do |p|
+  - name, path = p
+  = link_to name.to_s.capitalize, path
+  %br/

data/views/cimi/cloudEntryPoint/index.xml.haml

@@ -0,0 +1,9 @@
+!!!XML
+%CloudEntryPoint{ :xmlns => CMWG_NAMESPACE }
+  %uri= api_url_for("/cloudEntryPoint")
+  %name cloud entry point
+  %description cloud entry point
+  %created= Time.new.getutc.to_s
+  - @collections.each do |api|
+    - res_name = api[0].to_s.camelize(:lower_case_first_letter)
+    = "<#{res_name} href=\"#{api[1]}\"/>"

data/views/cimi/collection/index.html.haml

@@ -0,0 +1,45 @@
+- new_name = @dmtfitem["uri"] + " Collection"
+- new_name = new_name.gsub(/[A-Z]/, ' \0')
+%h1 #{new_name.capitalize}
+
+%form{ :action => api_url_for("/collection/" + @dmtfitem["uri"]) }
+  %input{ :name => :id, :type => :hidden, :value => @dmtfitem["uri"] }/
+  %input{ :name => :xmlRootNode, :type => :hidden, :value => @xml_root_node }/
+  %p
+    %label
+      Name:
+  %p
+    %input{ :name => :name, :size => 50, :value => @dmtfitem["name"], :style => "width:50%;" }
+    %input{ :name => :created, :type => :hidden, :size => 50, :value => @dmtfitem["created"] }
+  %p
+  %br
+    %label
+      Description:
+  %p
+    %textarea{ :name => :description, :cols => 50, :rows => 4, :style => "width:50%;" } #{@dmtfitem['description']}
+  %p
+    - if @dmtfitem["operation"]
+      - if @dmtfitem["operation"].kind_of? (Array)
+        - property_object = @dmtfitem["operation"]
+      - else
+        - property_object = [@dmtfitem["operation"]]
+      - iter = -1
+      - property_object.map do | operation|
+        - iter += 1
+        %br
+        %label
+          = operation["rel"].capitalize + ": " + api_url_for(operation["href"])
+          %input{ :name => "operation_"+iter.to_s, :oper_type => operation["rel"], :type => :hidden, :value => operation["href"] }
+  %br
+%p
+%br
+- new_name = @dmtfitem["uri"]
+- new_name = new_name.gsub(/[A-Z]/, ' \0')
+- if @dmtf_col_items
+  %label
+    = new_name.capitalize.pluralize + ":"
+  %table{ :style => "width:52%;"}
+    - @dmtf_col_items.map do |template|
+      %tr
+        %td
+          %a{ :href => template["href"] }= template["name"]

data/views/cimi/collection/response.xml.haml

@@ -0,0 +1,3 @@
+!!!XML
+%ReturnCode{ :xmlns => CMWG_NAMESPACE }
+  %Status= "Success"

data/views/cimi/error.html.haml

@@ -0,0 +1,31 @@
+!!!
+!!! XML
+
+%html
+  %head
+    = stylesheet_link_tag '/stylesheets/compiled/screen.css', :media => 'screen, projection'
+    = stylesheet_link_tag '/stylesheets/compiled/print.css', :media => 'print'
+    /[if lt IE 8]
+      = stylesheet_link_tag '/stylesheets/compiled/ie.css', :media => 'screen, projection'
+    = stylesheet_link_tag '/stylesheets/compiled/application.css', :media => 'screen, projection'
+    %script{:type => "text/javascript", :src => "/javascripts/jquery-1.4.2.min.js" }
+    %script{:type => "text/javascript", :src => "/javascripts/application.js" }
+  %body
+    #wrapper
+      #header
+        = link_to image_tag( "/images/logo-wide.png" ), settings.root_url
+      = bread_crumb
+      #content{:class => :error}
+        = yield
+      #footer
+        #formats
+          Format:
+          =link_to_format(:xml)
+          |
+          =link_to_format(:json)
+        #driver_info
+          Driver: #{driver_symbol} | API version: #{settings.version}
+        #copyright
+          Copyright 2009-2011
+          %a{:href => 'http://incubator.apache.org/deltacloud/'} The Apache Software Foundation
+          and individual contributors.

data/views/cimi/errors/400.html.haml

@@ -0,0 +1,41 @@
+%div{ :'data-role' => :content, :'data-theme' => 'b'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+    %li{ :'data-role' => 'list-divider'} Server message
+    %li
+      %h3=[@error.class.name, @error.message].join(' - ')
+    %li{ :'data-role' => 'list-divider'} Original request URI
+    %li
+      %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'}
+        %span=request.env['REQUEST_URI']
+        %span{ :class => 'ui-li-count'} Retry
+    %li{ :'data-role' => 'list-divider'} Error details
+    %li
+      - if @error.class.method_defined? :details
+        %p= @error.details
+      - else
+        %em No details
+
+  %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+    %h3 Backtrace
+    %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+      %li
+        %pre=@error.backtrace.join("\n")
+
+  %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+    %h3 Parameters
+    %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+      - if params.keys.empty?
+        %li{ :'data-role' => 'list-divider'} No parameters
+      - params.each do |key, value|
+        %li{ :'data-role' => 'list-divider'}=key
+        %li
+          %span{:style => 'font-weight:normal;'}=value.inspect
+
+
+  %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+    %h3 Request details
+    %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+      - request.env.each do |key, value|
+        %li{ :'data-role' => 'list-divider'}=key
+        %li
+          %span{:style => 'font-weight:normal;'}=value.inspect

data/views/cimi/errors/400.xml.haml

@@ -0,0 +1,3 @@
+%error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
+  %parameter #{@error.name}
+  %message< #{cdata @error.message}

data/views/cimi/errors/401.html.haml

@@ -0,0 +1,41 @@
+%div{ :'data-role' => :content, :'data-theme' => 'b'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+    %li{ :'data-role' => 'list-divider'} Server message
+    %li
+      %h3=[@error.class.name, @error.message].join(' - ')
+    %li{ :'data-role' => 'list-divider'} Original request URI
+    %li
+      %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'}
+        %span=request.env['REQUEST_URI']
+        %span{ :class => 'ui-li-count'} Retry
+    %li{ :'data-role' => 'list-divider'} Error details
+    %li
+      - if @error.class.method_defined? :details
+        %p= @error.details
+      - else
+        %em No details
+
+  %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+    %h3 Backtrace
+    %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+      %li
+        %pre=@error.backtrace.join("\n")
+
+  %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+    %h3 Parameters
+    %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+      - if params.keys.empty?
+        %li{ :'data-role' => 'list-divider'} No parameters
+      - params.each do |key, value|
+        %li{ :'data-role' => 'list-divider'}=key
+        %li
+          %span{:style => 'font-weight:normal;'}=value.inspect
+
+
+  %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+    %h3 Request details
+    %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+      - request.env.each do |key, value|
+        %li{ :'data-role' => 'list-divider'}=key
+        %li
+          %span{:style => 'font-weight:normal;'}=value.inspect

data/views/cimi/errors/401.xml.haml

@@ -0,0 +1,2 @@
+%error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
+  %message< #{cdata @error.message}

data/views/cimi/errors/403.html.haml

@@ -0,0 +1,42 @@
+%div{ :'data-role' => :content, :'data-theme' => 'b'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+    %li{ :'data-role' => 'list-divider'} Server message
+    %li
+      %h3=[@error.class.name, @error.message].join(' - ')
+    %li{ :'data-role' => 'list-divider'} Original request URI
+    %li
+      %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'}
+        %span=request.env['REQUEST_URI']
+        %span{ :class => 'ui-li-count'} Retry
+    %li{ :'data-role' => 'list-divider'} Error details
+    %li
+      - if @error.class.method_defined? :details
+        %p= @error.details
+      - else
+        %em No details
+
+  - if @error.backtrace
+    %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+      %h3 Backtrace
+      %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+        %li
+          %pre=@error.backtrace.join("\n")
+
+  %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+    %h3 Parameters
+    %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+      - if params.keys.empty?
+        %li{ :'data-role' => 'list-divider'} No parameters
+      - params.each do |key, value|
+        %li{ :'data-role' => 'list-divider'}=key
+        %li
+          %span{:style => 'font-weight:normal;'}=value.inspect
+
+
+  %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+    %h3 Request details
+    %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+      - request.env.each do |key, value|
+        %li{ :'data-role' => 'list-divider'}=key
+        %li
+          %span{:style => 'font-weight:normal;'}=value.inspect

data/views/cimi/errors/403.xml.haml

@@ -0,0 +1,2 @@
+%error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
+  %message Method not allowed for this resource

data/views/cimi/errors/404.html.haml

@@ -0,0 +1,29 @@
+%div{ :'data-role' => :content, :'data-theme' => 'b'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+    %li{ :'data-role' => 'list-divider'} Server message
+    %li
+      %h3 Not Found
+    %li{ :'data-role' => 'list-divider'} Original request URI
+    %li
+      %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'}
+        %span=request.env['REQUEST_URI']
+        %span{ :class => 'ui-li-count'} Retry
+
+  %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+    %h3 Parameters
+    %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+      - if params.keys.empty?
+        %li{ :'data-role' => 'list-divider'} No parameters
+      - params.each do |key, value|
+        %li{ :'data-role' => 'list-divider'}=key
+        %li
+          %span{:style => 'font-weight:normal;'}=value.inspect
+
+
+  %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+    %h3 Request details
+    %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+      - request.env.each do |key, value|
+        %li{ :'data-role' => 'list-divider'}=key
+        %li
+          %span{:style => 'font-weight:normal;'}=value.inspect

data/views/cimi/errors/404.xml.haml

@@ -0,0 +1,2 @@
+%error{:url => "#{request.env['REQUEST_URI']}", :status => "#{response.status}"}
+  %message Resource not found

data/views/cimi/errors/405.html.haml

@@ -0,0 +1,29 @@
+%div{ :'data-role' => :content, :'data-theme' => 'b'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+    %li{ :'data-role' => 'list-divider'} Server message
+    %li
+      %h3 Method not allowed on given resource
+    %li{ :'data-role' => 'list-divider'} Original request URI
+    %li
+      %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'}
+        %span=request.env['REQUEST_URI']
+        %span{ :class => 'ui-li-count'} Retry
+
+  %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+    %h3 Parameters
+    %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+      - if params.keys.empty?
+        %li{ :'data-role' => 'list-divider'} No parameters
+      - params.each do |key, value|
+        %li{ :'data-role' => 'list-divider'}=key
+        %li
+          %span{:style => 'font-weight:normal;'}=value.inspect
+
+
+  %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
+    %h3 Request details
+    %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'e'}
+      - request.env.each do |key, value|
+        %li{ :'data-role' => 'list-divider'}=key
+        %li
+          %span{:style => 'font-weight:normal;'}=value.inspect