fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

data/lib/fog/ecloud/models/compute/server_configuration_options.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::ServerConfigurationOption
 
         def all
-          data = connection.get_server_configuration_options(href).body
+          data = service.get_server_configuration_options(href).body
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_server_configuration_option(uri)
+          if data = service.get_server_configuration_option(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound

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

@@ -4,13 +4,13 @@ module Fog
   module Compute
     class Ecloud
       class Servers < Fog::Ecloud::Collection
-        
+
         model Fog::Compute::Ecloud::Server
 
         identity :href
 
         def all
-          data = connection.get_servers(href).body
+          data = service.get_servers(href).body
           if data.keys.include?(:VirtualMachines)
             data = data[:VirtualMachines][:VirtualMachine]
           elsif data[:VirtualMachine]
@@ -22,10 +22,13 @@ module Fog
         end
 
         def get(uri)
-          if data = connection.get_server(uri)
-            new(data.body)
+          data = service.get_server(uri).body
+          if data == ""
+            new({})
+          else
+            new(data)
           end
-        rescue Fog::Errors::NotFound
+        rescue Excon::Errors::NotFound
           nil
         end
 
@@ -34,31 +37,31 @@ module Fog
         end
 
         def create( template_uri, options )
-          options[:cpus] ||= 1
-          options[:memory] ||= 512
+          options[:cpus]        ||= 1
+          options[:memory]      ||= 512
           options[:description] ||= ""
-          options[:tags] ||= []
+          options[:tags]        ||= []
+
           if template_uri =~ /\/templates\/\d+/
             options[:uri] = href + "/action/createVirtualMachine"
             options[:customization] ||= :linux
             options[:powered_on] ||= false
             if options[:ips]
-              options[:ips] = options[:ips].is_a?(String) ? [options[:ips]] : options[:ips]
+              options[:ips] = [*options[:ips]]
             else
-              options[:network_uri] = options[:network_uri].is_a?(String) ? [options[:network_uri]] : options[:network_uri]
-              options[:network_uri].each do |uri|
+              [*options[:network_uri]].each do |uri|
                 index = options[:network_uri].index(uri)
-                ip = Fog::Compute::Ecloud::IpAddresses.new(:connection => connection, :href => uri).detect { |i| i.host == nil }.name
+                ip = self.service.ip_addresses(:href => uri).detect { |i| i.host == nil && i.detected_on.nil? }.name
                 options[:ips] ||= []
                 options[:ips][index] = ip
               end
             end
-            data = connection.virtual_machine_create_from_template( template_uri, options ).body
+            data = service.virtual_machine_create_from_template( template_uri, options ).body
           else
             options[:uri] = href + "/action/importVirtualMachine"
-            data = connection.virtual_machine_import( template_uri, options ).body
+            data = service.virtual_machine_import( template_uri, options ).body
           end
-          object = new(data)
+          object = self.service.servers.new(data)
           object
         end
 

data/lib/fog/ecloud/models/compute/ssh_key.rb

@@ -10,7 +10,7 @@ module Fog
         attribute :default, :aliases => :Default, :type => :boolean
         attribute :finger_print, :aliases => :FingerPrint
 
-        
+
         def id
           href.scan(/\d+/)[0]
         end

data/lib/fog/ecloud/models/compute/ssh_keys.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::SshKey
 
         def all
-          data = connection.get_ssh_keys(href).body[:SshKey]
+          data = service.get_ssh_keys(href).body[:SshKey]
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_ssh_key(uri)
+          if data = service.get_ssh_key(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound

data/lib/fog/ecloud/models/compute/storage_usage_detail_summary.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::StorageUsageDetail
 
         def all
-          data = connection.get_storage_usage_detail_summary(href).body[:VirtualMachines][:VirtualMachine]
+          data = service.get_storage_usage_detail_summary(href).body[:VirtualMachines][:VirtualMachine]
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_storage_usage_detail(uri)
+          if data = service.get_storage_usage_detail(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound

data/lib/fog/ecloud/models/compute/support_tickets.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::SupportTicket
 
         def all
-          data = connection.get_support_tickets(href).body[:TicketReference]
+          data = service.get_support_tickets(href).body[:TicketReference]
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_support_ticket(uri)
+          if data = service.get_support_ticket(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound

data/lib/fog/ecloud/models/compute/tags.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::Tag
 
         def all
-          data = connection.get_tags(href).body[:DeviceTag]
+          data = service.get_tags(href).body[:DeviceTag]
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_tag(uri)
+          if data = service.get_tag(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound

data/lib/fog/ecloud/models/compute/task.rb

@@ -14,6 +14,9 @@ module Fog
         attribute :error_message, :aliases => :ErrorMessage
         attribute :initiated_by, :aliases => :InitiatedBy
 
+        def ready?
+          !self.completed_time.nil?
+        end
       end
     end
   end

data/lib/fog/ecloud/models/compute/tasks.rb

@@ -4,7 +4,7 @@ module Fog
   module Compute
     class Ecloud
       class Tasks < Fog::Ecloud::Collection
-        
+
         model Fog::Compute::Ecloud::Task
 
         identity :href
@@ -12,13 +12,13 @@ module Fog
         attribute :total_count, :aliases => :TotalCount
 
         def all
-          data = connection.get_tasks(href).body
+          data = service.get_tasks(href).body
           data = data[:Task] ? data[:Task] : data
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_task(uri)
+          if data = service.get_task(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound

data/lib/fog/ecloud/models/compute/template.rb

@@ -4,17 +4,16 @@ module Fog
       class Template < Fog::Ecloud::Model
         identity :href
 
-        attribute :name, :aliases => :Name
-        attribute :type, :aliases => :Type
-        attribute :other_links, :aliases => :Links
-        attribute :operating_system, :aliases => :OperatingSystem
-        attribute :description, :aliases => :Description
-        attribute :storage, :aliases => :Storage
-        attribute :network_adapters, :aliases => :NetworkAdapters
-        attribute :customization, :aliases => :Customization
+        attribute :name,              :aliases => :Name
+        attribute :type,              :aliases => :Type
+        attribute :other_links,       :aliases => :Links
+        attribute :operating_system,  :aliases => :OperatingSystem
+        attribute :description,       :aliases => :Description
+        attribute :storage,           :aliases => :Storage
+        attribute :network_adapters,  :aliases => :NetworkAdapters
+        attribute :customization,     :aliases => :Customization
         attribute :licensed_software, :aliases => :LicensedSoftware
 
-        
         def id
           href.scan(/\d+/)[0]
         end

data/lib/fog/ecloud/models/compute/templates.rb

@@ -11,7 +11,7 @@ module Fog
 
         def all
           r_data = []
-          data = connection.get_templates(href).body[:Families]
+          data = service.get_templates(href).body[:Families]
           data[:Family].is_a?(Hash) ? data = [data[:Family]] : data = data[:Family]
           data.each do |d|
             d[:Categories][:Category].each do |cat|
@@ -28,7 +28,7 @@ module Fog
         end
 
         def get(uri)
-          if data = connection.get_template(uri)
+          if data = service.get_template(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound

data/lib/fog/ecloud/models/compute/trusted_network_group.rb

@@ -10,18 +10,18 @@ module Fog
         attribute :hosts, :aliases => :Hosts
 
         def internet_services
-          @internet_services ||= Fog::Compute::Ecloud::InternetServices.new(:connection => connection, :href => href)
+          @internet_services ||= Fog::Compute::Ecloud::InternetServices.new(:service => service, :href => href)
         end
 
         def edit(options)
           options[:uri] = href
-          data = connection.trusted_network_groups_edit(options).body
-          task = Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => data[:href])[0]
+          data = service.trusted_network_groups_edit(options).body
+          task = Fog::Compute::Ecloud::Tasks.new(:service => service, :href => data[:href])[0]
         end
 
         def delete
-          data = connection.trusted_network_groups_delete(href).body
-          task = Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => data[:href])[0]
+          data = service.trusted_network_groups_delete(href).body
+          task = Fog::Compute::Ecloud::Tasks.new(:service => service, :href => data[:href])[0]
         end
 
         def id

data/lib/fog/ecloud/models/compute/trusted_network_groups.rb

@@ -10,13 +10,13 @@ module Fog
         model Fog::Compute::Ecloud::TrustedNetworkGroup
 
         def all
-          data = connection.get_trusted_network_groups(href).body
+          data = service.get_trusted_network_groups(href).body
           data = data[:TrustedNetworkGroup] ? data[:TrustedNetworkGroup] : data
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_trusted_network_group(uri)
+          if data = service.get_trusted_network_group(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound

data/lib/fog/ecloud/models/compute/user.rb

@@ -19,11 +19,11 @@ module Fog
         attribute :is_multifactor_authentication_enabled, :aliases => :IsMultifactorAuthenticationEnabled, :type => :boolean
 
         def roles
-          @roles = Fog::Compute::Ecloud::Roles.new(:connection => connection, :href => "/cloudapi/ecloud/admin/roles/users/#{id}")
+          @roles = Fog::Compute::Ecloud::Roles.new(:service => service, :href => "/cloudapi/ecloud/admin/roles/users/#{id}")
         end
 
         def api_keys
-          @api_keys = Fog::Compute::Ecloud::ApiKeys.new(:connection => connection, :href => "/cloudapi/ecloud/admin/apiKeys/users/#{id}")
+          @api_keys = Fog::Compute::Ecloud::ApiKeys.new(:service => service, :href => "/cloudapi/ecloud/admin/apiKeys/users/#{id}")
         end
 
         def id

data/lib/fog/ecloud/models/compute/users.rb

@@ -10,12 +10,12 @@ module Fog
         model Fog::Compute::Ecloud::User
 
         def all
-          data = connection.get_users(href).body[:User]
+          data = service.get_users(href).body[:User]
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_user(uri)
+          if data = service.get_user(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound

data/lib/fog/ecloud/models/compute/virtual_machine_assigned_ip.rb

@@ -0,0 +1,32 @@
+module Fog
+  module Compute
+    class Ecloud
+      class VirtualMachineAssignedIp < Fog::Ecloud::Model
+        identity :href
+
+        attribute :network, :aliases => :Networks
+        attribute :address
+
+        def id
+          href.scan(/\d+/)[0]
+        end
+
+        def network=(network)
+          network = network.dup
+          network_address = network[:Network]
+          @network = self.connection.networks.new(network_address)
+          network_id = @network.href.match(/(\d+)$/)[1]
+          address_ip = network_address[:IpAddresses][:IpAddress]
+          @address = self.connection.ip_addresses.new(
+            :href => "/cloudapi/ecloud/ipaddresses/networks/#{network_id}/#{address_ip}",
+            :name => address_ip
+          )
+        end
+        attr_reader :network
+
+        def address=(address); end
+        attr_reader :address
+      end
+    end
+  end
+end

data/lib/fog/ecloud/models/compute/virtual_machine_assigned_ips.rb

@@ -0,0 +1,27 @@
+require 'fog/ecloud/models/compute/virtual_machine_assigned_ip'
+
+module Fog
+  module Compute
+    class Ecloud
+      class VirtualMachineAssignedIps < Fog::Ecloud::Collection
+
+        identity :virtual_machine_id
+
+        model Fog::Compute::Ecloud::VirtualMachineAssignedIp
+
+        def all
+          data = connection.get_virtual_machine_assigned_ips(self.identity).body
+          load(data)
+        end
+
+        def get(uri)
+          if data = connection.get_virtual_machine_assigned_ip(self.identity)
+            new(data.body)
+          end
+        rescue Fog::Errors::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/fog/ecloud/requests/compute/admin_edit_authentication_levels.rb

@@ -18,7 +18,6 @@ module Fog
 
         private
 
-        
         def build_authentication_levels_edit(data)
           xml = Builder::XmlMarkup.new
           xml.AuthenticationLevels do
@@ -26,7 +25,7 @@ module Fog
             xml.SHA1Enabled data[:sha1]
             xml.SHA256Enabled data[:sha256]
             xml.SHA512Enabled data[:sha512]
-          end    
+          end
         end
       end
     end

data/lib/fog/ecloud/requests/compute/get_admin_organization.rb

@@ -6,6 +6,20 @@ module Fog
         basic_request :get_admin_organization
       end
 
+      class Mock
+        def get_admin_organization(uri)
+
+          organization_id = id_from_uri(uri)
+          admin_organization    = self.data[:admin_organizations][organization_id]
+
+          if admin_organization
+            body = Fog::Ecloud.slice(admin_organization, :id, :organization_id)
+
+            response(:body => body)
+          else response(:status => 404) # ?
+          end
+        end
+      end
     end
   end
 end

data/lib/fog/ecloud/requests/compute/get_compute_pool.rb

@@ -6,6 +6,17 @@ module Fog
         basic_request :get_compute_pool
       end
 
+      class Mock
+        def get_compute_pool(uri)
+          compute_pool_id = id_from_uri(uri)
+          compute_pool = self.data[:compute_pools][compute_pool_id]
+
+          if compute_pool
+            response(:body => Fog::Ecloud.slice(compute_pool, :id, :environment))
+          else response(:status => 404) # ?
+          end
+        end
+      end
     end
   end
 end

data/lib/fog/ecloud/requests/compute/get_compute_pools.rb

@@ -6,6 +6,27 @@ module Fog
         basic_request :get_compute_pools
       end
 
+      class Mock
+        def get_compute_pools(uri) # /cloudapi/ecloud/computepools/environments/534
+          environment_id = id_from_uri(uri)
+          environment    = self.data[:environments][environment_id]
+
+          compute_pools  = self.data[:compute_pools].values.select{|cp| cp[:environment_id] == environment_id}
+
+          compute_pools = compute_pools.map{|cp| Fog::Ecloud.slice(cp, :id, :environment_id)}
+
+          compute_pool_response = {:ComputePool => (compute_pools.size > 1 ? compute_pools : compute_pools.first)} # GAH
+          body = {
+            :href  => uri,
+            :type  => "application/vnd.tmrk.cloud.computePool; type=collection",
+            :Links => {
+              :Link => environment,
+            }
+          }.merge(compute_pool_response)
+
+          response(:body => body)
+        end
+      end
     end
   end
 end