fog 0.5.3 → 0.6.0

data/lib/fog/compute/models/voxel/servers.rb

@@ -0,0 +1,31 @@
+require 'fog/core/collection'
+require 'fog/compute/models/voxel/server'
+
+module Fog
+  module Voxel
+    class Compute
+      class Servers < Fog::Collection
+
+        model Fog::Voxel::Compute::Server
+
+        def all
+          data = connection.devices_list.body['devices'].select {|device| device['type']['id'] == '3'}
+          load(data)
+        end
+
+        def get(device_id)
+          if device_id && server = connection.devices_list(device_id).body['devices']
+
+            if server.empty?
+              nil
+            else
+              new(server.first)
+            end
+          end
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/compute/new_servers.rb

@@ -1,5 +1,3 @@
-require 'fog/core/parser'
-
 module Fog
   module NewServers
     class Compute < Fog::Service
@@ -57,6 +55,8 @@ module Fog
             Formatador.display_line(warning)
           end
 
+          require 'fog/core/parser'
+
           @new_servers_password = options[:new_servers_password]
           @new_servers_username = options[:new_servers_username]
           @host   = options[:host]    || "noc.newservers.com"

data/lib/fog/compute/parsers/voxel/basic.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Parsers
+    module Voxel
+      module Compute
+
+        class Basic < Fog::Parsers::Base
+
+          def reset
+            @response = {}
+          end
+
+          def start_element(name, attrs = [])
+            super
+
+            case name
+            when 'err'
+              @response['err'] = {
+                'code'  => attr_value('code', attrs),
+                'msg'   => attr_value('msg', attrs)
+              }
+            when 'rsp'
+              @response['stat'] = attr_value('stat', attrs)
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/parsers/voxel/devices_list.rb

@@ -0,0 +1,111 @@
+module Fog
+  module Parsers
+    module Voxel
+      module Compute
+
+        class DevicesList < Fog::Parsers::Base
+
+          def reset
+            @device          = {}
+            @response        = { 'devices' => [] }
+            @in_storage      = false
+          end
+
+          def start_element(name, attrs = [])
+            super
+
+            case name
+            when 'accessmethod'
+              @access_method = { 'type' => attr_value('type', attrs) }
+            when 'accessmethods'
+              @device['access_methods'] = []
+            when 'device'
+              @device = {
+                'id'      => attr_value('id', attrs),
+                'label'   => attr_value('label', attrs),
+                'status'  => attr_value('status', attrs)
+              }
+            when 'err'
+              @response['err'] = {
+                'code'  => attr_value('code', attrs),
+                'msg'   => attr_value('msg', attrs)
+              }
+            when 'cage', 'facility', 'rack', 'row', 'zone'
+              @device['location'][name] = { 'id' => attr_value('id', attrs) }
+              if code = attr_value('code', attrs)
+                @device['location'][name]['code'] = code
+              end
+            when 'drive'
+              @drive = { 'position' => attr_value('position', attrs) }
+            when 'ipassignment'
+              type = attr_value('type', attrs)
+              @device['ipassignments'] = []
+              @device['ipassignments'] << {
+                'id'          => attr_value('id', attrs),
+                'type'        => attr_value('type', attrs),
+                'description' => attr_value('description', attrs),
+              }
+            when 'ipassignments'
+              @device['ipassignments'] = {}
+            when 'location'
+              @device['location'] = {}
+            when 'memory'
+              @device['memory'] = { 'size' =>  attr_value('size', attrs).to_i }
+            when 'model', 'type'
+              @device[name] = { 'id'    => attr_value('id', attrs) }
+            when 'operating_system'
+              @device['operating_system'] = {}
+            when 'power_consumption'
+              @device[name] = attr_value('unit', attrs)
+            when 'processor'
+              @device['processor'] = {}
+            when 'rsp'
+              @response['stat'] = attr_value('stat', attrs)
+            when 'storage'
+              @device['drives'] = []
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'access_method'
+              @device['access_methods'] << @access_method
+            when 'architecture'
+              @device['operating_system'][name] = @value.to_i
+            when 'cage', 'facility', 'rack', 'row', 'zone'
+              @device['location'][name]['value'] = @value
+            when 'cores'
+              @device['processor'][name] = @value.to_i
+            when 'description'
+              @device[name] = @value
+            when 'device'
+              @response['devices'] << @device
+              @device = {}
+            when 'drive'
+              @device['drives'] << @drive
+              @drive = {}
+            when 'cores'
+              @device['processing_cores'] = @value.to_i
+            when 'ipassignment'
+              @device['ipassignments'].last['value'] = @value
+            when 'model', 'type'
+              @device[name]['value'] = @value
+            when 'name'
+              @device['operating_system'][name] = @value
+            when 'position'
+              @device['location'][name] = @value
+            when 'power_consumption'
+              @device[name] = [@value, @device[name]].join(' ')
+            when 'size'
+              @drive[name] = @value.to_i
+            when 'host', 'password', 'protocol', 'username'
+              @access_method[name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/parsers/voxel/images_list.rb

@@ -0,0 +1,59 @@
+module Fog
+  module Parsers
+    module Voxel
+      module Compute
+
+        class ImagesList < Fog::Parsers::Base
+
+          def reset
+            @image = {}
+            @response = { 'images' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            super
+
+            case name
+            when 'err'
+              @response['err'] = {
+                'code'  => attr_value('code', attrs),
+                'msg'   => attr_value('msg', attrs)
+              }
+            when 'size'
+              @image['filesystem']['units'] = attr_value('units', attrs)
+            when 'image'
+              @image = {
+                'id' => attr_value('id', attrs).to_i,
+                'summary' => attr_value('summary', attrs)
+              }
+            when 'filesystem', 'operating_system'
+              @image[name] = {}
+            when 'rsp'
+              @response['stat'] = attr_value('stat', attrs)
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'architecture'
+              @image['operating_system'][name] = @value.to_i
+            when 'admin_username', 'family', 'product_family', 'product_version', 'version'
+              @image['operating_system'][name] = @value
+            when 'description'
+              @image[name] = @value
+            when 'image'
+              @response['images'] << @image
+              @image = {}
+            when 'size'
+              @image['filesystem'][name] = @value.to_i
+            when 'type'
+              @image['filesystem'][name] = @value
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/parsers/voxel/voxcloud_create.rb

@@ -0,0 +1,40 @@
+module Fog
+  module Parsers
+    module Voxel
+      module Compute
+
+        class VoxcloudCreate < Fog::Parsers::Base
+
+          def reset
+            @response = { 'device' => {} }
+          end
+
+          def start_element(name, attrs = [])
+            super
+
+            case name
+            when 'err'
+              @response['err'] = {
+                'code'  => attr_value('code', attrs),
+                'msg'   => attr_value('msg', attrs)
+              }
+            when 'rsp'
+              @response['stat'] = attr_value('stat', attrs)
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'id'
+              @response['device'][name] = @value
+            when 'last_update'
+              @response['device'][name] = Time.at(@value.to_i)
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/parsers/voxel/voxcloud_delete.rb

@@ -0,0 +1,31 @@
+module Fog
+  module Parsers
+    module Voxel
+      module Compute
+
+        class VoxcloudDelete < Fog::Parsers::Base
+
+          def reset
+            @response = {}
+          end
+
+          def start_element(name, attrs = [])
+            super
+
+            case name
+            when 'rsp'
+              @response['stat'] = attr_value('stat', attrs)
+            when 'err'
+              @response['err'] = {
+                'code'  => attr_value('code', attrs),
+                'msg'   => attr_value('msg', attrs)
+              }
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/parsers/voxel/voxcloud_status.rb

@@ -0,0 +1,42 @@
+module Fog
+  module Parsers
+    module Voxel
+      module Compute
+        class VoxcloudStatus < Fog::Parsers::Base
+          def reset
+            @response = { 'devices' => [] }
+            @device = {}
+          end
+
+          def start_element(name, attrs = [])
+            super
+
+            case name
+            when 'rsp'
+              @response['stat'] = attr_value('stat', attrs)
+            when 'err'
+              @response['err'] = {
+                'code'  => attr_value('code', attrs),
+                'msg'   => attr_value('msg', attrs)
+              }
+            when 'device'
+              @device = {}
+            end
+          end
+
+          def end_element(name)
+            case name
+            when 'device'
+              @response['devices'] << @device
+              @device = {}
+            when 'id', 'status'
+              @device[name] = @value
+            when 'last_update'
+              @device[name] = Time.at(@value.to_i)
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/rackspace.rb

@@ -1,19 +1,3 @@
-module Fog
-  module Rackspace
-    class Servers
-
-      def self.new(attributes = {})
-        location = caller.first
-        warning = "[yellow][WARN] Fog::Rackspace::Servers#new is deprecated, use Fog::Rackspace::Compute#new instead[/]"
-        warning << " [light_black](" << location << ")[/] "
-        Formatador.display_line(warning)
-        Fog::Rackspace::Compute.new(attributes)
-      end
-
-    end
-  end
-end
-
 module Fog
   module Rackspace
     class Compute < Fog::Service

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

@@ -3,6 +3,8 @@ module Fog
     class Compute
       class Real
 
+        require 'fog/compute/parsers/aws/basic'
+
         # Associate an elastic IP address with an instance
         #
         # ==== Parameters

data/lib/fog/compute/requests/aws/authorize_security_group_ingress.rb

@@ -3,11 +3,13 @@ module Fog
     class Compute
       class Real
 
+        require 'fog/compute/parsers/aws/basic'
+
         # Add permissions to a security group
         #
         # ==== Parameters
+        # * group_name<~String> - Name of group
         # * options<~Hash>:
-        #   * 'GroupName'<~String> - Name of group
         #   * 'SourceSecurityGroupName'<~String> - Name of security group to authorize
         #   * 'SourceSecurityGroupOwnerId'<~String> - Name of owner to authorize
         #   or
@@ -22,9 +24,18 @@ module Fog
         #   * body<~Hash>:
         #     * 'requestId'<~String> - Id of request
         #     * 'return'<~Boolean> - success?
-        def authorize_security_group_ingress(options = {})
+        def authorize_security_group_ingress(group_name, options = {})
+          if group_name.is_a?(Hash)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::AWS::Compute#authorize_security_group_ingress now requires the 'group_name' parameter. Only specifying an options hash is now deprecated"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+            options = group_name
+            group_name = options['GroupName']
+          end
           request({
             'Action'    => 'AuthorizeSecurityGroupIngress',
+            'GroupName' => group_name,
             :idempotent => true,
             :parser     => Fog::Parsers::AWS::Compute::Basic.new
           }.merge!(options))
@@ -34,16 +45,25 @@ module Fog
 
       class Mock
 
-        def authorize_security_group_ingress(options = {})
+        def authorize_security_group_ingress(group_name, options = {})
+          if group_name.is_a?(Hash)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::AWS::Compute#authorize_security_group_ingress now requires the 'group_name' parameter. Only specifying an options hash is now deprecated"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+            options = group_name
+            group_name = options['GroupName']
+          end
+
           response = Excon::Response.new
-          group = @data[:security_groups][options['GroupName']]
+          group = @data[:security_groups][group_name]
 
           if group
             group['ipPermissions'] ||= []
-            if options['GroupName'] && options['SourceSecurityGroupName'] && options['SourceSecurityGroupOwnerId']
+            if group_name && options['SourceSecurityGroupName'] && options['SourceSecurityGroupOwnerId']
               ['tcp', 'udp'].each do |protocol|
                 group['ipPermissions'] << {
-                  'groups'      => [{'groupName' => options['GroupName'], 'userId' => @owner_id}],
+                  'groups'      => [{'groupName' => group_name, 'userId' => @owner_id}],
                   'fromPort'    => 1,
                   'ipRanges'    => [],
                   'ipProtocol'  => protocol,
@@ -51,7 +71,7 @@ module Fog
                 }
               end
               group['ipPermissions'] << {
-                'groups'      => [{'groupName' => options['GroupName'], 'userId' => @owner_id}],
+                'groups'      => [{'groupName' => group_name, 'userId' => @owner_id}],
                 'fromPort'    => -1,
                 'ipRanges'    => [],
                 'ipProtocol'  => 'icmp',
@@ -76,7 +96,7 @@ module Fog
             }
             response
           else
-            raise Fog::AWS::Compute::NotFound.new("The security group '#{options['GroupName']}' does not exist")
+            raise Fog::AWS::Compute::NotFound.new("The security group '#{group_name}' does not exist")
           end
         end