Permalink
Browse files

Merge changes I66390da8,I1350fb76

* changes:
  allow non-free mongo & memcache plans; fix memcache startup
  Update base gem pointer for legacy services
  • Loading branch information...
2 parents f09667c + f5f0792 commit 2da80c7b6cf6d32ff2cbe23993e405d46d010fb9 @kushmerick kushmerick committed with Gerrit Code Review Oct 3, 2012
Showing with 52 additions and 50 deletions.
  1. +1 −1 Rakefile
  2. +1 −1 memcached/Gemfile
  3. +2 −2 memcached/Gemfile.lock
  4. +1 −1 mongodb/Gemfile
  5. +2 −2 mongodb/Gemfile.lock
  6. +1 −1 mysql/Gemfile
  7. +2 −2 mysql/Gemfile.lock
  8. +6 −5 ng/memcached/lib/memcached_service/memcached_node.rb
  9. +3 −2 ng/mongodb/lib/mongodb_service/mongodb_node.rb
  10. +1 −1 postgresql/Gemfile
  11. +2 −2 postgresql/Gemfile.lock
  12. +1 −1 rabbit/Gemfile
  13. +2 −2 rabbit/Gemfile.lock
  14. +1 −1 redis/Gemfile
  15. +2 −2 redis/Gemfile.lock
  16. +1 −1 vblob/Gemfile
  17. +23 −23 vblob/Gemfile.lock
  18. BIN vblob/vendor/cache/builder-3.0.0.gem
  19. BIN vblob/vendor/cache/builder-3.1.3.gem
  20. BIN vblob/vendor/cache/ci_reporter-1.6.9.gem
  21. BIN vblob/vendor/cache/ci_reporter-1.7.2.gem
  22. BIN vblob/vendor/cache/daemons-1.1.8.gem
  23. BIN vblob/vendor/cache/daemons-1.1.9.gem
  24. BIN vblob/vendor/cache/data_objects-0.10.8.gem
  25. BIN vblob/vendor/cache/data_objects-0.10.9.gem
  26. BIN vblob/vendor/cache/dm-do-adapter-1.1.0.gem
  27. BIN vblob/vendor/cache/dm-do-adapter-1.2.0.gem
  28. BIN vblob/vendor/cache/do_sqlite3-0.10.8.gem
  29. BIN vblob/vendor/cache/do_sqlite3-0.10.9.gem
  30. BIN vblob/vendor/cache/ffi-1.0.11.gem
  31. BIN vblob/vendor/cache/ffi-1.1.5.gem
  32. BIN vblob/vendor/cache/json_pure-1.7.3.gem
  33. BIN vblob/vendor/cache/json_pure-1.7.5.gem
  34. BIN vblob/vendor/cache/multi_json-1.0.4.gem
  35. BIN vblob/vendor/cache/multi_json-1.3.6.gem
  36. BIN vblob/vendor/cache/rspec-2.11.0.gem
  37. BIN vblob/vendor/cache/rspec-2.7.0.gem
  38. BIN vblob/vendor/cache/rspec-core-2.11.1.gem
  39. BIN vblob/vendor/cache/rspec-core-2.7.1.gem
  40. BIN vblob/vendor/cache/rspec-expectations-2.11.3.gem
  41. BIN vblob/vendor/cache/rspec-expectations-2.7.0.gem
  42. BIN vblob/vendor/cache/rspec-mocks-2.11.3.gem
  43. BIN vblob/vendor/cache/rspec-mocks-2.7.0.gem
  44. BIN vblob/vendor/cache/simplecov-0.5.4.gem
  45. BIN vblob/vendor/cache/simplecov-0.6.4.gem
View
@@ -1,6 +1,6 @@
require 'tmpdir'
-SERVICES_DIR = %w(atmos couchdb echo elasticsearch filesystem memcached mongodb mysql neo4j postgresql rabbit redis service_broker vblob tools/backup/manager marketplace)
+SERVICES_DIR = %w(atmos couchdb echo elasticsearch filesystem memcached mongodb mysql neo4j postgresql rabbit redis service_broker vblob tools/backup/manager marketplace ng/mysql ng/postgresql ng/vblob ng/mongodb ng/redis ng/rabbit ng/memcached)
desc "Run integration tests."
task "tests" do |t|
View
@@ -12,7 +12,7 @@ gem "dalli"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
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 => 'db367f31'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '98b180d6c7'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '21f9a32ab50'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '21f9a32ab50'
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: db367f3166b7ee63c8a4b4d40fd948babc407370
- ref: db367f31
+ revision: 98b180d6c7db85c6d8e5e52fc6ba727f1eef3d5b
+ ref: 98b180d6c7
specs:
vcap_services_base (0.1.16)
curb (~> 0.7.16)
View
@@ -15,7 +15,7 @@ gem "sinatra"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
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 => 'db367f31'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '98b180d6c7'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '21f9a32ab50'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '21f9a32ab50'
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: db367f3166b7ee63c8a4b4d40fd948babc407370
- ref: db367f31
+ revision: 98b180d6c7db85c6d8e5e52fc6ba727f1eef3d5b
+ ref: 98b180d6c7
specs:
vcap_services_base (0.1.16)
curb (~> 0.7.16)
View
@@ -17,7 +17,7 @@ gem "curb"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
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 => 'db367f31'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '98b180d6c7'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '21f9a32ab50'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '21f9a32ab50'
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: db367f3166b7ee63c8a4b4d40fd948babc407370
- ref: db367f31
+ revision: 98b180d6c7db85c6d8e5e52fc6ba727f1eef3d5b
+ ref: 98b180d6c7
specs:
vcap_services_base (0.1.16)
curb (~> 0.7.16)
@@ -256,7 +256,8 @@ class VCAP::Services::Memcached::Node::ProvisionedService
property :port, Integer, :unique => true
property :user, String, :required => true
property :password, String, :required => true
- property :plan, Enum[:free], :required => true
+ # property plan is deprecated. The instances in one node have same plan.
+ property :plan, Integer, :required => true
property :version, String, :required => false
property :container, String
@@ -285,19 +286,19 @@ def init(args)
@logger = args[:logger]
@quota = args[:filesystem_quota] || false
+ FileUtils.mkdir_p(@base_dir)
+ FileUtils.mkdir_p(@log_dir)
+
DataMapper.setup(:default, args[:local_db])
DataMapper::auto_upgrade!
-
- FileUtils.mkdir_p(base_dir)
- FileUtils.mkdir_p(log_dir)
end
def create(args)
raise "Parameter missing" unless args['port']
p_service = new
p_service.name = args['name']
p_service.port = args['port']
- p_service.plan = args['plan']
+ p_service.plan = 1
p_service.user = args['user']
p_service.password = args['password']
p_service.version = args['version']
@@ -333,7 +333,8 @@ class VCAP::Services::MongoDB::Node::ProvisionedService
property :name, String, :key => true
property :port, Integer, :unique => true
property :password, String, :required => true
- property :plan, Enum[:free], :required => true
+ # property plan is deprecated. The instances in one node have same plan.
+ property :plan, Integer, :required => true
property :pid, Integer
property :memory, Integer
property :admin, String, :required => true
@@ -378,7 +379,7 @@ def create(args)
p_service = new
p_service.name = args['name'] ? args['name'] : UUIDTools::UUID.random_create.to_s
p_service.port = args['port']
- p_service.plan = args['plan'] ? args['plan'] : 'free'
+ p_service.plan = 1
p_service.password = args['password'] ? args['password'] : UUIDTools::UUID.random_create.to_s
p_service.memory = args['memory'] if args['memory']
p_service.admin = args['admin'] ? args['admin'] : 'admin'
View
@@ -15,7 +15,7 @@ gem "sinatra"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
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 => 'db367f31'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '98b180d6c7'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '21f9a32ab50'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '21f9a32ab50'
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: db367f3166b7ee63c8a4b4d40fd948babc407370
- ref: db367f31
+ revision: 98b180d6c7db85c6d8e5e52fc6ba727f1eef3d5b
+ ref: 98b180d6c7
specs:
vcap_services_base (0.1.16)
curb (~> 0.7.16)
View
@@ -16,7 +16,7 @@ gem "rest-client"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
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 => 'db367f31'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '98b180d6c7'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '21f9a32ab50'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '21f9a32ab50'
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: db367f3166b7ee63c8a4b4d40fd948babc407370
- ref: db367f31
+ revision: 98b180d6c7db85c6d8e5e52fc6ba727f1eef3d5b
+ ref: 98b180d6c7
specs:
vcap_services_base (0.1.16)
curb (~> 0.7.16)
View
@@ -16,7 +16,7 @@ gem "curb"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
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 => 'db367f31'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '98b180d6c7'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '21f9a32ab50'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '21f9a32ab50'
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: db367f3166b7ee63c8a4b4d40fd948babc407370
- ref: db367f31
+ revision: 98b180d6c7db85c6d8e5e52fc6ba727f1eef3d5b
+ ref: 98b180d6c7
specs:
vcap_services_base (0.1.16)
curb (~> 0.7.16)
View
@@ -16,7 +16,7 @@ gem "yajl-ruby"
gem 'vcap_common', :require => ['vcap/common', 'vcap/component'], :git => 'git://github.com/cloudfoundry/vcap-common.git', :ref => 'fd6b6d91'
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 => 'db367f31'
+gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => '98b180d6c7'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '21f9a32ab50'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => '21f9a32ab50'
View
@@ -32,8 +32,8 @@ GIT
GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
- revision: db367f3166b7ee63c8a4b4d40fd948babc407370
- ref: db367f31
+ revision: 98b180d6c7db85c6d8e5e52fc6ba727f1eef3d5b
+ ref: 98b180d6c7
specs:
vcap_services_base (0.1.16)
curb (~> 0.7.16)
@@ -72,12 +72,12 @@ GEM
addressable (2.2.8)
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
- builder (3.0.0)
- ci_reporter (1.6.9)
+ builder (3.1.3)
+ ci_reporter (1.7.2)
builder (>= 2.1.2)
curb (0.7.18)
- daemons (1.1.8)
- data_objects (0.10.8)
+ daemons (1.1.9)
+ data_objects (0.10.9)
addressable (~> 2.1)
datamapper (1.1.0)
dm-aggregates (= 1.1.0)
@@ -96,7 +96,7 @@ GEM
dm-core (~> 1.1.0)
dm-core (1.1.0)
addressable (~> 2.2.4)
- dm-do-adapter (1.2.0)
+ dm-do-adapter (1.1.0)
data_objects (~> 0.10.2)
dm-core (~> 1.1.0)
dm-migrations (1.1.0)
@@ -106,7 +106,7 @@ GEM
fastercsv (~> 1.5.4)
json (~> 1.4.6)
dm-sqlite-adapter (1.1.0)
- dm-do-adapter (~> 1.2.0)
+ dm-do-adapter (~> 1.1.0)
do_sqlite3 (~> 0.10.2)
dm-timestamps (1.1.0)
dm-core (~> 1.1.0)
@@ -121,8 +121,8 @@ GEM
uuidtools (~> 2.1.2)
dm-validations (1.1.0)
dm-core (~> 1.1.0)
- do_sqlite3 (0.10.8)
- data_objects (= 0.10.8)
+ do_sqlite3 (0.10.9)
+ data_objects (= 0.10.9)
em-http-request (1.0.0.beta.3)
addressable (>= 2.2.3)
em-socksify
@@ -132,16 +132,16 @@ GEM
eventmachine
eventmachine_httpserver (0.2.1)
fastercsv (1.5.5)
- ffi (1.0.11)
+ ffi (1.1.5)
http_parser.rb (0.5.3)
httpclient (2.2.7)
json (1.4.6)
- json_pure (1.7.3)
+ json_pure (1.7.5)
macaddr (1.6.1)
systemu (~> 2.5.0)
membrane (0.0.2)
mime-types (1.19)
- multi_json (1.0.4)
+ multi_json (1.3.6)
multipart-post (1.1.5)
nats (0.4.24)
daemons (>= 1.1.5)
@@ -166,18 +166,18 @@ GEM
redisk (>= 0.2.1)
resque (~> 1.19)
uuid (~> 2.3)
- rspec (2.7.0)
- rspec-core (~> 2.7.0)
- rspec-expectations (~> 2.7.0)
- rspec-mocks (~> 2.7.0)
- rspec-core (2.7.1)
- rspec-expectations (2.7.0)
- diff-lcs (~> 1.1.2)
- rspec-mocks (2.7.0)
+ rspec (2.11.0)
+ rspec-core (~> 2.11.0)
+ rspec-expectations (~> 2.11.0)
+ rspec-mocks (~> 2.11.0)
+ rspec-core (2.11.1)
+ rspec-expectations (2.11.3)
+ diff-lcs (~> 1.1.3)
+ rspec-mocks (2.11.3)
ruby-hmac (0.4.0)
rubyzip (0.9.9)
- simplecov (0.5.4)
- multi_json (~> 1.0.3)
+ simplecov (0.6.4)
+ multi_json (~> 1.0)
simplecov-html (~> 0.5.3)
simplecov-html (0.5.3)
simplecov-rcov (0.2.3)
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.

0 comments on commit 2da80c7

Please sign in to comment.