deltacloud-core 0.3.0 → 0.4.0

data/support/fedora/deltacloudd-fedora

@@ -0,0 +1,5 @@
+#!/usr/bin/ruby
+
+root_path = File.join('/', 'usr', 'share', 'deltacloud-core')
+$:.unshift File.join(root_path, 'lib')
+load File.join(root_path, 'bin', 'deltacloudd')

data/tests/common.rb

@@ -98,6 +98,11 @@ module DeltacloudTestCommon
       end
     else
       get(uri, params || {}, opts[:auth] ? authenticate(opts) : {})
+      if last_response.status.to_s =~ /5(\d{2})/
+        puts "============= [ ERROR ] ================"
+        puts last_response.inspect
+        puts "========================================"
+      end
     end
     last_response.status.should_not == 401
   end
@@ -105,6 +110,11 @@ module DeltacloudTestCommon
   def get_auth_url(uri, params={}, opts={})
     opts.merge!(:auth => true)
     get_url(uri, params, opts)
+    if last_response.status.to_s =~ /5(\d{2})/
+      puts "============= [ ERROR ] ================"
+      puts last_response.inspect
+      puts "========================================"
+    end
   end
 
   def post_url(uri, params={}, opts={})
@@ -114,7 +124,12 @@ module DeltacloudTestCommon
         post(uri, params || {}, authenticate(opts))
       end
     else
-        post(uri, params || {}, authenticate(opts))
+      post(uri, params || {}, authenticate(opts))
+      if last_response.status.to_s =~ /5(\d{2})/
+        puts "============= [ ERROR ] ================"
+        puts last_response.inspect
+        puts "========================================"
+      end
     end
   end
 
@@ -125,7 +140,12 @@ module DeltacloudTestCommon
         delete(uri, params || {}, authenticate(opts))
       end
     else
-        delete(uri, params || {}, authenticate(opts))
+      delete(uri, params || {}, authenticate(opts))
+      if last_response.status.to_s =~ /5(\d{2})/
+        puts "============= [ ERROR ] ================"
+        puts last_response.inspect
+        puts "========================================"
+      end
     end
   end
 
@@ -136,7 +156,12 @@ module DeltacloudTestCommon
         put(uri, params || {}, authenticate(opts))
       end
     else
-        put(uri, params || {}, authenticate(opts))
+       put(uri, params || {}, authenticate(opts))
+      if last_response.status.to_s =~ /5(\d{2})/
+        puts "============= [ ERROR ] ================"
+        puts last_response.inspect
+        puts "========================================"
+      end
     end
   end
 
@@ -148,8 +173,13 @@ module DeltacloudTestCommon
 
   # Check if given URI require authentication
   def require_authentication?(uri)
+    # We need to make sure we don't have both API_USER and API_PASSWORD
+    # set in the environment; otherwise LazyAuth will use those instead
+    # of asking for credentials
+    api_user = ENV.delete("API_USER")
     get uri, {}
-    true if last_response.status == 401
+    ENV["API_USER"] = api_user
+    last_response.status == 401
   end
 
   def with_provider(new_provider, &block)

data/tests/drivers/mock/api_test.rb

@@ -69,7 +69,7 @@ module DeltacloudUnitTest
 
       with_provider("storage") do
         get_auth_url '/api/instances'
-        last_response.status.should == 404
+        last_response.status.should == 403
       end
     end
 
@@ -79,7 +79,7 @@ module DeltacloudUnitTest
 
       with_provider("storage") do
         get_url '/api/docs/instances'
-        last_response.status.should == 404
+        last_response.status.should == 403
       end
     end
 
@@ -126,7 +126,7 @@ module DeltacloudUnitTest
       (last_xml_response/'api/link[@rel="instances"]/feature[@name="user_data"]').first.should_not == nil
       get_auth_url "/api;driver=mock"
       (last_xml_response/'api/link[@rel="instances"]/feature[@name="user_name"]').first.should_not == nil
-      (last_xml_response/'api/link[@rel="instances"]/feature[@name="user_data"]').first.should == nil
+      (last_xml_response/'api/link[@rel="instances"]/feature[@name="firewalls"]').first.should == nil
     end
 
   end

data/tests/drivers/mock/images_test.rb

@@ -113,6 +113,18 @@ module DeltacloudUnitTest
       Nokogiri::HTML(last_response.body).search('html').first.name.should == 'html'
     end
 
+    def test_it_creates_and_destroys_image_from_instance
+      post_url "/api/images", { :name => "img4", :description => "Test::Unit image", :instance_id => "inst1"}
+      last_response.status.should == 201
+      last_response.headers['Location'].should_not == nil
+      get_auth_url last_response.headers['Location'], {}
+      (last_xml_response/'instance/name').should_not == nil
+      delete_url "/api/images/img4", {}
+      last_response.status.should == 204
+      get_auth_url "/api/images/img4", {}
+      last_response.status.should == 404
+    end
+
     private
 
     def test_image_attributes(image)

data/tests/drivers/mock/instances_test.rb

@@ -197,10 +197,12 @@ module DeltacloudUnitTest
       (instance/'public_addreses').should_not == nil
       (instance/'public_addresses/address').to_a.size.should > 0
       (instance/'public_addresses/address').first.text.should_not == ""
+      (instance/'public_addresses/address').first[:type].should == "hostname"
 
       (instance/'private_addresses').should_not == nil
       (instance/'private_addresses/address').to_a.size.should > 0
       (instance/'private_addresses/address').first.text.should_not == ""
+      (instance/'private_addresses/address').first[:type].should == "hostname"
 
       (instance/'actions/link').to_a.size.should > 0
       (instance/'actions/link').each do |link|

data/tests/rabbit_test.rb

@@ -41,10 +41,10 @@ module DeltacloudUnitTest
 
     def test_effective_params
       features = @driver.features(:instances).collect { |f| f.name }
-      features.should =~ [:hardware_profiles, :user_name, :authentication_key]
+      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]
+      op.effective_params(@driver).keys.should =~ [:image_id, :hwp_memory, :hwp_id, :keyname, :name, :hwp_storage, :realm_id, :user_data]
 
       op.params.keys =~ [:realm_id, :image_id, :hwp_id]
     end

data/views/addresses/_address.html.haml

@@ -0,0 +1,6 @@
+%li
+  %a{ :href => address_url(@address.id), :'data-ajax' => 'false'}
+    %img{ :class => 'ui-link-thumb', :src => '/images/address.png'}
+    %h3= @address.id
+    %span{ :class => 'ui-li-count'}
+      = @address.instance_id ? @address.instance_id : 'Free'

data/views/addresses/associate.html.haml

@@ -0,0 +1,12 @@
+=header "Associate to instance"
+=subheader @address.id
+
+%div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
+  %form{ :action => associate_address_url(@address.id), :method => :post}
+    %div{ 'data-role' => :fieldcontain }
+      %label{ :for => :name} Instance:
+      %select{:name => 'instance_id'}
+        %option
+          - @instances.each do |inst|
+            %option{ :value => inst.id } #{inst.id} - #{inst.name}
+    %button{ :type => :submit} Associate

data/views/addresses/index.html.haml

@@ -0,0 +1,9 @@
+=header "Addresses" do
+  %a{ :href => "#", :onclick => "create_address('#{create_address_url}')", :'data-icon' => :plus, :'data-role' => :button, :class => 'ui-btn-right', :'data-ajax' => "false", :method => :post} Create new address
+=subheader "#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}"
+
+%div{ :'data-role' => :content, :'data-theme' => 'c'}
+  %ul#address_list{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'a'}
+    %li{ :'data-role' => 'list-divider'}=driver_symbol
+    - @elements.each do |address|
+      = haml :"addresses/_address", :locals => { :@address => address, :partial => true }

data/views/addresses/index.xml.haml

@@ -0,0 +1,4 @@
+!!!XML
+%addresses
+  - @elements.each do |c|
+    = haml :'addresses/show', :locals => { :@address => c, :partial => true }

data/views/addresses/show.html.haml

@@ -0,0 +1,21 @@
+=header "Address"
+=subheader @address.id
+
+%div{ :'data-role' => :content, :'data-theme' => 'c'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
+    %li{ :'data-role' => 'list-divider'} Address
+    %li
+      %p{ :'data-role' => 'fieldcontain'}=@address.id
+    %li{ :'data-role' => 'list-divider'} Associated to instance
+    %li
+      %p{ :'data-role' => 'fieldcontain'}=@address.instance_id || "Not associated yet"
+    %li{ :'data-role' => 'list-divider'} Actions
+    %li
+      %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
+        - if @address.associated?
+          =link_to @address.instance_id, instance_url(@address.instance_id)
+          =link_to_action 'Disassociate', disassociate_address_url(@address.id), :post
+        - else
+          - if driver.respond_to?(:associate_address)
+            =link_to_action 'Associate', associate_address_url(@address.id), :get
+        =link_to_action "Destroy", destroy_address_url(@address.id), :delete

data/views/addresses/show.xml.haml

@@ -0,0 +1,14 @@
+- unless defined?(partial)
+  !!! XML
+%address{ :href => address_url(@address.id), :id => @address.id }
+  %ip<
+    =@address.id
+  %actions
+    - if driver.respond_to?(:destroy_address)
+      %link{ :rel => "destroy", :method => "delete", :href => destroy_address_url(@address.id)}
+    - if driver.respond_to?(:associate_address) and not @address.instance_id
+      %link{ :rel => "associate", :method => "post", :href => associate_address_url(@address.id)}
+    - if driver.respond_to?(:disassociate_address) and @address.instance_id
+      %link{ :rel => "disassociate", :method => "post", :href => disassociate_address_url(@address.id)}
+  - if @address.instance_id
+    %instance{ :href => instance_url(@address.instance_id), :id => @address.instance_id}

data/views/api/show.html.haml

@@ -1,12 +1,7 @@
-%h1
-  Deltacloud API #{settings.version}
+=header "Deltacloud API #{settings.version}", :back => 'false'
+=subheader "#{driver_symbol}@#{Thread::current[:provider] || ENV['API_PROVIDER'] || 'default'}"
 
-%ul
-  - @collections.sort_by { |k| k.to_s }.each do |key|
-    %li
-      = link_to key.to_s.gsub('_', ' ').titlecase, url_for("/api/#{key}")
-      %dl
-        - collections[key].operations.each_key do |op|
-          - next if [:index, :show].include?(op)
-          %dt
-            = op
+%div{ :'data-role' => :content, :'data-theme' => 'c'}
+  %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

data/views/api/show.xml.haml

@@ -3,3 +3,5 @@
     %link{ :rel=>entry_point[0], :href=>entry_point[1] }
       - for feature in driver.features(entry_point[0])
         %feature{ :name=>feature.name }
+          - for name,value in feature.constraints
+            %constraint{ :name=>name, :value=>value }

data/views/blobs/new.html.haml

@@ -1,26 +1,27 @@
-%h1 New Blob
+=header "Create new blob"
 
-%form{ :action => bucket_url(@bucket_id), :method => :post, :enctype => 'multipart/form-data'}
-  %label
-    Blob Name:
-    %input{ :name => 'blob_id', :size => 512}/
-  %label
-    Blob Data:
+%div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
+  %form{ :action => bucket_url(@bucket_id), :method => :post, :enctype => 'multipart/form-data', "data-ajax" => "false"}
+    %div{ 'data-role' => :fieldcontain }
+      %label
+        Blob Name:
+      %input{ :name => 'blob_id', :size => 512}/
+    %div{ 'data-role' => :fieldcontain }
+      %label
+        Blob Data:
+      %input{ :type => "file", :name => 'blob_data', :size => 50}/
+    %input{ :type => "hidden", :name => "meta_params", :value => "0"}
+    %a{ :href => "javascript:;", :onclick => "more_fields();"} Add Metadata
+    %div{ :id => "metadata_holder", :style => "display: none;", :'data-role' => :fieldcontain}
+      %label
+        Metadata Key:
+      %input{ :type => "text", :name => "meta_name", :value => ""}/
+      %br
+      %label
+        Metadata Value:
+      %input{ :type => "text", :name => "meta_value", :value => ""}/
+      %br
+    %a{ :href => "javascript:;", :onclick => "less_fields();"} Less Metadata
     %br
-    %input{ :type => "file", :name => 'blob_data', :size => 50}/
     %br
-    %br
-  %input{ :type => "hidden", :name => "meta_params", :value => "0"}
-  %a{ :href => "javascript:;", :onclick => "more_fields();"} Add Metadata
-  %div{ :id => "metadata_holder", :style => "display: none;"}
-    %label
-      Metadata Key:
-    %input{ :type => "text", :name => "meta_name", :value => ""}/
-    %label
-      Metadata Value:
-    %input{ :type => "text", :name => "meta_value", :value => ""}/
-  %br
-  %a{ :href => "javascript:;", :onclick => "less_fields();"} Less Metadata
-  %br
-  %br
-  %input{ :type => :submit, :name => "commit", :value => "create"}/
+    %input{ :type => :submit, :name => "commit", :value => "create"}/

data/views/blobs/show.html.haml

@@ -1,32 +1,31 @@
-%h1 Blob
-%h2
-  = @blob.id
+=header "Blob"
+=subheader @blob.id
 
-%dl
-  %di
-    %dt Bucket
-    %dd
-      = @blob.bucket
-    %dt Content_Length
-    %dd
-      = @blob.content_length
-    %dt Content_Type
-    %dd
-      = @blob.content_type
-    %dt Last_Modified
-    %dd
-      = @blob.last_modified
-    %dt Content
-    %dd
-      =link_to 'Blob content', bucket_url(@blob.bucket) + '/' + @blob.id + '/content'
-    %dt User_Metadata
-    %dd
-      -@blob.user_metadata.each do |k,v|
-        %b #{k} :
-        #{v}
-        %br
-    %dt Delete this Blob
-    %dd
-      %form{ :action => bucket_url(@blob.bucket) + '/' + @blob.id , :method => :post }
-        %input{ :type => "hidden", :name => "_method", :value => "delete"}
-        %input{ :type => :submit, :value => "Delete"}/
+%div{ :'data-role' => :content, :'data-theme' => 'c'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'd'}
+    %li{ :'data-role' => 'list-divider'} Bucket
+    %li
+      %p{ :'data-role' => 'fieldcontain'}=@blob.bucket
+    %li{ :'data-role' => 'list-divider'} Content length
+    %li
+      %p{ :'data-role' => 'fieldcontain'}=@blob.content_length
+    %li{ :'data-role' => 'list-divider'} Content type
+    %li
+      %p{ :'data-role' => 'fieldcontain'}=@blob.content_type
+    %li{ :'data-role' => 'list-divider'} Last modified
+    %li
+      %p{ :'data-role' => 'fieldcontain'}=@blob.last_modified
+    %li{ :'data-role' => 'list-divider'} Content
+    %li
+      %a{ :href => bucket_url(@blob.bucket) + '/' + @blob.id + '/content' }="Download"
+    %li{ :'data-role' => 'list-divider'} User meta-data
+    %li
+      %p{ :'data-role' => 'fieldcontain'}
+        - @blob.user_metadata.each do |k,v|
+          %b #{k} :
+          #{v}
+          %br
+    %li{ :'data-role' => 'list-divider'} Actions
+    %li
+      %div{ :'data-role' => 'controlgroup', :'data-type' => "horizontal" }
+        =link_to_action 'Delete',bucket_url(@blob.bucket) + '/' + @blob.id, :delete

data/views/buckets/index.html.haml

@@ -1,23 +1,11 @@
-%h1
-  Buckets
-%br
-%p
-  =link_to 'Create new bucket', "/api/buckets/new"
+=header "Buckets" do
+  %a{ :href => api_url_for('buckets/new'), :'data-icon' => :plus, :'data-role' => :button, :class => 'ui-btn-right'} Create new bucket
 
-%table.display
-  %thead
-    %tr
-      %th
-        ID
-      %th
-        Name
-
-  %tbody
+%div{ :'data-role' => :content, :'data-theme' => 'c'}
+  %ul{ :'data-role' => :listview , :'data-inset' => :true, :'data-divider-theme' => 'a'}
     - @buckets.each do |bucket|
-      %tr
-        %td
-          = link_to bucket.id, bucket_url(bucket.id)
-        %td
-          = bucket.name
-        %td
-          =link_to_action 'Delete', destroy_bucket_url(bucket.name), :delete
+      %li
+        %a{ :href => bucket_url(bucket.id), :'data-ajax' => 'false'}
+          %img{ :class => 'ui-link-thumb', :src => '/images/bucket.png'}
+          %h3=bucket.name
+          %p=bucket.id

data/views/buckets/index.xml.haml

@@ -1,8 +1,4 @@
-!!! XML
+!!!XML
 %buckets
-  - @elements.each do |bucket|
-    %bucket{:href => bucket_url(bucket.id), :id => bucket.id}
-      - bucket.attributes.select{ |attr| attr!=:id }.each do |attribute|
-        - haml_tag("#{attribute}".tr('-', '_'), :<) do
-          - haml_concat bucket.send(attribute)
-
+  - @elements.each do |c|
+    = haml :'buckets/show', :locals => { :@bucket => c, :partial => true }

data/views/buckets/new.html.haml

@@ -1,13 +1,14 @@
-%h1 New Bucket
+=header "New bucket"
 
-%form{ :action => buckets_url, :method => :post }
-  %label
-    Bucket Name:
-    %input{ :name => 'name', :size => 250}/
-    %br
-  -if driver_has_bucket_location_feature?
-    %p
-      %label
-        Location: (optional)
-        %input{ :name => 'location', :size => 20 }/
-  %input{ :type => :submit, :name => "commit", :value => "create"}/
+%div{ :'data-role' => :content, :'data-theme' => 'c', :class => 'middle-dialog'}
+  %form{ :action => buckets_url, :method => :post }
+    %label
+      Bucket Name:
+      %input{ :name => 'name', :size => 250}/
+      %br
+    -if driver_has_bucket_location_feature?
+      %p
+        %label
+          Location: (optional)
+          %input{ :name => 'location', :size => 20 }/
+    %input{ :type => :submit, :name => "commit", :value => "create"}/