Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Browse the repository at this point in the history
1. Add option for cloud admin access only for analytics REST API
Allow cloud admin role access only for analytics REST API controlled via --cloud_admin_access_only currently defaulted to False but will default to True once provisioning changes are done. contrail-analytics-api will validate role from the X-Auth-Token header via vnc_api/contrail-api. For debug/administration a localhost bound port 8181 - --admin_port is provided that requires basic HTTP access authentication. Clients of analytics REST API - contrail-flows, contrail-logs, contrail-stats, contrail-topology are changed to use admin port. contrail-svc-monitor is changed to use auth token. Conflicts: src/opserver/SConscript Partial-Bug: #1461175 (cherry picked from commit 5492f71) 2. Rename cloud_admin_access_only to multi_tenancy in contrail-analytics-api Closes-Bug: #1461175 (cherry picked from commit 36df099) 3. for bool option, a conversion from string to bool is required. Closes-Bug: #1595044 (cherry picked from commit 1d6b81b) 4. Change cloud admin role name to "cloud-admin" from "admin" for analytics API access Closes-Bug: #1600699 (cherry picked from commit 8c13101) 5. Rename multi_tenancy to aaa_mode for analytics API Handle keystone v2 and v3 token infos returned by VNC API. Enable cloud-admin-only aaa_mode by default Change analytics DB and underlay to overlay mapper to use local admin port when quering opserver Do not cache auth_token in vnc lib Closes-Bug: #1599654 (cherry picked from commit a2a7c92) 6. Changes to bring analytics authenticated access in sync with config 1. Rename aaa_mode value cloud-admin-only to cloud-admin 2. CLOUD_ADMIN_ROLE defaults to admin instead of cloud-admin Partial-Bug: #1607563 (cherry picked from commit 42db6e3) 7. Fix missing import of OpServerUtils in analytics_db.py Closes-Bug: #1609054 (cherry picked from commit cf5f056) 8. Remove aaa_mode value cloud-admin-only Closes-Bug: #1609987 9. Keep on trying to create VNC API client from analytics API The gevent that creates the VNC API client was exiting due to authentication failure exception. Changed code to handle all exceptions and keep on trying to create the API client. The node status will show the API connection down in case we are not able to create the VNC API client. Closes-Bug: #1611158 (cherry picked from commit 8072aa5) 10. Keystone middleware doesn't like if token is unicode. It must be converted to string before validation. Fixes-Bug: #1604773 (cherry picked from commit 18df643) 11. Change the obj-perms API to pass in the user token in HTTP headers With PKI tokens, when user token was passed in query parameters for obj-perms API the token was getting truncated. Changed the API to accept user token in X-USER-TOKEN HTTP header. Closes-Bug: #1614376 12. 1. Called once check moved from _list_collection to list_bulk_collection_http_post, due to refractoring bug. 2. Removed the local API server teardown for class TestPermissions 3. Project's within class TestPermissions appended with self.id(), to create unique Project for each testcase. Closes-Bug: 1555323 (cherry picked from commit a8ac59a) Change-Id: Ia6bb36b37a86b33d87f304e9c784fa6fd780222b
- Loading branch information
Megh Bhatt
committed
Aug 23, 2016
1 parent
94725ab
commit 761ffd9
Showing
30 changed files
with
605 additions
and
204 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.