Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bug 1508084 - Add ServiceClassID and ServiceInstanceID params during provision and bind #515

Merged

Conversation

maleck13
Copy link
Contributor

This PR resolves issue #481
and part of #470
Changes proposed in this pull request

  • pass through the serviceClassID and serviceInstanceID to provision and bind apbs

Note
Not currently passing through the user as is mentioned in issue 470. Is this still something that is wanted? I can see the user is resolved and could be passed down to the broker methods.
If we wanted to pass the user would we pass the entire user object or just the username perhaps?

Testing

The unit tests for the broker seemed a bit lacking so tested this manually: The apb and asb logs appeared as follows:
Is this sufficient?

[[ provision --extra-vars {"_apb_plan_id":"default","_apb_service_class_id":"b43a4272a6efcaaa3e0b9616324f1099","_apb_service_instance_id":"64f8056d-bc9a-4aa7-b6d1-de80f9b23e96","namespace":"test","postgresql_database":"admin","postgresql_password":"admin","postgresql_user":"admin"} == *\s\2\i\/\a\s\s\e\m\b\l\e* ]]
[2017-10-24T11:50:59.947Z] [WARNING] Broker configured to *NOT* launch and run APB bind
172.17.0.2 - - [24/Oct/2017:11:50:59 +0000] "PUT /ansible-service-broker/v2/service_instances/64f8056d-bc9a-4aa7-b6d1-de80f9b23e96/service_bindings/9f23a35d-4f8b-4ba9-b60a-d1c9e32cbe41 HTTP/1.1" 201 185
[2017-10-24T11:51:00.096Z] [DEBUG] Auto Escalate has been set to true, we are escalating permissions
[2017-10-24T11:51:00.096Z] [DEBUG] Injecting PlanID as parameter: { _apb_plan_id: default }
[2017-10-24T11:51:00.096Z] [DEBUG] Injecting ServiceClassID as parameter: { _apb_service_class_id: b43a4272a6efcaaa3e0b9616324f1099 }
[2017-10-24T11:51:00.096Z] [DEBUG] Injecting ServiceInstanceID as parameter: { _apb_service_instance_id: 64f8056d-bc9a-4aa7-b6d1-de80f9b23e96 }

@openshift-ci-robot openshift-ci-robot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label Oct 24, 2017
@maleck13
Copy link
Contributor Author

@jwmatthews @eriknelson I think this is ready to review now when you're ready

Copy link
Contributor

@jmrodri jmrodri left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ACK

@jmrodri jmrodri changed the title Add ServiceClassID and ServiceInstanceID params during provision and bind Bug 1508084 - Add ServiceClassID and ServiceInstanceID params during provision and bind Oct 31, 2017
@jmrodri jmrodri merged commit 793e3dc into openshift:master Oct 31, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants