Skip to content
This repository has been archived by the owner on Jan 26, 2022. It is now read-only.

Commit

Permalink
Base Gem bump for supporting CCNG-v2 api
Browse files Browse the repository at this point in the history 
 - Marketplace gateway cleanup
   - Monkeypatched spec helper methods
   - Fixed and verified specs
   - Use catalog manager for CC interactions

 - NO Update to service_broker

 - git shortlog 88a5b80..dcba6b3

    Harshawardhan Gadgil (2):
      CCNG support for service gateways
      Merge "CCNG support for service gateways"

    felixhoo (3):
      Fix orphan binding name issue
      Merge "Fix orphan binding name issue"
      [service-ng] Save container handle as earily as possible.

Change-Id: I5a22e82c95b0f8844a6cc4a5814e374b48f562b5
  • Loading branch information
Harshawardhan Gadgil committed Dec 21, 2012
1 parent 69affc7 commit 105fd7e
Show file tree
Hide file tree
Showing 65 changed files with 575 additions and 1,337 deletions.
2 changes: 1 addition & 1 deletion atmos/Gemfile
View file
Expand Up @@ -13,7 +13,7 @@ gem "xml-simple"

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 => '88a5b80'
gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'

Expand Down
9 changes: 6 additions & 3 deletions atmos/Gemfile.lock
View file
Expand Up @@ -32,10 +32,11 @@ GIT

GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
revision: 88a5b8049ee8b31a11274447901c888f7421c59f
ref: 88a5b80
revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
ref: dcba6b3
specs:
vcap_services_base (0.1.16)
vcap_services_base (0.1.17)
cf-uaa-lib
curb (~> 0.7.16)
datamapper (~> 1.1.0)
do_sqlite3 (~> 0.10.3)
Expand Down Expand Up @@ -73,6 +74,8 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
cf-uaa-lib (1.3.1)
multi_json
ci_reporter (1.6.4)
builder (>= 2.1.2)
curb (0.7.18)
Expand Down
Binary file added atmos/vendor/cache/cf-uaa-lib-1.3.1.gem
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion couchdb/Gemfile
View file
Expand Up @@ -14,7 +14,7 @@ gem "couchrest"

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 => '88a5b80'
gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'

Expand Down
9 changes: 6 additions & 3 deletions couchdb/Gemfile.lock
View file
Expand Up @@ -32,10 +32,11 @@ GIT

GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
revision: 88a5b8049ee8b31a11274447901c888f7421c59f
ref: 88a5b80
revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
ref: dcba6b3
specs:
vcap_services_base (0.1.16)
vcap_services_base (0.1.17)
cf-uaa-lib
curb (~> 0.7.16)
datamapper (~> 1.1.0)
do_sqlite3 (~> 0.10.3)
Expand Down Expand Up @@ -73,6 +74,8 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
cf-uaa-lib (1.3.1)
multi_json
ci_reporter (1.7.0)
builder (>= 2.1.2)
couchrest (1.0.1)
Expand Down
Binary file added couchdb/vendor/cache/cf-uaa-lib-1.3.1.gem
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion echo/Gemfile
View file
Expand Up @@ -13,7 +13,7 @@ gem "thin"

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 => '88a5b80'
gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'

Expand Down
9 changes: 6 additions & 3 deletions echo/Gemfile.lock
View file
Expand Up @@ -32,10 +32,11 @@ GIT

GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
revision: 88a5b8049ee8b31a11274447901c888f7421c59f
ref: 88a5b80
revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
ref: dcba6b3
specs:
vcap_services_base (0.1.16)
vcap_services_base (0.1.17)
cf-uaa-lib
curb (~> 0.7.16)
datamapper (~> 1.1.0)
do_sqlite3 (~> 0.10.3)
Expand Down Expand Up @@ -73,6 +74,8 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
cf-uaa-lib (1.3.1)
multi_json
ci_reporter (1.7.0)
builder (>= 2.1.2)
curb (0.7.18)
Expand Down
Binary file added echo/vendor/cache/cf-uaa-lib-1.3.1.gem
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion elasticsearch/Gemfile
View file
Expand Up @@ -12,7 +12,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 => '88a5b80'
gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'

Expand Down
9 changes: 6 additions & 3 deletions elasticsearch/Gemfile.lock
View file
Expand Up @@ -32,10 +32,11 @@ GIT

GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
revision: 88a5b8049ee8b31a11274447901c888f7421c59f
ref: 88a5b80
revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
ref: dcba6b3
specs:
vcap_services_base (0.1.16)
vcap_services_base (0.1.17)
cf-uaa-lib
curb (~> 0.7.16)
datamapper (~> 1.1.0)
do_sqlite3 (~> 0.10.3)
Expand Down Expand Up @@ -73,6 +74,8 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
cf-uaa-lib (1.3.1)
multi_json
ci_reporter (1.6.4)
builder (>= 2.1.2)
curb (0.7.18)
Expand Down
Binary file added elasticsearch/vendor/cache/cf-uaa-lib-1.3.1.gem
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion filesystem/Gemfile
View file
Expand Up @@ -12,7 +12,7 @@ gem "thin"

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 => '88a5b80'
gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'

Expand Down
9 changes: 6 additions & 3 deletions filesystem/Gemfile.lock
View file
Expand Up @@ -32,10 +32,11 @@ GIT

GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
revision: 88a5b8049ee8b31a11274447901c888f7421c59f
ref: 88a5b80
revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
ref: dcba6b3
specs:
vcap_services_base (0.1.16)
vcap_services_base (0.1.17)
cf-uaa-lib
curb (~> 0.7.16)
datamapper (~> 1.1.0)
do_sqlite3 (~> 0.10.3)
Expand Down Expand Up @@ -73,6 +74,8 @@ GEM
bcrypt-ruby (2.1.4)
beefcake (0.3.7)
builder (3.0.0)
cf-uaa-lib (1.3.1)
multi_json
ci_reporter (1.6.4)
builder (>= 2.1.2)
curb (0.7.18)
Expand Down
Binary file added filesystem/vendor/cache/cf-uaa-lib-1.3.1.gem
View file
Binary file not shown.
2 changes: 1 addition & 1 deletion marketplace/Gemfile
View file
Expand Up @@ -11,7 +11,7 @@ gem "cf-uaa-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 => '88a5b80'
gem 'vcap_services_base', :git => 'git://github.com/cloudfoundry/vcap-services-base.git', :ref => 'dcba6b3'
gem 'warden-client', :require => ['warden/client'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'
gem 'warden-protocol', :require => ['warden/protocol'], :git => 'git://github.com/cloudfoundry/warden.git', :ref => 'fe6cb51'

Expand Down
9 changes: 6 additions & 3 deletions marketplace/Gemfile.lock
View file
Expand Up @@ -32,10 +32,11 @@ GIT

GIT
remote: git://github.com/cloudfoundry/vcap-services-base.git
revision: 88a5b8049ee8b31a11274447901c888f7421c59f
ref: 88a5b80
revision: dcba6b3ddc444b0eff1b5ae24d140744e068bfa1
ref: dcba6b3
specs:
vcap_services_base (0.1.16)
vcap_services_base (0.1.17)
cf-uaa-lib
curb (~> 0.7.16)
datamapper (~> 1.1.0)
do_sqlite3 (~> 0.10.3)
Expand Down Expand Up @@ -80,6 +81,8 @@ GEM
launchy
rest-client
yajl-ruby
cf-uaa-lib (1.3.1)
multi_json
ci_reporter (1.7.1)
builder (>= 2.1.2)
curb (0.7.18)
Expand Down
11 changes: 2 additions & 9 deletions marketplace/bin/marketplace_gateway
View file
Expand Up @@ -9,19 +9,12 @@ require 'vcap_services_base'
require 'optparse'

$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
require 'base/marketplace_async_gateway'
require 'base/marketplace_async_gateway_v2'
require 'base/marketplace_gateway'

class VCAP::Services::Marketplace::Gateway < VCAP::Services::Base::Gateway

def async_gateway_class
if @cc_api_version == "v1"
VCAP::Services::Marketplace::MarketplaceAsyncServiceGateway
elsif @cc_api_version == "v2"
VCAP::Services::Marketplace::MarketplaceAsyncServiceGatewayV2
else
raise "Unknown CC api version: #{@cc_api_version}"
end
VCAP::Services::Marketplace::MarketplaceServiceGateway
end

def load_config
Expand Down
19 changes: 6 additions & 13 deletions marketplace/config/marketplace_gateway.yml
View file
Expand Up @@ -2,7 +2,6 @@
cloud_controller_uri: api.vcap.me
ip_route: localhost
index: 0
token: changemarketplacetoken
mbus: nats://localhost:4222/
logging:
level: debug
Expand All @@ -20,16 +19,10 @@ acls:
users: []

external_uri: "http://test-mpgw.vcap.me"
refresh_interval: 300
refresh_interval: 120

cc_version: v2

uaa_endpoint: "https://uaa.vcap.me"

client_auth_credentials:
username: mpgwadmin
password: password

service_tokens:
foo_provider: fooprovidertoken
testservice_TestProvider: testmarketplacetoken
cc_api_version: v1
token: testservicetoken
service_auth_tokens:
testservice_TestProvider: testservicetoken
fooservice_FooProvider: fooservicetoken
23 changes: 0 additions & 23 deletions marketplace/config/test_marketplace_gateway.yml
View file

This file was deleted.

102 changes: 0 additions & 102 deletions marketplace/lib/base/cc_client.rb
View file

This file was deleted.

0 comments on commit 105fd7e

Please sign in to comment.