fog 0.4.0 → 0.4.1

data/lib/fog/compute/parsers/terremark_ecloud/get_catalog_item.rb

@@ -0,0 +1,43 @@
+module Fog
+  module Parsers
+    module TerremarkEcloud
+      module Compute
+
+        class GetCatalogItem < Fog::Parsers::Base
+
+          def reset
+            @response = { 'Entity' => {}, 'Link' => {}, 'Property' => {} }
+          end
+
+          def start_element(name, attrs = [])
+            case name
+            when 'CatalogItem'
+              for attribute in %w{href type name}
+                if value = attr_value(attribute, attrs)
+                  @response[attribute] = value
+                end
+              end
+            when 'Link', 'Entity'
+              for attribute in %w{href name rel type}
+                if value = attr_value(attribute, attrs)
+                  @response[name][attribute] = value
+                end
+              end
+            when 'Property'
+              @property_key = attr_value('key', attrs)
+            end
+
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'Property'
+              @response['Property'][@property_key] = @value
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/parsers/terremark_ecloud/get_ip_addresses.rb

@@ -0,0 +1,27 @@
+module Fog
+  module Parsers
+    module TerremarkEcloud
+      module Compute
+
+        class GetIpAddresses < Fog::Parsers::Base
+
+          def reset
+            @response = { 'IpAddresses' => [] }
+            @ip_address = {}
+          end
+
+          def end_element(name)
+            case name
+            when 'Id', 'Href', 'Name', 'RnatAddress', 'Server', 'Status'
+              @ip_address[name] = @value
+            when 'IpAddress'
+              @response['IpAddresses'] << @ip_address
+              @ip_address = {}
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/parsers/terremark_ecloud/get_network.rb

@@ -0,0 +1,59 @@
+module Fog
+  module Parsers
+    module TerremarkEcloud
+      module Compute
+
+        class GetNetwork < Fog::Parsers::Base
+
+          def reset
+            @response = {
+              'Configuration' => {},
+              'Features' => {},
+              'Link' => {}
+            }
+          end
+
+          def start_element(name, attrs = [])
+            case name
+            when 'Network'
+              for attribute in %w{href name}
+                if value = attr_value(attribute, attrs)
+                  @response[attribute] = value
+                end
+              end
+            when 'Link'
+              for attribute in %w{href name rel type}
+                if value = attr_value(attribute, attrs)
+                  @response[name][attribute] = value
+                end
+              end
+            when 'Configuration'
+              @in_configuration = true
+            when 'Features'
+              @in_features = true
+            end
+
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'Configuration'
+              @in_configuration = false
+            when 'Gateway', 'Netmask'
+              if @in_configuration
+                @response['Configuration'][name] = @value
+              end
+            when 'Features'
+              @in_features = false
+            else
+              if @in_features
+                @response['Features'][name] = @value
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/parsers/terremark_ecloud/get_organization.rb

@@ -0,0 +1,35 @@
+module Fog
+  module Parsers
+    module TerremarkEcloud
+      module Compute
+
+        class GetOrganization < Fog::Parsers::Base
+
+          def reset
+            @response = { 'Link' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            case name
+            when 'Link'
+              link = {}
+              for attribute in %w{href name rel type}
+                if value = attr_value(attribute, attrs)
+                  link[attribute] = value
+                end
+              end
+              @response['Link'] << link
+            when 'Org'
+              for attribute in %w{href name}
+                if value = attr_value(attribute, attrs)
+                  @response[attribute] = value
+                end
+              end
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/parsers/terremark_ecloud/get_vdc.rb

@@ -0,0 +1,110 @@
+module Fog
+  module Parsers
+    module TerremarkEcloud
+      module Compute
+
+        class GetVdc < Fog::Parsers::Base
+
+          def reset
+            @response = {
+              'AvailableNetworks' => [],
+              'ComputeCapacity'   => {
+                'Cpu'                   => {},
+                'DeployedVmsQuota'      => {},
+                'InstantiatedVmsQuota'  => {},
+                'Memory'                => {}
+              },
+              'Link'              => [],
+              'ResourceEntities'  => [],
+              'StorageCapacity'   => {}
+            }
+          end
+
+          def start_element(name, attrs = [])
+            case name
+            when 'Cpu'
+              @in_cpu = true
+            when 'DeployedVmsQuota'
+              @in_deployed_vms_quota = true
+            when 'InstantiatedVmsQuota'
+              @in_instantiated_vms_quota = true
+            when 'Link'
+              link = {}
+              for attribute in %w{href name rel type}
+                if value = attr_value(attribute, attrs)
+                  link[attribute] = value
+                end
+              end
+              @response['Link'] << link
+            when 'Memory'
+              @in_memory = true
+            when 'Network'
+              network = {}
+              for attribute in %w{href name type}
+                if value = attr_value(attribute, attrs)
+                  network[attribute] = value
+                end
+              end
+              @response['AvailableNetworks'] << network
+            when 'StorageCapacity'
+              @in_storage_capacity = true
+            when 'ResourceEntity'
+              resource_entity = {}
+              for attribute in %w{href name type}
+                if value = attr_value(attribute, attrs)
+                  resource_entity[attribute] = value
+                end
+              end
+              @response['ResourceEntities'] << resource_entity
+            when 'Vdc'
+              for attribute in %w{href name}
+                if value = attr_value(attribute, attrs)
+                  @response[attribute] = value
+                end
+              end
+            end
+            super
+          end
+
+          def end_element(name)
+            case name
+            when 'Description'
+              @response[name] = @value
+            when 'Allocated', 'Limit', 'Used'
+              if @in_cpu
+                @response['ComputeCapacity']['Cpu'][name] = @value.to_i
+              elsif @in_deployed_vms_quota
+                @response['ComputeCapacity']['DeployedVmsQuota'][name] = @value.to_i
+              elsif @in_instantiated_vms_quota
+                @response['ComputeCapacity']['InstantiatedVmsQuota'][name] = @value.to_i
+              elsif @in_memory
+                @response['ComputeCapacity']['Memory'][name] = @value.to_i
+              elsif @in_storage_capacity
+                @response['StorageCapacity'][name] = @value.to_i
+              end
+            when 'Cpu'
+              @in_cpu = false
+            when 'DeployedVmsQuota'
+              @in_deployed_vms_quota = false
+            when 'InstantiatedVmsQuota'
+              @in_instantiated_vms_quota = false
+            when 'Memory'
+              @in_memory = false
+            when 'StorageCapacity'
+              @in_storage_capacity = false
+            when 'Units'
+              if @in_storage_capacity
+                @response['StorageCapacity'][name] = @value
+              elsif @in_cpu
+                @response['ComputeCapacity']['Cpu'][name] = @value
+              elsif @in_memory
+                @response['ComputeCapacity']['Memory'][name] = @value
+              end
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/compute/parsers/terremark_ecloud/get_versions.rb

@@ -0,0 +1,28 @@
+module Fog
+  module Parsers
+    module TerremarkEcloud
+      module Compute
+
+        class GetVersions < Fog::Parsers::Base
+
+          def reset
+            @response = { 'SupportedVersions' => [] }
+            @version_info = {}
+          end
+
+          def end_element(name)
+            case name
+            when 'LoginUrl', 'Version'
+              @version_info[name] = @value
+            when 'VersionInfo'
+              @response['SupportedVersions'] << @version_info
+              @version_info = {}
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end

data/lib/fog/compute/parsers/terremark_ecloud/login.rb

@@ -0,0 +1,27 @@
+module Fog
+  module Parsers
+    module TerremarkEcloud
+      module Compute
+
+        class Login < Fog::Parsers::Base
+
+          def reset
+            @response = { 'OrgList' => [] }
+          end
+
+          def start_element(name, attrs = [])
+            case name
+            when 'Org'
+              @response['OrgList'] << {
+                'href'  => attr_value('href', attrs),
+                'name'  => attr_value('name', attrs),
+                'type'  => attr_value('type', attrs)
+              }
+            end
+          end
+
+        end
+      end
+    end
+  end
+end

data/lib/fog/{rackspace/compute.rb → compute/rackspace.rb}

@@ -1,11 +1,28 @@
+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
 
       requires :rackspace_api_key, :rackspace_username
       recognizes :rackspace_auth_url, :persistent
+      recognizes :provider # remove post deprecation
 
-      model_path 'fog/rackspace/models/compute'
+      model_path 'fog/compute/models/rackspace'
       model       :flavor
       collection  :flavors
       model       :image
@@ -13,7 +30,7 @@ module Fog
       model       :server
       collection  :servers
 
-      request_path 'fog/rackspace/requests/compute'
+      request_path 'fog/compute/requests/rackspace'
       request :confirm_resized_server
       request :create_image
       request :create_server
@@ -59,6 +76,13 @@ module Fog
         end
 
         def initialize(options={})
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::Rackspace::Compute.new is deprecated, use Fog::Compute.new(:provider => 'Rackspace') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
           @rackspace_username = options[:rackspace_username]
           @data = self.class.data[@rackspace_username]
         end
@@ -68,6 +92,13 @@ module Fog
       class Real
 
         def initialize(options={})
+          unless options.delete(:provider)
+            location = caller.first
+            warning = "[yellow][WARN] Fog::Rackspace::Compute.new is deprecated, use Fog::Compute.new(:provider => 'Rackspace') instead[/]"
+            warning << " [light_black](" << location << ")[/] "
+            Formatador.display_line(warning)
+          end
+
           require 'json'
           credentials = Fog::Rackspace.authenticate(options)
           @auth_token = credentials['X-Auth-Token']

data/lib/fog/{aws/requests/compute → compute/requests/aws}/allocate_address.rb

@@ -3,7 +3,7 @@ module Fog
     class Compute
       class Real
 
-        require 'fog/aws/parsers/compute/allocate_address'
+        require 'fog/compute/parsers/aws/allocate_address'
 
         # Acquire an elastic IP address.
         #

data/lib/fog/{aws/requests/compute → compute/requests/aws}/attach_volume.rb

@@ -3,7 +3,7 @@ module Fog
     class Compute
       class Real
 
-        require 'fog/aws/parsers/compute/attach_volume'
+        require 'fog/compute/parsers/aws/attach_volume'
 
         # Attach an Amazon EBS volume with a running instance, exposing as specified device
         #

data/lib/fog/{aws/requests/compute → compute/requests/aws}/create_image.rb

@@ -3,7 +3,7 @@ module Fog
     class Compute
       class Real
 
-        require 'fog/aws/parsers/compute/create_image'
+        require 'fog/compute/parsers/aws/create_image'
 
         # Create a bootable EBS volume AMI
         #

data/lib/fog/{aws/requests/compute → compute/requests/aws}/create_key_pair.rb

@@ -3,7 +3,7 @@ module Fog
     class Compute
       class Real
 
-        require 'fog/aws/parsers/compute/create_key_pair'
+        require 'fog/compute/parsers/aws/create_key_pair'
 
         # Create a new key pair
         #