You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@deltacloud.apache.org by mf...@redhat.com on 2013/02/27 14:43:49 UTC

[PATCH core 1/2] CIMI: Removed debug statements from AddressCollection

From: Michal Fojtik <mf...@redhat.com>


Signed-off-by: Michal fojtik <mf...@redhat.com>
---
 server/lib/cimi/collections/addresses.rb | 2 --
 1 file changed, 2 deletions(-)

diff --git a/server/lib/cimi/collections/addresses.rb b/server/lib/cimi/collections/addresses.rb
index 92aca3e..c34068d 100644
--- a/server/lib/cimi/collections/addresses.rb
+++ b/server/lib/cimi/collections/addresses.rb
@@ -25,9 +25,7 @@ module CIMI::Collections
       operation :index, :with_capability => :addresses do
         description 'List all Addresses in the AddressCollection'
         control do
-          puts "GET ADDRESSES"
           addresses = Address.list(self).select_by(params['$select'])
-          puts "GOT #{addresses.size}"
           respond_to do |format|
             format.xml {addresses.to_xml}
             format.json {addresses.to_json}
-- 
1.8.1.2


[PATCH core 2/2] Core: Fixed Rabbit namespacing issues with Addresses (DTACLOUD-500)

Posted by mf...@redhat.com.
From: Michal Fojtik <mf...@redhat.com>

NOTE: A sinatra-rabbit >= 1.15 is required to make this work and to
fix the bug.

Signed-off-by: Michal fojtik <mf...@redhat.com>
---
 server/deltacloud-core.gemspec            | 2 +-
 server/lib/cimi/collections/base.rb       | 4 ++++
 server/lib/deltacloud/collections/base.rb | 4 ++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/server/deltacloud-core.gemspec b/server/deltacloud-core.gemspec
index a8ecce0..d52c970 100644
--- a/server/deltacloud-core.gemspec
+++ b/server/deltacloud-core.gemspec
@@ -70,7 +70,7 @@ Gem::Specification.new do |s|
   s.add_dependency('rake', '>= 0.8.7')
   s.add_dependency('haml', '>= 2.2.17')
   s.add_dependency('sinatra', '>= 1.3.0')
-  s.add_dependency('sinatra-rabbit', '>= 1.0.11')
+  s.add_dependency('sinatra-rabbit', '>= 1.1.5')
   s.add_dependency('rack', '>= 1.0.0')
   s.add_dependency('rack-accept')
   s.add_dependency('json_pure', '>= 1.5.0')
diff --git a/server/lib/cimi/collections/base.rb b/server/lib/cimi/collections/base.rb
index cf92143..eac1c70 100644
--- a/server/lib/cimi/collections/base.rb
+++ b/server/lib/cimi/collections/base.rb
@@ -18,6 +18,10 @@ require_relative '../models'
 module CIMI::Collections
   class Base < Sinatra::Base
 
+    Sinatra::Rabbit.configure do
+      enable :use_namespace
+    end
+
     include Sinatra::Rabbit
     include Sinatra::Rabbit::Features
     include CIMI::Model
diff --git a/server/lib/deltacloud/collections/base.rb b/server/lib/deltacloud/collections/base.rb
index fe8ba2b..e6d7333 100644
--- a/server/lib/deltacloud/collections/base.rb
+++ b/server/lib/deltacloud/collections/base.rb
@@ -16,6 +16,10 @@
 module Deltacloud::Collections
   class Base < Sinatra::Base
 
+    Sinatra::Rabbit.configure do
+      enable :use_namespace
+    end
+
     include Sinatra::Rabbit
     include Sinatra::Rabbit::Features
 
-- 
1.8.1.2