fog-ecloud 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2e83dda125c24efdc6bb59f7a1efa4ff4120a696
-  data.tar.gz: 1f12561d6840d912487e3b232427ce0bbae71d03
+  metadata.gz: 0ec8e33430c2f7d0e58e5f35e129e0299c535e71
+  data.tar.gz: 04fe961db178cc2ea233cc763e2e04fdfc7ab866
 SHA512:
-  metadata.gz: acaf1a53a378f337dffbd099a5d39df257d5e5d80f4471d8bdb685b4edfc7afc02802512cb2f02b49792d36ec24baa64b8b5e5adeffff8980686792aef3cf8bf
-  data.tar.gz: d9850ff7f927e0c00d6b139418626db6d2979acf6c2492c5ae3065f95e3894d479417b5bd408ae8ccdbc1abe38beffcc3d94996f15ce442dd41eb47e8b4f9dca
+  metadata.gz: 9c960b0135d9e5a89fb2bbe8217ff72f21e9017f9c6f0ce28c83a13febbbae67eaca6d1ae12398e0aebdc99256ecb6ff05a9a2729f9394815311f428e204441b
+  data.tar.gz: 7f35e38111a6b82c25e5c950f91ddfb42b4dff4b59d63612262e440f457e2e88b120d69aeea534bdd5d4cd02cc545aabfcd81ab6496390bfc0827b7caef211bc

data/lib/fog/compute/ecloud.rb

@@ -289,8 +289,8 @@ module Fog
           @persistent              = options[:persistent] || false
           @version                 = options[:ecloud_version] || "2013-06-01"
           @authentication_method   = options[:ecloud_authentication_method] || :cloud_api_auth
-          @access_key              = options[:ecloud_access_key]
-          @private_key             = options[:ecloud_private_key]
+          @access_key              = options[:ecloud_access_key].to_s
+          @private_key             = options[:ecloud_private_key].to_s
           if @private_key.nil? || @authentication_method == :basic_auth
             @authentication_method = :basic_auth
             @username              = options[:ecloud_username]
@@ -308,7 +308,7 @@ module Fog
           if params[:uri].is_a?(String)
             params[:uri] = URI.parse(@host + params[:uri])
           end
-          host_url = "#{params[:uri].scheme}://#{params[:uri].host}#{params[:uri].port ? ':#{params[:uri].port}' : ''}"
+          host_url = "#{params[:uri].scheme}://#{params[:uri].host}#{params[:uri].port ? ":#{params[:uri].port}" : ''}"
 
           # Hash connections on the host_url ... There"s nothing to say we won"t get URI"s that go to
           # different hosts.
@@ -401,7 +401,7 @@ module Fog
         # section 5.6.3.3 in the ~1000 page pdf spec
         def canonicalize_resource(path)
           uri, query_string = path.split("?")
-          return uri if query_string.nil?
+          return uri.downcase if query_string.nil?
           query_string_pairs = query_string.split("&").sort.map { |e| e.split("=") }
           tm_query_string = query_string_pairs.map { |x| "#{x.first.downcase}:#{x.last}" }.join("\n")
           "#{uri.downcase}\n#{tm_query_string}\n"

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

@@ -37,6 +37,11 @@ module Fog
                               self.service.organizations.new(organization_link)
                             end
         end
+
+        def reload
+          @organization = nil
+          super
+        end
       end
     end
   end

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

@@ -64,6 +64,19 @@ module Fog
         def id
           href.scan(/\d+/)[0]
         end
+
+        def reload
+          @servers = nil
+          @layout = nil
+          @cpu_usage = nil
+          @memory_usage = nil
+          @storage_usage = nil
+          @operating_system_families = nil
+          @templates = nil
+          @detached_disks = nil
+          @environment = nil
+          super
+        end
       end
     end
   end

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

@@ -104,6 +104,24 @@ module Fog
                              self.service.organizations.new(organization_link)
                            end
         end
+
+        def reload
+          @public_ips = nil
+          @internet_services = nil
+          @node_services = nil
+          @backup_internet_services = nil
+          @networks = nil
+          @layout = nil
+          @rows = nil
+          @tasks = nil
+          @firewall_acls = nil
+          @compute_pools = nil
+          @physical_devices = nil
+          @trusted_network_groups = nil
+          @rnats = nil
+          @organization = nil
+          super
+        end
       end
       Vdc = Environment
     end

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

@@ -12,8 +12,18 @@ module Fog
 
         def all
           data = []
-          service.get_organization(href).body[:Locations][:Location].each do |d|
-            environments = d[:Environments]
+          raw_location = service.get_organization(href).body[:Locations][:Location]
+          if raw_location.is_a?(Array)
+            # If there's more than one location, the XML parser returns an
+            # array.
+            location = raw_location
+          else
+            # Otherwise it returns a hash.
+            location = [raw_location]
+          end
+
+          location.each do |l|
+            environments = l[:Environments]
             next unless environments
             if environments[:Environment].is_a?(Array)
               environments[:Environment].each { |e| data << e }

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

@@ -91,6 +91,12 @@ module Fog
         end
 
         alias_method :destroy, :delete
+
+        def reload
+          @nodes = nil
+          @monitors = nil
+          super
+        end
       end
     end
   end

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

@@ -33,6 +33,11 @@ module Fog
           network_href = other_links.find { |l| l[:type] == "application/vnd.tmrk.cloud.network" }[:href]
           network      = self.service.networks.get(network_href)
         end
+
+        def reload
+          @server = nil
+          super
+        end
       end
     end
   end

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

@@ -14,6 +14,11 @@ module Fog
         def id
           href.scan(/\d+/)[0]
         end
+
+        def reload
+          @rows = nil
+          super
+        end
       end
     end
   end

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

@@ -16,6 +16,11 @@ module Fog
         def id
           href.scan(/\d+/)[0]
         end
+
+        def reload
+          @catalog = nil
+          super
+        end
       end
     end
   end

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

@@ -40,6 +40,12 @@ module Fog
         def location
           environment.id
         end
+
+        def reload
+          @rnats = nil
+          @ips = nil
+          super
+        end
       end
     end
   end

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

@@ -39,6 +39,11 @@ module Fog
         end
 
         alias_method :destroy, :delete
+
+        def reload
+          @tasks = nil
+          super
+        end
       end
     end
   end

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

@@ -15,6 +15,11 @@ module Fog
         def id
           href.scan(/\d+/)[0]
         end
+
+        def reload
+          @operating_systems = nil
+          super
+        end
       end
     end
   end

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

@@ -39,6 +39,19 @@ module Fog
           end
         end
 
+        # Set instance variables for child collections/models to nil so that they will be reloaded correctly
+        #
+        # @return nothing
+        def reload
+          @locations = nil
+          @environments = nil
+          @tags = nil
+          @admin = nil
+          @users = nil
+          @support_tickets = nil
+          super
+        end
+
         def edit_authentication_levels(options = {})
           options[:uri] = "#{service.base_path}/admin/organizations/#{id}/authenticationLevels"
           data = service.admin_edit_authentication_levels(options).body

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

@@ -32,6 +32,11 @@ module Fog
         def organization_uri=(new_organization_uri)
           @organization_uri = new_organization_uri
         end
+
+        def reload
+          @organization_uri = nil
+          super
+        end
       end
     end
   end

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

@@ -317,6 +317,15 @@ module Fog
         end
 
         alias_method :destroy, :delete
+
+        def reload
+          @tasks = nil
+          @processes = nil
+          @hardware_configuration = nil
+          @configuration = nil
+          @networks = nil
+          super
+        end
       end
     end
   end

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

@@ -27,6 +27,11 @@ module Fog
         def id
           href.scan(/\d+/)[0]
         end
+
+        def reload
+          @internet_services = nil
+          super
+        end
       end
     end
   end

data/lib/fog/ecloud/version.rb

@@ -1,5 +1,5 @@
 module Fog
   module Ecloud
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fog-ecloud
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Paulo Henrique Lopes Ribeiro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog-core