fog 1.24.0 → 1.25.0

data/lib/fog/opennebula/models/compute/flavors.rb

@@ -28,6 +28,13 @@ module Fog
           nil
         end
 
+        def get_by_filter(flavor_filter)
+          data = service.template_pool(flavor_filter)
+          load(data)
+        rescue Fog::Compute::OpenNebula::NotFound
+          nil
+        end
+
       end
 
     end

data/lib/fog/opennebula/models/compute/interface.rb

@@ -16,7 +16,7 @@ module Fog
         end
  
         def vnetid
-          return ""
+          return vnet
         end
 
         def persisted?

data/lib/fog/opennebula/models/compute/network.rb

@@ -7,6 +7,7 @@ module Fog
 
         identity :id
         attribute :name
+        attribute :uname
         attribute :uid
         attribute :gid
         attribute :description

data/lib/fog/opennebula/models/compute/networks.rb

@@ -8,13 +8,17 @@ module Fog
         model Fog::Compute::OpenNebula::Network
 
         def all(filter={})
-          load(service.list_networks(filter))
+          self.get_by_filter(filter)
         end
 
         def get(id)
           self.all({:id => id}).first
         end
 
+        def get_by_filter(filter)
+          load(service.list_networks(filter))
+        end
+
       end
     end
   end

data/lib/fog/opennebula/requests/compute/list_networks.rb

@@ -6,36 +6,44 @@ module Fog
     class OpenNebula
       class Real
         def list_networks(filter = { })
-
           networks=[]
-            netpool = ::OpenNebula::VirtualNetworkPool.new(client)
-            if filter[:id].nil?
-              netpool.info!(-2,-1,-1)
-            elsif filter[:id]
-              filter[:id] = filter[:id].to_i if filter[:id].is_a?(String)
-              netpool.info!(-2, filter[:id], filter[:id])
-            end # if filter[:id].nil?
- 
+          netpool = ::OpenNebula::VirtualNetworkPool.new(client)
+          if filter[:id].nil?
+            netpool.info!(-2,-1,-1)
+          elsif filter[:id]
+            filter[:id] = filter[:id].to_i if filter[:id].is_a?(String)
+            netpool.info!(-2, filter[:id], filter[:id])
+          end # if filter[:id].nil?
+
           netpool.each do |network| 
-	    networks << network_to_attributes(network.to_hash)
-	  end
+            if filter[:network] && filter[:network].is_a?(String) && !filter[:network].empty?
+              next if network.to_hash["VNET"]["NAME"] != filter[:network]
+            end
+            if filter[:network_uname] && filter[:network_uname].is_a?(String) && !filter[:network_uname].empty?
+              next if network.to_hash["VNET"]["UNAME"] != filter[:network_uname]
+            end
+            if filter[:network_uid] && filter[:network_uid].is_a?(String) && !filter[:network_uid].empty?
+              next if network.to_hash["VNET"]["UID"] != filter[:network_uid]
+            end
+            networks << network_to_attributes(network.to_hash)
+          end
           networks
         end
 
         def network_to_attributes(net)
           return if net.nil?
-	  #{"VNET"=>{"ID"=>"155", "UID"=>"0", "GID"=>"1", "UNAME"=>"oneadmin", "GNAME"=>"users", "NAME"=>"vlan99-2", "PERMISSIONS"=>{"OWNER_U"=>"1", "OWNER_M"=>"1", "OWNER_A"=>"0", "GROUP_U"=>"1", "GROUP_M"=>"0", "GROUP_A"=>"0", "OTHER_U"=>"0", "OTHER_M"=>"0", "OTHER_A"=>"0"}, "CLUSTER_ID"=>"-1", "CLUSTER"=>{}, "TYPE"=>"0", "BRIDGE"=>"ovsbr", "VLAN"=>"1", "PHYDEV"=>{}, "VLAN_ID"=>"99", "GLOBAL_PREFIX"=>{}, "SITE_PREFIX"=>{}, "RANGE"=>{"IP_START"=>"10.10.99.127", "IP_END"=>"10.10.99.249"}, "TOTAL_LEASES"=>"0", "TEMPLATE"=>{"DESCRIPTION"=>"test", "NETWORK_ADDRESS"=>"10.10.99.0", "NETWORK_MASK"=>"255.255.255.0"}}}
           h = {
-            :id    	 => net["VNET"]["ID"],
-            :name  	 => net["VNET"]["NAME"],
-	    :uid   	 => net["VNET"]["UID"],
-	    :gid   	 => net["VNET"]["GID"],
+            :id    => net["VNET"]["ID"],
+            :name  => net["VNET"]["NAME"],
+            :uid   => net["VNET"]["UID"],
+            :uname => net["VNET"]["UNAME"],
+            :gid   => net["VNET"]["GID"],
           }
 
-	  h[:description] = net["VNET"]["TEMPLATE"]["DESCRIPTION"] unless net["VNET"]["TEMPLATE"]["DESCRIPTION"].nil?
-	  h[:vlan] 	  = net["VNET"]["VLAN_ID"] unless (net["VNET"]["VLAN_ID"].nil? || net["VNET"]["VLAN_ID"].empty?)
+          h[:description] = net["VNET"]["TEMPLATE"]["DESCRIPTION"] unless net["VNET"]["TEMPLATE"]["DESCRIPTION"].nil?
+          h[:vlan] 	      = net["VNET"]["VLAN_ID"] unless (net["VNET"]["VLAN_ID"].nil? || net["VNET"]["VLAN_ID"].empty?)
 
-	  return h
+          return h
         end
 
       end
@@ -49,12 +57,13 @@ module Fog
 
         def mock_network name
           {
-            :id    	 => "5",
-            :name  	 => name,
-	    :uid   	 => "5",
-	    :gid   	 => "5",
-	    :description => "netDescription",
-	    :vlan	 => "5"
+            :id    	     => "5",
+            :name  	     => name,
+            :uid   	     => "5",
+            :uname       => "mock",
+            :gid   	     => "5",
+            :description => "netDescription",
+            :vlan	       => "5"
           }
         end
       end

data/lib/fog/opennebula/requests/compute/template_pool.rb

@@ -41,13 +41,20 @@ module Fog
             # filtering by name
             # done here, because OpenNebula:TemplatePool does not support something like .delete_if
             if filter[:name] && filter[:name].is_a?(String) && !filter[:name].empty?
-                next if t.to_hash["VMTEMPLATE"]["NAME"] != filter[:name]
+              next if t.to_hash["VMTEMPLATE"]["NAME"] != filter[:name]
+            end
+            if filter[:uname] && filter[:uname].is_a?(String) && !filter[:uname].empty?
+              next if t.to_hash["VMTEMPLATE"]["UNAME"] != filter[:uname]
+            end
+            if filter[:uid] && filter[:uid].is_a?(String) && !filter[:uid].empty?
+              next if t.to_hash["VMTEMPLATE"]["UID"] != filter[:uid]
             end
 
             h = Hash[
               :id => t.to_hash["VMTEMPLATE"]["ID"], 
               :name => t.to_hash["VMTEMPLATE"]["NAME"], 
-              :content => t.template_str
+              :content => t.template_str,
+              :USER_VARIABLES => "" # Default if not set in template
             ]
             h.merge! t.to_hash["VMTEMPLATE"]["TEMPLATE"]
 
@@ -62,8 +69,16 @@ module Fog
               end
             elsif nics.is_a? Hash
               nics["model"] = "virtio" if nics["model"].nil?
-              nics["uuid"] = "0" if nics["uuid"].nil? # is it better is to remove this NIC?
-              h["NIC"] << interfaces.new({ :vnet => networks.get(nics["uuid"]), :model => nics["model"]})
+              #nics["uuid"] = "0" if nics["uuid"].nil? # is it better is to remove this NIC?
+              n = networks.get_by_filter({
+                :id => nics["NETWORK_ID"],
+                :network => nics["NETWORK"],
+                :network_uname => nics["NETWORK_UNAME"],
+                :network_uid => nics["NETWORK_UID"]
+              })
+              n.each do |i|
+                h["NIC"] << interfaces.new({ :vnet => i })
+              end
             else
               # should i break?
             end
@@ -85,7 +100,34 @@ module Fog
 
       class Mock
         def template_pool(filter = { })
-          [ {}, {} ]
+          [ 
+            {
+              :content => %Q{
+                NAME = mock-vm
+                MEMORY = 512
+                VCPU = 1
+                CPU = 1
+              },
+              :id => 1,
+              :name => 'mock',
+              :cpu => 1,
+              :vcpu => 1,
+              :memory => 512,
+              :sched_requirements => 'CPUSPEED > 1000',
+              :sched_rank => 'FREECPU',
+              :sched_ds_requirements => "NAME=mock",
+              :sched_ds_rank => "FREE_MB",
+              :disk => {},
+              :nic => {},
+              :os => {
+                'ARCH' => 'x86_64'
+              },
+              :graphics => {},
+              :raw => {},
+              :context => {},
+              :user_variables => {}
+            }
+          ]
         end
       end #class Mock
     end #class OpenNebula

data/lib/fog/openstack/compute.rb

@@ -203,7 +203,7 @@ module Fog
               :servers => {},
               :key_pairs => {},
               :security_groups => {
-                0 => {
+                '0' => {
                   "id"          => 0,
                   "tenant_id"   => Fog::Mock.random_hex(8),
                   "name"        => "default",
@@ -380,7 +380,7 @@ module Fog
             options = {
               :openstack_api_key    => @openstack_api_key,
               :openstack_username   => @openstack_username,
-              :openstack_auth_token => @auth_token,
+              :openstack_auth_token => @openstack_must_reauthenticate ? nil : @auth_token,
               :openstack_auth_uri   => @openstack_auth_uri,
               :openstack_region     => @openstack_region,
               :openstack_tenant     => @openstack_tenant,

data/lib/fog/openstack/docs/storage.md

@@ -268,6 +268,15 @@ directory.destroy
 
 **Note**: Directory must be empty before it can be deleted.
 
+
+## Directory URL
+
+To get a directory's URL:
+
+```ruby
+directory.public_url
+```
+
 ## List Files
 
 To list files in a directory:
@@ -384,6 +393,14 @@ File.open('germany.jpg', 'w') {|f| f.write(file_object.body) }
 **Note**: This method is more memory intensive as the entire object is loaded into memory before saving the file as in the example above.
 
 
+## File URL
+
+To get a file's URL:
+
+```ruby
+file.public_url
+```
+
 ## Metadata
 
 You can access metadata as an attribute on `Fog::Storage::Rackspace::File`.
@@ -439,3 +456,4 @@ file.destroy
 ## Support and Feedback
 
 Your feedback is appreciated! If you have specific issues with the **fog** SDK, you should file an [issue via Github](https://github.com/fog/fog/issues).
+

data/lib/fog/openstack/identity.rb

@@ -255,7 +255,7 @@ module Fog
             options = {
               :openstack_api_key  => @openstack_api_key,
               :openstack_username => @openstack_username,
-              :openstack_auth_token => @openstack_auth_token,
+              :openstack_auth_token => @openstack_must_reauthenticate ? nil : @openstack_auth_token,
               :openstack_auth_uri => @openstack_auth_uri,
               :openstack_tenant   => @openstack_tenant,
               :openstack_service_type => @openstack_service_type,

data/lib/fog/openstack/image.rb

@@ -179,7 +179,7 @@ module Fog
               :openstack_username => @openstack_username,
               :openstack_auth_uri => @openstack_auth_uri,
               :openstack_region   => @openstack_region,
-              :openstack_auth_token => @openstack_auth_token,
+              :openstack_auth_token => @openstack_must_reauthenticate ? nil : @openstack_auth_token,
               :openstack_service_type => @openstack_service_type,
               :openstack_service_name => @openstack_service_name,
               :openstack_endpoint_type => @openstack_endpoint_type

data/lib/fog/openstack/metering.rb

@@ -172,7 +172,7 @@ module Fog
               :openstack_api_key  => @openstack_api_key,
               :openstack_username => @openstack_username,
               :openstack_auth_uri => @openstack_auth_uri,
-              :openstack_auth_token => @openstack_auth_token,
+              :openstack_auth_token => @openstack_must_reauthenticate ? nil : @openstack_auth_token,
               :openstack_service_type => @openstack_service_type,
               :openstack_service_name => @openstack_service_name,
               :openstack_endpoint_type => @openstack_endpoint_type

data/lib/fog/openstack/models/compute/server.rb

@@ -131,6 +131,7 @@ module Fog
               1
             else 0 end
           }
+          all_floating.empty? ? manual : all_floating
         end
 
         alias_method :public_ip_addresses, :floating_ip_addresses

data/lib/fog/openstack/models/storage/directory.rb

@@ -9,7 +9,7 @@ module Fog
 
         attribute :bytes, :aliases => 'X-Container-Bytes-Used'
         attribute :count, :aliases => 'X-Container-Object-Count'
-        
+
         attr_writer :public
 
         def destroy
@@ -30,7 +30,13 @@ module Fog
         end
 
         def public_url
-          raise NotImplementedError
+          requires :key
+
+          @public_url ||= begin
+            service.public_url(key)
+          rescue Fog::Storage::OpenStack::NotFound => err
+            nil
+          end
         end
 
         def save

data/lib/fog/openstack/network.rb

@@ -314,7 +314,7 @@ module Fog
               :openstack_api_key  => @openstack_api_key,
               :openstack_username => @openstack_username,
               :openstack_auth_uri => @openstack_auth_uri,
-              :openstack_auth_token => @openstack_auth_token,
+              :openstack_auth_token => @openstack_must_reauthenticate ? nil : @openstack_auth_token,
               :openstack_service_type => @openstack_service_type,
               :openstack_service_name => @openstack_service_name,
               :openstack_endpoint_type => @openstack_endpoint_type,

data/lib/fog/openstack/orchestration.rb

@@ -176,7 +176,7 @@ module Fog
             options = {
               :openstack_api_key    => @openstack_api_key,
               :openstack_username   => @openstack_username,
-              :openstack_auth_token => @auth_token,
+              :openstack_auth_token => @openstack_must_reauthenticate ? nil : @auth_token,
               :openstack_auth_uri   => @openstack_auth_uri,
               :openstack_region     => @openstack_region,
               :openstack_tenant     => @openstack_tenant,

data/lib/fog/openstack/requests/compute/create_security_group.rb

@@ -23,7 +23,7 @@ module Fog
         def create_security_group(name, description)
           Fog::Identity::OpenStack.new(:openstack_auth_url => credentials[:openstack_auth_url])
           tenant_id = Fog::Identity::OpenStack::Mock.data[current_tenant][:tenants].keys.first
-          security_group_id = Fog::Mock.random_numbers(2).to_i
+          security_group_id = Fog::Mock.random_numbers(2).to_i + 1
           self.data[:security_groups][security_group_id.to_s] = {
             'tenant_id' => tenant_id,
             'rules'     => [],

data/lib/fog/openstack/requests/storage/public_url.rb

@@ -0,0 +1,28 @@
+module Fog
+  module Storage
+    class OpenStack
+      class Real
+
+        # Get public_url for an object
+        #
+        # ==== Parameters
+        # * container<~String> - Name of container to look in
+        # * object<~String> - Name of object to look for
+        #
+        def public_url(container=nil, object=nil)
+          return nil if container.nil?
+          u = "#{url}/#{Fog::OpenStack.escape(container)}"
+          u << "/#{Fog::OpenStack.escape(object)}" unless object.nil?
+          u
+        end
+
+        private
+
+        def url
+          "#{@scheme}://#{@host}:#{@port}#{@path}"
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openstack/requests/storage/put_container.rb

@@ -10,6 +10,7 @@ module Fog
         def put_container(name, options={})
           headers = options[:headers] || {}
           headers['X-Container-Read'] = '.r:*' if options[:public]
+          headers['X-Remove-Container-Read'] = 'x' if options[:public] == false
           request(
             :expects  => [201, 202],
             :method   => 'PUT',

data/lib/fog/openstack/storage.rb

@@ -36,6 +36,7 @@ module Fog
       request :put_dynamic_obj_manifest
       request :put_static_obj_manifest
       request :post_set_meta_temp_url_key
+      request :public_url
 
       class Mock
         def self.data

data/lib/fog/openstack/volume.rb

@@ -193,7 +193,7 @@ module Fog
               :openstack_api_key  => @openstack_api_key,
               :openstack_username => @openstack_username,
               :openstack_auth_uri => @openstack_auth_uri,
-              :openstack_auth_token => @openstack_auth_token,
+              :openstack_auth_token => @openstack_must_reauthenticate ? nil : @openstack_auth_token,
               :openstack_service_type => @openstack_service_type,
               :openstack_service_name => @openstack_service_name,
               :openstack_endpoint_type => @openstack_endpoint_type

data/lib/fog/ovirt/compute.rb

@@ -46,6 +46,7 @@ module Fog
       request :list_template_volumes
       request :add_volume
       request :destroy_volume
+      request :update_volume
       request :get_api_version
       request :list_quotas
       request :get_quota

data/lib/fog/ovirt/models/compute/server.rb

@@ -79,6 +79,11 @@ module Fog
           service.add_volume(id, attrs)
         end
 
+        def update_volume attrs
+          wait_for { stopped? } if attrs[:blocking]
+          service.update_volume(id, attrs)
+        end
+
         def destroy_volume attrs
           wait_for { stopped? } if attrs[:blocking]
           service.destroy_volume(id, attrs)

data/lib/fog/ovirt/requests/compute/update_volume.rb

@@ -0,0 +1,39 @@
+module Fog
+  module Compute
+    class Ovirt
+
+      module Shared
+        def check_arguments(id, options)
+          raise ArgumentError, "instance id is a required parameter" unless id
+          raise ArgumentError, "disk id is a required parameter for update-volume" unless options.has_key? :id
+        end
+      end
+
+
+      class Real
+        extend ::Fog::Compute::Ovirt::Shared
+
+        def update_volume(id, options)
+          check_arguments(id, options)
+
+          disk_id = options[:id]
+          options.delete(:id)
+
+          client.update_volume(id, disk_id, options)
+          true # If we come here, expect success and return true
+        end
+
+      end
+
+      class Mock
+        extend ::Fog::Compute::Ovirt::Shared
+
+        def update_volume(id, options)
+          check_arguments(id, options)
+          true
+        end
+      end
+
+    end
+  end
+end