fog 0.0.78 → 0.0.79

data/Gemfile.lock

@@ -1,69 +1,69 @@
 --- 
-specs: 
-- rake: 
-    version: 0.8.7
-- annals: 
-    version: 0.0.3
-- excon: 
-    version: 0.0.21
-- formatador: 
-    version: 0.0.13
-- json: 
-    version: 1.4.0
-- mime-types: 
-    version: "1.16"
-- net-ssh: 
-    version: 2.0.22
-- nokogiri: 
-    version: 1.4.1
-- rspec: 
-    version: 1.3.0
-- ruby-hmac: 
-    version: 0.4.0
-- shindo: 
-    version: 0.0.17
-hash: e443f12a9a7794f2ff4fc8e8d201b12b1e8b30bb
-sources: 
-- Rubygems: 
-    uri: http://gemcutter.org
 dependencies: 
   formatador: 
-    version: ">= 0.0.10"
     group: 
     - :default
-  nokogiri: 
-    version: ">= 0"
+    version: ">= 0.0.10"
+  rake: 
     group: 
     - :default
-  rake: 
     version: ">= 0"
+  ruby-hmac: 
     group: 
     - :default
-  rspec: 
     version: ">= 0"
+  mime-types: 
     group: 
     - :default
-  ruby-hmac: 
     version: ">= 0"
+  rspec: 
     group: 
     - :default
-  mime-types: 
     version: ">= 0"
+  net-ssh: 
     group: 
     - :default
-  net-ssh: 
     version: ">= 0"
+  json: 
     group: 
     - :default
-  json: 
     version: ">= 0"
+  excon: 
     group: 
     - :default
-  excon: 
     version: ">= 0.0.21"
+  shindo: 
     group: 
     - :default
-  shindo: 
     version: ">= 0"
+  nokogiri: 
     group: 
     - :default
+    version: ">= 0"
+specs: 
+- rake: 
+    version: 0.8.7
+- annals: 
+    version: 0.0.3
+- excon: 
+    version: 0.0.21
+- formatador: 
+    version: 0.0.13
+- json: 
+    version: 1.4.1
+- mime-types: 
+    version: "1.16"
+- net-ssh: 
+    version: 2.0.22
+- nokogiri: 
+    version: 1.4.1
+- rspec: 
+    version: 1.3.0
+- ruby-hmac: 
+    version: 0.4.0
+- shindo: 
+    version: 0.0.17
+hash: e443f12a9a7794f2ff4fc8e8d201b12b1e8b30bb
+sources: 
+- Rubygems: 
+    uri: http://gemcutter.org

data/fog.gemspec

@@ -7,8 +7,8 @@ Gem::Specification.new do |s|
   ## If your rubyforge_project name is different, then edit it and comment out
   ## the sub! line in the Rakefile
   s.name              = 'fog'
-  s.version           = '0.0.78'
-  s.date              = '2010-04-25'
+  s.version           = '0.0.79'
+  s.date              = '2010-04-26'
   s.rubyforge_project = 'fog'
 
   ## Make sure your summary is short. The description may be as long
@@ -263,10 +263,13 @@ Gem::Specification.new do |s|
     lib/fog/terremark/models/shared/servers.rb
     lib/fog/terremark/models/shared/task.rb
     lib/fog/terremark/models/shared/tasks.rb
+    lib/fog/terremark/models/shared/vdc.rb
+    lib/fog/terremark/models/shared/vdcs.rb
     lib/fog/terremark/parser.rb
     lib/fog/terremark/parsers/shared/get_catalog.rb
     lib/fog/terremark/parsers/shared/get_catalog_item.rb
     lib/fog/terremark/parsers/shared/get_internet_services.rb
+    lib/fog/terremark/parsers/shared/get_network_ips.rb
     lib/fog/terremark/parsers/shared/get_node_services.rb
     lib/fog/terremark/parsers/shared/get_organization.rb
     lib/fog/terremark/parsers/shared/get_organizations.rb
@@ -293,6 +296,7 @@ Gem::Specification.new do |s|
     lib/fog/terremark/requests/shared/get_catalog_item.rb
     lib/fog/terremark/requests/shared/get_internet_services.rb
     lib/fog/terremark/requests/shared/get_network.rb
+    lib/fog/terremark/requests/shared/get_network_ips.rb
     lib/fog/terremark/requests/shared/get_node_services.rb
     lib/fog/terremark/requests/shared/get_organization.rb
     lib/fog/terremark/requests/shared/get_organizations.rb

data/lib/fog.rb

@@ -31,7 +31,7 @@ require 'fog/terremark'
 
 module Fog
 
-  VERSION = '0.0.78'
+  VERSION = '0.0.79'
 
   module Mock
     @delay = 1

data/lib/fog/aws/models/ec2/volume.rb

@@ -34,8 +34,6 @@ module Fog
         end
 
         def server=(new_server)
-          requires :device
-
           if new_server
             attach(new_server)
           else
@@ -68,6 +66,7 @@ module Fog
             @server = new_server
             @availability_zone = new_server.availability_zone
           elsif new_server
+            requires :device
             @server = nil
             @server_id = new_server.id
             connection.attach_volume(@server_id, @id, @device)

data/lib/fog/terremark/models/shared/network.rb

@@ -15,6 +15,11 @@ module Fog
         attribute :fencemode
         attribute :links
 
+        def ips
+          #Until there is a real model for these ?
+          connection.get_network_ips(@id).body['IpAddresses']
+        end
+
         private
 
         def href=(new_href)

data/lib/fog/terremark/models/shared/vdc.rb

@@ -0,0 +1,35 @@
+require 'fog/model'
+
+module Fog
+  module Terremark
+    module Shared
+
+      class Vdc < Fog::Model
+
+        identity :id
+
+        attribute :name
+
+        def networks
+          connection.networks(:vdc_id => @id)
+        end
+
+        def addresses
+          connection.addresses(:vdc_id => @id)
+        end
+
+        private
+
+        def href=(new_href)
+          @id = new_href.split('/').last.to_i
+        end
+
+        def type=(new_type); end
+
+        def rel=(new_rel); end
+
+      end
+
+    end
+  end
+end

data/lib/fog/terremark/models/shared/vdcs.rb

@@ -0,0 +1,52 @@
+module Fog
+  module Terremark
+    module Shared
+
+      module Mock
+        def vdcs(options = {})
+          Fog::Terremark::Shared::Vdcs.new(options.merge(:connection => self))
+        end
+      end
+
+      module Real
+        def vdcs(options = {})
+          Fog::Terremark::Shared::Vdcs.new(options.merge(:connection => self))
+        end
+      end
+
+      class Vdcs < Fog::Collection
+
+        model Fog::Terremark::Shared::Vdc
+
+        def all
+          data = connection.get_organization(organization_id).body['Links'].select do |entity|
+            entity['type'] == 'application/vnd.vmware.vcloud.vdc+xml'
+          end
+          load(data)
+        end
+
+        def get(vdc_id)
+          if vdc_id && vdc = connection.get_vdc(vdc_id).body
+            new(vdc)
+          elsif !vdc_id
+            nil
+          end
+        rescue Excon::Errors::Forbidden
+          nil
+        end
+
+        def organization_id
+          @vdc_id ||= connection.default_organization_id
+        end
+
+        private
+
+        def organization_id=(new_organization_id)
+          @organization_id = new_organization_id
+        end
+
+      end
+
+    end
+  end
+end

data/lib/fog/terremark/parsers/shared/get_network_ips.rb

@@ -0,0 +1,33 @@
+module Fog
+  module Parsers
+    module Terremark
+      module Shared
+
+        class GetNetworkIps< Fog::Parsers::Base
+
+          def reset
+            @ip_address = {}
+            @response = { 'IpAddresses' => [] }
+          end
+
+          def start_element(name,attributes=[])
+            @value = ''
+          end
+
+          def end_element(name)
+            case name
+            when 'Name', 'Status', 'Server'
+              @ip_address[name.downcase] = @value
+            when 'IpAddress'
+              @response['IpAddresses'] << @ip_address
+              @ip_address = {}
+            end
+          end
+
+        end
+
+      end
+    end
+  end
+end
+

data/lib/fog/terremark/requests/shared/get_network.rb

@@ -11,9 +11,7 @@ module Fog
         # ==== Returns
         # * response<~Excon::Response>:
         #   * body<~Hash>:
-        #     * 'PublicIpAddresses'<~Array>
-        #       * 'href'<~String> - linke to item
-        #       * 'name'<~String> - name of item
+        #   FIXME
         def get_network(network_id)
          request(
             :expects  => 200,

data/lib/fog/terremark/requests/shared/get_network_ips.rb

@@ -0,0 +1,40 @@
+module Fog
+  module Terremark
+    module Shared
+      module Real
+
+        # Get details for a Network
+        #
+        # ==== Parameters
+        # * network_id<~Integer> - Id of the network to look up
+        #
+        # ==== Returns
+        # * response<~Excon::Response>:
+        #   * body<~Hash>:
+        #   FIXME
+        def get_network_ips(network_id)
+          opts =  {
+            :expects  => 200,
+            :method   => 'GET',
+            :parser   => Fog::Parsers::Terremark::Shared::GetNetworkIps.new,
+            :path     => "network/#{network_id}/ipAddresses"
+          }
+          if self.is_a?(Fog::Terremark::Ecloud::Real)
+            opts[:path] = "/extensions/network/#{network_id}/ips"
+          end
+          request(opts)
+        end
+
+      end
+
+      module Mock
+
+        def get_network_ips(network_id)
+          raise MockNotImplemented.new("Contributions welcome!")
+        end
+
+      end
+    end
+  end
+end
+

data/lib/fog/terremark/shared.rb

@@ -87,9 +87,12 @@ module Fog
         require 'fog/terremark/models/shared/servers'
         require 'fog/terremark/models/shared/task'
         require 'fog/terremark/models/shared/tasks'
+        require 'fog/terremark/models/shared/vdc'
+        require 'fog/terremark/models/shared/vdcs'
         require 'fog/terremark/parsers/shared/get_catalog'
         require 'fog/terremark/parsers/shared/get_catalog_item'
         require 'fog/terremark/parsers/shared/get_internet_services'
+        require 'fog/terremark/parsers/shared/get_network_ips'
         require 'fog/terremark/parsers/shared/get_node_services'
         require 'fog/terremark/parsers/shared/get_organization'
         require 'fog/terremark/parsers/shared/get_organizations'
@@ -116,6 +119,7 @@ module Fog
         require 'fog/terremark/requests/shared/get_catalog_item'
         require 'fog/terremark/requests/shared/get_internet_services'
         require 'fog/terremark/requests/shared/get_network'
+        require 'fog/terremark/requests/shared/get_network_ips'
         require 'fog/terremark/requests/shared/get_node_services'
         require 'fog/terremark/requests/shared/get_organization'
         require 'fog/terremark/requests/shared/get_organizations'

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 78
-  version: 0.0.78
+  - 79
+  version: 0.0.79
 platform: ruby
 authors: 
 - geemus (Wesley Beary)
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-25 00:00:00 -07:00
+date: 2010-04-26 00:00:00 -07:00
 default_executable: fog
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -341,10 +341,13 @@ files:
 - lib/fog/terremark/models/shared/servers.rb
 - lib/fog/terremark/models/shared/task.rb
 - lib/fog/terremark/models/shared/tasks.rb
+- lib/fog/terremark/models/shared/vdc.rb
+- lib/fog/terremark/models/shared/vdcs.rb
 - lib/fog/terremark/parser.rb
 - lib/fog/terremark/parsers/shared/get_catalog.rb
 - lib/fog/terremark/parsers/shared/get_catalog_item.rb
 - lib/fog/terremark/parsers/shared/get_internet_services.rb
+- lib/fog/terremark/parsers/shared/get_network_ips.rb
 - lib/fog/terremark/parsers/shared/get_node_services.rb
 - lib/fog/terremark/parsers/shared/get_organization.rb
 - lib/fog/terremark/parsers/shared/get_organizations.rb
@@ -371,6 +374,7 @@ files:
 - lib/fog/terremark/requests/shared/get_catalog_item.rb
 - lib/fog/terremark/requests/shared/get_internet_services.rb
 - lib/fog/terremark/requests/shared/get_network.rb
+- lib/fog/terremark/requests/shared/get_network_ips.rb
 - lib/fog/terremark/requests/shared/get_node_services.rb
 - lib/fog/terremark/requests/shared/get_organization.rb
 - lib/fog/terremark/requests/shared/get_organizations.rb