deltacloud-core 1.0.3 → 1.0.4

data/tests/drivers/ec2/keys_test.rb

@@ -3,7 +3,7 @@ require 'require_relative' if RUBY_VERSION < '1.9'
 
 require_relative 'common.rb'
 
-describe 'Ec2Driver Instances' do
+describe 'Ec2Driver Keys' do
 
   before do
     @driver = Deltacloud::new(:ec2, credentials)

data/tests/drivers/google/buckets_test.rb

@@ -74,13 +74,13 @@ describe 'Deltacloud API' do
     blob.id.must_equal blob_name_google
     blob.content_length.to_i.must_be :'>',0
     blob.last_modified.wont_be_empty
-    blob.content_type.must_equal 'text/html'
+    blob.content_type.must_equal 'image/png'
     blob.user_metadata.keys.wont_be_empty
   end
 
   it 'can retrieve named blob metadata' do
     blob_metadata = @driver.blob_metadata({:id => blob_name_google, 'bucket' => bucket_name_google})
-    {"author"=>"deltacloud", "foo"=>"bar"}.must_equal blob_metadata
+    {"name1"=>"Author", "value1"=>"deltacloud", "name2"=>"foo", "value2"=>"bar"}.must_equal blob_metadata
   end
 
   it 'can update blob metadata' do

data/tests/drivers/google/common.rb

@@ -4,8 +4,8 @@ require_relative '../../test_helper'
 
 def credentials
   {
-    :user => 'GOOGXKQLYTEOZTILUBZ5',
-    :password => 'M3pvZUy2ivT78ipQ+u1xv6TkY83q9DUnGXkov3tA'
+    :user => 'GOOG4PBMMHEB2BTY6Q7U',
+    :password => '7NxqwXy85xmaWB6o1RZ66IxqP+Rmbu8UFiFdpcSw'
   }
 end
 
@@ -16,5 +16,5 @@ end
 VCR.configure do |c|
   c.cassette_library_dir = "#{File.dirname(__FILE__)}/fixtures/"
   c.hook_into :excon
-  c.default_cassette_options = { :record => :none }
+  c.default_cassette_options = { :record => :new_episodes }
 end

data/tests/test_helper.rb

@@ -20,6 +20,24 @@ if ENV['COVERAGE']
   end
 end
 
+# Make the test output more nice and readable
+#
+begin
+  require 'turn'
+  Turn.config do |c|
+    c.format  = :pretty
+    c.trace   = true
+    c.natural = true
+  end
+rescue LoadError
+end
+
+begin
+  require "minitest/reporters"
+  MiniTest::Reporters.use!(MiniTest::Reporters::JUnitReporter.new) if !ENV['BUILD_NUMBER'].nil?
+rescue LoadError
+end
+
 def record_retries(name='', opts = {})
   opts[:before] = Proc.new { |r, &block|
     VCR.use_cassette("#{__name__}-#{name.empty? ? '' : "#{name}-"}#{r}", &block)
@@ -32,6 +50,16 @@ end
 
 include Rack::Test::Methods
 
+def run_frontend(frontend=:deltacloud)
+  Rack::Builder.new {
+    use Rack::MatrixParams
+    map Deltacloud[frontend].root_url do
+      use Rack::MatrixParams
+      run Deltacloud[frontend].klass
+    end
+  }.to_app
+end
+
 def status; last_response.status; end
 def headers; last_response.headers; end
 def response_body; last_response.body; end

data/views/api/show.html.haml

@@ -3,9 +3,9 @@
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview, :'data-inset' => 'true'}
-    - supported_collections do |c|
+    - @collections.each do |c|
       %li
-        %a{ :href => api_url_for(c.collection_name),  :'data-icon' => "arrow-r"}=c.collection_name.to_s.gsub('_', ' ').titlecase
+        %a{ :href => url_for(c.collection_name),  :'data-icon' => "arrow-r"}=c.collection_name.to_s.gsub('_', ' ').titlecase
 
 
 - unless Deltacloud::Drivers.driver_config.nil?

data/views/api/show.xml.haml

@@ -1,5 +1,5 @@
 %api{ :version => settings.version, :driver => driver_symbol, :provider => Thread.current[:provider] || ENV['API_PROVIDER'] }
-  - supported_collections do |c|
+  - @collections.each do |c|
     %link{ :rel => c.collection_name, :href => self.send(:"#{c.collection_name}_url")}
       - c.features.select { |f| driver.class.has_feature?(c.collection_name, f.name) }.each do |f|
         %feature{ :name => f.name }

data/views/buckets/index.html.haml

@@ -1,5 +1,5 @@
 =header "Buckets" do
-  %a{ :href => api_url_for('buckets/new'), :'data-icon' => :plus, :'data-role' => :button, :class => 'ui-btn-right'} Create new bucket
+  %a{ :href => url_for('buckets/new'), :'data-icon' => :plus, :'data-role' => :button, :class => 'ui-btn-right'} Create new bucket
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'a'}

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

@@ -1,6 +1,6 @@
 !!!XML
 %CloudEntryPoint{ :xmlns => CMWG_NAMESPACE }
-  %uri= api_url_for("/cloudEntryPoint")
+  %uri= url_for("/cloudEntryPoint")
   %name cloud entry point
   %description cloud entry point
   %created= Time.new.getutc.to_s

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

@@ -2,7 +2,7 @@
 - new_name = new_name.gsub(/[A-Z]/, ' \0')
 %h1 #{new_name.capitalize}
 
-%form{ :action => api_url_for("/collection/" + @dmtfitem["uri"]) }
+%form{ :action => url_for("/collection/" + @dmtfitem["uri"]) }
   %input{ :name => :id, :type => :hidden, :value => @dmtfitem["uri"] }/
   %input{ :name => :xmlRootNode, :type => :hidden, :value => @xml_root_node }/
   %p
@@ -28,7 +28,7 @@
         - iter += 1
         %br
         %label
-          = operation["rel"].capitalize + ": " + api_url_for(operation["href"])
+          = operation["rel"].capitalize + ": " + url_for(operation["href"])
           %input{ :name => "operation_"+iter.to_s, :oper_type => operation["rel"], :type => :hidden, :value => operation["href"] }
   %br
 %p
@@ -42,4 +42,4 @@
     - @dmtf_col_items.map do |template|
       %tr
         %td
-          %a{ :href => template["href"] }= template["name"]
+          %a{ :href => template["href"] }= template["name"]

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

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

data/views/cimi/error.html.haml

@@ -28,4 +28,4 @@
         #copyright
           Copyright 2009-2011
           %a{:href => 'http://incubator.apache.org/deltacloud/'} The Apache Software Foundation
-          and individual contributors.
+          and individual contributors.

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

@@ -3,4 +3,4 @@
   %message< #{cdata @error.message}
   %backend{ :driver => driver_symbol }
     %code=response.status
-  %backtrace< #{cdata @error.backtrace.join("\n")}
+  %backtrace< #{h bt(@error.backtrace)}

data/views/cimi/layout.html.haml

@@ -29,4 +29,4 @@
         #copyright
           Copyright 2009-2011
           %a{:href => 'http://incubator.apache.org/deltacloud/'} The Apache Software Foundation
-          and individual contributors.
+          and individual contributors.

data/views/cimi/machine_configurations/show.html.haml

@@ -95,7 +95,7 @@
 :javascript
   function fixupXml(theNode) {
     var xmlData = "<?xml version='1.0' encoding='utf-8' ?>";
-    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://www.dmtf.org/cimi'>";
+    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://schemas.dmtf.org/cimi/1'>";
     xmlData += getStandardData(theNode);
     xmlData += "<cpu>" + $(theNode.form).attr("cpu").value + "</cpu>";
     xmlData += "<memory quantity='" + $(theNode.form).attr("memory_quantity").value + "' units='";
@@ -156,4 +156,4 @@
     })
 
     cellRightBut.appendChild(er);
-  }
+  }

data/views/cimi/machine_configurations/show.xml.haml

@@ -24,4 +24,4 @@
         %capacity{ :quantity => disk["capacity"]["quantity"], :units => disk["capacity"]["units"] }
         %guestInterface= disk["guestInterface"]
   %operation{ :rel => "edit", :href => machine_configurations_url + "/" + @dmtfitem["uri"] }
-  %operation{ :rel => "delete", :href => machine_configurations_url + "/" + @dmtfitem["uri"] }
+  %operation{ :rel => "delete", :href => machine_configurations_url + "/" + @dmtfitem["uri"] }

data/views/cimi/machine_images/show.html.haml

@@ -63,7 +63,7 @@
 :javascript
   function fixupXml(theNode) {
     var xmlData = "<?xml version='1.0' encoding='utf-8' ?>";
-    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://www.dmtf.org/cimi'>";
+    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://schemas.dmtf.org/cimi/1'>";
     xmlData += getStandardData(theNode);
     xmlData += "<imageLocation href='" + $(theNode.form).attr("imageLocation").value + "' />";
     xmlData += "<imageData>" + $(theNode.form).attr("imageData").value + "</imageData>";
@@ -76,4 +76,4 @@
     xmlData += "</" + $(theNode.form).attr("xmlRootNode").value + ">";
 
     return xmlData;
-  }
+  }

data/views/cimi/machine_images/show.xml.haml

@@ -14,4 +14,4 @@
       %property{ :name => key}=value["content"]
   %imageLocation{ :href => @dmtfitem["imageLocation"]}
   %operation{ :rel => "edit", :href => machine_images_url + "/" + @dmtfitem["uri"] }
-  %operation{ :rel => "delete", :href => machine_images_url + "/" + @dmtfitem["uri"] }
+  %operation{ :rel => "delete", :href => machine_images_url + "/" + @dmtfitem["uri"] }

data/views/cimi/machines/show.html.haml

@@ -107,7 +107,7 @@
 :javascript
   function fixupXml(theNode) {
     var xmlData = "<?xml version='1.0' encoding='utf-8' ?>";
-    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://www.dmtf.org/cimi'>";
+    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://schemas.dmtf.org/cimi/1'>";
     xmlData += getStandardData(theNode);
     xmlData += "<cpu>" + $(theNode.form).attr("cpu").value + "</cpu>";
     xmlData += "<memory quantity='" + $(theNode.form).attr("memory_quantity").value + "' units='";
@@ -174,4 +174,4 @@
 
     cellRightBut.appendChild(er);
 
-  }
+  }

data/views/cimi/machines/show.xml.haml

@@ -25,4 +25,4 @@
         %capacity{ :quantity => disk["capacity"]["quantity"], :units => disk["capacity"]["units"] }
         %guestInterface= disk["guestInterface"]
   %operation{ :rel => "edit", :href => machines_url + "/" + @dmtfitem["uri"] }
-  %operation{ :rel => "delete", :href => machines_url + "/" + @dmtfitem["uri"] }
+  %operation{ :rel => "delete", :href => machines_url + "/" + @dmtfitem["uri"] }

data/views/cimi/volumes/show.html.haml

@@ -54,7 +54,7 @@
 :javascript
   function fixupXml(theNode) {
     var xmlData = "<?xml version='1.0' encoding='utf-8' ?>";
-    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://www.dmtf.org/cimi'>";
+    xmlData += "<" + $(theNode.form).attr("xmlRootNode").value + " xmlns='http://schemas.dmtf.org/cimi/1'>";
     xmlData += getStandardData(theNode);
     xmlData += "<cpu>" + $(theNode.form).attr("cpu").value + "</cpu>";
     xmlData += "<memory quantity='" + $(theNode.form).attr("memory_quantity").value + "' units='";
@@ -65,4 +65,4 @@
     xmlData += "</" + $(theNode.form).attr("xmlRootNode").value + ">";
 
     return xmlData;
-  }
+  }

data/views/cimi/volumes/show.xml.haml

@@ -14,4 +14,4 @@
       %property{ :name => key}=value["content"]
   %capacity{ :quantity => @dmtfitem["capacity"]["quantity"], :units => @dmtfitem["capacity"]["units"]}
   %operation{ :rel => "edit", :href => volumes_url + "/" + @dmtfitem["uri"] }
-  %operation{ :rel => "delete", :href => volumes_url + "/" + @dmtfitem["uri"] }
+  %operation{ :rel => "delete", :href => volumes_url + "/" + @dmtfitem["uri"] }

data/views/docs/collection.html.haml

@@ -13,7 +13,7 @@
       %h3 Operations:
     - @operations.keys.sort_by { |k| k.to_s }.each do |operation|
       %li{ :'data-role' => 'list-divider'}
-        %a{:href => api_url_for("docs/#{@collection.name.to_s}/#{operation}"), :'data-ajax' => 'false'} #{operation}
+        %a{:href => url_for("docs/#{@collection.name.to_s}/#{operation}"), :'data-ajax' => 'false'} #{operation}
       %li
         %br
         %p=@operations[operation].description

data/views/docs/collection.xml.haml

@@ -1,9 +1,9 @@
 %docs{:status => "unsupported"}
-  %collection{:url => api_url_for("docs/#{@collection.name}"), :name => "#{@collection.name}"}
+  %collection{:url => url_for("docs/#{@collection.name}"), :name => "#{@collection.name}"}
     %description #{@collection.description}
     %operations
       - @operations.keys.sort_by { |k| k.to_s }.each do |operation|
-        %operation{:url => api_url_for("#{@collection.name.to_s}"), :name => "#{operation}", :href => api_url_for("#{@operations[operation].path}"), :method => "#{@operations[operation].method}"}
+        %operation{:url => url_for("#{@collection.name.to_s}"), :name => "#{operation}", :href => url_for("#{@operations[operation].path}"), :method => "#{@operations[operation].method}"}
           %description #{@operations[operation].description}
           - @operations[operation].each_param do |param|
             %parameter{:name => "#{param.name}", :type => "#{param.type}"}

data/views/docs/index.html.haml

@@ -5,7 +5,7 @@
   %ul{ :'data-role' => :listview, :'data-inset' => 'true'}
     - collections.keys.sort_by { |k| k.to_s }.each do |collection|
       %li
-        %a{:href => api_url_for("docs/#{collection}"), :'data-ajax' => 'false'}
+        %a{:href => url_for("docs/#{collection}"), :'data-ajax' => 'false'}
           %h3=collection.to_s.capitalize.tr('_', ' ')
           %p=collections[collection].description
 

data/views/docs/index.xml.haml

@@ -1,5 +1,5 @@
 %docs{:status => "unsupported"}
   - collections.keys.sort_by { |k| k.to_s }.each do |collection|
-    %collection{:url => api_url_for("docs/#{collection}")}
+    %collection{:url => url_for("docs/#{collection}")}
       %name #{collection}
       %description  #{collections[collection].description}

data/views/docs/operation.xml.haml

@@ -1,5 +1,5 @@
 %docs{:status => "unsupported"}
-  %operation{:url => api_url_for("docs/#{@collection.name.to_s}"), :name => "#{@operation.name.to_s}", :href => url_for("#{@operation.path}"), :method => "#{@operation.method}"}
+  %operation{:url => url_for("docs/#{@collection.name.to_s}"), :name => "#{@operation.name.to_s}", :href => url_for("#{@operation.path}"), :method => "#{@operation.method}"}
     %description #{@operation.description}
     - @operation.each_param do |param|
       %parameter{:name => "#{param.name}", :type => "#{param.type}"}

data/views/error.html.haml

@@ -26,7 +26,7 @@
         %div{ 'data-role' => :navbar}
           %ul
             %li
-              %a{ :'data-icon' => 'home', :href => api_url_for(''), :'data-ajax' => 'false'} Home
+              %a{ :'data-icon' => 'home', :href => url_for(''), :'data-ajax' => 'false'} Home
             %li=link_to_format(:xml)
             %li=link_to_format(:json)
         %div{ 'data-role' => :header, 'data-theme' => 'a' }

data/views/errors/500.html.haml

@@ -2,7 +2,7 @@
   %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(' - ')
+      %h3= h [@error.class.name, @error.message].join(' - ')
     %li{ :'data-role' => 'list-divider'} Original request URI
     %li
       %a{ :href => request.env['REQUEST_URI'], :'data-ajax' => 'false'}
@@ -11,15 +11,18 @@
     %li{ :'data-role' => 'list-divider'} Error details
     %li
       - if @error.class.method_defined? :details
-        %p= @error.details
+        %p= h @error.details
       - else
         %em No details
+    %li{ :'data-role' => 'list-divider'} Backtrace
+    %li
+      %pre= bt @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")
+        %pre= h @error.backtrace.join("\n")
 
   %div{ 'data-role' => :collapsible, 'data-collapsed' => "true"}
     %h3 Parameters
@@ -40,4 +43,4 @@
         - next if value.inspect.to_s == '#'
         %li{ :'data-role' => 'list-divider'}=key
         %li
-          %span{:style => 'font-weight:normal;'}=value.inspect
+          %span{:style => 'font-weight:normal;'}= h value.inspect

data/views/firewalls/index.html.haml

@@ -1,5 +1,5 @@
 =header "Firewalls" do
-  %a{ :href => api_url_for('firewalls/new'), :'data-icon' => :plus, :'data-role' => :button, :class => 'ui-btn-right'} Create new firewall
+  %a{ :href => url_for('firewalls/new'), :'data-icon' => :plus, :'data-role' => :button, :class => 'ui-btn-right'} Create new firewall
 =subheader "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}"
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}

data/views/firewalls/show.html.haml

@@ -18,7 +18,7 @@
         =link_to_action "Destroy", destroy_firewall_url(@firewall.id), :delete
 
 =header "Rules", :back => 'false' do
-  %a{ :href => api_url_for("firewalls/#{@firewall.id}/new_rule"), :'data-icon' => :plus, :'data-role' => :button, :class => 'ui-btn-right', :'data-ajax' => 'false'} Add new rule
+  %a{ :href => url_for("firewalls/#{@firewall.id}/new_rule"), :'data-icon' => :plus, :'data-role' => :button, :class => 'ui-btn-right', :'data-ajax' => 'false'} Add new rule
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   - @firewall.rules.each do |rule|

data/views/images/show.html.haml

@@ -25,9 +25,9 @@
       %li
         %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
           - @image.hardware_profiles.each do |hwp|
-            %a{ :href => api_url_for("hardware_profiles/#{hwp.name}"), :'data-role' => "button", :'data-ajax' => 'false'} #{hwp.name}
+            %a{ :href => url_for("hardware_profiles/#{hwp.name}"), :'data-role' => "button", :'data-ajax' => 'false'} #{hwp.name}
     %li{ :'data-role' => 'list-divider'} Actions
     %li
       %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
-        %a{ :href => api_url_for("instances/new?image_id=#{@image.id}"), :'data-role' => "button", :'data-ajax' => 'false'} Launch
+        %a{ :href => url_for("instances/new?image_id=#{@image.id}"), :'data-role' => "button", :'data-ajax' => 'false'} Launch
         = link_to_action 'Destroy', destroy_image_url(@image.id), :delete

data/views/index.html.haml

@@ -0,0 +1,9 @@
+%html
+  %head
+  %body
+    %h1 Deltacloud API
+    %h2 Enabled Frontends:
+    %ul
+      - Deltacloud.enabled_frontends.each do |f|
+        %li
+          %a{ :href => f.root_url}=f.name

data/views/instance_states/show.html.haml

@@ -2,7 +2,7 @@
 =subheader "#{driver_symbol}@#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}"
 
 %div{ :'data-role' => :content, :'data-theme' => 'd', :class => 'middle-dialog'}
-  %img{ :src => api_url_for('instance_states?format=png') }
+  %img{ :src => url_for('instance_states?format=png') }
 
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-theme' => 'a'}
     - @machine.states.each do |state|

data/views/instances/run_command.html.haml

@@ -2,7 +2,7 @@
 =subheader "#{@instance.id}"
 
 %div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
-  %form{ :action => api_url_for('/instances/%s/run' % @instance.id), :method => :post }
+  %form{ :action => url_for('/instances/%s/run' % @instance.id), :method => :post }
     %p
       %label{ :for => :cmd } Desired command:
       %input{ :name => :cmd, :value => "", :type => :text}

data/views/instances/show.html.haml

@@ -59,6 +59,6 @@
         - @instance.actions.each do |action|
           =link_to_action action, self.send(:"#{action}_instance_url", @instance.id), instance_action_method(action)
         - if @instance.state=="RUNNING" and driver.respond_to?(:run_on_instance)
-          =link_to_action 'run command', api_url_for('instances/%s/run' % @instance.id), :get
+          =link_to_action 'run command', url_for('instances/%s/run' % @instance.id), :get
         - if @instance.can_create_image?
-          =link_to_action 'Create Image', api_url_for("images/new?instance_id=#{@instance.id}"), :get
+          =link_to_action 'Create Image', url_for("images/new?instance_id=#{@instance.id}"), :get

data/views/keys/index.html.haml

@@ -1,5 +1,5 @@
 =header "Keys" do
-  %a{ :href => api_url_for('keys/new'), :'data-icon' => :plus, :'data-role' => :button, :class => 'ui-btn-right'} Create new key
+  %a{ :href => url_for('keys/new'), :'data-icon' => :plus, :'data-role' => :button, :class => 'ui-btn-right'} Create new key
 
 %div{ :'data-role' => :content, :'data-theme' => 'c'}
   %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'a'}

data/views/layout.html.haml

@@ -18,7 +18,7 @@
         %div{ 'data-role' => :navbar}
           %ul
             %li
-              %a{ :'data-icon' => 'home', :href => "#{api_url_for('').chomp("/")}", :'data-ajax' => 'false'} Home
+              %a{ :'data-icon' => 'home', :href => "#{url_for('').chomp("/")}", :'data-ajax' => 'false'} Home
             %li=link_to_format(:xml)
             %li=link_to_format(:json)
         %div{ 'data-role' => :header, 'data-theme' => 'a' }