deltacloud-core 1.1.2 → 1.1.3

data/lib/deltacloud/collections/addresses.rb

@@ -39,8 +39,8 @@ module Deltacloud::Collections
           status 201    # Created
           response['Location'] = address_url(@address.id)
           respond_to do |format|
-            format.xml  { haml :"addresses/show", :ugly => true }
-            format.html { haml :"addresses/_address", :layout => false }
+            format.xml  { haml :"addresses/show", :ugly => true, :locals => { :address => @address } }
+            format.html { haml :"addresses/_address", :layout => false, :locals => { :address => @address } }
             format.json { JSON::dump(:address => @address.to_hash(self)) }
           end
         end

data/lib/deltacloud/collections/buckets.rb

@@ -27,7 +27,7 @@ module Deltacloud::Collections
     get '/buckets/:bucket/%s' % NEW_BLOB_FORM_ID do
       @bucket_id = params[:bucket]
       respond_to do |format|
-        format.html {haml :"blobs/new"}
+        format.html {haml :"blobs/new", :locals=>{:bucket_id => @bucket_id} }
       end
     end
 
@@ -65,14 +65,12 @@ module Deltacloud::Collections
             report_error(400) # likely blob size < 112 KB (didn't hit streaming patch)
           end
         when "finalize" then
-          bucket_id = params[:bucket]
-          blob_id = params[:blob]
           segmented_blob_manifest = BlobHelper.extract_segmented_blob_manifest(request)
           segmented_blob_id = BlobHelper.segmented_blob_id(request)
           @blob = driver.create_blob(credentials, params[:bucket], params[:blob], nil, {:segment_manifest=>segmented_blob_manifest, :segmented_blob_id=>segmented_blob_id})
           respond_to do |format|
-            format.xml { haml :"blobs/show" }
-            format.html { haml :"blobs/show" }
+            format.xml { haml :"blobs/show", :locals => { :blob => @blob } }
+            format.html { haml :"blobs/show", :locals => { :blob => @blob } }
             format.json { xml_to_json 'blobs/show' }
           end
         else
@@ -89,8 +87,8 @@ module Deltacloud::Collections
         @blob = driver.blob(credentials, {:id => params[:blob],
                                           'bucket' => params[:bucket]})
         respond_to do |format|
-          format.xml { haml :"blobs/show" }
-          format.html { haml :"blobs/show" }
+          format.xml { haml :"blobs/show", :locals => { :blob => @blob } }
+          format.html { haml :"blobs/show", :locals => { :blob => @blob } }
           format.json { JSON::dump(:blob => @blob.to_hash(self) ) }
         end
       elsif(env["BLOB_FAIL"])
@@ -108,8 +106,8 @@ module Deltacloud::Collections
         @blob = driver.create_blob(credentials, bucket_id, blob_id, blob_data, user_meta)
         temp_file.delete
         respond_to do |format|
-          format.xml { haml :"blobs/show" }
-          format.html { haml :"blobs/show" }
+          format.xml  { haml :"blobs/show", :locals => { :blob => @blob } }
+          format.html { haml :"blobs/show", :locals => { :blob => @blob } }
           format.json { JSON::dump(:blob => @blob.to_hash(self)) }
         end
       end
@@ -128,7 +126,7 @@ module Deltacloud::Collections
           status 201
           response['Location'] = bucket_url(@bucket.id)
           respond_to do |format|
-            format.xml  { haml :"buckets/show" }
+            format.xml  { haml :"buckets/show", :locals=> { :bucket => @bucket } }
             format.json { JSON::dump(:bucket => @bucket.to_hash(self)) }
             format.html do
               redirect bucket_url(@bucket.id) if @bucket and @bucket.id
@@ -158,8 +156,8 @@ module Deltacloud::Collections
             @blob = driver.blob(credentials, { :id => params[:blob_id], 'bucket' => params[:id]} )
             if @blob
               respond_to do |format|
-                format.xml { haml :"blobs/show" }
-                format.html { haml :"blobs/show" }
+                format.xml { haml :"blobs/show", :locals => { :blob => @blob } }
+                format.html { haml :"blobs/show", :locals => { :blob => @blob } }
                 format.json { JSON::dump(:blob => @blob.to_hash(self)) }
               end
             else
@@ -192,8 +190,8 @@ module Deltacloud::Collections
             @blob = driver.create_blob(credentials, bucket_id, blob_id, blob_data, user_meta)
             status 201
             respond_to do |format|
-              format.xml { haml :"blobs/show" }
-              format.html { haml :"blobs/show"}
+              format.xml { haml :"blobs/show", :locals => { :blob => @blob } }
+              format.html { haml :"blobs/show", :locals => { :blob => @blob }}
               format.json { JSON::dump(:blob => @blob.to_hash(self)) }
             end
           end
@@ -225,8 +223,8 @@ module Deltacloud::Collections
               @blob = driver.blob(credentials, {:id => params[:blob],
                                                 'bucket' => params[:bucket]})
               respond_to do |format|
-                format.xml { haml :"blobs/show" }
-                format.html { haml :"blobs/show" }
+                format.xml { haml :"blobs/show", :locals => { :blob => @blob } }
+                format.html { haml :"blobs/show", :locals => { :blob => @blob } }
                 format.json { JSON::dump(@blob.to_hash(self)) }
               end
             elsif(env["BLOB_FAIL"])
@@ -244,8 +242,8 @@ module Deltacloud::Collections
               @blob = driver.create_blob(credentials, bucket_id, blob_id, blob_data, user_meta)
               temp_file.delete
               respond_to do |format|
-                format.xml { haml :"blobs/show" }
-                format.html { haml :"blobs/show" }
+                format.xml { haml :"blobs/show", :locals => { :blob => @blob } }
+                format.html { haml :"blobs/show", :locals => { :blob => @blob } }
                 format.json { JSON::dump(@blob.to_hash(self)) }
               end
             end

data/lib/deltacloud/collections/drivers.rb

@@ -22,9 +22,9 @@ module Deltacloud::Collections
         control do
           @drivers = Deltacloud::Drivers.driver_config
           respond_to do |format|
-            format.xml { haml :"drivers/index" }
+            format.xml { haml :"drivers/index", :locals => { :drivers => @drivers } }
             format.json { @drivers.to_json }
-            format.html { haml :"drivers/index" }
+            format.html { haml :"drivers/index", :locals => { :drivers => @drivers } }
           end
         end
       end
@@ -38,9 +38,9 @@ module Deltacloud::Collections
           @driver = Deltacloud::Drivers.driver_config[@name]
           halt 404 unless @driver
           respond_to do |format|
-            format.xml { haml :"drivers/show" }
+            format.xml { haml :"drivers/show", :locals => { :driver => @driver, :name => @name, :providers => @providers } }
             format.json { { :driver => @driver.merge(:id => params[:id]) }.to_json }
-            format.html { haml :"drivers/show" }
+            format.html { haml :"drivers/show",  :locals => { :driver => @driver, :name => @name, :providers => @providers }}
           end
         end
       end

data/lib/deltacloud/collections/firewalls.rb

@@ -25,7 +25,7 @@ module Deltacloud::Collections
     get '/firewalls/:id/new_rule' do
       @firewall_name = params[:id]
       respond_to do |format|
-        format.html {haml :"firewalls/new_rule" }
+        format.html { haml :"firewalls/new_rule", :locals => { :firewall_name => @firewall_name } }
       end
     end
 
@@ -64,8 +64,8 @@ module Deltacloud::Collections
           status 201  # Created
           response['Location'] = firewall_url(@firewall.id)
           respond_to do |format|
-            format.xml  { haml :"firewalls/show" }
-            format.html { haml :"firewalls/show" }
+            format.xml  { haml :"firewalls/show", :locals => { :firewall => @firewall } }
+            format.html { haml :"firewalls/show", :locals => { :firewall => @firewall } }
             format.json { JSON::dump(:firewall => @firewall.to_hash(self)) }
           end
         end
@@ -107,8 +107,8 @@ module Deltacloud::Collections
           @firewall = driver.firewall(credentials, {:id => params[:id]})
           status 201
           respond_to do |format|
-            format.xml  { haml :"firewalls/show" }
-            format.html { haml :"firewalls/show" }
+            format.xml  { haml :"firewalls/show", :locals => { :firewall => @firewall} }
+            format.html { haml :"firewalls/show", :locals => { :firewall => @firewall} }
             format.json { JSON::dump(:firewall => @firewall.to_hash(self) ) }
           end
         end

data/lib/deltacloud/collections/images.rb

@@ -23,7 +23,7 @@ module Deltacloud::Collections
 
     new_route_for :images do
       halt 404 unless params[:instance_id]
-      @instance = Deltacloud::Instance.new( :id => params[:instance_id] )
+      @opts[:instance] = Deltacloud::Instance.new( :id => params[:instance_id] )
     end
 
     collection :images do
@@ -49,9 +49,9 @@ module Deltacloud::Collections
           status 201  # Created
           response['Location'] = image_url(@image.id)
           respond_to do |format|
-            format.xml  { haml :"images/show" }
+            format.xml  { haml :"images/show", :locals => { :image => @image } }
             format.json { JSON::dump(:image => @image.to_hash(self)) }
-            format.html { haml :"images/show" }
+            format.html { haml :"images/show", :locals => { :image => @image } }
           end
         end
       end

data/lib/deltacloud/collections/instance_states.rb

@@ -26,7 +26,7 @@ module Deltacloud::Collections
         control do
           @machine = driver.instance_state_machine
           respond_to do |format|
-            format.xml { haml :'instance_states/show', :layout => false }
+            format.xml { haml :'instance_states/show', :layout => false, :locals => { :machine => @machine } }
             format.json do
               out = []
               @machine.states.each do |state|
@@ -37,12 +37,12 @@ module Deltacloud::Collections
               end
               out.to_json
             end
-            format.html { haml :'instance_states/show'}
-            format.gv { erb :"instance_states/show" }
+            format.html { haml :'instance_states/show', :locals => { :machine => @machine }}
+            format.gv { erb :"instance_states/show", :locals => { :machine => @machine } }
             format.png do
               # Trick respond_to into looking up the right template for the
               # graphviz file
-              gv = erb(:"instance_states/show")
+              gv = erb(:"instance_states/show", :locals => { :machine => @machine })
               png =  ''
               cmd = 'dot -Kdot -Gpad="0.2,0.2" -Gsize="5.0,8.0" -Gdpi="180" -Tpng'
               ::Open3.popen3( cmd ) do |stdin, stdout, stderr|

data/lib/deltacloud/collections/instances.rb

@@ -22,19 +22,28 @@ module Deltacloud::Collections
     check_features :for => lambda { |c, f| driver.class.has_feature?(c, f) }
 
     new_route_for(:instances) do
-      @instance = Deltacloud::Instance.new( { :id=>params[:id], :image_id=>params[:image_id] } )
-      @image   = driver.image(credentials, :id => params[:image_id])
-      @hardware_profiles = driver.hardware_profiles(credentials, :architecture => @image.architecture )
-      @realms = [Deltacloud::Realm.new(:id => params[:realm_id])] if params[:realm_id]
-      @realms ||= driver.realms(credentials)
-      @firewalls = driver.firewalls(credentials) if driver.class.has_feature? :instances, :firewalls
-      @keys = driver.keys(credentials) if driver.class.has_feature? :instances, :authentication_key
+      @opts = {
+        :instance => Deltacloud::Instance.new(:id=>params[:id], :image_id=>params[:image_id]),
+      }
+      @opts[:image] = driver.image(credentials, :id => params[:image_id])
+      @opts[:hardware_profiles] = @opts[:image].hardware_profiles
+      if params[:realm_id]
+        @opts[:realms] = [ Deltacloud::Realm.new(:id => params[:realm_id]) ] if params[:realm_id]
+      else
+        @opts[:realms] = driver.realms(credentials)
+      end
+      if driver.class.has_feature?(:instances, :firewalls)
+        @opts[:firewalls] = driver.firewalls(credentials)
+      end
+      if driver.class.has_feature?(:instances, :authentication_key)
+        @opts[:keys] = driver.keys(credentials)
+      end
     end
 
     get '/instances/:id/run' do
       respond_to do |format|
         @instance = driver.instances(credentials, :id => params[:id]).first
-        format.html {haml :"instances/run_command" }
+        format.html {haml :"instances/run_command", :locals => @instance }
       end
     end
 
@@ -59,7 +68,7 @@ module Deltacloud::Collections
           end
           status 201  # Created
           respond_to do |format|
-            format.xml  { haml :"instances/#{action_handler}" }
+            format.xml  { haml :"instances/#{action_handler}", :locals => {:instance=>@instance} }
             format.json do
               if @elements
                 JSON::dump(:instances => @elements.map { |i| i.to_hash(self) })
@@ -69,10 +78,10 @@ module Deltacloud::Collections
             end
             format.html do
               if @elements
-                haml :"instances/index"
+                haml :"instances/index", :locals => { :elements => @elements }
               elsif @instance and @instance.id
                 response['Location'] = instance_url(@instance.id)
-                haml :"instances/show"
+                haml :"instances/show", :locals => { :instance => @instance }
               else
                 redirect instances_url
               end
@@ -113,8 +122,8 @@ module Deltacloud::Collections
         control do
           @output = driver.run_on_instance(credentials, params)
           respond_to do |format|
-            format.xml { haml :"instances/run" }
-            format.html { haml :"instances/run" }
+            format.xml { haml :"instances/run", :locals => { :output => @output } }
+            format.html { haml :"instances/run", :locals => { :output => @output } }
             format.json { JSON::dump({:instance => { :id => params[:id], :public_address => @output.ssh.network.ip, :command => @output.ssh.command, :output => @output.body}})}
           end
         end

data/lib/deltacloud/collections/keys.rb

@@ -40,8 +40,8 @@ module Deltacloud::Collections
           status 201
           response['Location'] = key_url(@key.id)
           respond_to do |format|
-            format.xml  { haml :"keys/show", :ugly => true }
-            format.html { haml :"keys/show" }
+            format.xml  { haml :"keys/show", :ugly => true, :locals => { :key => @key } }
+            format.html { haml :"keys/show", :locals => { :key => @key } }
             format.json { JSON::dump(:key => @key.to_hash(self)) }
           end
         end

data/lib/deltacloud/collections/load_balancers.rb

@@ -19,7 +19,7 @@ module Deltacloud::Collections
     set :capability, lambda { |m| driver.respond_to? m }
 
     new_route_for :load_balancers do
-      @realms = driver.realms(credentials)
+      @opts[:realms] = driver.realms(credentials)
     end
 
     collection :load_balancers do
@@ -30,19 +30,22 @@ module Deltacloud::Collections
       operation :show, :with_capability => :load_balancer do
         param :id, :string, :required
         control do
-          @load_balancer = driver.load_balancer(credentials, params)
-          @registered_instances = @load_balancer.instances.collect{|i| {:id => i.id, :name=> i.name}}
-          # if provider supports realm_filter and load balancer has only one realm (which is mostly the case), use optimization:
-          if @load_balancer.realms.size == 1 and driver.class.has_feature?(:instances, :realm_filter)
-            all_instances = driver.instances(credentials, :realm_id => @load_balancer.realms.first.id).collect{|i| {:id => i.id, :name => i.name}}
-          elsif
+          vars = {}
+          vars[:load_balancer] = driver.load_balancer(credentials, params)
+          vars[:registered_instances] = vars[:load_balancer].instances.map{ |i| {:id => i.id, :name=> i.name} }
+          # If provider supports realm_filter and load balancer has only one realm (which is mostly the case), use optimization:
+          if vars[:load_balancer].realms.size == 1 and driver.class.has_feature?(:instances, :realm_filter)
+            all_instances = driver.instances(credentials, :realm_id => vars[:load_balancer].realms.first.id).collect{ |i|
+              { :id => i.id, :name => i.name }
+            }
+          else
             all_instances = driver.instances(credentials).collect{|i| {:id => i.id, :name => i.name} }
           end
-          @unregistered_instances = all_instances - @registered_instances
+          vars[:unregistered_instances] = all_instances - vars[:registered_instances]
           respond_to do |format|
-            format.xml { haml :'load_balancers/show' }
+            format.xml { haml :'load_balancers/show', :locals => vars }
             format.json { JSON::dump(:load_balancer => @load_balancer.to_hash(self)) }
-            format.html { haml :'load_balancers/show' }
+            format.html { haml :'load_balancers/show', :locals => vars }
           end
         end
       end
@@ -58,7 +61,7 @@ module Deltacloud::Collections
           status 201  # Created
           response['Location'] = load_balancer_url(@load_balancer.id)
           respond_to do |format|
-            format.xml  { haml :"load_balancers/show" }
+            format.xml  { haml :"load_balancers/show", :locals => { :load_balancer => @load_balancer } }
             format.json { JSON::dump(:load_balancer => @load_balancer.to_hash(self)) }
             format.html { redirect load_balancer_url(@load_balancer.id)}
           end
@@ -72,7 +75,7 @@ module Deltacloud::Collections
           driver.lb_register_instance(credentials, params)
           @load_balancer = driver.load_balancer(credentials, :id => params[:id])
           respond_to do |format|
-            format.xml { haml :'load_balancers/show' }
+            format.xml { haml :'load_balancers/show', :locals => { :load_balancer => @load_balancer } }
             format.json { JSON::dump(:load_balancer => @load_balancer.to_hash(self) ) }
             format.html { redirect load_balancer_url(@load_balancer.id)}
           end
@@ -86,7 +89,7 @@ module Deltacloud::Collections
           driver.lb_unregister_instance(credentials, params)
           @load_balancer = driver.load_balancer(credentials, :id => params[:id])
           respond_to do |format|
-            format.xml { haml :'load_balancers/show' }
+            format.xml { haml :'load_balancers/show', :locals => { :load_balancer => @load_balancer } }
             format.json { JSON::dump(:load_balancer => @load_balancer.to_hash(self)) }
             format.html { redirect load_balancer_url(@load_balancer.id) }
           end

data/lib/deltacloud/collections/storage_snapshots.rb

@@ -34,9 +34,9 @@ module Deltacloud::Collections
           status 201  # Created
           response['Location'] = storage_snapshot_url(@storage_snapshot.id)
           respond_to do |format|
-            format.xml { haml :"storage_snapshots/show" }
-            format.html { haml :"storage_snapshots/show" }
-            format.json { xml_to_json "storage_snapshots/show" }
+            format.xml { haml :"storage_snapshots/show", :locals => { :storage_snapshot => @storage_snapshot } }
+            format.html { haml :"storage_snapshots/show", :locals => { :storage_snapshot => @storage_snapshot } }
+            format.json { JSON::dump(:storage_snapshot => @storage_snapshot.to_hash(self)) }
           end
         end
       end

data/lib/deltacloud/collections/storage_volumes.rb

@@ -24,7 +24,7 @@ module Deltacloud::Collections
     new_route_for(:storage_volumes)
 
     get "/storage_volumes/:id/attach_instance" do
-      @instances = driver.instances(credentials)
+      @opts[:instances] = driver.instances(credentials)
       respond_to do |format|
         format.html{ haml :"storage_volumes/attach"}
       end
@@ -46,8 +46,8 @@ module Deltacloud::Collections
           status 201
           response['Location'] = storage_volume_url(@storage_volume.id)
           respond_to do |format|
-            format.xml  { haml :"storage_volumes/show" }
-            format.html { haml :"storage_volumes/show" }
+            format.xml  { haml :"storage_volumes/show", :locals => { :storage_volume => @storage_volume } }
+            format.html { haml :"storage_volumes/show", :locals => { :storage_volume => @storage_volume } }
             format.json { JSON::dump(:storage_volume => @storage_volume.to_hash(self)) }
           end
         end
@@ -62,7 +62,7 @@ module Deltacloud::Collections
           status 202
           respond_to do |format|
             format.html { redirect(storage_volume_url(params[:id]))}
-            format.xml  { haml :"storage_volumes/show" }
+            format.xml  { haml :"storage_volumes/show", :locals => { :storage_volume => @storage_volume } }
             format.json { JSON::dump(:storage_volume => @storage_volume.to_hash(self)) }
           end
         end
@@ -78,7 +78,7 @@ module Deltacloud::Collections
           status 202
           respond_to do |format|
             format.html { redirect(storage_volume_url(params[:id]))}
-            format.xml  { haml :"storage_volumes/show" }
+            format.xml  { haml :"storage_volumes/show", :locals => { :storage_volume => @storage_volume } }
             format.json { JSON::dump(:storage_volume => @storage_volume.to_hash(self)) }
           end
         end

data/lib/deltacloud/core_ext/ordered_hash.rb

@@ -1,9 +1,5 @@
 # Code from ActiveSupport, https://github.com/rails/rails/tree/3-2-stable/activesupport
 # MIT licensed
-begin
-  require 'psych'
-rescue LoadError
-end
 
 require 'yaml'
 

data/lib/deltacloud/drivers/fgcp/fgcp_client.rb

@@ -82,6 +82,10 @@ class FgcpClient
     request('ListVSYS')
   end
 
+  def get_vsys_status(vsys_id)
+    request('GetVSYSStatus', {'vsysId' => vsys_id})
+  end
+
   def get_vsys_attributes(vsys_id)
     request('GetVSYSAttributes', {'vsysId' => vsys_id})
   end
@@ -94,6 +98,10 @@ class FgcpClient
     request('ListVSYSDescriptor')
   end
 
+  def get_vsys_descriptor_configuration(vsys_descriptor_id)
+    request('GetVSYSDescriptorConfiguration', {'vsysDescriptorId' => vsys_descriptor_id})
+  end
+
   def list_vservers(vsys_id)
     request('ListVServer', {'vsysId' => vsys_id})
   end

data/lib/deltacloud/drivers/fgcp/fgcp_driver.rb

@@ -516,7 +516,8 @@ class FgcpDriver < Deltacloud::BaseDriver
               vdisks['vdisk'].each do |vdisk|
 
                 #state requires an additional call per volume. Only set if attached.
-                #exclude system disks as they are not detachable?
+                #exclude system disks as they are instance disks, not volumes
+                kind = determine_storage_type(vdisk['vdiskId'][0])
                 volumes << StorageVolume.new(
                   :id          => vdisk['vdiskId'][0],
                   :name        => vdisk['vdiskName'][0],
@@ -524,9 +525,9 @@ class FgcpDriver < Deltacloud::BaseDriver
                   :instance_id => vdisk['attachedTo'].nil? ? nil : vdisk['attachedTo'][0],
                   :realm_id    => client.extract_vsys_id(vdisk['vdiskId'][0]),
                   # aligning with rhevm, which returns 'system' or 'data'
-                  :kind        => determine_storage_type(vdisk['vdiskId'][0]),
+                  :kind        => kind,
                   :state       => vdisk['attachedTo'].nil? ? 'AVAILABLE' : 'IN-USE'
-                )
+                ) unless kind == 'system'
               end
             end
           rescue Exception => ex # cater for case where vsys was just destroyed since list_vsys call