fog 1.3.1 → 1.4.0

data/lib/fog/openstack/models/image/image.rb

@@ -0,0 +1,85 @@
+require 'fog/core/model'
+
+module Fog
+  module Image
+    class OpenStack
+
+      class Image < Fog::Model
+
+        identity :id
+
+        attribute :name
+        attribute :size
+        attribute :disk_format
+        attribute :container_format
+        attribute :id
+        attribute :checksum
+
+        #detailed
+        attribute :min_disk
+        attribute :created_at
+        attribute :deleted_at
+        attribute :updated_at
+        attribute :deleted
+        attribute :protected
+        attribute :is_public
+        attribute :status
+        attribute :min_ram
+        attribute :owner
+        attribute :properties
+        attribute :location
+        attribute :copy_from
+
+
+        def initialize(attributes)
+          @connection = attributes[:connection]
+          super
+        end
+
+        def save
+          requires :name
+          identity ? update : create
+        end
+
+        def create
+          requires :name
+          merge_attributes(connection.create_image(self.attributes).body['image'])
+            self
+        end
+
+        def update
+          requires :name
+          merge_attributes(connection.update_image(self.attributes).body['image'])
+          self
+        end
+
+        def destroy
+          requires :id
+          connection.delete_image(self.id)
+          true
+        end
+
+        def add_member(member_id)
+          requires :id
+          connection.add_member_to_image(self.id, member_id)
+        end
+
+        def remove_member(member_id)
+          requires :id
+          connection.remove_member_from_image(self.id, member_id)
+        end
+
+        def members
+          requires :id
+          connection.get_image_members(self.id).body['members']
+        end
+
+        def metadata
+          requires :id
+          connection.get_image(self.id).headers
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/image/images.rb

@@ -0,0 +1,60 @@
+require 'fog/core/collection'
+require 'fog/openstack/models/image/image'
+
+module Fog
+  module Image
+    class OpenStack
+      class Images < Fog::Collection
+        model Fog::Image::OpenStack::Image
+
+        def all
+          load(connection.list_public_images_detailed.body['images'])
+        end
+
+        def details
+          load(connection.list_public_images_detailed.body['images'])
+        end
+
+        def find_by_id(id)
+          self.find {|image| image.id == id}
+        end
+
+        def public
+          images = load(connection.list_public_images_detailed.body['images'])
+          images.delete_if{|image| image.is_public == false}
+        end
+
+        def private
+          images = load(connection.list_public_images_detailed.body['images'])
+          images.delete_if{|image| image.is_public}
+        end
+
+        def destroy(id)
+          image = self.find_by_id(id)
+          image.destroy
+        end
+
+        def method_missing(method_sym, *arguments, &block)
+          if method_sym.to_s =~ /^find_by_(.*)$/
+            load(connection.list_public_images_detailed($1 ,arguments.first).body['images'])
+          else
+            super
+          end
+        end
+
+        def find_by_size_min(size)
+          find_attribute(__method__, size)
+        end
+
+        def find_by_size_max(size)
+          find_attribute(__method__, size)
+        end
+
+        def find_attribute(attribute,value)
+          attribute = attribute.to_s.gsub("find_by_", "")
+          load(connection.list_public_images_detailed(attribute , value).body['images'])
+        end
+      end
+    end
+  end
+end

data/lib/fog/openstack/models/volume/volume.rb

@@ -0,0 +1,46 @@
+require 'fog/core/model'
+
+module Fog
+  module Volume
+    class OpenStack
+
+      class Volume < Fog::Model
+
+        identity :id
+
+        attribute :display_name,        :aliases => 'displayName'
+        attribute :display_description, :aliases => 'displayDescription'
+        attribute :status
+        attribute :size
+        attribute :type,                :aliases => 'volumeType'
+        attribute :snapshot_id,         :aliases => 'snapshotId'
+        attribute :availability_zone,   :aliases => 'availabilityZone'
+        attribute :created_at,          :aliases => 'createdAt'
+        attribute :attachments
+
+
+        def initialize(attributes)
+          @connection = attributes[:connection]
+          super
+        end
+
+        def save
+          requires :display_name, :size
+          data = connection.create_volume(display_name, display_description, size, attributes)
+          merge_attributes(data.body['volume'])
+          true
+        end
+
+        def destroy
+          requires :id
+          connection.delete_volume(id)
+          true
+        end
+
+      end
+
+    end
+  end
+
+end
+

data/lib/fog/openstack/models/volume/volumes.rb

@@ -0,0 +1,27 @@
+require 'fog/core/collection'
+require 'fog/openstack/models/volume/volume'
+
+module Fog
+  module Volume
+    class OpenStack
+
+      class Volumes < Fog::Collection
+        model Fog::Volume::OpenStack::Volume
+
+        def all(detailed=true)
+          load(connection.list_volumes(detailed).body['volumes'])
+        end
+
+        def find_by_id(volume_id)
+          if volume = connection.get_volume_details(volume_id).body['volume']
+            new(volume)
+          end
+        rescue Fog::Volume::OpenStack::NotFound
+          nil
+        end
+      end
+
+    end
+  end
+end
+

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

@@ -0,0 +1,29 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        # Add an IP address on a network.
+        #
+        # === Parameters
+        # * server_id <~String> - The ID of the server in which to add an IP to.
+        # * network_id <~String> - The ID of the network the IP should be on.
+        # === Returns
+        # * success <~Boolean>
+        def add_fixed_ip(server_id, network_id)
+          body = {
+            'addFixedIp' => {
+              'networkId' => network_id
+            }
+          }
+          server_action(server_id, body).status == 202
+        end # def add_fixed_ip
+      end # class Real
+
+      class Mock
+        def add_fixed_ip(server_id, network_id)
+          true
+        end # def add_fixed_ip
+      end # class Mock
+    end # class OpenStack
+  end # module Compute
+end # module Fog

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

@@ -0,0 +1,42 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+
+        def allocate_address(pool = nil)
+
+          request(
+            :body     => MultiJson.encode({'pool' => pool}),
+            :expects  => [200, 202],
+            :method   => 'POST',
+            :path     => 'os-floating-ips.json'
+          )
+        end
+
+      end
+
+      class Mock
+        def allocate_address
+          response = Excon::Response.new
+          response.status = 200
+          response.headers = {
+            "X-Compute-Request-Id" => "req-d4a21158-a86c-44a6-983a-e25645907f26",
+            "Content-Type" => "application/json",
+            "Content-Length" => "105",
+            "Date"=> Date.new
+          }
+          response.body = {
+            "floating_ip" => {
+              "instance_id" => nil,
+              "ip" => "192.168.27.132",
+              "fixed_ip" => nil,
+              "id" => 4,
+              "pool"=>"nova"
+            }
+          }
+          response
+        end
+      end # mock
+    end # openstack
+  end #compute
+end

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

@@ -0,0 +1,27 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+
+        def associate_address(server_id, ip_address)
+          body = { "addFloatingIp" => {"address" => ip_address}}
+          server_action(server_id, body)
+        end
+
+      end
+
+      class Mock
+        def associate_address(server_id, ip_address)
+          response = Excon::Response.new
+          response.status = 202
+          response.headers = {
+            "Content-Type" => "text/html, charset=UTF-8",
+            "Content-Length" => "0",
+            "Date"=> Date.new
+          }
+          response
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,28 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+
+        def attach_volume(volume_id, server_id, device)
+          data = {
+            'volumeAttachment' => {
+              'volumeId' => volume_id.to_s,
+              'device'   => device
+            }
+          }
+          request(
+            :body     => MultiJson.encode(data),
+            :expects  => [200, 202],
+            :method   => 'POST',
+            :path     => "servers/%s/os-volume_attachments" % [server_id]
+          )
+        end
+
+      end
+
+      class Mock
+      end
+
+    end
+  end
+end

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

@@ -0,0 +1,41 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        def boot_from_snapshot(name, image_ref, flavor_ref, options={})
+          data = {
+            'server' => {
+              'flavorRef'  => flavor_ref,
+              'imageRef'   => image_ref,
+              'name'       => name
+            }
+          }
+
+          vanilla_options = ['metadata', 'accessIPv4', 'accessIPv6',
+                             'availability_zone', 'user_data', 'block_device_mapping',
+                             'key_name', 'security_groups']
+          vanilla_options.select{|o| options[o]}.each do |key|
+            data['server'][key] = options[key]
+          end
+
+          if options['personality']
+            data['server']['personality'] = []
+            for file in options['personality']
+              data['server']['personality'] << {
+                'contents'  => Base64.encode64(file['contents']),
+                'path'      => file['path']
+              }
+            end
+          end
+
+          request(
+            :body     => MultiJson.encode(data),
+            :expects  => [200, 202],
+            :method   => 'POST',
+            :path     => '/os-volumes_boot.json'
+          )
+        end
+      end
+    end # class OpenStack
+  end # module Compute
+end # module Fog

data/lib/fog/openstack/requests/compute/{change_password_server.rb → change_server_password.rb}

@@ -3,7 +3,7 @@ module Fog
     class OpenStack
       class Real
 
-        def change_password_server(server_id, admin_password)
+        def change_server_password(server_id, admin_password)
           body = { 'changePassword' => { 'adminPass' => admin_password }}
           server_action(server_id, body)
         end
@@ -12,7 +12,7 @@ module Fog
 
       class Mock
 
-        def change_password_server(server_id, admin_password)
+        def change_server_password(server_id, admin_password)
           response = Excon::Response.new
           response.status = 202
           response

data/lib/fog/openstack/requests/compute/{confirm_resized_server.rb → confirm_resize_server.rb}

@@ -3,7 +3,7 @@ module Fog
     class OpenStack
       class Real
 
-        def confirm_resized_server(server_id)
+        def confirm_resize_server(server_id)
           body = { 'confirmResize' => nil }
           server_action(server_id, body, 204)
         end
@@ -12,7 +12,7 @@ module Fog
 
       class Mock
 
-        def confirm_resized_server(server_id)
+        def confirm_resize_server(server_id)
           response = Excon::Response.new
           response.status = 204
           response

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

@@ -0,0 +1,82 @@
+module Fog
+  module Compute
+    class OpenStack
+      class Real
+        # PARAMETERS #
+        # name        = Name of flavor
+        # ram         = Memory in MB
+        # vcpus       = Number of VCPUs
+        # disk        = Size of local disk in GB
+        # swap        = Swap space in MB
+        # rxtx_factor = RX/TX factor
+        def create_flavor(attributes)
+          # Get last flavor id
+          flavor_ids = Array.new
+          flavors = list_flavors_detail.body['flavors']
+          flavors.each do |flavor|
+            flavor_ids << flavor['id'].to_i
+          end
+
+          # Set flavor id
+          attributes[:flavor_id] = attributes[:flavor_id] || flavor_ids.sort.last + 1
+
+          data = {
+            'flavor' => {
+              'name' => attributes[:name],
+              'ram' => attributes[:ram],
+              'vcpus' => attributes[:vcpus],
+              'disk' => attributes[:disk],
+              'id' => attributes[:flavor_id],
+              'swap' => attributes[:swap],
+              'OS-FLV-EXT-DATA:ephemeral' => attributes[:ephemeral],
+              'rxtx_factor' => attributes[:rxtx_factor]
+            }
+          }
+
+          request(
+            :body => MultiJson.encode(data),
+            :expects => 200,
+            :method => 'POST',
+            :path => 'flavors'
+          )
+        end
+      end
+
+      class Mock
+        def create_flavor(attributes)
+          response = Excon::Response.new
+          response.status = 200
+          response.headers = {
+            "X-Compute-Request-Id" => "req-fdc6f99e-55a2-4ab1-8904-0892753828cf",
+            "Content-Type" => "application/json",
+            "Content-Length" => "356",
+            "Date" => Date.new
+          }
+          response.body = {
+            "flavor" => {
+              "vcpus" => attributes[:vcpus],
+              "disk" => attributes[:disc],
+              "name" => attributes[:name],
+              "links" => [
+                {
+                  "href" => "http://192.168.27.100:8774/v1.1/6733e93c5f5c4eb1bcabc6902ba208d6/flavors/11",
+                  "rel" => "self"
+                },
+                {
+                  "href" => "http://192.168.27.100:8774/6733e93c5f5c4eb1bcabc6902ba208d6/flavors/11",
+                  "rel" => "bookmark"
+                }
+              ],
+              "rxtx_factor" => attributes[:rxtx_factor] || 1,
+              "OS-FLV-EXT-DATA:ephemeral" => attributes[:ephemeral] || 0,
+              "ram" => attributes[:ram],
+              "id" => 11,
+              "swap" => attributes[:swap] || ""
+            }
+          }
+          response
+        end
+      end # mock
+    end # openstack
+  end # compute
+end # fog