Use new provision response format

Change-Id: Ib1fa1fa3d1be93770463e648f0f8d538aafeca26

atmos/Gemfile

@@ -11,9 +11,9 @@ gem "sinatra"
 gem "thin"
 gem "xml-simple"
 
-gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'b7e3508eb9'
+gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'b0cc19d5'
 gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '4db4cc92ce'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'b8a47d1b'
 gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'd8334ce8a3'
 gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'd8334ce8a3'
 

atmos/Gemfile.lock

@@ -15,20 +15,22 @@ GIT
 
 GIT
   remote: git://github.com/cloudfoundry/vcap-common.git
-  revision: b7e3508eb96b86162ca385f1f46a13ecfcce359d
-  ref: b7e3508eb9
+  revision: b0cc19d5520c9849600dbd8cf2883bff66d7643e
+  ref: b0cc19d5
   specs:
-    vcap_common (1.0.14)
+    vcap_common (2.0.4)
       eventmachine
+      httpclient
+      membrane (~> 0.0.2)
       nats (~> 0.4.22.beta.8)
       posix-spawn (~> 0.3.6)
       thin (~> 1.3.1)
       yajl-ruby (~> 0.8.3)
 
 GIT
   remote: git://github.com/cloudfoundry/vcap-services-base.git
-  revision: 4db4cc92ce5dc83d2cce95999508dbda51b34f0b
-  ref: 4db4cc92ce
+  revision: b8a47d1bc7d8901362db938a146107ccfb4f92e4
+  ref: b8a47d1b
   specs:
     vcap_services_base (0.1.12)
       curb (~> 0.7.16)
@@ -128,10 +130,12 @@ GEM
     eventmachine_httpserver (0.2.1)
     fastercsv (1.5.5)
     http_parser.rb (0.5.3)
+    httpclient (2.2.5)
     json (1.4.6)
     json_pure (1.7.3)
     macaddr (1.6.1)
       systemu (~> 2.5.0)
+    membrane (0.0.2)
     multi_json (1.0.4)
     nats (0.4.24)
       daemons (>= 1.1.5)

atmos/lib/atmos_service/provisioner.rb

@@ -45,20 +45,13 @@ def provision_service(request, prov_handle=nil, &blk)
       shared_secret = @atmos_helper.create_user(token, st_name)
 
       svc = {
-        :data => {:subtenant_name => st_name, :subtenant_id => st_id, :host => @host},
-        :service_id => st_name,
-        :credentials => {:host => @host, :port => @port, :token => token,
-          :shared_secret => shared_secret, :subtenant_id => st_id}
-      }
-      # set 'configuration' instead of 'data' to keep local hash consistent
-      svc_local = {
         :configuration => {"subtenant_name" => st_name, "subtenant_id" => st_id, "host" => @host},
         :service_id => st_name,
         :credentials => {"host" => @host, "port" => @port, "token" => token,
           "shared_secret" => shared_secret, "subtenant_id" => st_id}
       }
       @logger.debug("Service provisioned: #{svc.inspect}")
-      @prov_svcs[svc[:service_id]] = svc_local
+      @prov_svcs[svc[:service_id]] = svc
       blk.call(success(svc))
     rescue => e
       # roll back work

couchdb/Gemfile

@@ -12,9 +12,9 @@ gem "sinatra"
 gem "thin"
 gem "couchrest"
 
-gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'b7e3508eb9'
+gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'b0cc19d5'
 gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '4db4cc92ce'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'b8a47d1b'
 gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'd8334ce8a3'
 gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'd8334ce8a3'
 

couchdb/Gemfile.lock

@@ -15,20 +15,22 @@ GIT
 
 GIT
   remote: git://github.com/cloudfoundry/vcap-common.git
-  revision: b7e3508eb96b86162ca385f1f46a13ecfcce359d
-  ref: b7e3508eb9
+  revision: b0cc19d5520c9849600dbd8cf2883bff66d7643e
+  ref: b0cc19d5
   specs:
-    vcap_common (1.0.14)
+    vcap_common (2.0.4)
       eventmachine
+      httpclient
+      membrane (~> 0.0.2)
       nats (~> 0.4.22.beta.8)
       posix-spawn (~> 0.3.6)
       thin (~> 1.3.1)
       yajl-ruby (~> 0.8.3)
 
 GIT
   remote: git://github.com/cloudfoundry/vcap-services-base.git
-  revision: 4db4cc92ce5dc83d2cce95999508dbda51b34f0b
-  ref: 4db4cc92ce
+  revision: b8a47d1bc7d8901362db938a146107ccfb4f92e4
+  ref: b8a47d1b
   specs:
     vcap_services_base (0.1.12)
       curb (~> 0.7.16)
@@ -132,10 +134,12 @@ GEM
     eventmachine_httpserver (0.2.1)
     fastercsv (1.5.5)
     http_parser.rb (0.5.3)
+    httpclient (2.2.5)
     json (1.4.6)
     json_pure (1.7.3)
     macaddr (1.6.1)
       systemu (~> 2.5.0)
+    membrane (0.0.2)
     mime-types (1.18)
     multi_json (1.3.6)
     nats (0.4.24)

echo/Gemfile

@@ -11,9 +11,9 @@ gem "do_sqlite3"
 gem "sinatra", "~> 1.2.3"
 gem "thin"
 
-gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'b7e3508eb9'
+gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'b0cc19d5'
 gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '4db4cc92ce'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'b8a47d1b'
 gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'd8334ce8a3'
 gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'd8334ce8a3'
 

echo/Gemfile.lock

@@ -15,20 +15,22 @@ GIT
 
 GIT
   remote: git://github.com/cloudfoundry/vcap-common.git
-  revision: b7e3508eb96b86162ca385f1f46a13ecfcce359d
-  ref: b7e3508eb9
+  revision: b0cc19d5520c9849600dbd8cf2883bff66d7643e
+  ref: b0cc19d5
   specs:
-    vcap_common (1.0.14)
+    vcap_common (2.0.4)
       eventmachine
+      httpclient
+      membrane (~> 0.0.2)
       nats (~> 0.4.22.beta.8)
       posix-spawn (~> 0.3.6)
       thin (~> 1.3.1)
       yajl-ruby (~> 0.8.3)
 
 GIT
   remote: git://github.com/cloudfoundry/vcap-services-base.git
-  revision: 4db4cc92ce5dc83d2cce95999508dbda51b34f0b
-  ref: 4db4cc92ce
+  revision: b8a47d1bc7d8901362db938a146107ccfb4f92e4
+  ref: b8a47d1b
   specs:
     vcap_services_base (0.1.12)
       curb (~> 0.7.16)
@@ -128,10 +130,12 @@ GEM
     eventmachine_httpserver (0.2.1)
     fastercsv (1.5.5)
     http_parser.rb (0.5.3)
+    httpclient (2.2.5)
     json (1.4.6)
     json_pure (1.7.3)
     macaddr (1.6.1)
       systemu (~> 2.5.0)
+    membrane (0.0.2)
     multi_json (1.3.6)
     nats (0.4.24)
       daemons (>= 1.1.5)

elasticsearch/Gemfile

@@ -10,9 +10,9 @@ gem "sinatra"
 gem "thin"
 gem "rest-client"
 
-gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'b7e3508eb9'
+gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'b0cc19d5'
 gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '4db4cc92ce'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'b8a47d1b'
 gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'd8334ce8a3'
 gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'd8334ce8a3'
 

elasticsearch/Gemfile.lock

@@ -15,20 +15,22 @@ GIT
 
 GIT
   remote: git://github.com/cloudfoundry/vcap-common.git
-  revision: b7e3508eb96b86162ca385f1f46a13ecfcce359d
-  ref: b7e3508eb9
+  revision: b0cc19d5520c9849600dbd8cf2883bff66d7643e
+  ref: b0cc19d5
   specs:
-    vcap_common (1.0.14)
+    vcap_common (2.0.4)
       eventmachine
+      httpclient
+      membrane (~> 0.0.2)
       nats (~> 0.4.22.beta.8)
       posix-spawn (~> 0.3.6)
       thin (~> 1.3.1)
       yajl-ruby (~> 0.8.3)
 
 GIT
   remote: git://github.com/cloudfoundry/vcap-services-base.git
-  revision: 4db4cc92ce5dc83d2cce95999508dbda51b34f0b
-  ref: 4db4cc92ce
+  revision: b8a47d1bc7d8901362db938a146107ccfb4f92e4
+  ref: b8a47d1b
   specs:
     vcap_services_base (0.1.12)
       curb (~> 0.7.16)
@@ -128,10 +130,12 @@ GEM
     eventmachine_httpserver (0.2.1)
     fastercsv (1.5.5)
     http_parser.rb (0.5.3)
+    httpclient (2.2.5)
     json (1.4.6)
     json_pure (1.7.3)
     macaddr (1.6.1)
       systemu (~> 2.5.0)
+    membrane (0.0.2)
     mime-types (1.16)
     multi_json (1.0.4)
     nats (0.4.24)

filesystem/Gemfile

@@ -10,9 +10,9 @@ gem "do_sqlite3"
 gem "sinatra"
 gem "thin"
 
-gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'b7e3508eb9'
+gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'b0cc19d5'
 gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '4db4cc92ce'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'b8a47d1b'
 gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'd8334ce8a3'
 gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'd8334ce8a3'
 

filesystem/Gemfile.lock

@@ -15,20 +15,22 @@ GIT
 
 GIT
   remote: git://github.com/cloudfoundry/vcap-common.git
-  revision: b7e3508eb96b86162ca385f1f46a13ecfcce359d
-  ref: b7e3508eb9
+  revision: b0cc19d5520c9849600dbd8cf2883bff66d7643e
+  ref: b0cc19d5
   specs:
-    vcap_common (1.0.14)
+    vcap_common (2.0.4)
       eventmachine
+      httpclient
+      membrane (~> 0.0.2)
       nats (~> 0.4.22.beta.8)
       posix-spawn (~> 0.3.6)
       thin (~> 1.3.1)
       yajl-ruby (~> 0.8.3)
 
 GIT
   remote: git://github.com/cloudfoundry/vcap-services-base.git
-  revision: 4db4cc92ce5dc83d2cce95999508dbda51b34f0b
-  ref: 4db4cc92ce
+  revision: b8a47d1bc7d8901362db938a146107ccfb4f92e4
+  ref: b8a47d1b
   specs:
     vcap_services_base (0.1.12)
       curb (~> 0.7.16)
@@ -128,10 +130,12 @@ GEM
     eventmachine_httpserver (0.2.1)
     fastercsv (1.5.5)
     http_parser.rb (0.5.3)
+    httpclient (2.2.5)
     json (1.4.6)
     json_pure (1.7.3)
     macaddr (1.6.1)
       systemu (~> 2.5.0)
+    membrane (0.0.2)
     multi_json (1.0.4)
     nats (0.4.24)
       daemons (>= 1.1.5)

filesystem/lib/filesystem_service/base_provisioner.rb

@@ -118,18 +118,12 @@ def provision_service(request, prov_handle=nil, &blk)
 
     credentials = gen_credentials(name, backend)
     svc = {
-      :data => prov_req.dup,
-      :service_id => name,
-      :credentials => credentials
-    }
-    # FIXME: workaround for inconsistant representation of bind handle and provision handle
-    svc_local = {
       :configuration => prov_req.dup,
       :service_id => name,
       :credentials => credentials
     }
     @logger.debug("Provisioned #{svc.inspect}")
-    @prov_svcs[svc[:service_id]] = svc_local
+    @prov_svcs[svc[:service_id]] = svc
     blk.call(success(svc))
   rescue => e
     if e.instance_of? FilesystemError

filesystem/spec/provisioner_spec.rb

@@ -112,7 +112,7 @@ class BaseProvisioner
     it "should return the credentials when provision successful" do
       @provisioner.provision_service(@request) do |msg|
         msg["success"].should == true
-        msg["response"][:data][:plan].should == "free"
+        msg["response"][:configuration][:plan].should == "free"
         msg["response"][:service_id].should be
         msg["response"][:credentials]["internal"].should be
         msg["response"][:credentials]["internal"]["name"].should be

memcached/Gemfile

@@ -10,9 +10,9 @@ gem "sinatra"
 gem "thin"
 gem "dalli"
 
-gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'b7e3508eb9'
+gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'b0cc19d5'
 gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '4db4cc92ce'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'b8a47d1b'
 gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'd8334ce8a3'
 gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'd8334ce8a3'
 

memcached/Gemfile.lock

@@ -15,20 +15,22 @@ GIT
 
 GIT
   remote: git://github.com/cloudfoundry/vcap-common.git
-  revision: b7e3508eb96b86162ca385f1f46a13ecfcce359d
-  ref: b7e3508eb9
+  revision: b0cc19d5520c9849600dbd8cf2883bff66d7643e
+  ref: b0cc19d5
   specs:
-    vcap_common (1.0.14)
+    vcap_common (2.0.4)
       eventmachine
+      httpclient
+      membrane (~> 0.0.2)
       nats (~> 0.4.22.beta.8)
       posix-spawn (~> 0.3.6)
       thin (~> 1.3.1)
       yajl-ruby (~> 0.8.3)
 
 GIT
   remote: git://github.com/cloudfoundry/vcap-services-base.git
-  revision: 4db4cc92ce5dc83d2cce95999508dbda51b34f0b
-  ref: 4db4cc92ce
+  revision: b8a47d1bc7d8901362db938a146107ccfb4f92e4
+  ref: b8a47d1b
   specs:
     vcap_services_base (0.1.12)
       curb (~> 0.7.16)
@@ -129,10 +131,12 @@ GEM
     eventmachine_httpserver (0.2.1)
     fastercsv (1.5.5)
     http_parser.rb (0.5.3)
+    httpclient (2.2.5)
     json (1.4.6)
     json_pure (1.7.3)
     macaddr (1.6.1)
       systemu (~> 2.5.0)
+    membrane (0.0.2)
     multi_json (1.3.6)
     nats (0.4.24)
       daemons (>= 1.1.5)

mongodb/Gemfile

@@ -13,9 +13,9 @@ gem "bson_ext"
 gem "thin"
 gem "sinatra"
 
-gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'b7e3508eb9'
+gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'b0cc19d5'
 gem 'vcap_logging', :require => ['vcap/logging'], :git => 'git://github.com/cloudfoundry/common.git', :ref => 'b96ec1192'
-gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '4db4cc92ce'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'b8a47d1b'
 gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'd8334ce8a3'
 gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'd8334ce8a3'