December 2009 - YaST Commits - openSUSE Mailing Lists

[yast-commit] <rest-service> master : Ntp plugin now use rest-service ancestor
by Josef Reidinger 11 Dec '09

11 Dec '09

ref: refs/heads/master commit ccf3a31ffe1abe0c5a0da47a01992ebfba25224b Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Dec 11 12:58:32 2009 +0100 Ntp plugin now use rest-service ancestor --- plugins/ntp/app/controllers/ntp_controller.rb | 14 +++----------- plugins/ntp/app/models/ntp.rb | 13 ++++++++----- plugins/ntp/test/functional/ntp_controller_test.rb | 6 +++--- 3 files changed, 14 insertions(+), 19 deletions(-) diff --git a/plugins/ntp/app/controllers/ntp_controller.rb b/plugins/ntp/app/controllers/ntp_controller.rb index 8af3666..f274cfe 100644 --- a/plugins/ntp/app/controllers/ntp_controller.rb +++ b/plugins/ntp/app/controllers/ntp_controller.rb @@ -1,4 +1,3 @@ - class NtpController < ApplicationController before_filter :login_required @@ -7,8 +6,8 @@ class NtpController < ApplicationController ntp = Ntp.find respond_to do |format| - format.xml { render :xml => ntp.actions.to_xml(:root => :actions)} - format.json { render :json => ntp.actions.to_json } + format.xml { render :xml => ntp.to_xml} + format.json { render :json => ntp.to_json } end end @@ -18,14 +17,7 @@ class NtpController < ApplicationController raise InvalidParameters.new :ntp => "Missing" end - @ntp = Ntp.find - - if root["synchronize"] - yapi_perm_check "ntp.synchronize" - @ntp.actions[:synchronize] = true - end - - @ntp.save + Ntp.new(root).save show end diff --git a/plugins/ntp/app/models/ntp.rb b/plugins/ntp/app/models/ntp.rb index c57115f..ee89f8d 100644 --- a/plugins/ntp/app/models/ntp.rb +++ b/plugins/ntp/app/models/ntp.rb @@ -1,10 +1,15 @@ -class Ntp +class Ntp < BaseModel::Base attr_accessor :actions + validates_inclusion_of :'actions[:synchronize]', :in => [ true, false ], :allow_nil => true + + before_save { yapi_perm_check "ntp.synchronize" if actions[:synchronize] } + public - def initialize + def initialize(args={}) @actions = { :synchronize => false } + super args end def self.find @@ -12,9 +17,7 @@ class Ntp end def save - if @actions[:synchronize] - synchronize - end + synchronize if @actions[:synchronize] end private diff --git a/plugins/ntp/test/functional/ntp_controller_test.rb b/plugins/ntp/test/functional/ntp_controller_test.rb index 9709de5..364f845 100644 --- a/plugins/ntp/test/functional/ntp_controller_test.rb +++ b/plugins/ntp/test/functional/ntp_controller_test.rb @@ -19,18 +19,18 @@ class SystemControllerTest < ActionController::TestCase ret = get :show assert_response :success response = Hash.from_xml(ret.body) - assert response["actions"]["synchronize"] == false + assert response["ntp"]["actions"]["synchronize"] == false end def test_update YastService.stubs(:Call).with("YaPI::NTP::Synchronize").once.returns("OK") - post :update, {"ntp"=>{"synchronize"=>true}} + post :update, {"ntp"=>{"actions" => {"synchronize"=>true}}} assert_response :success end def test_update_failed YastService.stubs(:Call).with("YaPI::NTP::Synchronize").once.returns("Failed") - post :update, {"ntp"=>{"synchronize"=>true}} + post :update, {"ntp"=>{"actions" => {"synchronize"=>true}}} assert_response 503 end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> jr-basemodel : serialize properly types
by Josef Reidinger 11 Dec '09

11 Dec '09

ref: refs/heads/jr-basemodel commit 059b914354a07c7391bedf5e15ed48066c87d061 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Dec 11 12:57:36 2009 +0100 serialize properly types --- .../lib/base_model/serializers/xml_serializer.rb | 20 +++++++++++++++++++- webservice/test/unit/base_model_test.rb | 3 ++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/webservice/lib/base_model/serializers/xml_serializer.rb b/webservice/lib/base_model/serializers/xml_serializer.rb index 8522710..de98e56 100644 --- a/webservice/lib/base_model/serializers/xml_serializer.rb +++ b/webservice/lib/base_model/serializers/xml_serializer.rb @@ -40,9 +40,27 @@ module BaseModel end end else - builder.tag!(name,value.to_s) + type = XML_TYPE_NAMES[value.class.to_s] + opts = {} + opts[:type] = type if type + builder.tag!(name,value.to_s,opts) end end + + XML_TYPE_NAMES = { #type conversion + "Symbol" => "symbol", + "Fixnum" => "integer", + "Bignum" => "integer", + "BigDecimal" => "decimal", + "Float" => "float", + "TrueClass" => "boolean", + "FalseClass" => "boolean", + "Date" => "date", + "DateTime" => "datetime", + "Time" => "datetime", + "ActiveSupport::TimeWithZone" => "datetime" + } unless defined?(XML_TYPE_NAMES) + end end end diff --git a/webservice/test/unit/base_model_test.rb b/webservice/test/unit/base_model_test.rb index 34f9466..7a2fffd 100644 --- a/webservice/test/unit/base_model_test.rb +++ b/webservice/test/unit/base_model_test.rb @@ -56,7 +56,8 @@ MASS_DATA = { :arg1 => "last", :arg2 => "5", :callback_used => false } COMPLEX_DATA = { "test" => [ "a","b"], #serializers doesn't differ symbol from string and always sue string - "test2" => [ "5","6"], #number after serializing is converted to string + "test2" => [ 5,6], #number test + "test4" => [ true,false], #number boolean "test3" => { "a" => "b","c"=> "d" }, #number after serializing is converted to string "test_escapes" => "<arg>/&\\test", "test_hash" => [{"a"=>"a"},{"b"=>"b"}] -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : serialize properly types
by Josef Reidinger 11 Dec '09

11 Dec '09

ref: refs/heads/master commit 059b914354a07c7391bedf5e15ed48066c87d061 Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Dec 11 12:57:36 2009 +0100 serialize properly types --- .../lib/base_model/serializers/xml_serializer.rb | 20 +++++++++++++++++++- webservice/test/unit/base_model_test.rb | 3 ++- 2 files changed, 21 insertions(+), 2 deletions(-) diff --git a/webservice/lib/base_model/serializers/xml_serializer.rb b/webservice/lib/base_model/serializers/xml_serializer.rb index 8522710..de98e56 100644 --- a/webservice/lib/base_model/serializers/xml_serializer.rb +++ b/webservice/lib/base_model/serializers/xml_serializer.rb @@ -40,9 +40,27 @@ module BaseModel end end else - builder.tag!(name,value.to_s) + type = XML_TYPE_NAMES[value.class.to_s] + opts = {} + opts[:type] = type if type + builder.tag!(name,value.to_s,opts) end end + + XML_TYPE_NAMES = { #type conversion + "Symbol" => "symbol", + "Fixnum" => "integer", + "Bignum" => "integer", + "BigDecimal" => "decimal", + "Float" => "float", + "TrueClass" => "boolean", + "FalseClass" => "boolean", + "Date" => "date", + "DateTime" => "datetime", + "Time" => "datetime", + "ActiveSupport::TimeWithZone" => "datetime" + } unless defined?(XML_TYPE_NAMES) + end end end diff --git a/webservice/test/unit/base_model_test.rb b/webservice/test/unit/base_model_test.rb index 34f9466..7a2fffd 100644 --- a/webservice/test/unit/base_model_test.rb +++ b/webservice/test/unit/base_model_test.rb @@ -56,7 +56,8 @@ MASS_DATA = { :arg1 => "last", :arg2 => "5", :callback_used => false } COMPLEX_DATA = { "test" => [ "a","b"], #serializers doesn't differ symbol from string and always sue string - "test2" => [ "5","6"], #number after serializing is converted to string + "test2" => [ 5,6], #number test + "test4" => [ true,false], #number boolean "test3" => { "a" => "b","c"=> "d" }, #number after serializing is converted to string "test_escapes" => "<arg>/&\\test", "test_hash" => [{"a"=>"a"},{"b"=>"b"}] -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60064 - /trunk/storage/storage/src/testsuite/lib/setup-system.ycp
by aschnell＠svn.opensuse.org 11 Dec '09

11 Dec '09

Author: aschnell Date: Fri Dec 11 11:07:40 2009 New Revision: 60064 URL: http://svn.opensuse.org/viewcvs/yast?rev=60064&view=rev Log: - give all info files the extension .info Modified: trunk/storage/storage/src/testsuite/lib/setup-system.ycp Modified: trunk/storage/storage/src/testsuite/lib/setup-system.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/li… ============================================================================== --- trunk/storage/storage/src/testsuite/lib/setup-system.ycp (original) +++ trunk/storage/storage/src/testsuite/lib/setup-system.ycp Fri Dec 11 11:07:40 2009 @@ -4,6 +4,6 @@ SCR::Execute(.target.bash, "mkdir -p tmp"); SCR::Execute(.target.bash, "rm -rf tmp/*"); - SCR::Execute(.target.bash, sformat("cp data/%1/* tmp/", name)); + SCR::Execute(.target.bash, sformat("cp data/%1/*.info tmp", name)); } } -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60063 - in /trunk/storage/storage/src/testsuite/data: empty/ half-empty/ reuse-home/ windows-only/ windows/
by aschnell＠svn.opensuse.org 11 Dec '09

11 Dec '09

Author: aschnell Date: Fri Dec 11 11:07:19 2009 New Revision: 60063 URL: http://svn.opensuse.org/viewcvs/yast?rev=60063&view=rev Log: - give all info files the extension .info Added: trunk/storage/storage/src/testsuite/data/empty/disk_sda.info - copied unchanged from r60062, trunk/storage/storage/src/testsuite/data/empty/disk_sda trunk/storage/storage/src/testsuite/data/half-empty/disk_sda.info - copied unchanged from r60062, trunk/storage/storage/src/testsuite/data/half-empty/disk_sda trunk/storage/storage/src/testsuite/data/reuse-home/disk_sda.info - copied unchanged from r60062, trunk/storage/storage/src/testsuite/data/reuse-home/disk_sda trunk/storage/storage/src/testsuite/data/reuse-home/free.info - copied unchanged from r60062, trunk/storage/storage/src/testsuite/data/reuse-home/free_info trunk/storage/storage/src/testsuite/data/reuse-home/volume.info - copied unchanged from r60062, trunk/storage/storage/src/testsuite/data/reuse-home/volume_info trunk/storage/storage/src/testsuite/data/windows-only/disk_sda.info - copied unchanged from r60062, trunk/storage/storage/src/testsuite/data/windows-only/disk_sda trunk/storage/storage/src/testsuite/data/windows-only/free.info - copied unchanged from r60062, trunk/storage/storage/src/testsuite/data/windows-only/free_info trunk/storage/storage/src/testsuite/data/windows-only/volume.info - copied unchanged from r60062, trunk/storage/storage/src/testsuite/data/windows-only/volume_info trunk/storage/storage/src/testsuite/data/windows/disk_sda.info - copied unchanged from r60062, trunk/storage/storage/src/testsuite/data/windows/disk_sda trunk/storage/storage/src/testsuite/data/windows/free.info - copied unchanged from r60062, trunk/storage/storage/src/testsuite/data/windows/free_info trunk/storage/storage/src/testsuite/data/windows/volume.info - copied unchanged from r60062, trunk/storage/storage/src/testsuite/data/windows/volume_info Removed: trunk/storage/storage/src/testsuite/data/empty/disk_sda trunk/storage/storage/src/testsuite/data/half-empty/disk_sda trunk/storage/storage/src/testsuite/data/reuse-home/disk_sda trunk/storage/storage/src/testsuite/data/reuse-home/free_info trunk/storage/storage/src/testsuite/data/reuse-home/volume_info trunk/storage/storage/src/testsuite/data/windows-only/disk_sda trunk/storage/storage/src/testsuite/data/windows-only/free_info trunk/storage/storage/src/testsuite/data/windows-only/volume_info trunk/storage/storage/src/testsuite/data/windows/disk_sda trunk/storage/storage/src/testsuite/data/windows/free_info trunk/storage/storage/src/testsuite/data/windows/volume_info Modified: trunk/storage/storage/src/testsuite/data/empty/Makefile.am trunk/storage/storage/src/testsuite/data/half-empty/Makefile.am trunk/storage/storage/src/testsuite/data/reuse-home/Makefile.am trunk/storage/storage/src/testsuite/data/windows-only/Makefile.am trunk/storage/storage/src/testsuite/data/windows/Makefile.am Modified: trunk/storage/storage/src/testsuite/data/empty/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/da… ============================================================================== --- trunk/storage/storage/src/testsuite/data/empty/Makefile.am (original) +++ trunk/storage/storage/src/testsuite/data/empty/Makefile.am Fri Dec 11 11:07:19 2009 @@ -2,5 +2,5 @@ # Makefile.am for storage/storage/src/testsuite/data/empty # -EXTRA_DIST = disk_sda +EXTRA_DIST = disk_sda.info Modified: trunk/storage/storage/src/testsuite/data/half-empty/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/da… ============================================================================== --- trunk/storage/storage/src/testsuite/data/half-empty/Makefile.am (original) +++ trunk/storage/storage/src/testsuite/data/half-empty/Makefile.am Fri Dec 11 11:07:19 2009 @@ -2,5 +2,5 @@ # Makefile.am for storage/storage/src/testsuite/data/half-empty # -EXTRA_DIST = disk_sda +EXTRA_DIST = disk_sda.info Modified: trunk/storage/storage/src/testsuite/data/reuse-home/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/da… ============================================================================== --- trunk/storage/storage/src/testsuite/data/reuse-home/Makefile.am (original) +++ trunk/storage/storage/src/testsuite/data/reuse-home/Makefile.am Fri Dec 11 11:07:19 2009 @@ -2,5 +2,5 @@ # Makefile.am for storage/storage/src/testsuite/data/reuse-home # -EXTRA_DIST = disk_sda free_info volume_info +EXTRA_DIST = disk_sda.info free.info volume.info Modified: trunk/storage/storage/src/testsuite/data/windows-only/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/da… ============================================================================== --- trunk/storage/storage/src/testsuite/data/windows-only/Makefile.am (original) +++ trunk/storage/storage/src/testsuite/data/windows-only/Makefile.am Fri Dec 11 11:07:19 2009 @@ -2,5 +2,5 @@ # Makefile.am for storage/storage/src/testsuite/data/windows-only # -EXTRA_DIST = disk_sda free_info volume_info +EXTRA_DIST = disk_sda.info free.info volume.info Modified: trunk/storage/storage/src/testsuite/data/windows/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/da… ============================================================================== --- trunk/storage/storage/src/testsuite/data/windows/Makefile.am (original) +++ trunk/storage/storage/src/testsuite/data/windows/Makefile.am Fri Dec 11 11:07:19 2009 @@ -2,5 +2,5 @@ # Makefile.am for storage/storage/src/testsuite/data/windows # -EXTRA_DIST = disk_sda free_info volume_info +EXTRA_DIST = disk_sda.info free.info volume.info -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> jr-basemodel : improve xml serialization
by Josef Reidinger 11 Dec '09

11 Dec '09

ref: refs/heads/jr-basemodel commit cb148ac8ac16c8346c67f902f616001802789c9d Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Dec 11 10:37:06 2009 +0100 improve xml serialization --- webservice/lib/base_model/base.rb | 9 ++++++- .../lib/base_model/serializers/xml_serializer.rb | 24 +++++++++++++++++++- webservice/test/unit/base_model_test.rb | 16 ++++++++++++- 3 files changed, 46 insertions(+), 3 deletions(-) diff --git a/webservice/lib/base_model/base.rb b/webservice/lib/base_model/base.rb index 0e89cc0..eb72bcb 100644 --- a/webservice/lib/base_model/base.rb +++ b/webservice/lib/base_model/base.rb @@ -1,5 +1,10 @@ module BaseModel class Base + + def to_model + self + end + def initialize(attr={}) load(attr) end @@ -14,7 +19,7 @@ module BaseModel end def new_record? - true + false #always update by default end def create_or_update @@ -46,5 +51,7 @@ module BaseModel include BaseModel::MassAssignment include BaseModel::Serialization + include YastRoles #to access permission check in models + end end diff --git a/webservice/lib/base_model/serializers/xml_serializer.rb b/webservice/lib/base_model/serializers/xml_serializer.rb index 9cee3a3..8522710 100644 --- a/webservice/lib/base_model/serializers/xml_serializer.rb +++ b/webservice/lib/base_model/serializers/xml_serializer.rb @@ -17,10 +17,32 @@ module BaseModel builder = options[:builder] || Builder::XmlMarkup.new(options) builder.tag!(root){ @attributes.each do |attr| - builder.tag!(attr.to_s[1..-1],(a)model.instance_variable_get(attr)) + value = @model.instance_variable_get(attr) + name = attr.to_s[1..-1] + serialize_value(name,value,builder) end } end + + protected +#place for all types for special serializing + def serialize_value(name,value,builder) + if value.is_a? Array + builder.tag!(name,{:type => "array"}) do + value.each do |v| + serialize_value(name,v,builder) + end + end + elsif value.is_a? Hash + builder.tag!(name) do + value.each do |k,v| + serialize_value(k,v,builder) + end + end + else + builder.tag!(name,value.to_s) + end + end end end end diff --git a/webservice/test/unit/base_model_test.rb b/webservice/test/unit/base_model_test.rb index 7be9418..34f9466 100644 --- a/webservice/test/unit/base_model_test.rb +++ b/webservice/test/unit/base_model_test.rb @@ -5,7 +5,7 @@ class BaseModelTest < ActiveSupport::TestCase validates_format_of :arg2, :with => /^\d$/ before_save :call - attr_accessor :arg1, :arg2, :callback_used + attr_accessor :arg1, :arg2, :callback_used, :carg attr_protected :callback_used def call @callback_used = true; @@ -54,23 +54,37 @@ MASS_DATA = { :arg1 => "last", :arg2 => "5", :callback_used => false } assert test2.arg2.nil? end +COMPLEX_DATA = { + "test" => [ "a","b"], #serializers doesn't differ symbol from string and always sue string + "test2" => [ "5","6"], #number after serializing is converted to string + "test3" => { "a" => "b","c"=> "d" }, #number after serializing is converted to string + "test_escapes" => "<arg>/&\\test", + "test_hash" => [{"a"=>"a"},{"b"=>"b"}] +} + def test_xml_serialization test= Test.new(MASS_DATA) + test.carg = COMPLEX_DATA xml = test.to_xml assert xml + puts xml.inspect test2 = Test.new test2.from_xml xml assert_equal "last", test2.arg1 assert_equal "5", test2.arg2 + assert_equal COMPLEX_DATA, test2.carg end def test_json_serialization test= Test.new(MASS_DATA) + test.carg = COMPLEX_DATA json = test.to_json + puts json.inspect assert json test2 = Test.new test2.from_json json assert_equal "last", test2.arg1 assert_equal "5", test2.arg2 + assert_equal COMPLEX_DATA, test2.carg end end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] <rest-service> master : improve xml serialization
by Josef Reidinger 11 Dec '09

11 Dec '09

ref: refs/heads/master commit cb148ac8ac16c8346c67f902f616001802789c9d Author: Josef Reidinger <jreidinger(a)suse.cz> Date: Fri Dec 11 10:37:06 2009 +0100 improve xml serialization --- webservice/lib/base_model/base.rb | 9 ++++++- .../lib/base_model/serializers/xml_serializer.rb | 24 +++++++++++++++++++- webservice/test/unit/base_model_test.rb | 16 ++++++++++++- 3 files changed, 46 insertions(+), 3 deletions(-) diff --git a/webservice/lib/base_model/base.rb b/webservice/lib/base_model/base.rb index 0e89cc0..eb72bcb 100644 --- a/webservice/lib/base_model/base.rb +++ b/webservice/lib/base_model/base.rb @@ -1,5 +1,10 @@ module BaseModel class Base + + def to_model + self + end + def initialize(attr={}) load(attr) end @@ -14,7 +19,7 @@ module BaseModel end def new_record? - true + false #always update by default end def create_or_update @@ -46,5 +51,7 @@ module BaseModel include BaseModel::MassAssignment include BaseModel::Serialization + include YastRoles #to access permission check in models + end end diff --git a/webservice/lib/base_model/serializers/xml_serializer.rb b/webservice/lib/base_model/serializers/xml_serializer.rb index 9cee3a3..8522710 100644 --- a/webservice/lib/base_model/serializers/xml_serializer.rb +++ b/webservice/lib/base_model/serializers/xml_serializer.rb @@ -17,10 +17,32 @@ module BaseModel builder = options[:builder] || Builder::XmlMarkup.new(options) builder.tag!(root){ @attributes.each do |attr| - builder.tag!(attr.to_s[1..-1],(a)model.instance_variable_get(attr)) + value = @model.instance_variable_get(attr) + name = attr.to_s[1..-1] + serialize_value(name,value,builder) end } end + + protected +#place for all types for special serializing + def serialize_value(name,value,builder) + if value.is_a? Array + builder.tag!(name,{:type => "array"}) do + value.each do |v| + serialize_value(name,v,builder) + end + end + elsif value.is_a? Hash + builder.tag!(name) do + value.each do |k,v| + serialize_value(k,v,builder) + end + end + else + builder.tag!(name,value.to_s) + end + end end end end diff --git a/webservice/test/unit/base_model_test.rb b/webservice/test/unit/base_model_test.rb index 7be9418..34f9466 100644 --- a/webservice/test/unit/base_model_test.rb +++ b/webservice/test/unit/base_model_test.rb @@ -5,7 +5,7 @@ class BaseModelTest < ActiveSupport::TestCase validates_format_of :arg2, :with => /^\d$/ before_save :call - attr_accessor :arg1, :arg2, :callback_used + attr_accessor :arg1, :arg2, :callback_used, :carg attr_protected :callback_used def call @callback_used = true; @@ -54,23 +54,37 @@ MASS_DATA = { :arg1 => "last", :arg2 => "5", :callback_used => false } assert test2.arg2.nil? end +COMPLEX_DATA = { + "test" => [ "a","b"], #serializers doesn't differ symbol from string and always sue string + "test2" => [ "5","6"], #number after serializing is converted to string + "test3" => { "a" => "b","c"=> "d" }, #number after serializing is converted to string + "test_escapes" => "<arg>/&\\test", + "test_hash" => [{"a"=>"a"},{"b"=>"b"}] +} + def test_xml_serialization test= Test.new(MASS_DATA) + test.carg = COMPLEX_DATA xml = test.to_xml assert xml + puts xml.inspect test2 = Test.new test2.from_xml xml assert_equal "last", test2.arg1 assert_equal "5", test2.arg2 + assert_equal COMPLEX_DATA, test2.carg end def test_json_serialization test= Test.new(MASS_DATA) + test.carg = COMPLEX_DATA json = test.to_json + puts json.inspect assert json test2 = Test.new test2.from_json json assert_equal "last", test2.arg1 assert_equal "5", test2.arg2 + assert_equal COMPLEX_DATA, test2.carg end end -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60062 - in /trunk/storage/storage/src/testsuite/data: ./ empty/ half-empty/ reuse-home/ windows-only/ windows/
by aschnell＠svn.opensuse.org 11 Dec '09

11 Dec '09

Author: aschnell Date: Fri Dec 11 10:28:49 2009 New Revision: 60062 URL: http://svn.opensuse.org/viewcvs/yast?rev=60062&view=rev Log: - added makefiles Added: trunk/storage/storage/src/testsuite/data/Makefile.am trunk/storage/storage/src/testsuite/data/empty/Makefile.am trunk/storage/storage/src/testsuite/data/half-empty/Makefile.am trunk/storage/storage/src/testsuite/data/reuse-home/Makefile.am trunk/storage/storage/src/testsuite/data/windows-only/Makefile.am trunk/storage/storage/src/testsuite/data/windows/Makefile.am Modified: trunk/storage/storage/src/testsuite/data/ (props changed) trunk/storage/storage/src/testsuite/data/empty/ (props changed) trunk/storage/storage/src/testsuite/data/half-empty/ (props changed) trunk/storage/storage/src/testsuite/data/reuse-home/ (props changed) trunk/storage/storage/src/testsuite/data/windows/ (props changed) trunk/storage/storage/src/testsuite/data/windows-only/ (props changed) Added: trunk/storage/storage/src/testsuite/data/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/da… ============================================================================== --- trunk/storage/storage/src/testsuite/data/Makefile.am (added) +++ trunk/storage/storage/src/testsuite/data/Makefile.am Fri Dec 11 10:28:49 2009 @@ -0,0 +1,6 @@ +# +# Makefile.am for storage/storage/src/testsuite/data +# + +SUBDIRS = empty half-empty reuse-home windows windows-only + Added: trunk/storage/storage/src/testsuite/data/empty/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/da… ============================================================================== --- trunk/storage/storage/src/testsuite/data/empty/Makefile.am (added) +++ trunk/storage/storage/src/testsuite/data/empty/Makefile.am Fri Dec 11 10:28:49 2009 @@ -0,0 +1,6 @@ +# +# Makefile.am for storage/storage/src/testsuite/data/empty +# + +EXTRA_DIST = disk_sda + Added: trunk/storage/storage/src/testsuite/data/half-empty/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/da… ============================================================================== --- trunk/storage/storage/src/testsuite/data/half-empty/Makefile.am (added) +++ trunk/storage/storage/src/testsuite/data/half-empty/Makefile.am Fri Dec 11 10:28:49 2009 @@ -0,0 +1,6 @@ +# +# Makefile.am for storage/storage/src/testsuite/data/half-empty +# + +EXTRA_DIST = disk_sda + Added: trunk/storage/storage/src/testsuite/data/reuse-home/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/da… ============================================================================== --- trunk/storage/storage/src/testsuite/data/reuse-home/Makefile.am (added) +++ trunk/storage/storage/src/testsuite/data/reuse-home/Makefile.am Fri Dec 11 10:28:49 2009 @@ -0,0 +1,6 @@ +# +# Makefile.am for storage/storage/src/testsuite/data/reuse-home +# + +EXTRA_DIST = disk_sda free_info volume_info + Added: trunk/storage/storage/src/testsuite/data/windows-only/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/da… ============================================================================== --- trunk/storage/storage/src/testsuite/data/windows-only/Makefile.am (added) +++ trunk/storage/storage/src/testsuite/data/windows-only/Makefile.am Fri Dec 11 10:28:49 2009 @@ -0,0 +1,6 @@ +# +# Makefile.am for storage/storage/src/testsuite/data/windows-only +# + +EXTRA_DIST = disk_sda free_info volume_info + Added: trunk/storage/storage/src/testsuite/data/windows/Makefile.am URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/testsuite/da… ============================================================================== --- trunk/storage/storage/src/testsuite/data/windows/Makefile.am (added) +++ trunk/storage/storage/src/testsuite/data/windows/Makefile.am Fri Dec 11 10:28:49 2009 @@ -0,0 +1,6 @@ +# +# Makefile.am for storage/storage/src/testsuite/data/windows +# + +EXTRA_DIST = disk_sda free_info volume_info + -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60061 - in /trunk/storage: package/ storage/src/include/ storage/src/modules/
by fehr＠svn.opensuse.org 10 Dec '09

10 Dec '09

Author: fehr Date: Thu Dec 10 18:50:28 2009 New Revision: 60061 URL: http://svn.opensuse.org/viewcvs/yast?rev=60061&view=rev Log: - verify entered crypt passwords in existing crypted devices (#467987) - get rid of ClassifiedSettings in Storage.ycp Modified: trunk/storage/package/yast2-storage.changes trunk/storage/storage/src/include/custom_part_lib.ycp trunk/storage/storage/src/include/ep-dialogs.ycp trunk/storage/storage/src/modules/Storage.ycp trunk/storage/storage/src/modules/StorageProposal.ycp Modified: trunk/storage/package/yast2-storage.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/package/yast2-storage.ch… ============================================================================== --- trunk/storage/package/yast2-storage.changes (original) +++ trunk/storage/package/yast2-storage.changes Thu Dec 10 18:50:28 2009 @@ -1,4 +1,10 @@ ------------------------------------------------------------------- +Thu Dec 10 18:48:13 CET 2009 - fehr(a)suse.de + +- verify entered crypt passwords in existing crypted devices (#467987) +- get rid of ClassifiedSettings in Storage.ycp + +------------------------------------------------------------------- Thu Dec 10 15:34:07 CET 2009 - fehr(a)suse.de - make removal of loop based files work again (#480738) Modified: trunk/storage/storage/src/include/custom_part_lib.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/cust… ============================================================================== --- trunk/storage/storage/src/include/custom_part_lib.ycp (original) +++ trunk/storage/storage/src/include/custom_part_lib.ycp Thu Dec 10 18:50:28 2009 @@ -581,8 +581,6 @@ ret["ok"] = Storage::SetCryptPwd( dev, fs_passwd ) && (new["format"]:false || Storage::SetCrypt( dev, true, new["format"]:false )); - if( ret["ok"]:false && new["type"]:`unknown == `loop ) - Storage::UpdateClassified( new["fpath"]:"", fs_passwd ); if( popup ) UI::CloseDialog(); } Modified: trunk/storage/storage/src/include/ep-dialogs.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/include/ep-d… ============================================================================== --- trunk/storage/storage/src/include/ep-dialogs.ycp (original) +++ trunk/storage/storage/src/include/ep-dialogs.ycp Thu Dec 10 18:50:28 2009 @@ -90,15 +90,13 @@ boolean AskPassword() { - if (!NeedPassword()) - return false; - - // TODO: this is ugly - string key = (data["type"]:`unknown != `loop) ? (data["device"]:"error") : (data["fpath"]:"error"); - if (Storage::HasClassified(key)) - return false; - - return true; + boolean ret = NeedPassword(); + if( ret && !do_format && size(data["mount"]:"")>0 ) + { + string key = (data["type"]:`unknown != `loop) ? (data["device"]:"error") : (data["fpath"]:"error"); + ret = Storage::NeedCryptPwd(key); + } + return( ret ); } /* MiniWorkflowStepPartitionSize data: @@ -514,6 +512,8 @@ UI::ChangeWidget(`id(`pw1), `Value, ""); UI::ChangeWidget(`id(`pw2), `Value, ""); + string dev = (data["type"]:`unknown != `loop) ? data["device"]:"" + : data["fpath"]:""; repeat { widget = MiniWorkflow::UserInput(); @@ -522,8 +522,11 @@ { password = (string) UI::QueryWidget(`id(`pw1), `Value); string tmp = (string) UI::QueryWidget(`id(`pw2), `Value); + boolean need_verify = !data["format"]:false && + size(data["mount"]:"")>0; - if (!Storage::CheckEncryptionPasswords(password, tmp, min_pw_len, empty_pw_allowed)) + if (!Storage::CheckEncryptionPasswords(password, tmp, min_pw_len, empty_pw_allowed) || + (need_verify && !Storage::CheckCryptOk(dev, password)) ) { UI::SetFocus(`id(`pw1) ); widget = `again; @@ -534,10 +537,7 @@ if (widget == `next) { - if (data["type"]:`unknown != `loop) - Storage::UpdateClassified(data["device"]:"", password); - else - Storage::UpdateClassified(data["fpath"]:"", password); + Storage::SetCryptPwd(dev, password); widget = `finish; } Modified: trunk/storage/storage/src/modules/Storage.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/Storage.ycp (original) +++ trunk/storage/storage/src/modules/Storage.ycp Thu Dec 10 18:50:28 2009 @@ -80,9 +80,6 @@ // end of resizing functions -global void UpdateClassified(string key, string pwd); - - map<string,any> conv_ctype = $[ "def_sym" : `CT_UNKNOWN, "def_int" : LibStorage::CUNKNOWN(), @@ -175,7 +172,6 @@ map DiskMapVersion = $[]; map DiskMap = $[]; -map<string, string> ClassifiedSettings = $[]; map type_order = $[ `CT_DISK : 0, `CT_MD : 1, `CT_DMRAID : 2, `CT_DMMULTIPATH : 3, `CT_LOOP : 4, `CT_DM : 5, `CT_LVM : 6, `CT_NFS : 7 ]; list<string> hw_packages = []; @@ -2315,21 +2311,6 @@ else y2milestone( "ChangeVolumeProperties sint ret:%1", ret ); } - if( ret==0 && - part["enc_type"]:`none != `none && haskey( ClassifiedSettings, dev ) ) - { - changed = true; - if( size(ClassifiedSettings[dev]:"")>0 ) - { - string pwd = ClassifiedSettings[dev]:""; - ret = LibStorage::StorageInterface::setCryptPassword( sint, dev, - pwd ); - if( ret<0 ) - y2error( "ChangeVolumeProperties sint ret:%1", ret ); - else - y2milestone( "ChangeVolumeProperties sint ret:%1", ret ); - } - } if( ret==0 && part["enc_type"]:`none != curr["enc_type"]:`none ) { changed = true; @@ -2674,42 +2655,61 @@ return ret; } +global string GetCryptPwd( string device ) + { + string pwd=""; + y2milestone( "GetCryptPwd device:%1", device ); + integer ret = 0; + ret = LibStorage::StorageInterface::getCryptPassword( sint, device, + pwd ); + if( ret<0 ) + y2error( "GetCryptPwd sint ret:%1", ret ); + else + y2milestone( "GetCryptPwd empty:%1", size(pwd)==0 ); + return( pwd ); + } + +global boolean SetCryptPwd( string device, string pwd ) + { + y2milestone( "SetCryptPwd device:%1", device ); + integer ret = 0; + ret = LibStorage::StorageInterface::setCryptPassword( sint, device, + pwd ); + if( ret<0 ) + y2error( "SetCryptPwd sint ret:%1", ret ); + else + y2milestone( "SetCryptPwd sint ret:%1", ret ); + return( ret==0 ); + } + +global boolean NeedCryptPwd( string device ) + { + boolean ret = false; + ret = LibStorage::StorageInterface::needCryptPassword( sint, device ); + y2milestone( "NeedCryptPwd device:%1 ret:%2", device, ret ); + return( ret ); + } + + global string CreateLoop( string file, boolean create, integer sizeK, string mp ) { y2milestone( "CreateLoop file:%1 create:%2 sizeK:%3 mp:%4", file, create, sizeK, mp ); string dev = ""; - integer ret = -9999; - if( haskey( ClassifiedSettings, file )) - { - string pwd = ClassifiedSettings[file]:""; - ret = LibStorage::StorageInterface::createFileLoop( sint, file, !create, - sizeK, mp, pwd, - dev ); - UpdateClassified(dev, pwd); - } + integer ret = 0; + string pwd = GetCryptPwd( file ); + ret = LibStorage::StorageInterface::createFileLoop( sint, file, !create, + sizeK, mp, pwd, dev ); if( ret<0 ) y2error( "CreateLoop sint ret:%1", ret ); + LibStorage::StorageInterface::forgetCryptPassword( sint, file ); UpdateTargetMapDisk( "/dev/loop" ); y2milestone( "CreateLoop dev:%1", dev ); return( dev ); } -global void UpdateClassified( string key, string pwd ) - { - ClassifiedSettings[key] = pwd; - //y2milestone( "ClassifiedSettings %1", ClassifiedSettings ); - } - - -global boolean HasClassified(string key) -{ - return haskey(ClassifiedSettings, key); -} - - define void HandleModulesOnBoot( map<string,map> targetMap ); global boolean UpdateLoop( string dev, string file, boolean create, @@ -2739,42 +2739,6 @@ return( ret==0 ); } -global string GetCryptPwd( string device ) - { - string pwd=""; - y2milestone( "GetCryptPwd device:%1", device ); - if( size(ClassifiedSettings[device]:"")>0 ) - pwd = ClassifiedSettings[device]:""; - else - { - integer ret = 0; - ret = LibStorage::StorageInterface::getCryptPassword( sint, device, - pwd ); - if( ret<0 ) - y2error( "GetCryptPwd sint ret:%1", ret ); - } - y2milestone( "GetCryptPwd empty:%1", size(pwd)==0 ); - return( pwd ); - } - -global boolean SetCryptPwd( string device, string pwd ) - { - y2milestone( "SetCryptPwd device:%1", device ); - integer ret = LibStorage::StorageInterface::setCryptPassword( sint, device, - pwd ); - y2milestone( "SetCryptPwd sint ret:%1", ret ); - map p = GetPartition( GetTargetMap(), device ); - if( ret==LibStorage::STORAGE_VOLUME_NOT_FOUND() || p["create"]:false ) - { - ClassifiedSettings[device] = pwd; - y2milestone( "setting classified %1 pwd size %2", device, size(pwd) ); - ret = 0; - } - else if( ret<0 ) - y2error( "SetCryptPwd sint ret:%1", ret ); - return( ret==0 ); - } - global string DefaultDiskLabel(integer size_k) { @@ -3404,7 +3368,6 @@ integer ret = LibStorage::StorageInterface::commit( sint ); if( ret<0 ) y2error( "CommitChanges sint ret:%1", ret ); - ClassifiedSettings = $[]; return( ret ); } @@ -5353,4 +5316,18 @@ return true; } +global boolean CheckCryptOk( string dev, string fs_passwd ) + { + integer i = LibStorage::StorageInterface::verifyCryptPassword( sint, dev, fs_passwd ); + if( i!=0 ) + Popup::Error( sformat(_("Could not set encryption. +System error code is %1. + +The crypt password provided could be incorrect. +"), i )); + y2milestone( "CheckCryptOk dev:%1 pwlen:%2 ret:%3", + dev, size(fs_passwd), i==0 ); + return( i==0 ); + } + } Modified: trunk/storage/storage/src/modules/StorageProposal.ycp URL: http://svn.opensuse.org/viewcvs/yast/trunk/storage/storage/src/modules/Stor… ============================================================================== --- trunk/storage/storage/src/modules/StorageProposal.ycp (original) +++ trunk/storage/storage/src/modules/StorageProposal.ycp Thu Dec 10 18:50:28 2009 @@ -191,7 +191,7 @@ { y2debug("setting encryption for %1", part_device); partition["enc_type"] = `luks; - Storage::UpdateClassified(part_device, proposal_password); + Storage::SetCryptPwd(part_device, proposal_password); } return partition; }); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0

[yast-commit] r60060 - in /trunk/control-center: VERSION.cmake package/yast2-control-center.changes src/main_window.cpp src/main_window.h
by kmachalkova＠svn.opensuse.org 10 Dec '09

10 Dec '09

Author: kmachalkova Date: Thu Dec 10 18:39:14 2009 New Revision: 60060 URL: http://svn.opensuse.org/viewcvs/yast?rev=60060&view=rev Log: Activate Ctrl-Q Modified: trunk/control-center/VERSION.cmake trunk/control-center/package/yast2-control-center.changes trunk/control-center/src/main_window.cpp trunk/control-center/src/main_window.h Modified: trunk/control-center/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/VERSION.cmake?rev… ============================================================================== --- trunk/control-center/VERSION.cmake (original) +++ trunk/control-center/VERSION.cmake Thu Dec 10 18:39:14 2009 @@ -1,3 +1,3 @@ SET(VERSION_MAJOR "2") -SET(VERSION_MINOR "18") -SET(VERSION_PATCH "12") +SET(VERSION_MINOR "19") +SET(VERSION_PATCH "0") Modified: trunk/control-center/package/yast2-control-center.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/package/yast2-con… ============================================================================== --- trunk/control-center/package/yast2-control-center.changes (original) +++ trunk/control-center/package/yast2-control-center.changes Thu Dec 10 18:39:14 2009 @@ -1,10 +1,12 @@ ------------------------------------------------------------------- Thu Dec 10 13:03:24 CET 2009 - kmachalkova(a)suse.cz -- Show correctly GenericNames containing comma (convert QStringList +- Correctly show GenericNames containing comma (convert QStringList to QString) (bnc#550085) - Show Name from .desktop (instead of client name) in status line (bnc#544167) +- Enable closing the main window with Ctrl+Q (bnc#551737) +- 2.19.0 ------------------------------------------------------------------- Mon Nov 23 16:30:53 CET 2009 - kmachalkova(a)suse.cz Modified: trunk/control-center/src/main_window.cpp URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/main_window.c… ============================================================================== --- trunk/control-center/src/main_window.cpp (original) +++ trunk/control-center/src/main_window.cpp Thu Dec 10 18:39:14 2009 @@ -162,7 +162,8 @@ readSettings(); - //initActions(); + initActions(); + addAction( shutdown ); //d->modview->addAction( addToF ); //d->modview->setContextMenuPolicy( Qt::ActionsContextMenu ); @@ -181,6 +182,8 @@ connect( d->searchField, SIGNAL( textChanged( const QString &)), SLOT( slotFilterChanged() )); + connect( shutdown, SIGNAL( activated()), qApp, SLOT( quit())); + } void MainWindow::setFullScreen( bool fs ) @@ -195,7 +198,9 @@ void MainWindow::initActions() { - addToF = new QAction( "Add to Favourites", this ); + //addToF = new QAction( "Add to Favourites", this ); + shutdown = new QAction( this ); + shutdown->setShortcut( ("Ctrl+Q") ); } void MainWindow::slotGroupPressed( const QModelIndex &index ) Modified: trunk/control-center/src/main_window.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/control-center/src/main_window.h… ============================================================================== --- trunk/control-center/src/main_window.h (original) +++ trunk/control-center/src/main_window.h Thu Dec 10 18:39:14 2009 @@ -53,6 +53,7 @@ Private *const d; QAction *addToF; + QAction *shutdown; void writeSettings(); void readSettings(); -- To unsubscribe, e-mail: yast-commit+unsubscribe(a)opensuse.org For additional commands, e-mail: yast-commit+help(a)opensuse.org

1 0