fog 1.28.0 → 1.29.0

data/lib/fog/rackspace/requests/networking_v2/create_security_group.rb

@@ -0,0 +1,12 @@
+class Fog::Rackspace::NetworkingV2::Real
+  def create_security_group(security_group)
+    data = {:security_group => security_group.attributes}
+
+    request(
+      :method  => 'POST',
+      :body    => Fog::JSON.encode(data),
+      :path    => "security-groups",
+      :expects => 201
+    )
+  end
+end

data/lib/fog/rackspace/requests/networking_v2/create_security_group_rule.rb

@@ -0,0 +1,12 @@
+class Fog::Rackspace::NetworkingV2::Real
+  def create_security_group_rule(security_group_rule)
+    data = {:security_group_rule => security_group_rule.attributes}
+
+    request(
+      :method  => 'POST',
+      :body    => Fog::JSON.encode(data),
+      :path    => "security-group-rules",
+      :expects => 201
+    )
+  end
+end

data/lib/fog/rackspace/requests/networking_v2/delete_security_group.rb

@@ -0,0 +1,5 @@
+class Fog::Rackspace::NetworkingV2::Real
+  def delete_security_group(id)
+    request(:method => 'DELETE', :path => "security-groups/#{id}", :expects => 204)
+  end
+end

data/lib/fog/rackspace/requests/networking_v2/delete_security_group_rule.rb

@@ -0,0 +1,5 @@
+class Fog::Rackspace::NetworkingV2::Real
+  def delete_security_group_rule(id)
+    request(:method => 'DELETE', :path => "security-group-rules/#{id}", :expects => 204)
+  end
+end

data/lib/fog/rackspace/requests/networking_v2/list_security_group_rules.rb

@@ -0,0 +1,5 @@
+class Fog::Rackspace::NetworkingV2::Real
+  def list_security_group_rules
+    request(:method => 'GET', :path => 'security-group-rules', :expects => 200)
+  end
+end

data/lib/fog/rackspace/requests/networking_v2/list_security_groups.rb

@@ -0,0 +1,5 @@
+class Fog::Rackspace::NetworkingV2::Real
+  def list_security_groups
+    request(:method => 'GET', :path => 'security-groups', :expects => 200)
+  end
+end

data/lib/fog/rackspace/requests/networking_v2/show_security_group.rb

@@ -0,0 +1,5 @@
+class Fog::Rackspace::NetworkingV2::Real
+  def show_security_group(id)
+    request(:method => 'GET', :path => "security-groups/#{id}", :expects => 200)
+  end
+end

data/lib/fog/rackspace/requests/networking_v2/show_security_group_rule.rb

@@ -0,0 +1,5 @@
+class Fog::Rackspace::NetworkingV2::Real
+  def show_security_group_rule(id)
+    request(:method => 'GET', :path => "security-group-rules/#{id}", :expects => 200)
+  end
+end

data/lib/fog/rackspace/requests/networking_v2/update_security_group.rb

@@ -0,0 +1,12 @@
+class Fog::Rackspace::NetworkingV2::Real
+  def update_security_group(security_group)
+    data = {:security_group => {:name => security_group.name}}
+
+    request(
+      :method  => 'PUT',
+      :body    => Fog::JSON.encode(data),
+      :path    => "security-groups/#{security_group.id}",
+      :expects => 200
+    )
+  end
+end

data/lib/fog/rackspace/requests/storage/get_object_https_url.rb

@@ -21,7 +21,7 @@ module Fog
         # http://docs.rackspace.com/files/api/v1/cf-devguide/content/Create_TempURL-d1a444.html
         def get_object_https_url(container, object, expires, options = {})
           if @rackspace_temp_url_key.nil?
-            raise ArgumentError, "Storage must my instantiated with the :rackspace_temp_url_key option"
+            raise ArgumentError, "Storage must be instantiated with the :rackspace_temp_url_key option"
           end
 
           method         = options[:method] || 'GET'

data/lib/fog/version.rb

@@ -1,3 +1,3 @@
 module Fog
-  VERSION = '1.28.0'
+  VERSION = '1.29.0'
 end

data/lib/fog/vsphere/requests/compute/cloudinit_to_customspec.rb

@@ -6,14 +6,22 @@ module Fog
           raise ArgumentError, "user_data can't be nil" if user_data.nil?
           custom_spec = { 'customization_spec' => Hash.new }
           user_data = YAML.load(user_data)
+          # hostname expects a string, REQUIRED
+          # netmask expects a string
+          # dns expects an array
+          # gateway expects an array
+          # domain expects a string, REQUIRED
+          # domainsuffixlist expects an array, REQUIRED
+          # timezone expects a string, for example Europe/Copenhagen, REQUIRED
           custom_spec['hostname']                    =  user_data['hostname'] if user_data.key?('hostname')
           custom_spec['ipsettings']                  =  { 'ip' => user_data['ip'] } if user_data.key?('ip')
           custom_spec['ipsettings']['subnetMask']    =  user_data['netmask'] if user_data.key?('netmask')
           custom_spec['ipsettings']['dnsServerList'] =  user_data['dns'] if user_data.key?('dns')
+          custom_spec['ipsettings']['gateway']       =  user_data['gateway'] if user_data.key?('gateway')
           custom_spec['domain']                      =  user_data['domain'] if user_data.key?('domain')
-          custom_spec['dnsSuffixList']               =  user_data['domain'] if user_data.key?('domain')
+          custom_spec['dnsSuffixList']               =  user_data['domainsuffixlist'] if user_data.key?('domainsuffixlist')
           custom_spec['time_zone']                   =  user_data['timezone'] if user_data.key?('timezone')
-          custom_spec           
+          custom_spec  
         end
       end
 
@@ -26,10 +34,11 @@ module Fog
           custom_spec['ipsettings']                  =  { 'ip' => user_data['ip'] } if user_data.key?('ip')
           custom_spec['ipsettings']['subnetMask']    =  user_data['netmask'] if user_data.key?('netmask')
           custom_spec['ipsettings']['dnsServerList'] =  user_data['dns'] if user_data.key?('dns')
+          custom_spec['ipsettings']['gateway']       =  user_data['gateway'] if user_data.key?('gateway')
           custom_spec['domain']                      =  user_data['domain'] if user_data.key?('domain')
-          custom_spec['dnsSuffixList']               =  user_data['domain'] if user_data.key?('domain')
+          custom_spec['dnsSuffixList']               =  user_data['domainsuffixlist'] if user_data.key?('domainsuffixlist')
           custom_spec['time_zone']                   =  user_data['timezone'] if user_data.key?('timezone')
-          custom_spec
+          custom_spec  
         end
       end
     end

data/lib/fog/vsphere/requests/compute/vm_clone.rb

@@ -116,11 +116,21 @@ module Fog
           # Options['network']
           # Build up the config spec
           if ( options.key?('network_label') )
-            #network_obj = datacenter_obj.networkFolder.find(options['network_label'])
             config_spec_operation = RbVmomi::VIM::VirtualDeviceConfigSpecOperation('edit')
-            nic_backing_info = RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo(:deviceName => options['network_label'])
-              #:deviceName => "Network adapter 1",
-              #:network => network_obj)
+            # Get the portgroup and handle it from there.
+            network = get_raw_network(options['network_label'],options['datacenter'])
+            if ( network.kind_of? RbVmomi::VIM::DistributedVirtualPortgroup)
+                # Create the NIC backing for the distributed virtual portgroup
+                nic_backing_info = RbVmomi::VIM::VirtualEthernetCardDistributedVirtualPortBackingInfo(
+                    :port => RbVmomi::VIM::DistributedVirtualSwitchPortConnection( 
+                                                                                  :portgroupKey => network.key, 
+                                                                                  :switchUuid => network.config.distributedVirtualSwitch.uuid
+                                                                                 ) 
+                )
+            else
+                # Otherwise it's a non distributed port group
+                nic_backing_info = RbVmomi::VIM::VirtualEthernetCardNetworkBackingInfo(:deviceName => options['network_label'])
+            end
             connectable = RbVmomi::VIM::VirtualDeviceConnectInfo(
               :allowGuestControl => true,
               :connected => true,
@@ -161,8 +171,11 @@ module Fog
             end
             raise ArgumentError, "domain is required" unless cust_options.key?("domain")
             cust_domain = cust_options['domain']
-            cust_ip_settings = RbVmomi::VIM::CustomizationIPSettings.new(cust_options["ipsettings"]) if cust_options.key?("ipsettings")
-            cust_ip_settings.ip = RbVmomi::VIM::CustomizationFixedIp("ipAddress" => cust_options["ipsettings"]["ip"]) if cust_options.key?("ipsettings")
+            if cust_options.key?("ipsettings")
+              cust_ip_settings = RbVmomi::VIM::CustomizationIPSettings.new(cust_options["ipsettings"])
+              cust_ip_settings.ip = RbVmomi::VIM::CustomizationFixedIp("ipAddress" => cust_options["ipsettings"]["ip"])
+              cust_ip_settings.gateway = cust_options['ipsettings']['gateway']
+            end
             cust_ip_settings ||= RbVmomi::VIM::CustomizationIPSettings.new("ip" => RbVmomi::VIM::CustomizationDhcpIpGenerator.new())
             cust_ip_settings.dnsDomain = cust_domain
             cust_global_ip_settings = RbVmomi::VIM::CustomizationGlobalIPSettings.new

data/lib/fog/xenserver/requests/compute/create_vdi.rb

@@ -9,25 +9,35 @@ module Fog
           raise ArgumentError.new('Missing #type attribute') if config[:type].nil?
           raise ArgumentError.new('Missing #sharable attribute') if config[:sharable].nil?
           raise ArgumentError.new('Missing #other_config attribute') if config[:other_config].nil?
-          if config[:storage_repository].nil? || config[:SR].nil?
-            raise ArgumentError.new('Missing #storage_repository or #SR attribute')
+
+          if config[:storage_repository].nil? && config[:SR].nil? && config[:__sr].nil?
+            raise ArgumentError.new('Missing StorageRepository reference.')
           end
 
-          if config[:storage_repository].present?
+          unless config[:storage_repository].nil?
             Fog::Logger.deprecation(
                 'The attribute #storage_repository is deprecated. Use #SR instead.'
             )
             config[:SR] = config[:storage_repository].reference
           end
-          if config[:name].present?
+
+          unless config[:__sr].nil?
+            Fog::Logger.deprecation(
+                'The attribute #__sr is deprecated. Use #SR instead.'
+            )
+            config[:SR] = config[:__sr]
+          end
+
+          unless config[:name].nil?
             Fog::Logger.deprecation(
                 'The attribute #name is deprecated. Use #name_label instead.'
             )
             config[:name_label] = config[:name]
           end
-          if config[:description].present?
+
+          unless config[:description].nil?
             Fog::Logger.deprecation(
-                'The attribute storage_repository is deprecated. Use SR instead.'
+                'The attribute #description is deprecated. Use #name_description instead.'
             )
             config[:name_description] = config[:description]
           end

data/lib/tasks/changelog_task.rb

@@ -109,6 +109,7 @@ Watchers      | #{watchers}
            'Ash Wilson',
            'Benson Kalahar',
            'Brian Hartsock',
+           'Chris Luo',
            'Chris Roberts',
            'Christopher Oliver',
            'Colin Hebert',
@@ -171,7 +172,7 @@ Watchers      | #{watchers}
       end
 
       def last_release_sha
-        `cat changelog.md | head -2`.split(' ').last
+        `cat CHANGELOG.md | head -2`.split(' ').last
       end
 
       def downloads

data/spec/fog/account_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 
 describe Fog::Account do
   Fog::Account.providers.each do |provider|

data/spec/fog/billing_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 
 describe Fog::Billing do
   Fog::Billing.providers.each do |provider|

data/spec/fog/bin/atmos_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 require "fog/bin"
 require "helpers/bin"
 
@@ -7,4 +6,28 @@ describe Atmos do
   include Fog::BinSpec
 
   let(:subject) { Atmos }
+
+  describe "#services" do
+    it "includes all services" do
+      assert_includes Atmos.services, :storage
+    end
+  end
+
+  describe "#class_for" do
+    describe "when requesting storage service" do
+      it "returns correct class" do
+        assert_equal Fog::Storage::Atmos, Atmos.class_for(:storage)
+      end
+    end
+  end
+
+  describe "#[]" do
+    describe "when requesting storage service" do
+      it "returns instance" do
+        Fog::Storage::Atmos.stub(:new, "instance") do
+          assert_equal "instance", Atmos[:storage]
+        end
+      end
+    end
+  end
 end

data/spec/fog/bin/aws_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 require "fog/bin"
 require "helpers/bin"
 

data/spec/fog/bin/baremetalcloud_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 require "fog/bin"
 require "helpers/bin"
 
@@ -7,4 +6,28 @@ describe BareMetalCloud do
   include Fog::BinSpec
 
   let(:subject) { BareMetalCloud }
+
+  describe "#services" do
+    it "includes all services" do
+      assert_includes BareMetalCloud.services, :compute
+    end
+  end
+
+  describe "#class_for" do
+    describe "when requesting storage service" do
+      it "returns correct class" do
+        assert_equal Fog::Compute::BareMetalCloud, BareMetalCloud.class_for(:compute)
+      end
+    end
+  end
+
+  describe "#[]" do
+    describe "when requesting compute service" do
+      it "returns instance" do
+        Fog::Compute::BareMetalCloud.stub(:new, "instance") do
+          assert_equal "instance", BareMetalCloud[:compute]
+        end
+      end
+    end
+  end
 end

data/spec/fog/bin/bluebox_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 require "fog/bin"
 require "helpers/bin"
 
@@ -7,4 +6,50 @@ describe Bluebox do
   include Fog::BinSpec
 
   let(:subject) { Bluebox }
+
+  describe "#services" do
+    it "includes all services" do
+      assert_includes Bluebox.services, :compute
+      assert_includes Bluebox.services, :dns
+      assert_includes Bluebox.services, :blb
+    end
+  end
+
+  describe "#class_for" do
+    describe "when requesting compute service" do
+      it "returns correct class" do
+        assert_equal Fog::Compute::Bluebox, Bluebox.class_for(:compute)
+      end
+    end
+
+    describe "when requesting dns service" do
+      it "returns correct class" do
+        assert_equal Fog::DNS::Bluebox, Bluebox.class_for(:dns)
+      end
+    end
+
+    describe "when requesting blb service" do
+      it "returns correct class" do
+        assert_equal Fog::Bluebox::BLB, Bluebox.class_for(:blb)
+      end
+    end
+  end
+
+  describe "#[]" do
+    describe "when requesting compute service" do
+      it "returns instance" do
+        Fog::Compute::Bluebox.stub(:new, "instance") do
+          assert_equal "instance", Bluebox[:compute]
+        end
+      end
+    end
+
+    describe "when requesting dns service" do
+      it "returns instance" do
+        Fog::DNS::Bluebox.stub(:new, "instance") do
+          assert_equal "instance", Bluebox[:dns]
+        end
+      end
+    end
+  end
 end

data/spec/fog/bin/brightbox_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 require "fog/bin"
 require "helpers/bin"
 

data/spec/fog/bin/clodo_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 require "fog/bin"
 require "helpers/bin"
 

data/spec/fog/bin/cloudsigma_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 require "fog/bin"
 require "helpers/bin"
 

data/spec/fog/bin/cloudstack_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 require "fog/bin"
 require "helpers/bin"
 

data/spec/fog/bin/digitalocean_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 require "fog/bin"
 require "helpers/bin"
 

data/spec/fog/bin/dnsimple_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 require "fog/bin"
 require "helpers/bin"
 

data/spec/fog/bin/dnsmadeeasy_spec.rb

@@ -1,5 +1,4 @@
-require "minitest/autorun"
-require "fog"
+require "spec_helper"
 require "fog/bin"
 require "helpers/bin"