fog-maestrodev 1.7.0.20121114190951 → 1.8.0.20130109172219

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

@@ -14,7 +14,7 @@ module Fog
 
         def all
           data = []
-          connection.get_organization(href).body[:Locations][:Location].each do |d| 
+          service.get_organization(href).body[:Locations][:Location].each do |d|
             if d[:Environments][:Environment].is_a?(Array)
               d[:Environments][:Environment].each { |e| data << e }
             else
@@ -25,7 +25,7 @@ module Fog
         end
 
         def get(uri)
-          if data = connection.get_environment(uri)
+          if data = service.get_environment(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound

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

@@ -15,7 +15,7 @@ module Fog
         attribute :port_range, :aliases => :PortRange
 
         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 id

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

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

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

@@ -10,29 +10,31 @@ module Fog
         attribute :index, :aliases => :Index
 
         def servers
-          @servers = Fog::Compute::Ecloud::Servers.new(:connection => connection, :href => href)
+          @servers = Fog::Compute::Ecloud::Servers.new(:service => service, :href => href)
         end
 
         def edit(options = {})
           options[:uri] = href
-          data = connection.groups_edit(options).body
-        end 
+          data = service.groups_edit(options).body
+        end
 
         def move_up
-          connection.groups_moveup(href).body
+          service.groups_moveup(href).body
         end
 
         def move_down
-          connection.groups_movedown(href).body
+          service.groups_movedown(href).body
         end
 
         def delete
-          connection.groups_delete(href).body
+          service.groups_delete(href).body
         end
 
         def id
           href.scan(/\d+/)[0]
         end
+
+        alias destroy delete
       end
     end
   end

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

@@ -10,16 +10,27 @@ module Fog
         model Fog::Compute::Ecloud::Group
 
         def all
-          data = connection.get_groups(href).body
-          data = data[:Groups] ? data[:Groups][:Group] : data
-          load(data)
+          data = service.get_groups(href).body
+          data = if data == ""
+                   ""
+                 else
+                   data[:Groups] ? data[:Groups][:Group] : data
+                 end
+          if data == "" || !data.is_a?(Array) && data[:type] == "application/vnd.tmrk.cloud.layoutRow"
+            nil
+          else
+            load(data)
+          end
         end
 
         def get(uri)
-          if data = connection.get_group(uri)
-            new(data.body)
+          data = service.get_group(uri).body
+          if data == ""
+            nil
+          else
+            new(data)
           end
-        rescue Fog::Errors::NotFound
+        rescue Excon::Errors::NotFound
           nil
         end
       end

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

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

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

@@ -4,10 +4,10 @@ module Fog
       class HardwareConfiguration < Fog::Ecloud::Model
         identity :href
 
-        attribute :processor_count, :aliases => :ProcessorCount, :type => :integer
-        attribute :mem, :aliases => :Memory
-        attribute :storage, :aliases => :Disks
-        attribute :network_cards, :aliases => :Nics
+        attribute :processor_count, :aliases => :ProcessorCount,           :type => :integer
+        attribute :memory,          :aliases => :Memory, :squash => :Value # {:Memory => {:Value => 15}}
+        attribute :storage,         :aliases => :Disks,  :squash => :Disk
+        attribute :network_cards,   :aliases => :Nics,   :squash => :Nic
 
         def id
           href.scan(/\d+/)[0]

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

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

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

@@ -4,72 +4,76 @@ module Fog
       class InternetService < Fog::Ecloud::Model
         identity :href
 
-        attribute :name, :aliases => :Name
-        attribute :type, :aliases => :Type
-        attribute :other_links, :aliases => :Links
-        attribute :actions, :aliases => :Actions
-        attribute :protocol, :aliases => :Protocol
-        attribute :port, :aliases => :Port, :type => :integer
-        attribute :enabled, :aliases => :Enabled, :type => :boolean
-        attribute :description, :aliases => :Description
-        attribute :public_ip, :aliases => :PublicIp
-        attribute :persistence, :aliases => :Persistence
-        attribute :redirect_url, :aliases => :RedirectUrl
-        attribute :trusted_network_group, :aliases => :TrustedNetworkGroup
+        attribute :name,                    :aliases => :Name
+        attribute :type,                    :aliases => :Type
+        attribute :other_links,             :aliases => :Links
+        attribute :actions,                 :aliases => :Actions
+        attribute :protocol,                :aliases => :Protocol
+        attribute :port,                    :aliases => :Port, :type => :integer
+        attribute :enabled,                 :aliases => :Enabled, :type => :boolean
+        attribute :description,             :aliases => :Description
+        attribute :public_ip,               :aliases => :PublicIp
+        attribute :persistence,             :aliases => :Persistence
+        attribute :redirect_url,            :aliases => :RedirectUrl
+        attribute :trusted_network_group,   :aliases => :TrustedNetworkGroup
         attribute :backup_internet_service, :aliases => :BackupInternetService
 
+        def ready?
+          !self.port.nil?
+        end
+
         def nodes
-          @nodes ||= Fog::Compute::Ecloud::Nodes.new(:connection => connection, :href => href)
+          @nodes ||= Fog::Compute::Ecloud::Nodes.new(:service => service, :href => href)
         end
 
         def monitors
-          @monitors ||= Fog::Compute::Ecloud::Monitors.new(:connection => connection, :href => "/cloudapi/ecloud/internetServices/#{id}/monitor") 
+          @monitors ||= Fog::Compute::Ecloud::Monitors.new(:service => service, :href => "/cloudapi/ecloud/internetServices/#{id}/monitor")
         end
 
         def save
-          if new_record?
-            result = connection.internet_service_create( collection.href, _compose_service_data )
+          unless persisted?
+            result = service.internet_service_create( collection.href, _compose_service_data )
             merge_attributes(result.body)
           else
-            connection.configure_internet_service( href, _compose_service_data, _compose_ip_data )
+            service.configure_internet_service( href, _compose_service_data, _compose_ip_data )
           end
         end
 
         def edit(options)
           options[:uri] = href
-          data = connection.internet_service_edit(options).body
-          task = Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => data[:href])[0]
+          data = service.internet_service_edit(options).body
+          task = Fog::Compute::Ecloud::Tasks.new(:service => service, :href => data[:href])[0]
         end
 
         def delete
-          data = connection.internet_service_delete(href).body
-          task = Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => data[:href])[0]
+          data = service.internet_service_delete(href).body
+          self.service.tasks.new(data)
         end
 
         def create_monitor(options = {})
           options = {:type => :default}.merge(options)
           case options[:type]
           when :default
-            data = connection.monitors_create_default(href + "/action/createDefaultMonitor").body
+            data = service.monitors_create_default(href + "/action/createDefaultMonitor").body
           when :ping
             options[:enabled] ||= true
             options[:uri] = href + "/action/createPingMonitor"
-            data = connection.monitors_create_ping(options).body
+            data = service.monitors_create_ping(options).body
           when :http
             options[:uri] = href + "/action/createHttpMonitor"
-            data = connection.monitors_create_http(options).body
+            data = service.monitors_create_http(options).body
           when :ecv
             options[:uri] = href + "/action/createEcvMonitor"
-            data = connection.monitors_create_ecv(options).body
+            data = service.monitors_create_ecv(options).body
           when :loopback
-            data = connection.monitors_create_loopback(href).body
+            data = service.monitors_create_loopback(href).body
           end
-          monitor = Fog::Compute::Ecloud::Monitors.new(:connection => connection, :href => data[:href])
+          monitor = Fog::Compute::Ecloud::Monitors.new(:service => service, :href => data[:href])
         end
 
         def disable_monitor
-          data = connection.monitors_disable(href + "/action/disableMonitor").body
-          task = Fog::Compute::Ecloud::Tasks.new(:connection => connection, :href => data[:href])
+          data = service.monitors_disable(href + "/action/disableMonitor").body
+          task = Fog::Compute::Ecloud::Tasks.new(:service => service, :href => data[:href])
         end
 
         def id
@@ -85,6 +89,8 @@ module Fog
           service_data.reject! {|k, v| v.nil? }
           service_data
         end
+
+        alias destroy delete
       end
     end
   end

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

@@ -10,7 +10,7 @@ module Fog
         model Fog::Compute::Ecloud::InternetService
 
         def all
-          data = connection.get_internet_services(href).body[:InternetServices]
+          data = service.get_internet_services(href).body[:InternetServices]
           if data.is_a?(Hash)
             load(data[:InternetService])
           elsif data.is_a?(String) && data.empty?
@@ -19,8 +19,11 @@ module Fog
         end
 
         def get(uri)
-          if data = connection.get_internet_service(uri)
-            new(data.body)
+          data = service.get_internet_service(uri).body
+          if data == ""
+            new({})
+          else
+            new(data)
           end
         rescue Fog::Errors::NotFound
           nil
@@ -28,12 +31,12 @@ module Fog
 
         def create(options)
           options[:uri] = "/cloudapi/ecloud/internetServices/publicIps/#{public_ip_id}/action/createInternetService"
-          options[:protocol] ||= "TCP"
-          options[:enabled] ||= true
-          options[:description] ||= ""
-          options[:persistence] ||= {}
+          options[:protocol]           ||= "TCP"
+          options[:enabled]            ||= true
+          options[:description]        ||= ""
+          options[:persistence]        ||= {}
           options[:persistence][:type] ||= "None"
-          data = connection.internet_service_create(options).body
+          data = service.internet_service_create(options).body
           object = new(data)
         end
 

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

@@ -6,7 +6,7 @@ module Fog
 
         attribute :name, :aliases => :Name
         attribute :type, :aliases => :Type
-        attribute :other_links, :aliases => :Links
+        attribute :other_links, :aliases => :Links, :squash => :Link
         attribute :host, :aliases => :Host
         attribute :detected_on, :aliases => :DetectedOn
         attribute :rnat, :aliases => :RnatAddress
@@ -15,9 +15,23 @@ module Fog
         def status
           (detected_on || host) ? "Assigned" : "Available"
         end
-        
+
         def id
-          href.scan(/\d+/)[0]
+          href.match(/((\d+{1,3}\.){3}(\d+{1,3}))$/)[1]
+        end
+
+        def server
+          @server ||= begin
+                        reload unless other_links
+                        server_link = other_links.find{|l| l[:type] == "application/vnd.tmrk.cloud.virtualMachine"}
+                        self.connection.servers.get(server_link[:href])
+                      end
+        end
+
+        def network
+          reload if other_links.nil?
+          network_href = other_links.detect { |l| l[:type] == "application/vnd.tmrk.cloud.network" }[:href]
+          network      = self.connection.networks.get(network_href)
         end
       end
     end

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

@@ -10,13 +10,18 @@ module Fog
         model Fog::Compute::Ecloud::IpAddress
 
         def all
-          data = connection.get_ip_addresses(href).body[:IpAddresses][:IpAddress]
+          data = service.get_network(href).body
+          data = if data[:IpAddresses]
+                   data[:IpAddresses][:IpAddress]
+                 else
+                   data
+                 end
           data = data.nil? ? [] : data
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_ip_address(uri)
+          if data = service.get_ip_address(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound

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

@@ -8,7 +8,7 @@ module Fog
         attribute :other_links, :aliases => :Links
 
         def rows
-          @rows = Fog::Compute::Ecloud::Rows.new(:connection => connection, :href => href)
+          @rows ||= self.service.rows(:href => href)
         end
 
         def id

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

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

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

@@ -11,7 +11,7 @@ module Fog
         attribute :type, :aliases => :Type
 
         def catalog(org_href)
-          @catalog ||= Fog::Compute::Ecloud::Catalog.new(:connection => connection, :href => "/cloudapi/ecloud/admin/catalog/organizations/#{org_href.scan(/\d+/)[0]}/locations/#{id}")
+          @catalog ||= Fog::Compute::Ecloud::Catalog.new(:service => service, :href => "/cloudapi/ecloud/admin/catalog/organizations/#{org_href.scan(/\d+/)[0]}/locations/#{id}")
         end
 
         def id

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

@@ -13,12 +13,12 @@ module Fog
         identity :href
 
         def all
-          data = connection.get_organization(href).body[:Locations][:Location]
+          data = service.get_organization(href).body[:Locations][:Location]
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_location(uri)
+          if data = service.get_location(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound

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

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