fog-maestrodev 1.15.0.20130927082724 → 1.18.0.20131111203459

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

@@ -12,23 +12,23 @@ module Fog
         attribute :other_links, :aliases => :Links, :squash => :Link
 
         def public_ips
-          @public_ips ||= Fog::Compute::Ecloud::PublicIps.new(:service => service, :href => "/cloudapi/ecloud/publicIps/environments/#{id}")
+          @public_ips ||= Fog::Compute::Ecloud::PublicIps.new(:service => service, :href => "#{service.base_path}/publicIps/environments/#{id}")
         end
 
         def internet_services
-          @internet_services ||= Fog::Compute::Ecloud::InternetServices.new(:service => service, :href => "/cloudapi/ecloud/networkSummary/environments/#{id}")
+          @internet_services ||= Fog::Compute::Ecloud::InternetServices.new(:service => service, :href => "#{service.base_path}/networkSummary/environments/#{id}")
         end
 
         def node_services
-          @node_services ||= Fog::Compute::Ecloud::Nodes.new(:service => service, :href => "/cloudapi/ecloud/networkSummary/environments/#{id}")
+          @node_services ||= Fog::Compute::Ecloud::Nodes.new(:service => service, :href => "#{service.base_path}/networkSummary/environments/#{id}")
         end
 
         def backup_internet_services
-          @backup_internet_services ||= Fog::Compute::Ecloud::BackupInternetServices.new(:service => service, :href => "/cloudapi/ecloud/backupInternetServices/environments/#{id}")
+          @backup_internet_services ||= Fog::Compute::Ecloud::BackupInternetServices.new(:service => service, :href => "#{service.base_path}/backupInternetServices/environments/#{id}")
         end
 
         def networks
-          @networks ||= self.service.networks(:href => "/cloudapi/ecloud/networks/environments/#{id}")
+          @networks ||= self.service.networks(:href => "#{service.base_path}/networks/environments/#{id}")
         end
 
         def servers
@@ -45,7 +45,7 @@ module Fog
         end
 
         def layout
-          @layout ||= self.service.layouts(:href => "/cloudapi/ecloud/layout/environments/#{id}").first
+          @layout ||= self.service.layouts(:href => "#{service.base_path}/layout/environments/#{id}").first
         end
 
         def rows
@@ -53,41 +53,41 @@ module Fog
         end
 
         def tasks
-          @tasks ||= Fog::Compute::Ecloud::Tasks.new(:service => service, :href => "/cloudapi/ecloud/tasks/environments/#{id}")
+          @tasks ||= Fog::Compute::Ecloud::Tasks.new(:service => service, :href => "#{service.base_path}/tasks/environments/#{id}")
         end
 
         def firewall_acls
-          @firewall_acls ||= Fog::Compute::Ecloud::FirewallAcls.new(:service => service, :href => "/cloudapi/ecloud/firewallAcls/environments/#{id}")
+          @firewall_acls ||= Fog::Compute::Ecloud::FirewallAcls.new(:service => service, :href => "#{service.base_path}/firewallAcls/environments/#{id}")
         end
 
         def compute_pools
-          @compute_pools ||= Fog::Compute::Ecloud::ComputePools.new(:service => service, :href => "/cloudapi/ecloud/computePools/environments/#{id}")
+          @compute_pools ||= Fog::Compute::Ecloud::ComputePools.new(:service => service, :href => "#{service.base_path}/computePools/environments/#{id}")
         end
 
         def physical_devices
-          @physical_devices ||= Fog::Compute::Ecloud::PhysicalDevices.new(:service => service, :href => "/cloudapi/ecloud/physicalDevices/environments/#{id}")
+          @physical_devices ||= Fog::Compute::Ecloud::PhysicalDevices.new(:service => service, :href => "#{service.base_path}/physicalDevices/environments/#{id}")
         end
 
         def trusted_network_groups
-          @trusted_network_groups ||= Fog::Compute::Ecloud::TrustedNetworkGroups.new(:service => service, :href => "/cloudapi/ecloud/trustedNetworkGroups/environments/#{id}")
+          @trusted_network_groups ||= Fog::Compute::Ecloud::TrustedNetworkGroups.new(:service => service, :href => "#{service.base_path}/trustedNetworkGroups/environments/#{id}")
         end
 
         def catalog
-          @catalog = service.catalog(:href => "/cloudapi/ecloud/admin/catalog/organizations/#{organization.id}")
+          @catalog = service.catalog(:href => "#{service.base_path}/admin/catalog/organizations/#{organization.id}")
         end
 
         def rnats
-          @rnats ||= Fog::Compute::Ecloud::Rnats.new(:service => service, :href => "/cloudapi/ecloud/rnats/environments/#{id}")
+          @rnats ||= Fog::Compute::Ecloud::Rnats.new(:service => service, :href => "#{service.base_path}/rnats/environments/#{id}")
         end
 
         def create_trusted_network_group(options = {})
-          options[:uri] = "/cloudapi/ecloud/trustedNetworkGroups/environments/#{id}/action/createTrustedNetworkGroup"
+          options[:uri] = "#{service.base_path}/trustedNetworkGroups/environments/#{id}/action/createTrustedNetworkGroup"
           data = service.trusted_network_groups_create(options).body
           tng = Fog::Compute::Ecloud::TrustedNetworkGroups.new(:service => service, :href => data[:href])[0]
         end
 
         def create_firewall_acl(options = {})
-          options[:uri] = "/cloudapi/ecloud/firewallAcls/environments/#{id}/action/createFirewallAcl"
+          options[:uri] = "#{service.base_path}/firewallAcls/environments/#{id}/action/createFirewallAcl"
           options[:permission] ||= "deny"
           options[:protocol] ||= "any"
           data = service.firewall_acls_create(options).body

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(:service => service, :href => "/cloudapi/ecloud/tasks/virtualMachines/#{id}")
+          @tasks = Fog::Compute::Ecloud::Tasks.new(:service => service, :href => "#{service.base_path}/tasks/virtualMachines/#{id}")
         end
 
         def id

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

@@ -27,7 +27,7 @@ module Fog
         end
 
         def monitors
-          @monitors ||= Fog::Compute::Ecloud::Monitors.new(:service => service, :href => "/cloudapi/ecloud/internetServices/#{id}/monitor")
+          @monitors ||= Fog::Compute::Ecloud::Monitors.new(:service => service, :href => "#{service.base_path}/internetServices/#{id}/monitor")
         end
 
         def save

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

@@ -26,7 +26,7 @@ module Fog
         end
 
         def create(options)
-          options[:uri] = "/cloudapi/ecloud/internetServices/publicIps/#{public_ip_id}/action/createInternetService"
+          options[:uri] = "#{service.base_path}/internetServices/publicIps/#{public_ip_id}/action/createInternetService"
           options[:protocol]           ||= "TCP"
           options[:enabled]            ||= true
           options[:description]        ||= ""

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(:service => service, :href => "/cloudapi/ecloud/admin/catalog/organizations/#{org_href.scan(/\d+/)[0]}/locations/#{id}")
+          @catalog ||= Fog::Compute::Ecloud::Catalog.new(:service => service, :href => "#{service.base_path}/admin/catalog/organizations/#{org_href.scan(/\d+/)[0]}/locations/#{id}")
         end
 
         def id

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

@@ -18,7 +18,7 @@ module Fog
         attribute :receive_string, :aliases => :ReceiveString
 
         def edit(options = {})
-          href = "/cloudapi/ecloud/internetServices/#{internet_service_id}/monitor?type="
+          href = "#{service.base_path}/internetServices/#{internet_service_id}/monitor?type="
           case type
           when "application/vnd.tmrk.cloud.pingMonitor"
             options[:uri] = href + "ping"

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

@@ -14,7 +14,7 @@ module Fog
         attribute :rnat_address,      :aliases => :RnatAddress
 
         def rnats
-          @rnats ||= Fog::Compute::Ecloud::Rnats.new(:service => service, :href => "cloudapi/ecloud/rnats/networks/#{id}")
+          @rnats ||= Fog::Compute::Ecloud::Rnats.new(:service => service, :href => "#{service.base_path}/rnats/networks/#{id}")
         end
 
         def ips

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

@@ -18,7 +18,7 @@ module Fog
         end
 
         def tasks
-          @tasks ||= Fog::Compute::Ecloud::Tasks.new(:service => service, :href => "/cloudapi/ecloud/tasks/virtualMachines/#{id}")
+          @tasks ||= Fog::Compute::Ecloud::Tasks.new(:service => service, :href => "#{service.base_path}/tasks/virtualMachines/#{id}")
         end
 
         def delete

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

@@ -26,7 +26,7 @@ module Fog
         end
 
         def create(options)
-          options[:uri] = "/cloudapi/ecloud/nodeServices/internetServices/#{internet_service_id}/action/createNodeService"
+          options[:uri] = "#{service.base_path}/nodeServices/internetServices/#{internet_service_id}/action/createNodeService"
           options[:protocol] ||= "TCP"
           options[:enabled] ||= true
           options[:description] ||= ""

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

@@ -20,51 +20,51 @@ module Fog
         end
 
         def tags
-          @tags ||= self.service.tags(:href => "/cloudapi/ecloud/deviceTags/organizations/#{id}")
+          @tags ||= self.service.tags(:href => "#{service.base_path}/deviceTags/organizations/#{id}")
         end
 
         def admin
-          @admin ||= self.service.admin_organizations.new(:href => "/cloudapi/ecloud/admin/organizations/#{id}")
+          @admin ||= self.service.admin_organizations.new(:href => "#{service.base_path}/admin/organizations/#{id}")
         end
 
         def users
-          @users ||= self.service.users(:href => "/cloudapi/ecloud/admin/users/organizations/#{id}")
+          @users ||= self.service.users(:href => "#{service.base_path}/admin/users/organizations/#{id}")
         end
 
         def support_tickets(type = :open)
           case type
           when :open
-            @support_tickets ||= Fog::Compute::Ecloud::SupportTickets.new(:service => service, :href => "/cloudapi/ecloud/admin/tickets/organizations/#{id}/active")
+            @support_tickets ||= Fog::Compute::Ecloud::SupportTickets.new(:service => service, :href => "#{service.base_path}/admin/tickets/organizations/#{id}/active")
           when :closed
-            @support_tickets ||= Fog::Compute::Ecloud::SupportTickets.new(:service => service, :href => "/cloudapi/ecloud/admin/tickets/organizations/#{id}/closed")
+            @support_tickets ||= Fog::Compute::Ecloud::SupportTickets.new(:service => service, :href => "#{service.base_path}/admin/tickets/organizations/#{id}/closed")
           end
         end
 
         def edit_authentication_levels(options = {})
-          options[:uri] = "/cloudapi/ecloud/admin/organizations/#{id}/authenticationLevels"
+          options[:uri] = "#{service.base_path}/admin/organizations/#{id}/authenticationLevels"
           data = service.admin_edit_authentication_levels(options).body
           level = Fog::Compute::Ecloud::AdminOrganizations.new(:service => service, :href => data[:href])[0]
         end
 
         def edit_password_complexity_rules(options = {})
-          options[:uri] = "/cloudapi/ecloud/admin/organizations/#{id}/passwordComplexityRules"
+          options[:uri] = "#{service.base_path}/admin/organizations/#{id}/passwordComplexityRules"
           data = service.admin_edit_password_complexity_rules(options).body
           level = Fog::Compute::Ecloud::PasswordComplexityRules.new(:service => service, :href => data[:href])[0]
         end
 
         def edit_login_banner(options = {})
-          options[:uri] = "/cloudapi/ecloud/admin/organizations/#{id}/loginBanner"
+          options[:uri] = "#{service.base_path}/admin/organizations/#{id}/loginBanner"
           data = service.admin_edit_login_banner(options).body
           banner = Fog::Compute::Ecloud::LoginBanners.new(:service => service, :href => data[:href])[0]
         end
 
         def enable_support_access(options = {})
-          options[:uri] = "/cloudapi/ecloud/admin/organizations/#{id}/action/enableSupportAccess"
+          options[:uri] = "#{service.base_path}/admin/organizations/#{id}/action/enableSupportAccess"
           service.admin_enable_support_access(options[:uri])
         end
 
         def disable_support_access(options = {})
-          options[:uri] = "/cloudapi/ecloud/admin/organizations/#{id}/action/disableSupportAccess"
+          options[:uri] = "#{service.base_path}/admin/organizations/#{id}/action/disableSupportAccess"
           service.admin_disable_support_access(options[:uri])
         end
 

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

@@ -33,7 +33,7 @@ module Fog
         end
 
         def create_group(options = {})
-          options[:uri] = "/cloudapi/ecloud/layoutGroups/environments/#{environment_id}/action/createLayoutGroup"
+          options[:uri] = "#{service.base_path}/layoutGroups/environments/#{environment_id}/action/createLayoutGroup"
           options[:row_name] = name
           options[:href] = href
           data = service.groups_create(options).body

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

@@ -26,7 +26,7 @@ module Fog
         end
 
         def create(options = {})
-          options[:uri] = "/cloudapi/ecloud/layoutRows/environments/#{environment_id}/action/createLayoutRow"
+          options[:uri] = "#{service.base_path}/layoutRows/environments/#{environment_id}/action/createLayoutRow"
           data = service.rows_create(options).body
           new(data)
         end

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

@@ -39,11 +39,11 @@ module Fog
         end
 
         def tasks
-          @tasks ||= self.service.tasks(:href => "/cloudapi/ecloud/tasks/virtualMachines/#{id}")
+          @tasks ||= self.service.tasks(:href => "#{service.base_path}/tasks/virtualMachines/#{id}")
         end
 
         def processes
-          @processes ||= Fog::Compute::Ecloud::GuestProcesses.new(:service, service, :href => "/cloudapi/ecloud/virtualMachines/#{id}/guest/processes")
+          @processes ||= Fog::Compute::Ecloud::GuestProcesses.new(:service, service, :href => "#{service.base_path}/virtualMachines/#{id}/guest/processes")
         end
 
         def hardware_configuration=(hardware_configuration)
@@ -51,12 +51,12 @@ module Fog
         end
 
         def hardware_configuration
-          @hardware_configuration ||= self.service.hardware_configurations.new(:href => "/cloudapi/ecloud/virtualMachines/#{id}/hardwareConfiguration")
+          @hardware_configuration ||= self.service.hardware_configurations.new(:href => "#{service.base_path}/virtualMachines/#{id}/hardwareConfiguration")
           @hardware_configuration.reload
         end
 
         def configuration
-          @configuration ||= Fog::Compute::Ecloud::ServerConfigurationOptions.new(:service => service, :href => "/cloudapi/ecloud/virtualMachines/#{id}/configurationOptions")[0]
+          @configuration ||= Fog::Compute::Ecloud::ServerConfigurationOptions.new(:service => service, :href => "#{service.base_path}/virtualMachines/#{id}/configurationOptions")[0]
         end
 
         def ips
@@ -64,7 +64,7 @@ module Fog
         end
 
         def networks
-          @networks ||= self.service.networks(:href => "/cloudapi/ecloud/virtualMachines/#{id}/assignedIps")
+          @networks ||= self.service.networks(:href => "#{service.base_path}/virtualMachines/#{id}/assignedIps")
         end
 
         def power_on
@@ -108,16 +108,16 @@ module Fog
                 options[:ips][index] = ip
               end
             end
-            data = service.virtual_machine_copy("/cloudapi/ecloud/virtualMachines/computePools/#{compute_pool_id}/action/copyVirtualMachine", options).body
+            data = service.virtual_machine_copy("#{service.base_path}/virtualMachines/computePools/#{compute_pool_id}/action/copyVirtualMachine", options).body
           elsif options[:type] == :identical
-            data = service.virtual_machine_copy_identical("/cloudapi/ecloud/virtualMachines/computePools/#{compute_pool_id}/action/copyIdenticalVirtualMachine", options).body
+            data = service.virtual_machine_copy_identical("#{service.base_path}/virtualMachines/computePools/#{compute_pool_id}/action/copyIdenticalVirtualMachine", options).body
           end
           vm = collection.from_data(data)
           vm
         end
 
         def rnats
-          rnats = Fog::Compute::Ecloud::Rnats.new(:service => service, :href => "/cloudapi/ecloud/rnats/environments/#{environment_id}")
+          rnats = Fog::Compute::Ecloud::Rnats.new(:service => service, :href => "#{service.base_path}/rnats/environments/#{environment_id}")
           associations = nil
           rnats.each do |rnat|
             if rnats.index(rnat) == 0
@@ -148,7 +148,7 @@ module Fog
 
         def create_rnat(options)
           options[:host_ip_href] ||= ips.first.href
-          options[:uri] = "/cloudapi/ecloud/rnats/environments/#{environment_id}/action/createAssociation"
+          options[:uri] = "#{service.base_path}/rnats/environments/#{environment_id}/action/createAssociation"
           data = service.rnat_associations_create_device(options).body
           rnat = Fog::Compute::Ecloud::Associations.new(:service => service, :href => data[:href])[0]
         end

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

@@ -14,7 +14,9 @@ module Fog
           data = service.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|
+            cats = d[:Categories][:Category]
+            cats = [cats] if cats.is_a?(Hash)
+            cats.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]

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

@@ -19,11 +19,11 @@ module Fog
         attribute :is_multifactor_authentication_enabled, :aliases => :IsMultifactorAuthenticationEnabled, :type => :boolean
 
         def roles
-          @roles = Fog::Compute::Ecloud::Roles.new(:service => service, :href => "/cloudapi/ecloud/admin/roles/users/#{id}")
+          @roles = Fog::Compute::Ecloud::Roles.new(:service => service, :href => "#{service.base_path}/admin/roles/users/#{id}")
         end
 
         def api_keys
-          @api_keys = Fog::Compute::Ecloud::ApiKeys.new(:service => service, :href => "/cloudapi/ecloud/admin/apiKeys/users/#{id}")
+          @api_keys = Fog::Compute::Ecloud::ApiKeys.new(:service => service, :href => "#{service.base_path}/admin/apiKeys/users/#{id}")
         end
 
         def id

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

@@ -18,7 +18,7 @@ module Fog
           network_id = @network.href.match(/(\d+)$/)[1]
           address_ip = network_address[:IpAddresses][:IpAddress]
           @address = self.service.ip_addresses.new(
-            :href => "/cloudapi/ecloud/ipaddresses/networks/#{network_id}/#{address_ip}",
+            :href => "#{service.base_path}/ipaddresses/networks/#{network_id}/#{address_ip}",
             :name => address_ip
           )
         end

data/lib/fog/ecloud/requests/compute/get_virtual_machine_assigned_ips.rb

@@ -5,7 +5,7 @@ module Fog
       class Real
         def get_virtual_machine_assigned_ips(virtual_machine_id)
           request(
-            :uri => "/cloudapi/ecloud/virtualmachines/#{virtual_machine_id}/assignedips",
+            :uri => "#{base_path}/virtualmachines/#{virtual_machine_id}/assignedips",
             :parse   => true
           )
         end

data/lib/fog/google/README.md

@@ -8,7 +8,7 @@ Google Cloud Storage originally was very similar to Amazon's S3. Because of this
 
 ## Compute
 
-Google Compute Engine is a Virtual Machine hosting service. Currently it is built on version [v1beta15](https://developers.google.com/compute/docs/reference/v1beta15/) of the GCE API.
+Google Compute Engine is a Virtual Machine hosting service. Currently it is built on version [v1beta16](https://developers.google.com/compute/docs/reference/v1beta16/) of the GCE API.
 
 Our implementation of the API currently supports 
 
@@ -23,6 +23,6 @@ Features we are looking forward to implementing in the future:
  * Global Metadata support
  * Image creation
 
-v1beta15 is still in beta, so we can imagine lots of changes to the API. If you are using Fog to interact with GCE, please keep Fog up to date and [file issues](https://github.com/fog/fog/issues?labels=google) for any anomalies you see.
+v1beta16 is still in beta, so we can imagine lots of changes to the API. If you are using Fog to interact with GCE, please keep Fog up to date and [file issues](https://github.com/fog/fog/issues?labels=google) for any anomalies you see.
 
 Thanks!