Using new fog-core release to fix some default_value issues

fog · Aug 26, 2014 · 62d87e5 · 62d87e5
1 parent b7542fd
commit 62d87e5
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/lib/fog/compute/xen_server/models/vdi.rb b/lib/fog/compute/xen_server/models/vdi.rb
@@ -46,18 +46,6 @@ class Vdi < Fog::Model
           require_before_save :name, :storage_repository
 
           alias_method :storage_repository, :sr
-
-          #
-          # Sharable is false by default
-          # read_only is false by default
-          # There is a bug on fog-core that need to be solved before
-          # default_values work with false value
-          #
-          def initialize(attributes = {})
-            self.read_only ||= false unless attributes[:read_only]
-            self.sharable ||= false unless attributes[:sharable]
-            super
-          end
         end
       end
     end

diff --git a/spec/fog/compute/xen_server/models/storage_repository_spec.rb b/spec/fog/compute/xen_server/models/storage_repository_spec.rb
@@ -54,8 +54,9 @@ def self.read_identity
                                                   :vdis => :__vdis })
   end
 
-  it 'should have 4 default values' do
+  it 'should have 5 default values' do
     storage_repository_class.default_values.must_equal(:content_type => 'user',
+                                                       :shared => false,
                                                        :description => '', 
                                                        :physical_size => '0', 
                                                        :sm_config => {})

diff --git a/spec/fog/compute/xen_server/models/vbd_spec.rb b/spec/fog/compute/xen_server/models/vbd_spec.rb
@@ -56,9 +56,10 @@ def self.read_identity
                                    :metrics => :__metrics })
   end
 
-  it 'should have 8 default values' do
+  it 'should have 9 default values' do
     vbd_class.default_values.must_equal(:bootable => true, 
-                                        :mode => 'RW', 
+                                        :mode => 'RW',
+                                        :empty => false,
                                         :other_config => { 'owner' => '' },
                                         :qos_supported_algorithms => [], 
                                         :qos_algorithm_params => {}, 

diff --git a/spec/fog/compute/xen_server/models/vdi_spec.rb b/spec/fog/compute/xen_server/models/vdi_spec.rb
@@ -69,8 +69,10 @@ def self.read_identity
                                  :snapshot_of => :__snapshot_of)
   end
 
-  it 'should have 3 default values' do
+  it 'should have 5 default values' do
     vdi_class.default_values.must_equal(:other_config => {},
+                                        :read_only => false,
+                                        :sharable => false,
                                         :tags => 'system',
                                         :virtual_size => '8589934592')
   end