Merge "Context tenants refactoring"

This commit is contained in:
Jenkins 2014-12-15 18:01:26 +00:00 committed by Gerrit Code Review
commit 77d2bb3956

View File

@ -1341,9 +1341,10 @@ class FakeUserContext(FakeContext):
}
user = {
"id": "uuid",
"endpoint": endpoint.Endpoint("url", "name", "pwd", "tenant")
"endpoint": endpoint.Endpoint("url", "name", "pwd", "tenant"),
"tenant_id": "uuid"
}
tenant = {"id": "uuid", "nema": "tenant"}
tenants = {"uuid": {"name": "tenant"}}
def __init__(self, context):
context.setdefault("task", mock.MagicMock())
@ -1351,7 +1352,7 @@ class FakeUserContext(FakeContext):
context.setdefault("admin", FakeUserContext.admin)
context.setdefault("users", [FakeUserContext.user])
context.setdefault("tenants", [FakeUserContext.tenant])
context.setdefault("tenants", FakeUserContext.tenants)
context.setdefault("scenario_name",
'NovaServers.boot_server_from_volume_and_delete')