fog 1.1.1 → 1.1.2

data/lib/fog/rackspace/requests/load_balancers/delete_nodes.rb

@@ -4,10 +4,9 @@ module Fog
       class Real
         def delete_nodes(load_balancer_id, *node_ids)
           query_string = node_ids.collect { |node_id| "id=#{node_id}" }.join('&')
-          puts query_string
           request(
             :expects => [200, 202],
-            :path => "loadbalancers/#{load_balancer_id}/nodes?#{node_ids}",
+            :path => "loadbalancers/#{load_balancer_id}/nodes?#{query_string}",
             :method => 'DELETE'
           )
         end

data/lib/fog/rackspace/requests/load_balancers/get_error_page.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Rackspace
+    class LoadBalancers
+      class Real
+        def get_error_page(load_balancer_id)
+          request(
+            :expects => 200,
+            :path => "loadbalancers/#{load_balancer_id}/errorpage",
+            :method => 'GET'
+          )
+         end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/load_balancers/list_load_balancers.rb

@@ -2,11 +2,17 @@ module Fog
   module Rackspace
     class LoadBalancers
       class Real
-        def list_load_balancers
+        def list_load_balancers(options = {})
+          if options.has_key? :node_address
+            query_string = "?nodeaddress=#{options[:node_address]}"
+          else
+            query_string = ''
+          end
+
           request(
             :expects  => 200,
             :method   => 'GET',
-            :path     => 'loadbalancers.json'
+            :path     => "loadbalancers.json?#{query_string}"
           )
         end
       end

data/lib/fog/rackspace/requests/load_balancers/remove_error_page.rb

@@ -0,0 +1,15 @@
+module Fog
+  module Rackspace
+    class LoadBalancers
+      class Real
+        def remove_error_page(load_balancer_id)
+          request(
+            :expects => [200, 202],
+            :path => "loadbalancers/#{load_balancer_id}/errorpage",
+            :method => 'DELETE'
+          )
+         end
+      end
+    end
+  end
+end

data/lib/fog/rackspace/requests/load_balancers/set_error_page.rb

@@ -0,0 +1,21 @@
+module Fog
+  module Rackspace
+    class LoadBalancers
+      class Real
+        def set_error_page(load_balancer_id, content)
+          data = {
+            'errorpage' => {
+              'content' => content
+            }
+          }
+          request(
+            :body     => MultiJson.encode(data),
+            :expects  => [200, 202],
+            :path     => "loadbalancers/#{load_balancer_id}/errorpage",
+            :method   => 'PUT'
+          )
+         end
+      end
+    end
+  end
+end

data/lib/fog/vcloud/compute.rb

@@ -64,6 +64,8 @@ module Fog
       PORT   = 443
       SCHEME = 'https'
 
+      attr_writer :default_organization_uri
+
       requires   :vcloud_username, :vcloud_password, :vcloud_host
       recognizes :vcloud_port, :vcloud_scheme, :vcloud_path, :vcloud_default_vdc
       recognizes :provider # remove post deprecation
@@ -81,8 +83,12 @@ module Fog
       collection :servers
       model :task
       collection :tasks
+      model :vapp
+      collection :vapps
       model :vdc
       collection :vdcs
+      model :organization
+      collection :organizations
 
       request_path 'fog/vcloud/requests/compute'
       request :clone_vapp
@@ -101,6 +107,7 @@ module Fog
       request :get_network_ips
       request :get_network_extensions
       request :get_organization
+      request :get_server
       request :get_task
       request :get_task_list
       request :get_vapp
@@ -296,7 +303,6 @@ module Fog
               parser = Nokogiri::XML::SAX::PushParser.new(document)
               parser << response.body
               parser.finish
-
               response.body = document.body
             end
           end

data/lib/fog/vcloud/models/compute/catalogs.rb

@@ -7,8 +7,11 @@ module Fog
 
         model Fog::Vcloud::Compute::Catalog
 
+        attribute :organization_uri
+
         def all
-          data = connection.get_organization(organization_uri).body[:Link].select { |link| link[:type] == "application/vnd.vmware.vcloud.catalog+xml" }
+          org_uri = self.organization_uri || connection.default_organization_uri
+          data = connection.get_organization(org_uri).body[:Link].select { |link| link[:type] == "application/vnd.vmware.vcloud.catalog+xml" }
           load(data)
         end
 
@@ -20,10 +23,6 @@ module Fog
           nil
         end
 
-        def organization_uri
-          @organization_uri ||= connection.default_organization_uri
-        end
-
         def item_by_name(name)
           res = nil
           items = all.collect { |catalog| catalog.catalog_items }

data/lib/fog/vcloud/models/compute/helpers/status.rb

@@ -0,0 +1,37 @@
+module Fog
+  module Vcloud
+    class Compute
+      module Helpers
+        module Status
+          def friendly_status
+            load_unless_loaded!
+            case status
+              when '0'
+            'creating'
+              when '8'
+            'off'
+              when '4'
+            'on'
+            else
+            'unknown'
+            end
+          end
+
+          def on?
+            reload_status
+            status == '4'
+          end
+
+          def off?
+            reload_status
+            status == '8'
+          end
+
+          def reload_status
+            reload # always ensure we have the correct status
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -3,61 +3,25 @@ module Fog
     class Compute
       class Network < Fog::Vcloud::Model
 
-        identity :href
+        identity :href, :aliases => :Href
 
-        ignore_attributes :xmlns, :xmlns_xsi, :xmlns_xsd, :xmlns_i, :Configuration, :Id
+        ignore_attributes :xmlns, :xmlns_xsi, :xmlns_xsd, :xmlns_i, :Id
 
         attribute :name, :aliases => :Name
-        #attribute :id, :aliases => :Id
-        attribute :features, :aliases => :Features, :type => :array
-        attribute :links, :aliases => :Link, :type => :array
-        attribute :type
-        attribute :gateway, :aliases => :GatewayAddress
-        attribute :broadcast, :aliases => :BroadcastAddress
-        attribute :address, :aliases => :Address
-        attribute :extension_href, :aliases => :Href
-        attribute :network_type, :aliases => :NetworkType
-        attribute :vlan, :aliases => :Vlan
-        attribute :friendly_name, :aliases => :FriendlyName
-
-        def ips
-          load_unless_loaded!
-          Fog::Vcloud::Compute::Ips.new( :connection => connection,
-               :href => links.detect { |link| link[:name] == "IP Addresses" }[:href] )
-        end
 
-        def save
-          if @changed
-            connection.configure_network( extension_href, _compose_network_data )
-          end
-          true
-        end
-
-        def reload
-          super
-          merge_attributes(extension_data.body)
-          self
-        end
+        attribute :description, :aliases => :Description
+        attribute :configuration, :aliases => :Configuration
+        attribute :provider_info, :aliases => :ProviderInfo
 
-        private
-
-        def extension_data
-          connection.get_network_extensions( extensions_link[:href] )
-        end
-
-        def extensions_link
-          links.detect { |link| link[:name] == name }
-        end
+        attribute :links, :aliases => :Link, :type => :array
 
-        def _compose_network_data
-          {
-            :id => id,
-            :href => extension_href,
-            :name => name,
-            :address => address,
-            :broadcast => broadcast,
-            :gateway => gateway
-          }
+        def parent_network
+          return nil if configuration[:ParentNetwork].nil?
+          @parent_network ||= Fog::Vcloud::Compute::Network.new(
+            :connection => connection,
+            :collection => Fog::Vcloud::Compute::Networks.new(:connection => connection),
+            :href => configuration[:ParentNetwork][:href]
+          )
         end
       end
     end

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

@@ -14,10 +14,19 @@ module Fog
 
         def all
           self.href = connection.default_vdc_href unless self.href
-          check_href!("Vdc")
-          if data = connection.get_vdc(href).body[:AvailableNetworks][:Network]
-            load(data)
+          data = nil
+          if self.href =~ /\/vdc\//
+            check_href!("Vdc")
+            data = [connection.get_vdc(self.href).body[:AvailableNetworks][:Network]].flatten.compact
+          elsif self.href =~ /\/org\//
+            check_href!("Org")
+            links = (l=connection.get_organization(self.href).body[:Link]).is_a?(Array) ? l : [l].compact
+            data = links.select{|l| l[:type] == 'application/vnd.vmware.vcloud.network+xml' }
+          elsif self.href =~ /\/vApp\//
+            check_href!("Vapp")
+            data = [(connection.get_vapp(self.href).body[:NetworkConfigSection]||{})[:NetworkConfig]].flatten.compact.collect{|n| n[:Configuration][:ParentNetwork] unless n[:Configuration].nil? }.compact
           end
+          load([*data]) unless data.nil?
         end
 
         def get(uri)

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

@@ -0,0 +1,44 @@
+module Fog
+  module Vcloud
+    class Compute
+      class Organization < Fog::Vcloud::Model
+
+        identity :href
+
+        ignore_attributes :xmlns, :xmlns_xsi, :xmlns_xsd
+
+        attribute :name
+        attribute :description, :aliases => :Description
+        attribute :type
+        attribute :full_name, :aliases => :FullName
+        attribute :other_links, :aliases => :Link
+
+        def networks
+          @networks ||= Fog::Vcloud::Compute::Networks.
+            new( :connection => connection,
+                 :href => href )
+        end
+
+        def tasks
+          load_unless_loaded!
+          @tasks ||= Fog::Vcloud::Compute::Tasks.
+            new( :connection => connection,
+                 :href => other_links.find{|l| l[:type] == 'application/vnd.vmware.vcloud.tasksList+xml'}[:href] )
+        end
+
+        def vdcs
+          @vdcs ||= Fog::Vcloud::Compute::Vdcs.
+            new( :connection => connection,
+                 :href => href )
+        end
+
+        def catalogs
+          @catalogs ||= Fog::Vcloud::Compute::Catalogs.
+            new( :connection => connection,
+                 :href => href )
+        end
+
+      end
+    end
+  end
+end

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

@@ -0,0 +1,29 @@
+require 'fog/vcloud/models/compute/organization'
+
+module Fog
+  module Vcloud
+    class Compute
+
+      class Organizations < Collection
+
+        model Fog::Vcloud::Compute::Organization
+
+        undef_method :create
+
+        def all
+          data = connection.login.body[:Org].select { |org| org[:type] == "application/vnd.vmware.vcloud.org+xml" }
+          data.each { |org| org.delete_if { |key, value| [:rel].include?(key) } }
+          load(data)
+        end
+
+        def get(uri)
+          if data = connection.get_organization(uri)
+            new(data.body)
+          end
+        rescue Fog::Errors::NotFound
+          nil
+        end
+      end
+    end
+  end
+end

data/lib/fog/vcloud/models/compute/server.rb

@@ -1,8 +1,11 @@
+require 'fog/vcloud/models/compute/helpers/status'
 module Fog
   module Vcloud
     class Compute
       class Server < Fog::Vcloud::Model
 
+        include Fog::Vcloud::Compute::Helpers::Status
+
         identity :href, :aliases => :Href
 
         ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd
@@ -10,49 +13,44 @@ module Fog
         attribute :type
         attribute :name
         attribute :status
-        attribute :network_connections, :aliases => :NetworkConnectionSection, :squash => :NetworkConnection
-        attribute :os, :aliases => :OperatingSystemSection
-        attribute :virtual_hardware, :aliases => :VirtualHardwareSection
+        attribute :deployed, :type => :boolean
         attribute :description, :aliases => :Description
-        attribute :storage_size, :aliases => :size
+
+        attribute :vapp_scoped_local_id, :aliases => :VAppScopedLocalId
+
+        attribute :network_connections, :aliases => :NetworkConnectionSection, :squash => :NetworkConnection
+        attribute :virtual_hardware, :aliases => :'ovf:VirtualHardwareSection', :squash => :'ovf:Item'
+
+        attribute :guest_customization, :aliases => :GuestCustomizationSection
+        attribute :operating_system, :aliases => :'ovf:OperatingSystemSection'
+
         attribute :links, :aliases => :Link, :type => :array
         attribute :tasks, :aliases => :Tasks, :type => :array
 
-        attribute :vm_data, :aliases => :Children, :squash => :Vm
-
-        def ip_address
+        def computer_name
           load_unless_loaded!
-          vm[0][:NetworkConnectionSection][:NetworkConnection][:IpAddress]
+          self.guest_customization[:ComputerName]
         end
 
-        def friendly_status
+        def os_desc
           load_unless_loaded!
-          case status
-          when '0'
-            'creating'
-          when '8'
-            'off'
-          when '4'
-            'on'
-          else
-            'unkown'
-          end
+          self.operating_system[:'ovf:Description']
         end
 
-        def ready?
-          reload_status # always ensure we have the correct status
-          running_tasks = tasks && tasks.flatten.any? {|ti| ti.kind_of?(Hash) && ti[:status] == 'running' }
-          status != '0' && !running_tasks # 0 is provisioning, and no running tasks
+        def os_type
+          load_unless_loaded!
+          self.operating_system[:vmw_osType]
         end
 
-        def on?
-          reload_status # always ensure we have the correct status
-          status == '4'
+        def ip_addresses
+          load_unless_loaded!
+          self.network_connections.collect{|n| n[:IpAddress] }
         end
 
-        def off?
+        def ready?
           reload_status # always ensure we have the correct status
-          status == '8'
+          running_tasks = tasks && tasks.flatten.any? {|ti| ti.kind_of?(Hash) && ti[:status] == 'running' }
+          status != '0' && !running_tasks # 0 is provisioning, and no running tasks
         end
 
         def power_on
@@ -83,11 +81,6 @@ module Fog
           power_on
         end
 
-        def vm
-          load_unless_loaded!
-          self.vm_data
-        end
-
         def name=(new_name)
           attributes[:name] = new_name
           @changed = true
@@ -120,7 +113,7 @@ module Fog
 
         def disks
           disk_mess.map do |dm|
-            { :number => dm[:"rasd:AddressOnParent"], :size => dm[:"rasd:VirtualQuantity"].to_i, :resource => dm[:"rasd:HostResource"] }
+            { :number => dm[:"rasd:AddressOnParent"].to_i, :size => dm[:"rasd:HostResource"][:vcloud_capacity].to_i, :resource => dm[:"rasd:HostResource"], :disk_data => dm }
           end
         end
 
@@ -187,12 +180,12 @@ module Fog
                 vh[:'rasd:ResourceType'] == '17' &&
                   vh[:'rasd:AddressOnParent'].to_s == @remove_disk.to_s
               end
-              connection.configure_vm_disks(vm_href, data)
+              connection.configure_vm_disks(self.href, data)
             end
             if @disk_change == :added
               data = disk_mess
               data << @add_disk
-              connection.configure_vm_disks(vm_href, data)
+              connection.configure_vm_disks(self.href, data)
             end
             if @name_changed || @description_changed
               edit_uri = links.select {|i| i[:rel] == 'edit'}
@@ -216,14 +209,6 @@ module Fog
         end
         alias :delete :destroy
 
-        def vm_href
-          load_unless_loaded!
-          #require 'pp'
-          #pp vm_data
-          #vm_data[0][:Link].select {|v| v[:rel] == 'edit'}[0][:href]
-          vm_data.kind_of?(Array)? vm_data[0][:href] : vm_data[:href]
-        end
-
         private
 
         def reset_tracking
@@ -242,29 +227,24 @@ module Fog
           }
         end
 
-        def virtual_hardware_section
-          load_unless_loaded!
-          vm[0][:"ovf:VirtualHardwareSection"][:"ovf:Item"]
-        end
-
         def memory_mess
           load_unless_loaded!
-          if virtual_hardware_section
-            virtual_hardware_section.detect { |item| item[:"rasd:ResourceType"] == "4" }
+          if virtual_hardware
+            virtual_hardware.detect { |item| item[:"rasd:ResourceType"] == "4" }
           end
         end
 
         def cpu_mess
           load_unless_loaded!
-          if virtual_hardware_section
-            virtual_hardware_section.detect { |item| item[:"rasd:ResourceType"] == "3" }
+          if virtual_hardware
+            virtual_hardware.detect { |item| item[:"rasd:ResourceType"] == "3" }
           end
         end
 
         def disk_mess
           load_unless_loaded!
-          if virtual_hardware_section
-            virtual_hardware_section.select { |item| item[:"rasd:ResourceType"] == "17" }
+          if virtual_hardware
+            virtual_hardware.select { |item| item[:"rasd:ResourceType"] == "17" }
           else
             []
           end
@@ -284,7 +264,6 @@ module Fog
         def reload_status
           self.status = connection.get_vapp(href).body[:status]
         end
-
       end
     end
   end