deltacloud-core 0.0.9 → 0.1.0

data/test.rb

@@ -0,0 +1,3 @@
+require 'rubygems'
+require 'rest-client'
+

data/views/blobs/new.html.haml

@@ -0,0 +1,10 @@
+%h1 New Blob
+
+%form{ :action => bucket_url(@bucket_id), :method => :post, :enctype => 'multipart/form-data'}
+  %label
+    Blob Name:
+    %input{ :name => 'blob_id', :size => 512}/
+    Blob Data:
+    %input{ :type => "file", :name => 'blob_data',  :size => 50}/
+    %br
+  %input{ :type => :submit, :name => "commit", :value => "create"}/

data/views/blobs/show.html.haml

@@ -3,18 +3,24 @@
   = @blob.id
 
 %dl
-  %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'
+  %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 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"}/

data/views/buckets/index.html.haml

@@ -30,4 +30,4 @@
           -bucket.blob_list.each do |blob|
             = blob
         %td
-          =link_to 'Delete', destroy_bucket_url(bucket.name), :class => 'delete'
+          =link_to_action 'Delete', destroy_bucket_url(bucket.name), :delete

data/views/buckets/show.html.haml

@@ -14,6 +14,9 @@
     %dd
       -@bucket.blob_list.each do |blob|
         = link_to blob, bucket_url(@bucket.name) + '/' + blob
-    %dt delete bucket (must be empty)
+    %dt Delete bucket (must be empty)
     %dd
-      =link_to 'Delete', destroy_bucket_url(@bucket.name), :class => 'delete'
+    %dt Create a new blob
+    %dd
+      =link_to 'Create Blob', bucket_url(@bucket.name) + '/new_blob'
+      =link_to_action 'Delete', destroy_bucket_url(@bucket.name), :delete

data/views/errors/backend_capability_failure.html.haml

@@ -0,0 +1,11 @@
+%h1 Backend Capability Failure
+
+%p= @error.message
+
+%dl
+  %di
+    %dt Request URL
+    %dd= request.env['REQUEST_URI']
+  %di
+    %dt Capability
+    %dd= @error.capability

data/views/errors/backend_capability_failure.xml.haml

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

data/views/errors/not_allowed.html.haml

@@ -0,0 +1,6 @@
+%h1 Method Not Allowed
+
+%dl
+  %di
+    %dt Request URL
+    %dd= request.env['REQUEST_URI']

data/views/errors/not_allowed.xml.haml

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

data/views/instances/index.html.haml

@@ -27,4 +27,4 @@
           = instance.state
         %td
           -instance.actions.each do |action|
-            =link_to action, self.send(:"#{action}_instance_url", instance.id), :class => instance_action_method(action)
+            =link_to_action action, self.send(:"#{action}_instance_url", instance.id), instance_action_method(action)

data/views/instances/new.html.haml

@@ -9,6 +9,14 @@
     %label
       Instance Name:
       %input{ :name => 'name', :size => 30 }/
+  -if driver_has_feature?(:register_to_load_balancer)
+    %p
+      %label
+        Assign to load balancer:
+        %select{:name => 'load_balancer_id'}
+          %option{:value => ""}
+          - @load_balancers.each do |load_balancer|
+            %option{:value => load_balancer.id} #{load_balancer.id}
   -if driver_has_feature?(:authentication_key)
     %p
       %label

data/views/instances/show.html.haml

@@ -40,4 +40,4 @@
     %dt
     %dd
       -@instance.actions.each do |action|
-        =link_to action, self.send(:"#{action}_instance_url", @instance.id), :class => instance_action_method(action)
+        =link_to_action action, self.send(:"#{action}_instance_url", @instance.id), instance_action_method(action)

data/views/keys/index.html.haml

@@ -18,7 +18,7 @@
             = "#{key.username} - #{key.password}"
         %td
           - if driver.respond_to?(:destroy_key)
-            =link_to 'Destroy', destroy_key_url(key.id), :class => 'delete'
+            =link_to_action 'Destroy', destroy_key_url(key.id), :delete
   %tfoot
     - if driver.respond_to?(:create_key)
       %tr

data/views/load_balancers/index.html.haml

@@ -0,0 +1,33 @@
+%h1 Load Balancers
+
+%table.display
+  %thead
+    %tr
+      %th ID
+      %th Hostname
+      %th Realm
+      %th Balancer port
+      %th Instances port
+      %th Actions
+  %tbody
+    - @elements.each do |balancer|
+      %tr
+        %td
+          = link_to balancer.id, load_balancer_url( balancer.id )
+        %td
+          = balancer.public_addresses.first
+        %td
+          = link_to balancer.realms.first.id, realm_url( balancer.realms.first.id )
+        %td
+          - balancer.listeners.each do |listener|
+            ="#{listener.protocol}[#{listener.load_balancer_port}]<br/>"
+        %td
+          - balancer.listeners.each do |listener|
+            ="#{listener.protocol}[#{listener.load_balancer_port}]<br/>"
+        %td
+          =link_to_action 'Destroy', destroy_load_balancer_url(balancer.id), :delete
+  %tfoot
+    %tr
+      %td{:colspan => 6, :style => "text-align:right;"}
+        =link_to 'Create &raquo;', "#{url_for('/api/load_balancers/new')}", :class => 'button'
+

data/views/load_balancers/index.xml.haml

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

data/views/load_balancers/new.html.haml

@@ -0,0 +1,38 @@
+%h1 New Load Balancer
+
+%form{ :action => '/api/load_balancers', :method => :post }
+  %p
+    %label
+      Name:
+    %input{ :name => 'name', :size => 30 }/
+  -if @instances
+    %p
+      %label
+        Running instance:
+      %select{ :name => 'instance_id'}
+        - @instances.select{|i| i.state=="RUNNING"}.each do |instance|
+          %option{ :value => instance.id } #{instance.id}
+  %p
+    %label
+      Realm:
+    %select{ :name => 'realm_id'}
+      - @realms.each do |realm|
+        %option{ :value => realm.id } #{realm.id} - #{realm.name}
+  %hr
+  %p
+    %label
+      Protocol:
+    %select{ :name => 'listener_protocol'}
+      %option{ :value => 'HTTP'}  HTTP
+      %option{ :value => 'TCP'} TCP
+  %p
+    %label
+      Load balancer port:
+    %input{ :name => "listener_lbr_port", :size => 30}
+  %p
+    %label
+      Instances port:
+    %input{ :name => "listener_inst_port", :size => 30}
+  %p
+    %input{ :type => :submit, :name => "commit", :value => "create" }/
+

data/views/load_balancers/show.html.haml

@@ -0,0 +1,37 @@
+%h1
+  = @load_balancer.id
+
+%dl
+  %di
+    %dt Public addresses
+    %dd
+      = @load_balancer.public_addresses.join(',')
+    - if @load_balancer.created_at
+      %dt Created at
+      %dd
+        = @load_balancer.created_at
+    %dt Realms
+    %dd
+      = @load_balancer.realms.collect { |r| "#{r.id} - #{r.name}" }.join(',')
+    %dt Listeners
+    %dd
+      - @load_balancer.listeners.each do |listener|
+        ="Load balancer port: #{listener.load_balancer_port}"
+        %br
+        ="Instance port: #{listener.instance_port}"
+        %br
+    - if @load_balancer.instances.class.eql?(Array)
+      %dt Instances
+      - @load_balancer.instances.each do |inst|
+        %dd
+          =inst.id
+          =link_to_action, 'Delete', unregister_load_balancer_url(@load_balancer.id, :instance_id => inst.id), :post
+
+%form{:action => url_for("/api/load_balancers/#{@load_balancer.id}/register"), :method => :post}
+  %p
+    %strong Add instances to load balancer
+  %p
+    %label Instance
+    %select{:name => :instance_id, :id => "list_instances"}
+    %input{:type => :submit, :value => "Assign"}
+

data/views/load_balancers/show.xml.haml

@@ -0,0 +1,21 @@
+- unless defined?(partial)
+  !!! XML
+%load_balancer{ :href => key_url(@load_balancer.id), :id => @load_balancer.id}
+  %actions
+    %link{ :rel => "destroy", :method => "delete", :href => destroy_load_balancer_url(@load_balancer.id)}
+  %public_addresses
+    - @load_balancer.public_addresses.each do |address|
+      %address #{address}
+  %created_at<
+    = @load_balancer.created_at
+  %realm{ :href => realm_url(@load_balancer.realms.first.id), :id => @load_balancer.realms.first.id}
+  %listeners
+    - @load_balancer.listeners.each do |listener|
+      %listener{ :protocol => listener.protocol}
+        %load_balancer_port #{listener.load_balancer_port}
+        %instance_port #{listener.instance_port}
+  %instances
+    - @load_balancer.instances.each do |instance|
+      %instance{:href => instance_url(instance.id), :id => instance.id}
+        %link{:rel => "unregister", :href => unregister_load_balancer_url(@load_balancer.id, { :instance_id => instance.id})}
+

data/views/storage_snapshots/index.xml.haml

@@ -4,6 +4,4 @@
     %storage_snapshot{ :href => storage_snapshot_url(snapshot.id), :id => snapshot.id }
       %created<
         =snapshot.created
-      %state<
-        =snapshot.state
       %storage_volume{ :href => storage_volume_url(snapshot.storage_volume_id), :id => snapshot.storage_volume_id }

data/views/storage_snapshots/show.xml.haml

@@ -2,6 +2,4 @@
 %storage_snapshot{:href => storage_snapshot_url(@storage_snapshot.id), :id => @storage_snapshot.id }
   %created<
     =@storage_snapshot.created
-  %state<
-    =@storage_snapshot.state
   %storage_volume{:href => storage_volume_url(@storage_snapshot.storage_volume_id), :id => @storage_snapshot.storage_volume_id}

data/views/storage_volumes/index.xml.haml

@@ -4,10 +4,10 @@
     %storage_volume{ :href => storage_volume_url(volume.id), :id => volume.id }
       %created<
         =volume.created
-      %capacity<
-        =volume.capacity
-      - unless volume.device.nil?
-        %device<
-          =volume.device
+      %capacity{ :unit => "GB" }<
+        = volume.capacity
       - unless volume.instance_id.nil?
-        %instance{:href => instance_url(volume.instance_id), :id => volume.instance_id}
+        %mount
+          %instance{:href => instance_url(volume.instance_id), :id => volume.instance_id}
+          - unless volume.device.nil?
+            %device{ :name => volume.device }

data/views/storage_volumes/show.xml.haml

@@ -2,10 +2,10 @@
 %storage_volume{ :href => storage_volume_url(@storage_volume.id), :id => @storage_volume.id}
   %created<
     =@storage_volume.created
-  %capacity<
-    =@storage_volume.capacity
-  %device<
-    =@storage_volume.device
-  %state<
-    =@storage_volume.state
-  %instance{:href => @storage_volume.instance_id, :id => @storage_volume.instance_id}
+  %capacity{ :unit => "GB" }<
+    = @storage_volume.capacity
+  - unless @storage_volume.instance_id.nil?
+    %mount
+      %instance{:href => @storage_volume.instance_id, :id => @storage_volume.instance_id}
+      - unless @storage_volume.device.nil?
+        %device{ :name => @storage_volume.device }

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: deltacloud-core
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 27
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 9
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors: 
 - Red Hat, Inc.
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-22 00:00:00 +02:00
+date: 2010-11-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -205,29 +205,29 @@ extra_rdoc_files:
 files: 
 - Rakefile
 - config.ru
+- parse.rb
 - deltacloud.rb
+- test.rb
 - server.rb
 - support/fedora/rubygem-deltacloud-core.spec
 - support/fedora/deltacloudd
-- lib/sinatra/lazy_auth.rb
 - lib/sinatra/accept_media_types.rb
+- lib/sinatra/respond_to.rb
 - lib/sinatra/static_assets.rb
 - lib/sinatra/url_for.rb
+- lib/sinatra/lazy_auth.rb
 - lib/sinatra/rabbit.rb
-- lib/sinatra/respond_to.rb
 - lib/deltacloud/models/base_model.rb
-- lib/deltacloud/models/realm.rb
-- lib/deltacloud/models/instance.rb
+- lib/deltacloud/models/blob.rb
+- lib/deltacloud/models/bucket.rb
 - lib/deltacloud/models/instance_profile.rb
-- lib/deltacloud/models/storage_volume.rb
+- lib/deltacloud/models/realm.rb
 - lib/deltacloud/models/storage_snapshot.rb
+- lib/deltacloud/models/load_balancer.rb
 - lib/deltacloud/models/image.rb
-- lib/deltacloud/models/blob.rb
-- lib/deltacloud/models/tag.rb
-- lib/deltacloud/models/bucket.rb
+- lib/deltacloud/models/instance.rb
 - lib/deltacloud/models/key.rb
-- lib/deltacloud/method_serializer.rb
-- lib/deltacloud/helpers.rb
+- lib/deltacloud/models/storage_volume.rb
 - lib/deltacloud/drivers/ec2/ec2_mock_driver.rb
 - lib/deltacloud/drivers/ec2/ec2_driver.rb
 - lib/deltacloud/drivers/terremark/terremark_driver.rb
@@ -240,21 +240,24 @@ files:
 - lib/deltacloud/drivers/mock/mock_driver.rb
 - lib/deltacloud/drivers/rimuhosting/rimuhosting_driver.rb
 - lib/deltacloud/drivers/rimuhosting/rimuhosting_client.rb
-- lib/deltacloud/drivers/rackspace/rackspace_client.rb
 - lib/deltacloud/drivers/rackspace/rackspace_driver.rb
+- lib/deltacloud/drivers/rackspace/rackspace_client.rb
 - lib/deltacloud/drivers/rhevm/rhevm_driver.rb
 - lib/deltacloud/drivers/azure/azure_driver.rb
-- lib/deltacloud/hardware_profile.rb
-- lib/deltacloud/validation.rb
 - lib/deltacloud/base_driver/base_driver.rb
 - lib/deltacloud/base_driver/features.rb
 - lib/deltacloud/base_driver/mock_driver.rb
-- lib/deltacloud/helpers/hardware_profiles_helper.rb
+- lib/deltacloud/helpers/blob_stream.rb
 - lib/deltacloud/helpers/conversion_helper.rb
+- lib/deltacloud/helpers/hardware_profiles_helper.rb
 - lib/deltacloud/helpers/application_helper.rb
-- lib/deltacloud/helpers/blob_stream.rb
-- lib/deltacloud/state_machine.rb
 - lib/deltacloud/base_driver.rb
+- lib/deltacloud/hardware_profile.rb
+- lib/deltacloud/helpers.rb
+- lib/deltacloud/method_serializer.rb
+- lib/deltacloud/state_machine.rb
+- lib/deltacloud/validation.rb
+- lib/deltacloud/backend_capability.rb
 - lib/drivers.rb
 - lib/deltacloud/drivers/mock/data/storage_volumes/vol1.yml
 - lib/deltacloud/drivers/mock/data/storage_volumes/vol3.yml
@@ -278,41 +281,42 @@ files:
 - views/instance_states/show.xml.haml
 - views/instance_states/show.html.haml
 - views/root/index.html.haml
-- views/storage_volumes/show.xml.haml
-- views/storage_volumes/index.xml.haml
-- views/storage_volumes/index.html.haml
 - views/storage_volumes/show.html.haml
+- views/storage_volumes/index.html.haml
+- views/storage_volumes/index.xml.haml
+- views/storage_volumes/show.xml.haml
 - views/accounts/index.html.haml
 - views/accounts/show.html.haml
-- views/storage_snapshots/show.xml.haml
+- views/storage_snapshots/show.html.haml
 - views/storage_snapshots/index.xml.haml
+- views/storage_snapshots/show.xml.haml
 - views/storage_snapshots/index.html.haml
-- views/storage_snapshots/show.html.haml
-- views/layout.html.haml
 - views/errors/not_found.html.haml
 - views/errors/auth_exception.xml.haml
 - views/errors/validation_failure.xml.haml
 - views/errors/not_found.xml.haml
-- views/errors/backend_error.xml.haml
 - views/errors/auth_exception.html.haml
 - views/errors/backend_error.html.haml
 - views/errors/validation_failure.html.haml
+- views/errors/backend_capability_failure.html.haml
+- views/errors/backend_capability_failure.xml.haml
+- views/errors/not_allowed.html.haml
+- views/errors/not_allowed.xml.haml
+- views/errors/backend_error.xml.haml
 - views/images/show.xml.haml
 - views/images/index.xml.haml
 - views/images/index.html.haml
 - views/images/show.html.haml
-- views/api/show.html.haml
-- views/api/show.xml.haml
 - views/keys/new.html.haml
 - views/keys/index.xml.haml
-- views/keys/index.html.haml
 - views/keys/show.html.haml
 - views/keys/show.xml.haml
+- views/keys/index.html.haml
 - views/instances/show.xml.haml
 - views/instances/index.xml.haml
+- views/instances/new.html.haml
 - views/instances/index.html.haml
 - views/instances/show.html.haml
-- views/instances/new.html.haml
 - views/hardware_profiles/show.xml.haml
 - views/hardware_profiles/index.xml.haml
 - views/hardware_profiles/index.html.haml
@@ -327,14 +331,22 @@ files:
 - views/realms/index.xml.haml
 - views/realms/show.html.haml
 - views/realms/index.html.haml
-- views/blobs/show.html.haml
 - views/blobs/show.xml.haml
-- views/buckets/index.html.haml
+- views/blobs/new.html.haml
+- views/blobs/show.html.haml
 - views/buckets/index.xml.haml
 - views/buckets/new.html.haml
-- views/buckets/show.html.haml
 - views/buckets/show.xml.haml
-- views/tags/index.html.haml
+- views/buckets/index.html.haml
+- views/buckets/show.html.haml
+- views/load_balancers/index.xml.haml
+- views/load_balancers/new.html.haml
+- views/load_balancers/show.xml.haml
+- views/load_balancers/index.html.haml
+- views/load_balancers/show.html.haml
+- views/api/show.html.haml
+- views/api/show.xml.haml
+- views/layout.html.haml
 - views/instance_states/show.png.erb
 - public/favicon.ico
 - public/images/topbar-bg.png
@@ -344,9 +356,9 @@ files:
 - public/javascripts/jquery-1.4.2.min.js
 - public/javascripts/application.js
 - public/stylesheets/compiled/ie.css
-- public/stylesheets/compiled/application.css
 - public/stylesheets/compiled/print.css
 - public/stylesheets/compiled/screen.css
+- public/stylesheets/compiled/application.css
 - bin/deltacloudd
 - COPYING
 has_rdoc: true