Merge pull request fog#2212 from dprince/orchestration_fixes

OpenStack Orchestration fixes
cmattson · Oct 2, 2013 · eb46930 · eb46930
2 parents b490406 + d49b10b
commit eb46930
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 5 deletions.
diff --git a/lib/fog/openstack/orchestration.rb b/lib/fog/openstack/orchestration.rb
@@ -163,7 +163,7 @@ def request(params)
               end
           end
 
-          if response.status == 200 && !response.body.empty?
+          if !response.body.empty? and response.get_header('Content-Type') =~ /application\/json/ then
             response.body = Fog::JSON.decode(response.body)
           end
 

diff --git a/lib/fog/openstack/requests/orchestration/create_stack.rb b/lib/fog/openstack/requests/orchestration/create_stack.rb
@@ -22,6 +22,7 @@ def create_stack(stack_name, options = {})
           }.merge(options)
 
           request(
+            :expects  => 201,
             :path => 'stacks',
             :method => 'POST',
             :body => MultiJson.encode(params)
@@ -45,8 +46,10 @@ def create_stack(stack_name, options = {})
           }
 
           response = Excon::Response.new
-          response.status = 202
-          response.body = {}
+          response.status = 201
+          response.body = {
+            'id' => stack_id,
+            'links'=>[{"href"=>"http://localhost:8004/v1/fake_tenant_id/stacks/#{stack_name}/#{stack_id}", "rel"=>"self"}]}
           response
         end
       end

diff --git a/lib/fog/openstack/requests/orchestration/delete_stack.rb b/lib/fog/openstack/requests/orchestration/delete_stack.rb
@@ -14,6 +14,7 @@ class Real
 
         def delete_stack(stack_name, stack_id)
           request(
+            :expects  => 204,
             :path => "stacks/#{stack_name}/#{stack_id}",
             :method => 'DELETE'
           )
@@ -26,7 +27,7 @@ def delete_stack(stack_name, stack_id)
           self.data[:stacks].delete(stack_id)
 
           response = Excon::Response.new
-          response.status = 202
+          response.status = 204
           response.body = {}
           response
         end

diff --git a/lib/fog/openstack/requests/orchestration/list_stacks.rb b/lib/fog/openstack/requests/orchestration/list_stacks.rb
@@ -25,6 +25,7 @@ class Real
 
         def list_stacks(options = {})
           request(
+            :expects  => 200,
             :path => 'stacks',
             :method => 'GET',
             :query => options

diff --git a/lib/fog/openstack/requests/orchestration/update_stack.rb b/lib/fog/openstack/requests/orchestration/update_stack.rb
@@ -20,6 +20,7 @@ def update_stack(stack_name, options = {})
           }.merge(options)
 
           request(
+            :expects  => 202,
             :path => 'stacks',
             :method => 'PUT',
             :body => MultiJson.encode(params)

diff --git a/tests/openstack/requests/orchestration/stack_tests.rb b/tests/openstack/requests/orchestration/stack_tests.rb
@@ -10,8 +10,13 @@
     'updated_time'        => Time
   }
 
+  @create_format = {
+    'id'                  => String,
+    'links'               => Array,
+  }
+
   tests('success') do
-    tests('#create_stack("teststack")').formats({}) do
+    tests('#create_stack("teststack")').formats(@create_format) do
       Fog::Orchestration[:openstack].create_stack("teststack").body
     end