Get tenant ID through token_auth header.
This commit is contained in:
parent
91a48c7271
commit
40c155c00c
|
@ -19,6 +19,5 @@ import ooi.api
|
||||||
|
|
||||||
class ComputeController(ooi.api.BaseController):
|
class ComputeController(ooi.api.BaseController):
|
||||||
def index(self, req):
|
def index(self, req):
|
||||||
token_info = req.environ["keystone.token_info"]
|
tenant_id = req.environ["keystone.token_auth"].user.project_id
|
||||||
tenant_id = token_info["token"]["tenant"]["id"]
|
req.path_info = "/%s/servers" % tenant_id
|
||||||
req.environ["PATH_INFO"] = "/v2/%s/servers" % tenant_id
|
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
# License for the specific language governing permissions and limitations
|
# License for the specific language governing permissions and limitations
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
|
import mock
|
||||||
import webob
|
import webob
|
||||||
import webob.dec
|
import webob.dec
|
||||||
import webob.exc
|
import webob.exc
|
||||||
|
@ -37,11 +38,12 @@ class TestComputeMiddleware(base.TestCase):
|
||||||
def test_list_vms_all(self):
|
def test_list_vms_all(self):
|
||||||
req = webob.Request.blank("/compute",
|
req = webob.Request.blank("/compute",
|
||||||
method="GET")
|
method="GET")
|
||||||
req.environ["keystone.token_info"] = {
|
|
||||||
"token": {
|
m = mock.MagicMock()
|
||||||
"tenant": {"id": "3dd7b3f6-c19d-11e4-8dfc-aa07a5b093db"}}}
|
m.user.project_id = "3dd7b3f6-c19d-11e4-8dfc-aa07a5b093db"
|
||||||
|
req.environ["keystone.token_auth"] = m
|
||||||
|
|
||||||
req.get_response(self.app)
|
req.get_response(self.app)
|
||||||
|
|
||||||
self.assertEqual("/v2/3dd7b3f6-c19d-11e4-8dfc-aa07a5b093db/servers",
|
self.assertEqual("/3dd7b3f6-c19d-11e4-8dfc-aa07a5b093db/servers",
|
||||||
req.environ["PATH_INFO"])
|
req.environ["PATH_INFO"])
|
||||||
|
|
|
@ -9,3 +9,4 @@ oslosphinx
|
||||||
testrepository>=0.0.18
|
testrepository>=0.0.18
|
||||||
testscenarios>=0.4
|
testscenarios>=0.4
|
||||||
testtools>=0.9.34
|
testtools>=0.9.34
|
||||||
|
mock
|
||||||
|
|
Loading…
Reference in New Issue