fog 1.11.1 → 1.12.0

data/lib/fog/openstack/requests/network/update_lb_member.rb

@@ -0,0 +1,41 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def update_lb_member(member_id, options = {})
+          data = { 'member' => {} }
+
+          vanilla_options = [:pool_id, :weight, :admin_state_up]
+          vanilla_options.select{ |o| options.has_key?(o) }.each do |key|
+            data['member'][key] = options[key]
+          end
+
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => 200,
+            :method  => 'PUT',
+            :path    => "lb/members/#{member_id}"
+          )
+        end
+      end
+
+      class Mock
+        def update_lb_member(member_id, options = {})
+          response = Excon::Response.new
+          if member = list_lb_members.body['members'].detect { |_| _['id'] == member_id }
+            member['pool_id']        = options[:pool_id]
+            member['weight']         = options[:weight]
+            member['admin_state_up'] = options[:admin_state_up]
+            response.body = { 'member' => member }
+            response.status = 200
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/openstack/requests/network/update_lb_pool.rb

@@ -0,0 +1,42 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def update_lb_pool(pool_id, options = {})
+          data = { 'pool' => {} }
+
+          vanilla_options = [:name, :description, :lb_method, :admin_state_up]
+          vanilla_options.select{ |o| options.has_key?(o) }.each do |key|
+            data['pool'][key] = options[key]
+          end
+
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => 200,
+            :method  => 'PUT',
+            :path    => "lb/pools/#{pool_id}"
+          )
+        end
+      end
+
+      class Mock
+        def update_lb_pool(pool_id, options = {})
+          response = Excon::Response.new
+          if pool = list_lb_pools.body['pools'].detect { |_| _['id'] == pool_id }
+            pool['name']            = options[:name]
+            pool['description']     = options[:description]
+            pool['lb_method']       = options[:lb_method]
+            pool['admin_state_up']  = options[:admin_state_up]
+            response.body = { 'pool' => pool }
+            response.status = 200
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+
+    end
+  end
+end

data/lib/fog/openstack/requests/network/update_lb_vip.rb

@@ -0,0 +1,44 @@
+module Fog
+  module Network
+    class OpenStack
+
+      class Real
+        def update_lb_vip(vip_id, options = {})
+          data = { 'vip' => {} }
+
+          vanilla_options = [:pool_id, :name, :description, :session_persistence, :connection_limit, :admin_state_up]
+          vanilla_options.select{ |o| options.has_key?(o) }.each do |key|
+            data['vip'][key] = options[key]
+          end
+
+          request(
+            :body    => Fog::JSON.encode(data),
+            :expects => 200,
+            :method  => 'PUT',
+            :path    => "lb/vips/#{vip_id}"
+          )
+        end
+      end
+
+      class Mock
+        def update_lb_vip(vip_id, options = {})
+          response = Excon::Response.new
+          if vip = list_lb_vips.body['vips'].detect { |_| _['id'] == vip_id }
+            vip['pool_id']             = options[:pool_id]
+            vip['name']                = options[:name]
+            vip['description']         = options[:description]
+            vip['session_persistence'] = options[:session_persistence]
+            vip['connection_limit']    = options[:connection_limit]
+            vip['admin_state_up']      = options[:admin_state_up]
+            response.body = { 'vip' => vip }
+            response.status = 200
+            response
+          else
+            raise Fog::Network::OpenStack::NotFound
+          end
+        end
+      end
+
+    end
+  end
+end

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

@@ -3,17 +3,30 @@ module Fog
     class OpenStack
       class Real
 
-        # Create a new object
+        # Create a new manifest object
         #
-        # ==== Parameters
-        # * container<~String> - Name for container, should be < 256 bytes and must not contain '/'
-        # * object<~String> - Name for object
+        # Creates an object with a +X-Object-Manifest+ header that specifies the common prefix ("<container>/<prefix>")
+        # for all uploaded segments. Retrieving the manifest object streams all segments matching this prefix.
+        # Segments must sort in the order they should be concatenated. Note that any future objects stored in the container
+        # along with the segments that match the prefix will be included when retrieving the manifest object.
         #
-        def put_object_manifest(container, object)
+        # All segments must be stored in the same container, but may be in a different container than the manifest object.
+        # The default +X-Object-Manifest+ header is set to "+container+/+object+", but may be overridden in +options+
+        # to specify the prefix and/or the container where segments were stored.
+        # If overridden, names should be CGI escaped (excluding spaces) if needed (see {Fog::Rackspace.escape}).
+        #
+        # @param container [String] Name for container where +object+ will be stored. Should be < 256 bytes and must not contain '/'
+        # @param object [String] Name for manifest object.
+        # @param options [Hash] Config headers for +object+.
+        # @option options [String] 'X-Object-Manifest' ("container/object") "<container>/<prefix>" for segment objects.
+        #
+        # @see http://docs.openstack.org/api/openstack-object-storage/1.0/content/large-object-creation.html
+        def put_object_manifest(container, object, options = {})
           path = "#{Fog::OpenStack.escape(container)}/#{Fog::OpenStack.escape(object)}"
+          headers = {'X-Object-Manifest' => path}.merge(options)
           request(
             :expects  => 201,
-            :headers  => {'X-Object-Manifest' => path},
+            :headers  => headers,
             :method   => 'PUT',
             :path     => path
           )

data/lib/fog/openstack/requests/volume/create_volume.rb

@@ -17,7 +17,7 @@ module Fog
             data['volume'][key] = options[key]
           end
           request(
-            :body     => Fog::JSON.encode(data),
+            :body     => MultiJson.encode(data),
             :expects  => [200, 202],
             :method   => 'POST',
             :path     => "volumes"

data/lib/fog/openstack/requests/volume/create_volume_snapshot.rb

@@ -14,7 +14,7 @@ module Fog
           }
 
           request(
-            :body     => Fog::JSON.encode(data),
+            :body     => MultiJson.encode(data),
             :expects  => [200, 202],
             :method   => 'POST',
             :path     => "snapshots"

data/lib/fog/openstack/volume.rb

@@ -56,6 +56,7 @@ module Fog
         end
 
         def initialize(options={})
+          require 'multi_json'
           @openstack_username = options[:openstack_username]
           @openstack_tenant   = options[:openstack_tenant]
           @openstack_auth_uri = URI.parse(options[:openstack_auth_url])
@@ -102,6 +103,8 @@ module Fog
         attr_reader :current_tenant
 
         def initialize(options={})
+          require 'multi_json'
+
           @openstack_auth_token = options[:openstack_auth_token]
 
           unless @openstack_auth_token
@@ -174,7 +177,7 @@ module Fog
             end
           end
           unless response.body.empty?
-            response.body = Fog::JSON.decode(response.body)
+            response.body = MultiJson.decode(response.body)
           end
           response
         end

data/lib/fog/openvz.rb

@@ -0,0 +1,9 @@
+require 'fog/core'
+
+module Fog
+  module Openvz
+    extend Fog::Provider
+    service(:compute, 'openvz/compute', 'Compute')
+  end
+end
+

data/lib/fog/openvz/README.md

@@ -0,0 +1,188 @@
+# Description
+The openvz provider implements a simple mapping between openvz commands and fog
+
+# Usage
+## Establish a connection
+    openvz = ::Fog::Compute.new( {:provider => 'openvz'})
+
+Additional option is **:openvz_connect_command**:
+It allows you to specify connect command to connect to the openvz server, if it's not localhost.
+
+- This is specified as a string where the '@command@' placeholder will be replaced when the commands are executed
+- The @command@ will contain double quotes, therefore make sure you use single quotes only inside the placeholder
+
+To connect to a remote ssh server myopenvzserver and sudo excute the command
+
+    openvz = ::Fog::Compute.new( {
+      :provider => 'openvz',
+      :openvz_connect_command => "ssh myopenvzserver 'sudo @command'"
+    })
+
+## List servers
+
+    openvz = ::Fog::Compute.new( {:provider => 'openvz'})
+    servers = openvz.servers.all
+    servers.each do |s|
+      puts c.ctid
+    end
+
+## Server Unique id
+Servers have the ctid as identity.
+
+## Get a specific server
+
+    openvz = ::Fog::Compute.new( {:provider => 'openvz'})
+    server = openvz.servers.get(104)
+
+## Server lifecycle
+
+    openvz = ::Fog::Compute.new( {:provider => 'openvz'})
+    # Create a server
+    server = openvz.servers.create(
+      :ctid       => '104',
+      :ostemplate => 'ubuntu-12.04-x86_64',
+      :diskspace  => 1024*1024 #in kbyte
+    )
+    server.reload
+
+    # Start a server
+    unless server.status == 'running'
+      server.start
+    end
+
+    server.set({
+      :nameserver => '8.8.8.8',
+      :ipadd => '192.168.8.10',
+      :ram => '380M',
+      :hostname => 'wonderfullserver',
+      :name => 'chef',
+      :description => 'wonderfullserver',
+      :save => true
+    })
+
+    # Reboot a server
+    server.reboot
+    sleep 3
+
+    # Get the ipaddress
+    puts "ipaddress: #{server.public_ip_address}"
+
+    server.wait_for { status == 'running' }
+
+    # Stop the server
+    server.stop
+
+    # Destroy the server
+    server.destroy
+
+## Models
+Both compute::server and computer::servers (collections) have been implemented
+
+Note:
+- server.save can only be called upon creation, use the server.set command to change the settings
+- server.public_ip_address will only return the first ip address
+- TODO: snapshots could be implemented as a collection
+- server.state has the standard openvz states.
+- server.ready? assumes server.status == 'running'
+
+## Requests
+### Passing parameters
+The server request are in essence a passthrough to __vzctl__.
+Just provide the options as a hash in key,value pairs. 
+If it's just a switch (like --save), use a key and a boolean(true).
+
+The following command in plain cli-vzctl:
+
+    vzctl set 104 --nameserver 8.8.8.8 --ipadd 192.168.8.10 --ram '380M'
+
+Would be in fog-speak:
+
+    server = openvz.servers.get(104)
+    server.set({
+      :nameserver => '8.8.8.8',
+      :ipadd      => '192.168.8.10',
+      :ram        => '380M',
+      :save       => true
+    })
+
+To specify multiple values for the same option pass an array
+
+    server.set({
+      :nameserver => ['8.8.8.8','7.7.7.7'],
+      :ipadd      => ['192.168.8.10','192.168.4.10'],
+      :ram        => '380M',
+      :save       => true
+    })
+
+### Passing arguments
+both exec, exec2 and runscript take no parameters just arguments
+
+    server = openvz.servers.get(104)
+    uname_output = server.exec("uname -a")
+
+### Not implemented
+From all the options to vzctl (see below) the following commands have **NOT** been implemented:
+
+- console : as it requires direct input
+
+## VZCTL commands
+
+the current version of the fog openvz driver is based on the following vzctl syntax
+
+    vzctl version 4.3
+    Copyright (C) 2000-2012, Parallels, Inc.
+    This program may be distributed under the terms of the GNU GPL License.
+
+    Usage: vzctl [options] <command> <ctid> [parameters]
+
+    vzctl create <ctid> [--ostemplate <name>] [--config <name>]
+       [--layout ploop|simfs] [--hostname <name>] [--name <name>] [--ipadd <addr>]
+       [--diskspace <kbytes>] [--private <path>] [--root <path>]
+       [--local_uid <UID>] [--local_gid <GID>]
+    vzctl start <ctid> [--force] [--wait]
+    vzctl destroy | mount | umount | stop | restart | status <ctid>
+    vzctl convert <ctid> [--layout ploop[:mode]] [--diskspace <kbytes>]
+    vzctl compact <ctid>
+    vzctl snapshot <ctid> [--id <uuid>] [--name <name>] [--description <desc>]
+       [--skip-suspend]
+    vzctl snapshot-switch | snapshot-delete <ctid> --id <uuid>
+    vzctl snapshot-mount <ctid> --id <uuid> --target <dir>
+    vzctl snapshot-umount <ctid> --id <uuid>
+    vzctl snapshot-list <ctid> [-H] [-o field[,field...]] [--id <uuid>]
+    vzctl quotaon | quotaoff | quotainit <ctid>
+    vzctl console <ctid> [ttyno]
+    vzctl enter <ctid> [--exec <command> [arg ...]]
+    vzctl exec | exec2 <ctid> <command> [arg ...]
+    vzctl runscript <ctid> <script>
+    vzctl suspend | resume <ctid> [--dumpfile <name>]
+    vzctl set <ctid> [--save] [--force] [--setmode restart|ignore]
+       [--ram <bytes>[KMG]] [--swap <bytes>[KMG]]
+       [--ipadd <addr>] [--ipdel <addr>|all] [--hostname <name>]
+       [--nameserver <addr>] [--searchdomain <name>]
+       [--onboot yes|no] [--bootorder <N>]
+       [--userpasswd <user>:<passwd>]
+       [--cpuunits <N>] [--cpulimit <N>] [--cpus <N>] [--cpumask <cpus>]
+       [--diskspace <soft>[:<hard>]] [--diskinodes <soft>[:<hard>]]
+       [--quotatime <N>] [--quotaugidlimit <N>] [--mount_opts <opt>[,<opt>...]]
+       [--capability <name>:on|off ...]
+       [--devices b|c:major:minor|all:r|w|rw]
+       [--devnodes device:r|w|rw|none]
+       [--netif_add <ifname[,mac,host_ifname,host_mac,bridge]]>]
+       [--netif_del <ifname>]
+       [--applyconfig <name>] [--applyconfig_map <name>]
+       [--features <name:on|off>] [--name <vename>] [--ioprio <N>]
+       [--pci_add [<domain>:]<bus>:<slot>.<func>] [--pci_del <d:b:s.f>]
+       [--iptables <name>] [--disabled <yes|no>]
+       [UBC parameters]
+
+    UBC parameters (N - items, P - pages, B - bytes):
+    Two numbers divided by colon means barrier:limit.
+    In case the limit is not given it is set to the same value as the barrier.
+       --numproc N[:N]      --numtcpsock N[:N]      --numothersock N[:N]
+       --vmguarpages P[:P]  --kmemsize B[:B]        --tcpsndbuf B[:B]
+       --tcprcvbuf B[:B]    --othersockbuf B[:B]    --dgramrcvbuf B[:B]
+       --oomguarpages P[:P] --lockedpages P[:P]     --privvmpages P[:P]
+       --shmpages P[:P]     --numfile N[:N]         --numflock N[:N]
+       --numpty N[:N]       --numsiginfo N[:N]      --dcachesize N[:N]
+       --numiptent N[:N]    --physpages P[:P]       --avnumproc N[:N]
+       --swappages P[:P]

data/lib/fog/openvz/compute.rb

@@ -0,0 +1,176 @@
+require 'fog/openvz'
+require 'fog/compute'
+
+module Fog
+  module Compute
+    class Openvz < Fog::Service
+
+      recognizes   :openvz_connect_command
+
+      model_path   'fog/openvz/models/compute'
+      model        :server
+      collection   :servers
+
+      request_path 'fog/openvz/requests/compute'
+      request      :list_servers
+      request      :get_server_details
+
+      request      :create_server
+      request      :start_server
+      request      :destroy_server
+      request      :mount_server
+      request      :umount_server
+      request      :stop_server
+      request      :restart_server
+      request      :status_server
+      request      :convert_server
+      request      :compact_server
+      request      :snapshot_server
+      request      :snapshot_switch_server
+      request      :snapshot_delete_server
+      request      :snapshot_mount_server
+      request      :snapshot_umount_server
+      request      :snapshot_list_server
+      request      :quotaon_server
+      request      :quotaoff_server
+      request      :quotainit_server
+      request      :exec_server
+      request      :exec2_server
+      request      :runscript_server
+      request      :suspend_server
+      request      :resume_server
+      request      :set_server
+
+      class Mock
+
+        def self.data
+          @data ||= Hash.new do |hash, key|
+            hash[key] = {
+              :servers => [],
+            }
+          end
+        end
+
+        def self.reset
+          @data = nil
+        end
+
+        def initialize(options={})
+          @openvz_connect_command = options[:openvz_connect_command]
+        end
+
+        def data
+          self.class.data[@openvz_connect_command]
+        end
+
+        def reset_data
+          self.class.data.delete(@openvz_connect_command)
+        end
+
+      end
+
+      class Real
+
+        def initialize(options={})
+          @openvz_connect_command = options[:openvz_connect_command]
+        end
+
+        def reload
+          #@connection.reset
+        end
+
+        def expand_commands(commands, params, args)
+          # For all params unless the ctid
+          # pass it to the command
+          params.keys.each do |k|
+            if (params[k]) && (k.to_s != 'ctid')
+
+              if params[k].is_a?(Array)
+                # For arrays we pass the params and key multiple times
+                params[k].each do |p|
+                  commands << "--#{k}"
+                  commands << "\"#{p}\""
+                end
+              else
+                commands << "--#{k}"
+                # For booleans only pass the options
+                # We put the values of params between doublequotes
+                commands << "\"#{params[k]}\"" unless !!params[k] == params[k]
+              end
+
+            end
+          end
+
+          # These commands will be passed directly
+          args.each do |a|
+            commands << a
+          end
+
+          # Delete empty commands
+          commands.delete("")
+
+          # Now build the full command
+          full_command = "#{commands.join(' ')}"
+
+          # If we have a connect command , expand it
+          if @openvz_connect_command.nil?
+            prefixed_command = "#{full_command}"
+          else
+            prefixed_command = @openvz_connect_command.sub('@command@',"#{full_command}")
+          end
+          return prefixed_command
+        end
+
+        def vzctl(command, params,args = [])
+          commands = [ 'vzctl', command, params['ctid'], params[:ctid] ]
+          prefixed_command = expand_commands(commands, params, args)
+
+          result = `#{prefixed_command}`
+          exitcode = $?.to_i
+
+          # Tofix - we use backticks to get the exitcode
+          # But backticks output stderr
+          arg_commands = [ 'exec', 'exec2', 'runscript' ]
+          if (arg_commands.include?(command))
+            return { :output => result , :exitcode => exitcode }
+          else
+            raise Fog::Errors::Error.new result unless exitcode == 0
+            return result
+          end
+        end
+
+        def vzlist(params,args = [])
+
+          commands = [ 'vzlist', '-a', '-j' , params['ctid'], params[:ctid] ]
+          prefixed_command = expand_commands(commands, params, args)
+
+          # We do some wier stuff here:
+          # - a simple backtick doesn't capture stderr
+          # - popen4 would solve it but would require another external gem dependency
+          # - popen3 doesn't capture exitcode (on ruby 1.8) but is a standard call
+          # - so we resort to checking the stderr instead
+          require 'open3'
+          result = ""
+          error = ""
+          puts prefixed_command
+          Open3.popen3("#{prefixed_command}") { |i,o,e,t|
+            result = result + o.read
+            error = error + e.read
+          }
+
+          if (error.length != 0)
+            if(error.include?("not found"))
+              return []
+            else
+              raise Fog::Errors::Error.new error
+            end
+          else
+            return Fog::JSON.decode(result)
+          end
+
+        end
+
+      end
+    end
+  end
+end