From cee7ae3c5d73afed1ee6efaef856372b29d82127 Mon Sep 17 00:00:00 2001
From: Daniel Molina <danmolin@fdi.ucm.es>
Date: Wed, 7 Dec 2011 18:30:09 +0100
Subject: [PATCH] Use a constant for pool filtering in OCCI

---
 src/cloud/occi/lib/OCCIServer.rb         | 15 ++++++---------
 src/cloud/occi/lib/VirtualMachineOCCI.rb |  4 ++--
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/src/cloud/occi/lib/OCCIServer.rb b/src/cloud/occi/lib/OCCIServer.rb
index 69ced7f360..86e68c5fd9 100755
--- a/src/cloud/occi/lib/OCCIServer.rb
+++ b/src/cloud/occi/lib/OCCIServer.rb
@@ -40,6 +40,9 @@ require 'pp'
 
 COLLECTIONS = ["compute", "instance_type", "network", "storage"]
 
+# FLAG that will filter the elements retrieved from the Pools
+POOL_FILTER = Pool::INFO_GROUP
+
 class OCCIServer < CloudServer
     # Server initializer
     # config_file:: _String_ path of the config file
@@ -109,11 +112,9 @@ class OCCIServer < CloudServer
     # [return] _String_,_Integer_ Pool Representation or error, status code
     def get_computes(request)
         # --- Get User's VMs ---
-        user_flag = -1
-
         vmpool = VirtualMachinePoolOCCI.new(
                         @client,
-                        user_flag)
+                        POOL_FILTER)
 
         # --- Prepare XML Response ---
         rc = vmpool.info
@@ -136,11 +137,9 @@ class OCCIServer < CloudServer
     # =>                          status code
     def get_networks(request)
         # --- Get User's VNETs ---
-        user_flag = -1
-
         network_pool = VirtualNetworkPoolOCCI.new(
                             @client,
-                            user_flag)
+                            POOL_FILTER)
 
         # --- Prepare XML Response ---
         rc = network_pool.info
@@ -162,11 +161,9 @@ class OCCIServer < CloudServer
     #                             status code
     def get_storages(request)
         # --- Get User's Images ---
-        user_flag = -1
-
         image_pool = ImagePoolOCCI.new(
                             @client,
-                            user_flag)
+                            POOL_FILTER)
 
         # --- Prepare XML Response ---
         rc = image_pool.info
diff --git a/src/cloud/occi/lib/VirtualMachineOCCI.rb b/src/cloud/occi/lib/VirtualMachineOCCI.rb
index 73274ba9b0..f05f194920 100755
--- a/src/cloud/occi/lib/VirtualMachineOCCI.rb
+++ b/src/cloud/occi/lib/VirtualMachineOCCI.rb
@@ -100,11 +100,11 @@ class VirtualMachineOCCI < VirtualMachine
     def to_one_template()
         if @vm_info == nil
             error_msg = "Missing COMPUTE section in the XML body"
-            return OpenNebula::Error.new(error_msg), 400
+            return OpenNebula::Error.new(error_msg)
         end
 
         if @template == nil
-            return OpenNebula::Error.new("Bad instance type"), 500
+            return OpenNebula::Error.new("Bad instance type")
         end
 
         begin