fog 1.3.1 → 1.4.0

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

@@ -0,0 +1,17 @@
+module Fog
+  module Compute
+    class Ecloud
+      class ServerConfigurationOption < Fog::Ecloud::Model
+        identity :href
+
+        attribute :disk, :aliases => :Disk
+        attribute :customization, :aliases => :Customization
+
+        
+        def id
+          href.scan(/\d+/)[0]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+require 'fog/ecloud/models/compute/server_configuration_option'
+
+module Fog
+  module Compute
+    class Ecloud
+      class ServerConfigurationOptions < Fog::Ecloud::Collection
+
+        identity :href
+
+        model Fog::Compute::Ecloud::ServerConfigurationOption
+
+        def all
+          data = connection.get_server_configuration_options(href).body
+          load(data)
+        end
+
+        def get(uri)
+          if data = connection.get_server_configuration_option(uri)
+            new(data.body)
+          end
+        rescue Fog::Errors::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

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

@@ -3,55 +3,65 @@ require 'fog/ecloud/models/compute/server'
 module Fog
   module Compute
     class Ecloud
-
       class Servers < Fog::Ecloud::Collection
-
-        undef_method :create
-
+        
         model Fog::Compute::Ecloud::Server
 
-        attribute :href, :aliases => :Href
+        identity :href
 
         def all
-          check_href!(:parent => "Vdc")
-          load(_vapps)
+          data = connection.get_servers(href).body
+          if data.keys.include?(:VirtualMachines)
+            data = data[:VirtualMachines][:VirtualMachine]
+          else
+            data = data[:VirtualMachine]
+          end
+          load(data)
         end
 
         def get(uri)
-          if data = connection.get_vapp(uri)
+          if data = connection.get_server(uri)
             new(data.body)
           end
         rescue Fog::Errors::NotFound
           nil
         end
 
-        def create( catalog_item_uri, options )
-          options[:vdc_uri] = href
-          options[:cpus] ||= 1
-          options[:memory] ||= 512
-          data = connection.instantiate_vapp_template( catalog_item_uri, options ).body
-          object = new(data)
-          object
-        end
-
-        private
-
-        def _resource_entities
-          if Hash === resource_entities = connection.get_vdc(href).body[:ResourceEntities]
-            resource_entities[:ResourceEntity]
-          end
+        def from_data(data)
+          new(data)
         end
 
-        def _vapps
-          resource_entities = _resource_entities
-          if resource_entities.nil?
-            []
+        def create( template_uri, options )
+          options[:cpus] ||= 1
+          options[:memory] ||= 512
+          options[:description] ||= ""
+          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]
+            else
+              options[:network_uri] = options[:network_uri].is_a?(String) ? [options[:network_uri]] : options[:network_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
+                options[:ips] ||= []
+                options[:ips][index] = ip
+              end
+            end
+            data = connection.virtual_machine_create_from_template( template_uri, options ).body
           else
-            resource_entities
+            options[:uri] = href + "/action/importVirtualMachine"
+            data = connection.virtual_machine_import( template_uri, options ).body
           end
+          object = new(data)
+          object
         end
 
       end
     end
   end
 end
+

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

@@ -0,0 +1,20 @@
+module Fog
+  module Compute
+    class Ecloud
+      class SshKey < Fog::Ecloud::Model
+        identity :href
+
+        attribute :name, :aliases => :Name
+        attribute :type, :aliases => :Type
+        attribute :other_links, :aliases => :Links
+        attribute :default, :aliases => :Default, :type => :boolean
+        attribute :finger_print, :aliases => :FingerPrint
+
+        
+        def id
+          href.scan(/\d+/)[0]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+require 'fog/ecloud/models/compute/ssh_key'
+
+module Fog
+  module Compute
+    class Ecloud
+      class SshKeys < Fog::Ecloud::Collection
+
+        identity :href
+
+        model Fog::Compute::Ecloud::SshKey
+
+        def all
+          data = connection.get_ssh_keys(href).body[:SshKey]
+          load(data)
+        end
+
+        def get(uri)
+          if data = connection.get_ssh_key(uri)
+            new(data.body)
+          end
+        rescue Fog::Errors::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,16 @@
+module Fog
+  module Compute
+    class Ecloud
+      class StorageUsageDetail < Fog::Ecloud::Model
+        identity :href
+
+        attribute :disk_count, :aliases => :DiskCount
+        attribute :allocated, :aliases => :Allocated
+        
+        def id
+          href.scan(/\d+/)[0]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+require 'fog/ecloud/models/compute/storage_usage_detail'
+
+module Fog
+  module Compute
+    class Ecloud
+      class StorageUsageDetailSummary < Fog::Ecloud::Collection
+
+        identity :href
+
+        model Fog::Compute::Ecloud::StorageUsageDetail
+
+        def all
+          data = connection.get_storage_usage_detail_summary(href).body[:VirtualMachines][:VirtualMachine]
+          load(data)
+        end
+
+        def get(uri)
+          if data = connection.get_storage_usage_detail(uri)
+            new(data.body)
+          end
+        rescue Fog::Errors::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+module Fog
+  module Compute
+    class Ecloud
+      class SupportTicket < Fog::Ecloud::Model
+        identity :href
+
+        attribute :type, :aliases => :Type
+        attribute :other_links, :aliases => :Links
+        attribute :date, :aliases => :Date
+        attribute :status, :aliases => :Status
+        attribute :category, :aliases => :Category
+        attribute :detected_by, :aliases => :DetectedBy
+        attribute :severity, :aliases => :Severity
+        attribute :device, :aliases => :Device
+        attribute :classification, :aliases => :Classification
+        attribute :owner, :aliases => :Owner
+        attribute :description, :aliases => :Description
+        attribute :information, :aliases => :Information
+        attribute :solution, :aliases => :Solution
+        attribute :history, :aliases => :History
+
+        
+        def id
+          href.scan(/\d+/)[0]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+require 'fog/ecloud/models/compute/support_ticket'
+
+module Fog
+  module Compute
+    class Ecloud
+      class SupportTickets < Fog::Ecloud::Collection
+
+        identity :href
+
+        model Fog::Compute::Ecloud::SupportTicket
+
+        def all
+          data = connection.get_support_tickets(href).body[:TicketReference]
+          load(data)
+        end
+
+        def get(uri)
+          if data = connection.get_support_ticket(uri)
+            new(data.body)
+          end
+        rescue Fog::Errors::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,13 @@
+module Fog
+  module Compute
+    class Ecloud
+      class Tag < Fog::Ecloud::Model
+        identity :name
+
+        def id
+          href.scan(/\d+/)[0]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,27 @@
+require 'fog/ecloud/models/compute/tag'
+
+module Fog
+  module Compute
+    class Ecloud
+      class Tags < Fog::Ecloud::Collection
+
+        identity :href
+
+        model Fog::Compute::Ecloud::Tag
+
+        def all
+          data = connection.get_tags(href).body[:DeviceTag]
+          load(data)
+        end
+
+        def get(uri)
+          if data = connection.get_tag(uri)
+            new(data.body)
+          end
+        rescue Fog::Errors::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

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

@@ -2,18 +2,17 @@ module Fog
   module Compute
     class Ecloud
       class Task < Fog::Ecloud::Model
+        identity :href
 
-        identity :href, :aliases => :Href
-
-        ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd
-
-        attribute :status
-        attribute :type
-        attribute :result, :aliases => :Result
-        attribute :owner, :aliases => :Owner
-        attribute :start_time, :aliases => :startTime, :type => :time
-        attribute :end_time, :aliases => :endTime, :type => :time
-        attribute :error, :aliases => :Error
+        attribute :type , :aliases => :Type
+        attribute :operation, :aliases => :Operation
+        attribute :status, :aliases => :Status
+        attribute :impacted_item, :aliases => :ImpactedItem
+        attribute :start_time, :aliases => :StartTime
+        attribute :completed_time, :aliases => :CompletedTime
+        attribute :notes, :aliases => :Notes
+        attribute :error_message, :aliases => :ErrorMessage
+        attribute :initiated_by, :aliases => :InitiatedBy
 
       end
     end

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

@@ -3,18 +3,18 @@ require 'fog/ecloud/models/compute/task'
 module Fog
   module Compute
     class Ecloud
-
       class Tasks < Fog::Ecloud::Collection
-
+        
         model Fog::Compute::Ecloud::Task
 
-        attribute :href, :aliases => :Href
+        identity :href
+        attribute :other_links, :aliases => :Links
+        attribute :total_count, :aliases => :TotalCount
 
         def all
-          check_href!
-          if data = connection.get_task_list(href).body[:Task]
-            load(data)
-          end
+          data = connection.get_tasks(href).body
+          data = data[:Task] ? data[:Task] : data
+          load(data)
         end
 
         def get(uri)
@@ -24,8 +24,8 @@ module Fog
         rescue Fog::Errors::NotFound
           nil
         end
-
       end
     end
   end
 end
+

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

@@ -0,0 +1,24 @@
+module Fog
+  module Compute
+    class Ecloud
+      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 :licensed_software, :aliases => :LicensedSoftware
+
+        
+        def id
+          href.scan(/\d+/)[0]
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,40 @@
+require 'fog/ecloud/models/compute/template'
+
+module Fog
+  module Compute
+    class Ecloud
+      class Templates < Fog::Ecloud::Collection
+
+        identity :href
+
+        model Fog::Compute::Ecloud::Template
+
+        def all
+          r_data = []
+          data = connection.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|
+              cat[:OperatingSystems][:OperatingSystem].is_a?(Hash) ? cat = [cat[:OperatingSystems][:OperatingSystem]] : cat = cat[:OperatingSystems][:OperatingSystem]
+              cat.each do |os|
+                os[:Templates][:Template].is_a?(Hash) ? os = [os[:Templates][:Template]] : os = os[:Templates][:Template]
+                os.each do |template|
+                  r_data << template
+                end
+              end
+            end
+          end
+          load(r_data)
+        end
+
+        def get(uri)
+          if data = connection.get_template(uri)
+            new(data.body)
+          end
+        rescue Fog::Errors::NotFound
+          nil
+        end
+      end
+    end
+  end
+end