You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@deltacloud.apache.org by lu...@apache.org on 2010/07/09 01:21:19 UTC

svn commit: r962076 - in /incubator/deltacloud/trunk/framework: app/helpers/conversion_helper.rb app/models/realm.rb lib/converters/xml_converter.rb

Author: lutter
Date: Thu Jul  8 23:21:18 2010
New Revision: 962076

URL: http://svn.apache.org/viewvc?rev=962076&view=rev
Log:
Clean up Realm model.  Add XML conversion for Realms.

Modified:
    incubator/deltacloud/trunk/framework/app/helpers/conversion_helper.rb
    incubator/deltacloud/trunk/framework/app/models/realm.rb
    incubator/deltacloud/trunk/framework/lib/converters/xml_converter.rb

Modified: incubator/deltacloud/trunk/framework/app/helpers/conversion_helper.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/app/helpers/conversion_helper.rb?rev=962076&r1=962075&r2=962076&view=diff
==============================================================================
--- incubator/deltacloud/trunk/framework/app/helpers/conversion_helper.rb (original)
+++ incubator/deltacloud/trunk/framework/app/helpers/conversion_helper.rb Thu Jul  8 23:21:18 2010
@@ -4,7 +4,7 @@ load 'converters/xml_converter.rb'
 module ConversionHelper
 
   def convert_to_xml(type, obj)
-    if ( [ :flavor, :account, :image, :instance, :storage_volume, :storage_snapshot ].include?( type ) )
+    if ( [ :flavor, :account, :image, :realm, :instance, :storage_volume, :storage_snapshot ].include?( type ) )
       Converters::XMLConverter.new( self, type ).convert(obj)
     end
   end

Modified: incubator/deltacloud/trunk/framework/app/models/realm.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/app/models/realm.rb?rev=962076&r1=962075&r2=962076&view=diff
==============================================================================
--- incubator/deltacloud/trunk/framework/app/models/realm.rb (original)
+++ incubator/deltacloud/trunk/framework/app/models/realm.rb Thu Jul  8 23:21:18 2010
@@ -1,12 +1,8 @@
 
 class Realm < BaseModel
 
-  attr_accessor :realm_id
   attr_accessor :name
   attr_accessor :limit
   attr_accessor :state
-  attr_accessor :actions
-  attr_accessor :public_addresses
-  attr_accessor :private_addresses
 
-end
\ No newline at end of file
+end

Modified: incubator/deltacloud/trunk/framework/lib/converters/xml_converter.rb
URL: http://svn.apache.org/viewvc/incubator/deltacloud/trunk/framework/lib/converters/xml_converter.rb?rev=962076&r1=962075&r2=962076&view=diff
==============================================================================
--- incubator/deltacloud/trunk/framework/lib/converters/xml_converter.rb (original)
+++ incubator/deltacloud/trunk/framework/lib/converters/xml_converter.rb Thu Jul  8 23:21:18 2010
@@ -48,6 +48,17 @@ module Converters
               builder.description( obj.description )
               builder.architecture( obj.architecture )
             }
+          when Realm
+            builder.realm( :href=>@link_builder.send( :realm_url, obj.id ) ) {
+              builder.id( obj.id )
+              builder.name( obj.name )
+              builder.state( obj.state )
+              if ( obj.limit == :unlimited )
+                builder.limit()
+              else
+                builder.limit( obj.limit )
+              end
+            }
           when Instance
             builder.instance( :href=>@link_builder.send( :instance_url, obj.id ) ) {
               builder.id( obj.id )