From 86dd81fda4f27fa296cda6752c94d7c7997e6618 Mon Sep 17 00:00:00 2001
From: Daniel Molina <danmolin@fdi.ucm.es>
Date: Thu, 17 Nov 2011 18:31:42 +0100
Subject: [PATCH] bug #697: Remove duplicated functionality in OCA

---
 src/oca/ruby/OpenNebula/Group.rb              | 4 +---
 src/oca/ruby/OpenNebula/Pool.rb               | 6 ++----
 src/oca/ruby/OpenNebula/VirtualMachine.rb     | 3 ---
 src/oca/ruby/OpenNebula/VirtualNetwork.rb     | 4 +---
 src/oca/ruby/OpenNebula/VirtualNetworkPool.rb | 2 +-
 5 files changed, 5 insertions(+), 14 deletions(-)

diff --git a/src/oca/ruby/OpenNebula/Group.rb b/src/oca/ruby/OpenNebula/Group.rb
index c3b9caa89a..758cfcd229 100644
--- a/src/oca/ruby/OpenNebula/Group.rb
+++ b/src/oca/ruby/OpenNebula/Group.rb
@@ -60,8 +60,6 @@ module OpenNebula
         # Class constructor
         def initialize(xml, client)
             super(xml,client)
-
-            @client = client
         end
 
         #######################################################################
@@ -75,7 +73,7 @@ module OpenNebula
             end
 
             msg = String.new
-            
+
             File.open(filename).each_line{ |l|
                 next if l.match(/^#/)
 
diff --git a/src/oca/ruby/OpenNebula/Pool.rb b/src/oca/ruby/OpenNebula/Pool.rb
index 35a22bc807..7410125311 100644
--- a/src/oca/ruby/OpenNebula/Pool.rb
+++ b/src/oca/ruby/OpenNebula/Pool.rb
@@ -33,7 +33,6 @@ module OpenNebula
             @element_name = element.upcase
 
             @client = client
-            @hash   = nil
         end
 
         # Default Factory Method for the Pools. The factory method returns an
@@ -48,7 +47,7 @@ module OpenNebula
         #######################################################################
         # Common XML-RPC Methods for all the Pool Types
         #######################################################################
-        
+
         #Gets the pool without any filter. Host, Group and User Pools
         # xml_method:: _String_ the name of the XML-RPC method
         def info(xml_method)
@@ -66,7 +65,7 @@ module OpenNebula
         def info_group(xml_method)
             return xmlrpc_info(xml_method,INFO_GROUP,-1,-1)
         end
-    
+
         def info_filter(xml_method, who, start_id, end_id)
             return xmlrpc_info(xml_method,who, start_id, end_id)
         end
@@ -120,7 +119,6 @@ module OpenNebula
         def initialize(node, client)
             @xml    = node
             @client = client
-            @hash   = nil
 
             if self['ID']
                 @pe_id = self['ID'].to_i
diff --git a/src/oca/ruby/OpenNebula/VirtualMachine.rb b/src/oca/ruby/OpenNebula/VirtualMachine.rb
index ee98880a9e..8e708ff9ff 100644
--- a/src/oca/ruby/OpenNebula/VirtualMachine.rb
+++ b/src/oca/ruby/OpenNebula/VirtualMachine.rb
@@ -107,9 +107,6 @@ module OpenNebula
         # Class constructor
         def initialize(xml, client)
             super(xml,client)
-
-            @element_name = "VM"
-            @client       = client
         end
 
         #######################################################################
diff --git a/src/oca/ruby/OpenNebula/VirtualNetwork.rb b/src/oca/ruby/OpenNebula/VirtualNetwork.rb
index 6fb8964492..7020bac0fc 100644
--- a/src/oca/ruby/OpenNebula/VirtualNetwork.rb
+++ b/src/oca/ruby/OpenNebula/VirtualNetwork.rb
@@ -62,8 +62,6 @@ module OpenNebula
         # Class constructor
         def initialize(xml, client)
             super(xml,client)
-
-            @client = client
         end
 
         #######################################################################
@@ -81,7 +79,7 @@ module OpenNebula
         def allocate(description)
             super(VN_METHODS[:allocate],description)
         end
-        
+
         # Replaces the template contents
         #
         # +new_template+ New template contents
diff --git a/src/oca/ruby/OpenNebula/VirtualNetworkPool.rb b/src/oca/ruby/OpenNebula/VirtualNetworkPool.rb
index 9b58ca5d4d..d182551ebc 100644
--- a/src/oca/ruby/OpenNebula/VirtualNetworkPool.rb
+++ b/src/oca/ruby/OpenNebula/VirtualNetworkPool.rb
@@ -31,7 +31,7 @@ module OpenNebula
         #######################################################################
         # Class constructor & Pool Methods
         #######################################################################
-        
+
         # +client+ a Client object that represents a XML-RPC connection
         # +user_id+ is to refer to a Pool with VirtualNetworks from that user
         def initialize(client, user_id=0)