You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by lu...@apache.org on 2010/07/09 01:20:45 UTC

svn commit: r962068 - /incubator/deltacloud/trunk/drivers/mock/lib/mock_driver.rb

Author: lutter
Date: Thu Jul  8 23:20:44 2010
New Revision: 962068

URL: http://svn.apache.org/viewvc?rev=962068&view=rev
Log:
Add realms into the model

Modified:
    incubator/deltacloud/trunk/drivers/mock/lib/mock_driver.rb

Modified: incubator/deltacloud/trunk/drivers/mock/lib/mock_driver.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/drivers/mock/lib/mock_driver.rb?rev=962068&r1=962067&r2=962068&view=diff
==============================================================================
--- incubator/deltacloud/trunk/drivers/mock/lib/mock_driver.rb (original)
+++ incubator/deltacloud/trunk/drivers/mock/lib/mock_driver.rb Thu Jul  8 23:20:44 2010
@@ -5,11 +5,11 @@ class MockDriver < DeltaCloud::BaseDrive
 
   ( STORAGE_ROOT = MOCK_STORAGE_ROOT ) unless defined?( STORAGE_ROOT )
 
-  # 
+  #
   # Flavors
-  # 
+  #
 
-  ( FLAVORS = [ 
+  ( FLAVORS = [
     Flavor.new({
       :id=>'m1-small',
       :memory=>1.7,
@@ -17,25 +17,25 @@ class MockDriver < DeltaCloud::BaseDrive
       :architecture=>'i386',
     }),
     Flavor.new({
-      :id=>'m1-large', 
+      :id=>'m1-large',
       :memory=>7.5,
       :storage=>850,
       :architecture=>'x86_64',
     }),
-    Flavor.new({ 
-      :id=>'m1-xlarge', 
+    Flavor.new({
+      :id=>'m1-xlarge',
       :memory=>15,
       :storage=>1690,
       :architecture=>'x86_64',
     }),
-    Flavor.new({ 
-      :id=>'c1-medium', 
+    Flavor.new({
+      :id=>'c1-medium',
       :memory=>1.7,
       :storage=>350,
       :architecture=>'x86_64',
     }),
-    Flavor.new({ 
-      :id=>'c1-xlarge', 
+    Flavor.new({
+      :id=>'c1-xlarge',
       :memory=>7,
       :storage=>1690,
       :architecture=>'x86_64',
@@ -50,17 +50,18 @@ class MockDriver < DeltaCloud::BaseDrive
     results
   end
 
-  # 
+  #
   # Images
-  # 
+  #
 
   def images(credentials, opts=nil )
     check_credentials( credentials )
+    puts(STORAGE_ROOT)
     images = []
     Dir[ "#{STORAGE_ROOT}/images/*.yml" ].each do |image_file|
       image = YAML.load( File.read( image_file ) )
       image[:id] = File.basename( image_file, ".yml" )
-      images << Image.new( image ) 
+      images << Image.new( image )
     end
     images = filter_on( images, :id, opts )
     images = filter_on( images, :architecture, opts )
@@ -72,9 +73,9 @@ class MockDriver < DeltaCloud::BaseDrive
     images.sort_by{|e| [e.owner_id,e.description]}
   end
 
-  # 
+  #
   # Instances
-  # 
+  #
 
   def instances(credentials, opts=nil)
     check_credentials( credentials )
@@ -91,7 +92,7 @@ class MockDriver < DeltaCloud::BaseDrive
     instances
   end
 
-  def create_instance(credentials, image_id, flavor_id)
+  def create_instance(credentials, image_id, opts)
     check_credentials( credentials )
     ids = Dir[ "#{STORAGE_ROOT}/instances/*.yml" ].collect{|e| File.basename( e, ".yml" )}
     next_id = ids.sort.last.succ
@@ -101,7 +102,7 @@ class MockDriver < DeltaCloud::BaseDrive
       :owner_id=>credentials[:name],
       :public_addresses=>["#{image_id}.#{next_id}.public.com"],
       :private_addresses=>["#{image_id}.#{next_id}.private.com"],
-      :flavor_id=>flavor_id,
+      :flavor_id=>opts[:flavor_id],
       :actions=>[ :reboot ],
     }
     File.open( "#{STORAGE_ROOT}/instances/#{next_id}.yml", 'w' ) {|f|
@@ -119,9 +120,9 @@ class MockDriver < DeltaCloud::BaseDrive
     FileUtils.rm( "#{STORAGE_ROOT}/instances/#{id}.yml" )
   end
 
-  # 
+  #
   # Storage Volumes
-  # 
+  #
 
   def storage_volumes(credentials, opts=nil)
     check_credentials( credentials )
@@ -137,9 +138,9 @@ class MockDriver < DeltaCloud::BaseDrive
     volumes
   end
 
-  # 
+  #
   # Storage Snapshots
-  # 
+  #
 
   def storage_snapshots(credentials, opts=nil)
     check_credentials( credentials )