deltacloud-core 0.0.2 → 0.0.3

data/views/errors/not_found.html.haml

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

data/views/errors/not_found.xml.haml

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

data/views/hardware_profiles/index.xml.haml

@@ -1,4 +1,4 @@
 !!! XML
-%hardware-profiles
+%hardware_profiles
   - @profiles.each do |prof|
     = haml :'hardware_profiles/show', :locals => { :@profile => prof, :partial => true }

data/views/hardware_profiles/show.xml.haml

@@ -1,7 +1,8 @@
 - unless defined?(partial)
   !!! XML
-%hardware-profile{ :href => hardware_profile_url(@profile.name) }
-  %id= @profile.name
+%hardware_profile{ :href => hardware_profile_url(@profile.name), :id => @profile.name }
+  %name<
+    =@profile.name
   - @profile.each_property do |prop|
     - attr = { :name => prop.name, :kind => prop.kind, :unit => prop.unit }
     - if prop.kind == :fixed

data/views/images/index.xml.haml

@@ -1,7 +1,8 @@
 !!! XML
 %images
   - @elements.each do |image|
-    %image{:href => image_url(image.id)}
-      - image.attributes.each do |attribute|
-        - haml_tag(attribute, :<) do
+    %image{:href => image_url(image.id), :id => image.id}
+      - image.attributes.select{ |attr| attr!=:id }.each do |attribute|
+        - haml_tag("#{attribute}".tr('-', '_'), :<) do
           - haml_concat image.send(attribute)
+

data/views/images/show.xml.haml

@@ -1,5 +1,5 @@
 !!! XML
-%image{:href => image_url(@image.id)}
-  - @image.attributes.each do |attribute|
+%image{:href => image_url(@image.id), :id => @image.id}
+  - @image.attributes.select{ |attr| attr!=:id }.each do |attribute|
     - haml_tag(attribute, :<) do
       - haml_concat @image.send(attribute)

data/views/instances/index.xml.haml

@@ -1,23 +1,21 @@
 !!! XML
 %instances
   - @elements.each do |instance|
-    %instance{:href => instance_url(instance.id)}
-      %id #{instance.id}
+    %instance{:href => instance_url(instance.id), :id => instance.id}
       %name #{instance.name}
       %owner_id #{instance.owner_id}
-      %image{:href => image_url(instance.image_id)}
-      %realm{:href => realm_url(instance.realm_id)}
+      %image{:href => image_url(instance.image_id), :id => instance.image_id }
+      %realm{:href => realm_url(instance.realm_id), :id => instance.realm_id }
       %state #{instance.state}
-      - haml_tag :"hardware-profile", { :href => hardware_profile_url(instance.instance_profile.id)} do
-        %id #{instance.instance_profile.id}
+      - haml_tag :"hardware_profile", { :id => instance.instance_profile.id, :href => hardware_profile_url(instance.instance_profile.id)} do
         - instance.instance_profile.overrides.each do |p, v|
           %property{:kind => 'fixed', :name => p, :value => v, :unit => Deltacloud::HardwareProfile::unit(p)}
       %actions
         - instance.actions.compact.each do |action|
           %link{:rel => action, :href => self.send("#{action}_instance_url", instance.id), :method => instance_action_method(action)}
-      %public-addresses
+      %public_addresses
         - instance.public_addresses.each do |address|
           %address  #{address}
-      %private-addresses
+      %private_addresses
         - instance.private_addresses.each do |address|
           %address  #{address}

data/views/instances/show.xml.haml

@@ -1,28 +1,27 @@
 !!! XML
-%instance{:href => instance_url(@instance.id)}
-  %id<
-    =@instance.id
+%instance{:href => instance_url(@instance.id), :id => @instance.id}
   %name<
     =@instance.name
   %owner_id<
     =@instance.owner_id
-  %image{:href => image_url(@instance.image_id)}
-  %realm{:href => realm_url(@instance.realm_id)}
+  %image{:href => image_url(@instance.image_id), :id => @instance.image_id }
+  %realm{:href => realm_url(@instance.realm_id), :id => @instance.realm_id }
   %state<
     =@instance.state
-  - haml_tag :"hardware-profile", {:href => hardware_profile_url(@instance.instance_profile.id)} do
-    %id<
-      =@instance.instance_profile.id
+  - haml_tag :"hardware_profile", {:id => @instance.instance_profile.id, :href => hardware_profile_url(@instance.instance_profile.id)} do
     - @instance.instance_profile.overrides.each do |p, v|
       %property{:kind => 'fixed', :name => p, :value => v, :unit => Deltacloud::HardwareProfile::unit(p)}
   %actions
     - @instance.actions.compact.each do |instance_action|
       %link{:rel => instance_action, :method => instance_action_method(instance_action), :href => self.send("#{instance_action}_instance_url", @instance.id)}
-  %public-addresses
+  - if @instance.instance_variables.include?("@launch_time")
+    %launch_time<
+      =@instance.launch_time
+  %public_addresses
     - @instance.public_addresses.each do |address|
       %address<
         =address
-  %private-addresses
+  %private_addresses
     - @instance.private_addresses.each do |address|
       %address<
         =address

data/views/realms/index.xml.haml

@@ -1,9 +1,7 @@
 !!!XML
 %realms
   - @elements.each do |realm|
-    %realm{:href => realm_url(realm.id)}
-      %id<
-        =realm.id
+    %realm{:href => realm_url(realm.id), :id => realm.id }
       %name<
         =realm.name
       %state<

data/views/realms/show.xml.haml

@@ -1,10 +1,9 @@
 !!!XML
-%realm{:href => realm_url(@realm.id)}
-  %id<
-    =@realm.id
+%realm{:href => realm_url(@realm.id), :id => @realm.id }
   %name<
     =@realm.name
   %state<
     =@realm.state
-  %limit<
-    =@realm.limit.eql?(:unlimited) ? '' : @realm.limit
+  - unless @realm.limit.eql?(:unlimited)
+    %limit<
+      =@realm.limit

data/views/storage_snapshots/index.xml.haml

@@ -1,11 +1,9 @@
 !!!XML
-%storage-snapshots
+%storage_snapshots
   - @elements.each do |snapshot|
-    %storage-snapshot{ :href => storage_snapshot_url(snapshot.id)}
-      %id<
-        =snapshot.id
+    %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)}
+      %storage_volume{ :href => storage_volume_url(snapshot.storage_volume_id), :id => snapshot.storage_volume_id }

data/views/storage_snapshots/show.xml.haml

@@ -1,9 +1,7 @@
 !!!XML
-%storage-snapshot{:href => storage_snapshot_url(@storage_snapshot.id)}
-  %id<
-    =@storage_snapshot.id
+%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)}
+  %storage_volume{:href => storage_volume_url(@storage_snapshot.storage_volume_id), :id => @storage_snapshot.storage_volume_id}

data/views/storage_volumes/index.xml.haml

@@ -1,13 +1,13 @@
 !!!XML
-%storage-volumes
+%storage_volumes
   - @elements.each do |volume|
-    %storage-volume{ :href => storage_volume_url(volume.id)}
-      %id<
-        =volume.id
+    %storage_volume{ :href => storage_volume_url(volume.id), :id => volume.id }
       %created<
         =volume.created
       %capacity<
         =volume.capacity
-      %device<
-        =volume.device
-      %instance{:href => volume.instance_id}
+      - unless volume.device.nil?
+        %device<
+          =volume.device
+      - unless volume.instance_id.nil?
+        %instance{:href => instance_url(volume.instance_id), :id => volume.instance_id}

data/views/storage_volumes/show.xml.haml

@@ -1,7 +1,5 @@
 !!!XML
-%storage-volume{ :href => storage_volume_url(@storage_volume.id)}
-  %id<
-    =@storage_volume.id
+%storage_volume{ :href => storage_volume_url(@storage_volume.id), :id => @storage_volume.id}
   %created<
     =@storage_volume.created
   %capacity<
@@ -10,4 +8,4 @@
     =@storage_volume.device
   %state<
     =@storage_volume.state
-  %instance{:href => @storage_volume.instance_id}
+  %instance{:href => @storage_volume.instance_id, :id => @storage_volume.instance_id}

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: deltacloud-core
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
+  prerelease: false
+  segments: 
+  - 0
+  - 0
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Red Hat, Inc.
@@ -9,139 +14,191 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-09 00:00:00 +02:00
+date: 2010-07-22 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: eventmachine
+  name: rake
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: eventmachine
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 12
+        - 10
         version: 0.12.10
-    version: 
+  type: :runtime
+  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   name: haml
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 2
+        - 17
         version: 2.2.17
-    version: 
+  type: :runtime
+  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
   name: sinatra
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 4
         version: 0.9.4
-    version: 
+  type: :runtime
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
-    version: 
+  type: :runtime
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   name: thin
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 2
+        - 5
         version: 1.2.5
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: json
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.2.3
-    version: 
+  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
   name: rerun
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 2
         version: 0.5.2
-    version: 
+  type: :runtime
+  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rake
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: json
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.8.7
-    version: 
+        segments: 
+        - 1
+        - 2
+        - 3
+        version: 1.2.3
+  type: :runtime
+  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
   name: compass
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 8
+        - 17
         version: 0.8.17
-    version: 
+  type: :development
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: nokogiri
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 1
         version: 1.4.1
-    version: 
+  type: :development
+  version_requirements: *id010
 - !ruby/object:Gem::Dependency 
   name: rack-test
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 5
+        - 3
         version: 0.5.3
-    version: 
+  type: :development
+  version_requirements: *id011
 - !ruby/object:Gem::Dependency 
   name: cucumber
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 6
+        - 3
         version: 0.6.3
-    version: 
+  type: :development
+  version_requirements: *id012
 - !ruby/object:Gem::Dependency 
   name: rcov
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id013 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 8
         version: 0.9.8
-    version: 
+  type: :development
+  version_requirements: *id013
 description: "    The Deltacloud API is built as a service-based REST API.\n    You do not directly link a Deltacloud library into your program to use it.\n    Instead, a client speaks the Deltacloud API over HTTP to a server\n    which implements the REST interface.\n"
 email: deltacloud-users@lists.fedorahosted.org
 executables: 
@@ -153,11 +210,10 @@ extra_rdoc_files:
 files: 
 - Rakefile
 - config.ru
-- server.rb
 - deltacloud.rb
+- server.rb
 - support/fedora/deltacloudd
 - support/fedora/rubygem-deltacloud-core.spec
-- lib/drivers.rb
 - lib/deltacloud/base_driver.rb
 - lib/deltacloud/base_driver/base_driver.rb
 - lib/deltacloud/base_driver/features.rb
@@ -173,30 +229,43 @@ files:
 - lib/deltacloud/drivers/rackspace/rackspace_client.rb
 - lib/deltacloud/drivers/rackspace/rackspace_driver.rb
 - lib/deltacloud/drivers/rhevm/rhevm_driver.rb
-- lib/deltacloud/drivers/terremark/terremark_driver.rb
 - lib/deltacloud/drivers/rimuhosting/rimuhosting_client.rb
 - lib/deltacloud/drivers/rimuhosting/rimuhosting_driver.rb
+- lib/deltacloud/drivers/terremark/terremark_driver.rb
 - lib/deltacloud/hardware_profile.rb
 - lib/deltacloud/helpers.rb
 - lib/deltacloud/helpers/application_helper.rb
 - lib/deltacloud/helpers/conversion_helper.rb
 - lib/deltacloud/helpers/hardware_profiles_helper.rb
+- lib/deltacloud/method_serializer.rb
 - lib/deltacloud/models/base_model.rb
-- lib/deltacloud/models/instance.rb
 - lib/deltacloud/models/image.rb
+- lib/deltacloud/models/instance.rb
+- lib/deltacloud/models/instance_profile.rb
 - lib/deltacloud/models/realm.rb
 - lib/deltacloud/models/storage_snapshot.rb
 - lib/deltacloud/models/storage_volume.rb
-- lib/deltacloud/models/instance_profile.rb
 - lib/deltacloud/state_machine.rb
 - lib/deltacloud/validation.rb
-- lib/deltacloud/method_serializer.rb
+- lib/drivers.rb
+- lib/sinatra/accept_media_types.rb
 - lib/sinatra/lazy_auth.rb
 - lib/sinatra/rabbit.rb
 - lib/sinatra/respond_to.rb
 - lib/sinatra/static_assets.rb
 - lib/sinatra/url_for.rb
-- lib/sinatra/accept_media_types.rb
+- lib/deltacloud/drivers/mock/data/images/img1.yml
+- lib/deltacloud/drivers/mock/data/images/img2.yml
+- lib/deltacloud/drivers/mock/data/images/img3.yml
+- lib/deltacloud/drivers/mock/data/instances/inst0.yml
+- lib/deltacloud/drivers/mock/data/instances/inst1.yml
+- lib/deltacloud/drivers/mock/data/instances/inst2.yml
+- lib/deltacloud/drivers/mock/data/storage_snapshots/snap1.yml
+- lib/deltacloud/drivers/mock/data/storage_snapshots/snap2.yml
+- lib/deltacloud/drivers/mock/data/storage_snapshots/snap3.yml
+- lib/deltacloud/drivers/mock/data/storage_volumes/vol1.yml
+- lib/deltacloud/drivers/mock/data/storage_volumes/vol2.yml
+- lib/deltacloud/drivers/mock/data/storage_volumes/vol3.yml
 - views/accounts/index.html.haml
 - views/accounts/show.html.haml
 - views/api/show.html.haml
@@ -213,34 +282,36 @@ files:
 - views/errors/backend_error.xml.haml
 - views/errors/validation_failure.html.haml
 - views/errors/validation_failure.xml.haml
+- views/errors/not_found.html.haml
+- views/errors/not_found.xml.haml
 - views/hardware_profiles/index.html.haml
-- views/hardware_profiles/show.html.haml
 - views/hardware_profiles/index.xml.haml
+- views/hardware_profiles/show.html.haml
 - views/hardware_profiles/show.xml.haml
 - views/images/index.html.haml
-- views/images/show.html.haml
 - views/images/index.xml.haml
+- views/images/show.html.haml
 - views/images/show.xml.haml
 - views/instance_states/show.html.haml
 - views/instance_states/show.xml.haml
 - views/instances/index.html.haml
+- views/instances/index.xml.haml
 - views/instances/new.html.haml
 - views/instances/show.html.haml
-- views/instances/index.xml.haml
 - views/instances/show.xml.haml
 - views/layout.html.haml
 - views/realms/index.html.haml
-- views/realms/show.html.haml
 - views/realms/index.xml.haml
+- views/realms/show.html.haml
 - views/realms/show.xml.haml
 - views/root/index.html.haml
 - views/storage_snapshots/index.html.haml
-- views/storage_snapshots/show.html.haml
 - views/storage_snapshots/index.xml.haml
+- views/storage_snapshots/show.html.haml
 - views/storage_snapshots/show.xml.haml
 - views/storage_volumes/index.html.haml
-- views/storage_volumes/show.html.haml
 - views/storage_volumes/index.xml.haml
+- views/storage_volumes/show.html.haml
 - views/storage_volumes/show.xml.haml
 - views/instance_states/show.gv.erb
 - public/favicon.ico
@@ -269,25 +340,29 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 1
+      - 8
+      - 1
       version: 1.8.1
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
 summary: Deltacloud REST API
 test_files: 
-- tests/deltacloud_test.rb
+- tests/realms_test.rb
 - tests/images_test.rb
 - tests/instances_test.rb
-- tests/realms_test.rb
-- tests/storage_snapshots_test.rb
-- tests/storage_volumes_test.rb
+- tests/api_test.rb
+- tests/hardware_profiles_test.rb
+- tests/instance_states_test.rb