fog 1.8.0 → 1.9.0

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

@@ -16,19 +16,19 @@ module Fog
         attribute :response_codes, :aliases => :ResponseCodes
         attribute :send_string, :aliases => :SendString
         attribute :receive_string, :aliases => :ReceiveString
-        
+
         def edit(options = {})
           href = "/cloudapi/ecloud/internetServices/#{internet_service_id}/monitor?type="
           case type
           when "application/vnd.tmrk.cloud.pingMonitor"
             options[:uri] = href + "ping"
-            data = connection.monitors_edit_ping(options).body
+            data = service.monitors_edit_ping(options).body
           when "application/vnd.tmrk.cloud.httpMonitor"
             options[:uri] = href + "http"
-            data = connection.monitors_edit_http(options).body
+            data = service.monitors_edit_http(options).body
           when "application/vnd.tmrk.cloud.ecvMonitor"
             options[:uri] = href + "ecv"
-            data = connection.monitors_edit_ecv(options).body
+            data = service.monitors_edit_ecv(options).body
           end
           object = collection.from_data(data)
         end

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

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

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

@@ -4,32 +4,42 @@ module Fog
       class Network < Fog::Ecloud::Model
         identity :href
 
-        attribute :name, :aliases => :Name
-        attribute :type, :aliases => :Type
-        attribute :other_links, :aliases => :Links
-        attribute :address, :aliases => :Address
-        attribute :network_type, :aliases => :NetworkType
+        attribute :name,              :aliases => :Name
+        attribute :type,              :aliases => :Type
+        attribute :other_links,       :aliases => :Links, :squash => :Link
+        attribute :address,           :aliases => :Address
+        attribute :network_type,      :aliases => :NetworkType
         attribute :broadcast_address, :aliases => :BroadcastAddress
-        attribute :gateway_address, :aliases => :GatewayAddress
-        attribute :rnat_address, :aliases => :RnatAddress
+        attribute :gateway_address,   :aliases => :GatewayAddress
+        attribute :rnat_address,      :aliases => :RnatAddress
 
         def rnats
-          @rnats ||= Fog::Compute::Ecloud::Rnats.new(:connection => connection, :href => "cloudapi/ecloud/rnats/networks/#{id}")
+          @rnats ||= Fog::Compute::Ecloud::Rnats.new(:service => service, :href => "cloudapi/ecloud/rnats/networks/#{id}")
         end
 
         def ips
-          @ips ||= Fog::Compute::Ecloud::IpAddresses.new(:connection => connection, :href => href)
+          @ips ||= Fog::Compute::Ecloud::IpAddresses.new(:service => service, :href => href)
         end
 
         def edit_rnat_association(options)
           options[:uri] = href
-          data = connection.rnat_associations_edit_network(options).body
-          task = Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => data[:href])[0]
+          data = service.rnat_associations_edit_network(options).body
+          task = Fog::Compute::Ecloud::Tasks.new(:service => service, :href => data[:href])[0]
         end
-        
+
         def id
           href.scan(/\d+/)[0]
         end
+
+        def environment
+          reload if other_links.nil?
+          environment_href = other_links.detect { |l| l[:type] == "application/vnd.tmrk.cloud.environment" }[:href]
+          self.service.environments.get(environment_href)
+        end
+
+        def location
+          environment.id
+        end
       end
     end
   end

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

@@ -5,19 +5,23 @@ module Fog
     class Ecloud
       class Networks < Fog::Ecloud::Collection
 
-        identity :href
+        attribute :href, :aliases => :Href
 
         model Fog::Compute::Ecloud::Network
 
         def all
-          data = connection.get_networks(href).body
-          data = data[:Networks] ? data[:Networks][:Network] : data[:Network]
-          data = data.nil? ? [] : data
+          body = service.get_networks(self.href).body
+          body = body[:Networks] ? body[:Networks][:Network] : body[:Network]
+          data = case body
+                 when NilClass then []
+                 when Array then body
+                 when Hash then [body]
+                 end
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_network(uri)
+          if data = service.get_network(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound

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

@@ -13,26 +13,32 @@ module Fog
         attribute :enabled, :aliases => :Enabled, :type => :boolean
         attribute :description, :aliases => :Description
 
+        def ready?
+          !self.name.nil?
+        end
+
         def tasks
-          @tasks ||= Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => "/cloudapi/ecloud/tasks/virtualMachines/#{id}")
+          @tasks ||= Fog::Compute::Ecloud::Tasks.new(:service => service, :href => "/cloudapi/ecloud/tasks/virtualMachines/#{id}")
         end
 
         def delete
-          data = connection.node_service_delete(href).body
-          task = Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => data[:href])[0]
+          data = service.node_service_delete(href).body
+          self.service.tasks.new(data)
         end
 
         def edit(options)
           options[:uri] = href
           options[:description] ||= ""
           options = {:name => name}.merge(options)
-          data = connection.node_service_edit(options).body
-          task = Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => data[:href])[0]
+          data = service.node_service_edit(options).body
+          task = Fog::Compute::Ecloud::Tasks.new(:service => service, :href => data[:href])[0]
         end
-        
+
         def id
           href.scan(/\d+/)[0]
         end
+
+        alias destroy delete
       end
     end
   end

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

@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Ecloud::Node
 
         def all
-          data = connection.get_nodes(href).body
+          data = service.get_nodes(href).body
           if data[:NodeServices]
             load(data[:NodeServices][:NodeService])
           else
@@ -19,8 +19,11 @@ module Fog
         end
 
         def get(uri)
-          if data = connection.get_node(uri)
-            new(data.body)
+          data = service.get_node(uri).body
+          if data == ""
+            new({})
+          else
+            new(data)
           end
         rescue Fog::Errors::NotFound
           nil
@@ -31,7 +34,7 @@ module Fog
           options[:protocol] ||= "TCP"
           options[:enabled] ||= true
           options[:description] ||= ""
-          data = connection.node_service_create(options).body
+          data = service.node_service_create(options).body
           object = new(data)
         end
 

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

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

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

@@ -9,7 +9,7 @@ module Fog
         attribute :operating_system_family, :aliases => :OperatingSystems
 
         def operating_systems
-          @operating_systems ||= Fog::Compute::Ecloud::OperatingSystems.new(:connection => connection, :data => operating_system_family[:OperatingSystem])
+          @operating_systems ||= self.service.operating_systems(:data => operating_system_family[:OperatingSystem])
         end
 
         def id

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

@@ -14,7 +14,7 @@ module Fog
         end
 
         def get(uri)
-          if data = connection.get_operating_system(uri)
+          if data = service.get_operating_system(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound

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

@@ -9,63 +9,63 @@ module Fog
 
         attribute :name, :aliases => :Name
         attribute :type, :aliases => :Type
-        attribute :other_links, :aliases => :Links
+        attribute :other_links, :aliases => :Links, :squash => :Link
 
         def locations
-          @locations ||= Fog::Compute::Ecloud::Locations.new( :connection => connection, :href => href )
+          @locations ||= Fog::Compute::Ecloud::Locations.new( :service => service, :href => href )
         end
 
-        def environments 
-          @environments ||= Fog::Compute::Ecloud::Environments.new(:connection => connection, :href => href)
+        def environments
+          @environments ||= self.service.environments(:href => href)
         end
 
         def tags
-          @tags ||= Fog::Compute::Ecloud::Tags.new(:connection => connection, :href => "/cloudapi/ecloud/deviceTags/organizations/#{id}")
+          @tags ||= self.service.tags(:href => "/cloudapi/ecloud/deviceTags/organizations/#{id}")
         end
 
         def admin
-          @admin ||= Fog::Compute::Ecloud::AdminOrganizations.new(:connection => connection, :href => "/cloudapi/ecloud/admin/organizations/#{id}").first
+          @admin ||= self.service.admin_organizations.new(:href => "/cloudapi/ecloud/admin/organizations/#{id}")
         end
 
         def users
-          @users ||= Fog::Compute::Ecloud::Users.new(:connection => connection, :href => "/cloudapi/ecloud/admin/users/organizations/#{id}")
+          @users ||= self.service.users(:href => "/cloudapi/ecloud/admin/users/organizations/#{id}")
         end
 
         def support_tickets(type = :open)
           case type
           when :open
-            @support_tickets ||= Fog::Compute::Ecloud::SupportTickets.new(:connection => connection, :href => "/cloudapi/ecloud/admin/tickets/organizations/#{id}/active")
+            @support_tickets ||= Fog::Compute::Ecloud::SupportTickets.new(:service => service, :href => "/cloudapi/ecloud/admin/tickets/organizations/#{id}/active")
           when :closed
-            @support_tickets ||= Fog::Compute::Ecloud::SupportTickets.new(:connection => connection, :href => "/cloudapi/ecloud/admin/tickets/organizations/#{id}/closed")
+            @support_tickets ||= Fog::Compute::Ecloud::SupportTickets.new(:service => service, :href => "/cloudapi/ecloud/admin/tickets/organizations/#{id}/closed")
           end
         end
 
         def edit_authentication_levels(options = {})
           options[:uri] = "/cloudapi/ecloud/admin/organizations/#{id}/authenticationLevels"
-          data = connection.admin_edit_authentication_levels(options).body
-          level = Fog::Compute::Ecloud::AdminOrganizations.new(:connection => connection, :href => data[:href])[0]
+          data = service.admin_edit_authentication_levels(options).body
+          level = Fog::Compute::Ecloud::AdminOrganizations.new(:service => service, :href => data[:href])[0]
         end
 
         def edit_password_complexity_rules(options = {})
           options[:uri] = "/cloudapi/ecloud/admin/organizations/#{id}/passwordComplexityRules"
-          data = connection.admin_edit_password_complexity_rules(options).body
-          level = Fog::Compute::Ecloud::PasswordComplexityRules.new(:connection => connection, :href => data[:href])[0]
+          data = service.admin_edit_password_complexity_rules(options).body
+          level = Fog::Compute::Ecloud::PasswordComplexityRules.new(:service => service, :href => data[:href])[0]
         end
 
         def edit_login_banner(options = {})
           options[:uri] = "/cloudapi/ecloud/admin/organizations/#{id}/loginBanner"
-          data = connection.admin_edit_login_banner(options).body
-          banner = Fog::Compute::Ecloud::LoginBanners.new(:connection => connection, :href => data[:href])[0]
+          data = service.admin_edit_login_banner(options).body
+          banner = Fog::Compute::Ecloud::LoginBanners.new(:service => service, :href => data[:href])[0]
         end
 
         def enable_support_access(options = {})
           options[:uri] = "/cloudapi/ecloud/admin/organizations/#{id}/action/enableSupportAccess"
-          connection.admin_enable_support_access(options[:uri])
+          service.admin_enable_support_access(options[:uri])
         end
 
         def disable_support_access(options = {})
           options[:uri] = "/cloudapi/ecloud/admin/organizations/#{id}/action/disableSupportAccess"
-          connection.admin_disable_support_access(options[:uri])
+          service.admin_disable_support_access(options[:uri])
         end
 
         def id

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

@@ -12,12 +12,12 @@ module Fog
         identity :href
 
         def all
-          data = connection.get_organizations(organization_uri).body
+          data = service.get_organizations(organization_uri).body
           load(data[:Organization])
         end
 
         def get(uri)
-          if data = connection.get_organization(uri)
+          if data = service.get_organization(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
@@ -25,7 +25,7 @@ module Fog
         end
 
         def organization_uri
-          @organization_uri ||= connection.default_organization_uri
+          @organization_uri ||= service.default_organization_uri
         end
 
         private

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

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

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

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

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

@@ -10,9 +10,9 @@ module Fog
         attribute :ip_type, :aliases => :IpType
 
         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 environment_id
           other_links[:Link].detect { |l| l[:type] == "application/vnd.tmrk.cloud.environment" }[:href].scan(/\d+/)[0]
         end

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

@@ -10,22 +10,25 @@ module Fog
         model Fog::Compute::Ecloud::PublicIp
 
         def all
-          data = connection.get_public_ips(href).body
+          data = service.get_public_ips(href).body
           data = data[:PublicIp] ? data[:PublicIp] : data
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_public_ip(uri)
-            new(data.body)
+          data = service.get_public_ip(uri).body
+          if data == ""
+            new({})
+          else
+            new(data)
           end
         rescue Fog::Errors::NotFound
           nil
         end
 
         def activate
-          data = connection.public_ip_activate(href + "/action/activatePublicIp").body
-          ip = Fog::Compute::Ecloud::PublicIps.new(:connection => connection, :href => data[:href])[0]
+          data = service.public_ip_activate(href + "/action/activatePublicIp").body
+          ip = Fog::Compute::Ecloud::PublicIps.new(:service => service, :href => data[:href])[0]
         end
       end
     end

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

@@ -11,11 +11,11 @@ module Fog
         attribute :public_ip, :aliases => :PublicIp
 
         def networks
-          @networks = Fog::Compute::Ecloud::Networks.new(:connection => connection, :href => href)
+          @networks = Fog::Compute::Ecloud::Networks.new(:service => service, :href => href)
         end
 
         def associations
-          @associations = Fog::Compute::Ecloud::Associations.new(:connection => connection, :href => href)
+          @associations = Fog::Compute::Ecloud::Associations.new(:service => service, :href => href)
         end
 
         def id

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

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

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

@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Ecloud::Role
 
         def all
-          data = connection.get_roles(href).body
+          data = service.get_roles(href).body
           if data[:OrganizationRole]
             load(data[:OrganizationRole])
           else
@@ -25,7 +25,7 @@ module Fog
         end
 
         def get(uri)
-          if data = connection.get_role(uri)
+          if data = service.get_role(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound