fog 1.0.0 → 1.5.0

data/lib/fog/storm_on_demand/requests/compute/list_images.rb

@@ -6,7 +6,7 @@ module Fog
         def list_images(options = {})
           request(
             :path     => "/server/image/list",
-            :body     => MultiJson.encode(options)
+            :body     => Fog::JSON.encode(options)
           )
         end
 

data/lib/fog/storm_on_demand/requests/compute/list_private_ips.rb

@@ -6,7 +6,7 @@ module Fog
         def list_private_ips(options = {})
           request(
             :path     => "/network/private/get",
-            :body     => MultiJson.encode(options)
+            :body     => Fog::JSON.encode(options)
           )
         end
 

data/lib/fog/storm_on_demand/requests/compute/list_servers.rb

@@ -6,7 +6,7 @@ module Fog
         def list_servers(options = {})
           request(
             :path     => "/storm/server/list",
-            :body     => MultiJson.encode(options)
+            :body     => Fog::JSON.encode(options)
           )
         end
 

data/lib/fog/storm_on_demand/requests/compute/list_templates.rb

@@ -6,7 +6,7 @@ module Fog
         def list_templates(options = {})
           request(
             :path     => "/server/template/list",
-            :body     => MultiJson.encode(options)
+            :body     => Fog::JSON.encode(options)
           )
         end
 

data/lib/fog/storm_on_demand/requests/compute/reboot_server.rb

@@ -6,7 +6,7 @@ module Fog
         def reboot_server(options = {})
           request(
             :path     => "/storm/server/reboot",
-            :body     => MultiJson.encode({:params => options})
+            :body     => Fog::JSON.encode({:params => options})
           )
         end
 

data/lib/fog/storm_on_demand/requests/compute/remove_balancer_node.rb

@@ -6,7 +6,7 @@ module Fog
         def remove_balancer_node(options = {})
           request(
             :path     => "/network/loadbalancer/removenode",
-            :body     => MultiJson.encode({:params => options})
+            :body     => Fog::JSON.encode({:params => options})
           )
         end
 

data/lib/fog/storm_on_demand/requests/compute/resize_server.rb

@@ -6,7 +6,7 @@ module Fog
         def resize_server(options = {})
           request(
             :path     => "/storm/server/resize",
-            :body     => MultiJson.encode({:params => options})
+            :body     => Fog::JSON.encode({:params => options})
           )
         end
 

data/lib/fog/storm_on_demand.rb

@@ -1,4 +1,4 @@
-require(File.expand_path(File.join(File.dirname(__FILE__), 'core')))
+require 'fog/core'
 
 module Fog
   module StormOnDemand

data/lib/fog/terremark/shared.rb

@@ -61,7 +61,7 @@ module Fog
           end
           begin
             do_request(params)
-          rescue Excon::Errors::Unauthorized => e
+          rescue Excon::Errors::Unauthorized
             @cookie = auth_token
             do_request(params)
           end

data/lib/fog/terremark/vcloud.rb

@@ -15,7 +15,7 @@ module Fog
      extend Fog::Terremark::Shared
 
      def self.new(options={})
-       Fog::Logger.warning("Fog::Terremark::Vcloud is deprecated, to be replaced with Vcloud 1.0 someday/maybe [light_black](#{caller.first})[/]")
+       Fog::Logger.deprecation("Fog::Terremark::Vcloud is deprecated, to be replaced with Vcloud 1.0 someday/maybe [light_black](#{caller.first})[/]")
 
        unless @required
          shared_requires

data/lib/fog/terremark.rb

@@ -1,4 +1,4 @@
-require(File.expand_path(File.join(File.dirname(__FILE__), 'core')))
+require 'fog/core'
 
 require 'fog/terremark/shared'
 require 'fog/terremark/parser'

data/lib/fog/vcloud/compute.rb

@@ -1,4 +1,4 @@
-require File.expand_path(File.join(File.dirname(__FILE__), '..', 'vcloud'))
+require 'fog/vcloud'
 require 'fog/compute'
 
 module Fog
@@ -52,6 +52,20 @@ module Fog
         end
       end
 
+      def link_up
+        load_unless_loaded!
+        self.links.find{|l| l[:rel] == 'up' }
+      end
+
+      def self.has_up(item)
+        class_eval <<-EOS, __FILE__,__LINE__
+          def #{item}
+            load_unless_loaded!
+            connection.get_#{item}(link_up[:href])
+          end
+        EOS
+      end
+
     end
   end
 end
@@ -60,12 +74,16 @@ module Fog
   module Vcloud
     class Compute < Fog::Service
 
-      PATH   = '/api/v1.0'
+      BASE_PATH   = '/api'
+      DEFAULT_VERSION = '1.5'
+      SUPPORTED_VERSIONS = [ '1.5', '1.0' ]
       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 :vcloud_port, :vcloud_scheme, :vcloud_path, :vcloud_default_vdc, :vcloud_version, :vcloud_base_path
       recognizes :provider # remove post deprecation
 
       model_path 'fog/vcloud/models/compute'
@@ -81,8 +99,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
@@ -93,21 +115,15 @@ module Fog
       request :configure_vm_name_description
       request :configure_vm_disks
       request :delete_vapp
-      request :get_catalog
       request :get_catalog_item
       request :get_customization_options
-      request :get_network
       request :get_network_ip
       request :get_network_ips
       request :get_network_extensions
-      request :get_organization
-      request :get_task
       request :get_task_list
-      request :get_vapp
       request :get_vapp_template
       request :get_vm_disks
       request :get_vm_memory
-      request :get_vdc
       request :instantiate_vapp_template
       request :login
       request :power_off
@@ -131,13 +147,16 @@ module Fog
           def basic_request(*args)
             self.class_eval <<-EOS, __FILE__,__LINE__
               def #{args[0]}(uri)
-                request({
-                  :expects => #{args[1] || 200},
-                  :method  => '#{args[2] || 'GET'}',
-                  :headers => #{args[3] ? args[3].inspect : '{}'},
-                  :body => '#{args[4] ? args[4] : ''}',
-                  :parse => true,
-                  :uri     => uri })
+                request(
+                  {
+                    :expects => #{args[1] || 200},
+                    :method  => '#{args[2] || 'GET'}',
+                    :headers => #{args[3] ? args[3].inspect : '{}'},
+                    :body => '#{args[4] ? args[4] : ''}',
+                    :parse => true,
+                    :uri     => uri
+                  }
+                )
               end
             EOS
           end
@@ -154,9 +173,10 @@ module Fog
               end
             EOS
           end
-
         end
 
+        attr_reader :version
+
         def initialize(options = {})
           require 'builder'
           require 'fog/core/parser'
@@ -165,13 +185,15 @@ module Fog
           @connection_options = options[:connection_options] || {}
           @persistent = options[:persistent]
 
-          @username = options[:vcloud_username]
-          @password = options[:vcloud_password]
-          @host     = options[:vcloud_host]
-          @vdc_href     = options[:vcloud_default_vdc]
-          @path     = options[:vcloud_path]   || Fog::Vcloud::Compute::PATH
-          @port     = options[:vcloud_port]   || Fog::Vcloud::Compute::PORT
-          @scheme   = options[:vcloud_scheme] || Fog::Vcloud::Compute::SCHEME
+          @username  = options[:vcloud_username]
+          @password  = options[:vcloud_password]
+          @host      = options[:vcloud_host]
+          @vdc_href  = options[:vcloud_default_vdc]
+          @base_path = options[:vcloud_base_path]   || Fog::Vcloud::Compute::BASE_PATH
+          @version   = options[:vcloud_version]     || Fog::Vcloud::Compute::DEFAULT_VERSION
+          @path      = options[:vcloud_path]        || "#{@base_path}/v#{@version}"
+          @port      = options[:vcloud_port]        || Fog::Vcloud::Compute::PORT
+          @scheme    = options[:vcloud_scheme]      || Fog::Vcloud::Compute::SCHEME
         end
 
         def reload
@@ -214,10 +236,17 @@ module Fog
         end
 
         def xmlns
-          { "xmlns" => "http://www.vmware.com/vcloud/v1",
-            "xmlns:ovf" => "http://schemas.dmtf.org/ovf/envelope/1",
-            "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",
-            "xmlns:xsd" => "http://www.w3.org/2001/XMLSchema" }
+          if version == '1.0'
+            { "xmlns" => "http://www.vmware.com/vcloud/v1",
+              "xmlns:ovf" => "http://schemas.dmtf.org/ovf/envelope/1",
+              "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",
+              "xmlns:xsd" => "http://www.w3.org/2001/XMLSchema" }
+          else
+            { 'xmlns' => "http://www.vmware.com/vcloud/v1.5",
+              "xmlns:ovf" => "http://schemas.dmtf.org/ovf/envelope/1",
+              "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",
+              "xmlns:xsd" => "http://www.w3.org/2001/XMLSchema" }
+          end
         end
 
         # If the cookie isn't set, do a get_organizations call to set it
@@ -229,14 +258,29 @@ module Fog
           end
           begin
             do_request(params)
-          rescue Excon::Errors::Unauthorized => e
+          rescue Excon::Errors::Unauthorized
             do_login
             do_request(params)
           end
         end
 
-        private
 
+        def basic_request_params(uri,*args)
+          {
+            :expects => args[0] || 200,
+            :method  => args[1] || 'GET',
+            :headers => args[2] ? args[2].inspect : {},
+            :body => args[3] ? args[3] : '',
+            :parse => true,
+            :uri     => uri
+          }
+        end
+
+        def base_path_url
+          "#{@scheme}://#{@host}:#{@port}#{@base_path}"
+        end
+
+        private
         def ensure_parsed(uri)
           if uri.is_a?(String)
             URI.parse(uri)
@@ -273,6 +317,7 @@ module Fog
 
           # Set headers to an empty hash if none are set.
           headers = params[:headers] || {}
+          headers['Accept'] = 'application/*+xml;version=1.5' if version == '1.5'
 
           # Add our auth cookie to the headers
           if @cookie
@@ -289,14 +334,12 @@ module Fog
           })
 
           # Parse the response body into a hash
-          #puts response.body
           unless response.body.empty?
             if params[:parse]
               document = Fog::ToHashDocument.new
               parser = Nokogiri::XML::SAX::PushParser.new(document)
               parser << response.body
               parser.finish
-
               response.body = document.body
             end
           end
@@ -305,7 +348,25 @@ module Fog
         end
 
       end
+      def self.item_requests(*types)
+        types.each{|t| item_request(t) }
+      end
+      def self.item_request(type)
+        Fog::Vcloud::Compute::Real.class_eval <<-EOS, __FILE__,__LINE__
+          def get_#{type}(uri)
+            Fog::Vcloud::Compute::#{type.to_s.capitalize}.new(
+              self.request(basic_request_params(uri)).body.merge(
+                :connection => self,
+                :collection => Fog::Vcloud::Compute::#{type.to_s.capitalize}s.new(
+                  :connection => self
+                )
+              )
+            )
+          end
+        EOS
+      end
 
+      item_requests :organization, :vdc, :network, :vapp, :server, :catalog, :task
     end
   end
 end

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

@@ -4,7 +4,7 @@ module Fog
       class Catalog < Fog::Vcloud::Model
 
         identity :href, :aliases => :Href
-
+        attribute :links, :aliases => :Link, :type => :array
         ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd
 
         attribute :type

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

@@ -4,7 +4,7 @@ module Fog
       class CatalogItem < Fog::Vcloud::Model
 
         identity :href, :aliases => :Href
-
+        attribute :links, :aliases => :Link, :type => :array
         ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd
 
         attribute :type

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

@@ -7,23 +7,20 @@ 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).links.select { |link| link[:type] == "application/vnd.vmware.vcloud.catalog+xml" }
           load(data)
         end
 
         def get(uri)
-          if data = connection.get_catalog(uri)
-            new(data.body)
-          end
+          connection.get_catalog(uri)
         rescue Fog::Errors::NotFound
           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/ip.rb

@@ -3,9 +3,9 @@ module Fog
     class Compute
       class Ip < Fog::Vcloud::Model
 
-        ignore_attributes :xmlns_i, :xmlns
-
         identity :href, :aliases => :Href
+        attribute :links, :aliases => :Link, :type => :array
+        ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd
 
         attribute :name, :aliases => :Name
         attribute :status, :aliases => :Status

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

@@ -3,61 +3,19 @@ module Fog
     class Compute
       class Network < Fog::Vcloud::Model
 
-        identity :href
-
-        ignore_attributes :xmlns, :xmlns_xsi, :xmlns_xsd, :xmlns_i, :Configuration, :Id
-
-        attribute :name, :aliases => :Name
-        #attribute :id, :aliases => :Id
-        attribute :features, :aliases => :Features, :type => :array
+        identity :href, :aliases => :Href
         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
+        ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd
 
-        def reload
-          super
-          merge_attributes(extension_data.body)
-          self
-        end
-
-        private
-
-        def extension_data
-          connection.get_network_extensions( extensions_link[:href] )
-        end
+        attribute :name, :aliases => :Name
 
-        def extensions_link
-          links.detect { |link| link[:name] == name }
-        end
+        attribute :description, :aliases => :Description
+        attribute :configuration, :aliases => :Configuration
+        attribute :provider_info, :aliases => :ProviderInfo
 
-        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 ||= connection.get_network(configuration[:ParentNetwork][:href])
         end
       end
     end

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

@@ -14,20 +14,34 @@ 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).available_networks].flatten.compact.reject{|n| n == '' }
+          elsif self.href =~ /\/org\//
+            check_href!("Org")
+            data = connection.get_organization(self.href).links.select{|l| l[:type] == network_type_id }
+          elsif self.href =~ /\/vApp\//
+            check_href!("Vapp")
+            data = [(connection.get_vapp(self.href).network_configs||{})[:NetworkConfig]].flatten.compact.collect{|n| n[:Configuration][:ParentNetwork] unless n[:Configuration].nil? }.compact
           end
+          load([*data]) unless data.nil?
         end
 
         def get(uri)
-          if data = connection.get_network(uri)
-            new(data.body)
-          end
-          rescue Fog::Errors::NotFound
+          connection.get_network(uri)
+        rescue Fog::Errors::NotFound
           nil
         end
 
+        private
+        def network_type_id
+          if connection.version == '1.0'
+            'application/vnd.vmware.vcloud.network+xml'
+          else
+            'application/vnd.vmware.vcloud.orgNetwork+xml'
+          end
+        end
       end
     end
   end

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

@@ -0,0 +1,43 @@
+module Fog
+  module Vcloud
+    class Compute
+      class Organization < Fog::Vcloud::Model
+
+        identity :href, :aliases => :Href
+        attribute :links, :aliases => :Link, :type => :array
+        ignore_attributes :xmlns, :xmlns_i, :xmlns_xsi, :xmlns_xsd
+
+        attribute :name
+        attribute :description, :aliases => :Description
+        attribute :type
+        attribute :full_name, :aliases => :FullName
+
+        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,32 @@
+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
+          raw_orgs = if connection.version == '1.0'
+            connection.login
+          else
+            connection.request(connection.basic_request_params("#{connection.base_path_url}/org/"))
+          end
+          data = raw_orgs.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)
+          connection.get_organization(uri)
+        rescue Fog::Errors::NotFound
+          nil
+        end
+      end
+    end
+  end
+end