x
/
bilean
Code Issues Proposed changes

Merge "Deprecated tenant"

This commit is contained in:
Jenkins 2016-03-01 07:13:10 +00:00 committed by Gerrit Code Review
parent 6563c227f7 039316bc33
commit 910b928807
11 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
bilean/api/openstack/v1/__init__.py
View File

@ -30,7 +30,7 @@ class API(wsgi.Router):
# Users
users_resource = users.create_resource(conf)
users_path = "/{tenant_id}/users"
users_path = "/{project_id}/users"
with mapper.submapper(controller=users_resource,
path_prefix=users_path) as user_mapper:
@ -54,7 +54,7 @@ class API(wsgi.Router):
# Resources
res_resource = resources.create_resource(conf)
res_path = "/{tenant_id}/resources"
res_path = "/{project_id}/resources"
with mapper.submapper(controller=res_resource,
path_prefix=res_path) as res_mapper:
@ -78,7 +78,7 @@ class API(wsgi.Router):
# Rules
rule_resource = rules.create_resource(conf)
rule_path = "/{tenant_id}/rules"
rule_path = "/{project_id}/rules"
with mapper.submapper(controller=rule_resource,
path_prefix=rule_path) as rule_mapper:
@ -114,7 +114,7 @@ class API(wsgi.Router):
# Policies
policy_resource = policies.create_resource(conf)
policy_path = "/{tenant_id}/policies"
policy_path = "/{project_id}/policies"
with mapper.submapper(controller=policy_resource,
path_prefix=policy_path) as policy_mapper:
@ -156,7 +156,7 @@ class API(wsgi.Router):
# Events
event_resource = events.create_resource(conf)
event_path = "/{tenant_id}/events"
event_path = "/{project_id}/events"
with mapper.submapper(controller=event_resource,
path_prefix=event_path) as event_mapper:

2
bilean/api/openstack/v1/events.py
View File

@ -32,7 +32,7 @@ class EventController(object):
self.rpc_client = rpc_client.EngineClient()
@util.policy_enforce
def index(self, req, tenant_id):
def index(self, req):
"""Lists summary information for all events"""
filter_whitelist = {
'resource_type': 'mixed',

4
bilean/api/openstack/v1/util.py
View File

@ -28,8 +28,8 @@ def policy_enforce(handler):
This is a handler method decorator.
"""
@functools.wraps(handler)
def handle_bilean_method(controller, req, tenant_id, **kwargs):
if req.context.project != tenant_id:
def handle_bilean_method(controller, req, project_id, **kwargs):
if req.context.project != project_id:
raise exc.HTTPForbidden()
rule = "%s:%s" % (controller.REQUEST_SCOPE, handler.__name__)

20
bilean/db/api.py
View File

@ -41,10 +41,10 @@ def db_version(engine):
return IMPL.db_version(engine)
def user_get(context, user_id, show_deleted=False, tenant_safe=True):
def user_get(context, user_id, show_deleted=False, project_safe=True):
return IMPL.user_get(context, user_id,
show_deleted=show_deleted,
tenant_safe=tenant_safe)
project_safe=project_safe)
def user_update(context, user_id, values):
@ -93,20 +93,20 @@ def rule_delete(context, rule_id):
return IMPL.rule_delete(context, rule_id)
def resource_get(context, resource_id, show_deleted=False, tenant_safe=True):
def resource_get(context, resource_id, show_deleted=False, project_safe=True):
return IMPL.resource_get(context, resource_id,
show_deleted=show_deleted,
tenant_safe=tenant_safe)
project_safe=project_safe)
def resource_get_all(context, user_id=None, show_deleted=False,
limit=None, marker=None, sort_keys=None,
sort_dir=None, filters=None, tenant_safe=True):
sort_dir=None, filters=None, project_safe=True):
return IMPL.resource_get_all(context, user_id=user_id,
show_deleted=show_deleted,
limit=limit, marker=marker,
sort_keys=sort_keys, sort_dir=sort_dir,
filters=filters, tenant_safe=tenant_safe)
filters=filters, project_safe=project_safe)
def resource_create(context, values):
@ -121,19 +121,19 @@ def resource_delete(context, resource_id):
IMPL.resource_delete(context, resource_id)
def event_get(context, event_id, tenant_safe=True):
return IMPL.event_get(context, event_id, tenant_safe=tenant_safe)
def event_get(context, event_id, project_safe=True):
return IMPL.event_get(context, event_id, project_safe=project_safe)
def event_get_all(context, user_id=None, show_deleted=False,
filters=None, limit=None, marker=None,
sort_keys=None, sort_dir=None, tenant_safe=True,
sort_keys=None, sort_dir=None, project_safe=True,
start_time=None, end_time=None):
return IMPL.event_get_all(context, user_id=user_id,
show_deleted=show_deleted,
filters=filters, limit=limit,
marker=marker, sort_keys=sort_keys,
sort_dir=sort_dir, tenant_safe=tenant_safe,
sort_dir=sort_dir, project_safe=project_safe,
start_time=start_time, end_time=end_time)

24
bilean/db/sqlalchemy/api.py
View File

@ -115,7 +115,7 @@ def db_version(engine):
return migration.db_version(engine)
def user_get(context, user_id, show_deleted=False, tenant_safe=True):
def user_get(context, user_id, show_deleted=False, project_safe=True):
query = model_query(context, models.User)
user = query.get(user_id)
@ -123,7 +123,7 @@ def user_get(context, user_id, show_deleted=False, tenant_safe=True):
if user is None or user.deleted_at is not None and not deleted_ok:
return None
if tenant_safe and context.tenant_id != user.id:
if project_safe and context.project != user.id:
return None
return user
@ -252,7 +252,7 @@ def rule_delete(context, rule_id):
session.flush()
def resource_get(context, resource_id, show_deleted=False, tenant_safe=True):
def resource_get(context, resource_id, show_deleted=False, project_safe=True):
query = model_query(context, models.Resource)
resource = query.get(resource_id)
@ -260,7 +260,7 @@ def resource_get(context, resource_id, show_deleted=False, tenant_safe=True):
if resource is None or resource.deleted_at is not None and not deleted_ok:
return None
if tenant_safe and context.tenant_id != resource.user_id:
if project_safe and context.project != resource.user_id:
return None
return resource
@ -268,12 +268,12 @@ def resource_get(context, resource_id, show_deleted=False, tenant_safe=True):
def resource_get_all(context, user_id=None, show_deleted=False,
limit=None, marker=None, sort_keys=None, sort_dir=None,
filters=None, tenant_safe=True):
filters=None, project_safe=True):
query = soft_delete_aware_query(context, models.Resource,
show_deleted=show_deleted)
if tenant_safe:
query = query.filter_by(user_id=context.tenant_id)
if project_safe:
query = query.filter_by(user_id=context.project)
elif user_id:
query = query.filter_by(user_id=user_id)
@ -327,14 +327,14 @@ def resource_delete(context, resource_id, soft_delete=True):
session.flush()
def event_get(context, event_id, tenant_safe=True):
def event_get(context, event_id, project_safe=True):
query = model_query(context, models.Event)
event = query.get(event_id)
if event is None:
return None
if tenant_safe and context.tenant_id != event.user_id:
if project_safe and context.project != event.user_id:
return None
return event
@ -342,13 +342,13 @@ def event_get(context, event_id, tenant_safe=True):
def event_get_all(context, user_id=None, limit=None, marker=None,
sort_keys=None, sort_dir=None, filters=None,
start_time=None, end_time=None, tenant_safe=True,
start_time=None, end_time=None, project_safe=True,
show_deleted=False):
query = soft_delete_aware_query(context, models.Event,
show_deleted=show_deleted)
if tenant_safe:
query = query.filter_by(user_id=context.tenant_id)
if project_safe:
query = query.filter_by(user_id=context.project)
elif user_id:
query = query.filter_by(user_id=user_id)

8
bilean/engine/event.py
View File

@ -50,12 +50,12 @@ class Event(object):
return cls(record.timestamp, **kwargs)
@classmethod
def load(cls, context, db_event=None, event_id=None, tenant_safe=True):
def load(cls, context, db_event=None, event_id=None, project_safe=True):
'''Retrieve an event record from database.'''
if db_event is not None:
return cls.from_db_record(db_event)
record = db_api.event_get(context, event_id, tenant_safe=tenant_safe)
record = db_api.event_get(context, event_id, project_safe=project_safe)
if record is None:
raise exception.EventNotFound(event=event_id)
@ -64,7 +64,7 @@ class Event(object):
@classmethod
def load_all(cls, context, user_id=None, limit=None, marker=None,
sort_keys=None, sort_dir=None, filters=None,
start_time=None, end_time=None, tenant_safe=True,
start_time=None, end_time=None, project_safe=True,
show_deleted=False,):
'''Retrieve all events from database.'''
@ -73,7 +73,7 @@ class Event(object):
sort_keys=sort_keys, sort_dir=sort_dir,
start_time=start_time,
end_time=end_time,
tenant_safe=tenant_safe,
project_safe=project_safe,
show_deleted=show_deleted)
for record in records:

8
bilean/engine/resource.py
View File

@ -82,12 +82,12 @@ class Resource(object):
@classmethod
def load(cls, context, resource_id=None, resource=None,
show_deleted=False, tenant_safe=True):
show_deleted=False, project_safe=True):
'''Retrieve a resource from database.'''
if resource is None:
resource = db_api.resource_get(context, resource_id,
show_deleted=show_deleted,
tenant_safe=tenant_safe)
project_safe=project_safe)
if resource is None:
raise exception.ResourceNotFound(resource=resource_id)
@ -96,7 +96,7 @@ class Resource(object):
@classmethod
def load_all(cls, context, user_id=None, show_deleted=False,
limit=None, marker=None, sort_keys=None, sort_dir=None,
filters=None, tenant_safe=True):
filters=None, project_safe=True):
'''Retrieve all users of from database.'''
records = db_api.resource_get_all(context, user_id=user_id,
@ -105,7 +105,7 @@ class Resource(object):
sort_keys=sort_keys,
sort_dir=sort_dir,
filters=filters,
tenant_safe=tenant_safe)
project_safe=project_safe)
return [cls._from_db_record(record) for record in records]

10
bilean/engine/service.py
View File

@ -235,7 +235,7 @@ class EngineService(service.Service):
If user's balance is not enough for resources to keep 1 hour,
will fail to validate.
"""
user = user_mod.User.load(cnxt, user_id=cnxt.tenant_id)
user = user_mod.User.load(cnxt, user_id=cnxt.project)
policy = policy_mod.Policy.load(cnxt, policy_id=user.policy_id)
count = resources.get('count', 1)
total_rate = 0
@ -285,7 +285,7 @@ class EngineService(service.Service):
@request_context
def resource_list(self, cnxt, user_id=None, limit=None, marker=None,
sort_keys=None, sort_dir=None, filters=None,
tenant_safe=True, show_deleted=False):
project_safe=True, show_deleted=False):
if limit is not None:
limit = utils.parse_int_param('limit', limit)
if show_deleted is not None:
@ -296,7 +296,7 @@ class EngineService(service.Service):
sort_keys=sort_keys,
sort_dir=sort_dir,
filters=filters,
tenant_safe=tenant_safe,
project_safe=project_safe,
show_deleted=show_deleted)
return [r.to_dict() for r in resources]
@ -337,7 +337,7 @@ class EngineService(service.Service):
@request_context
def event_list(self, cnxt, user_id=None, limit=None, marker=None,
sort_keys=None, sort_dir=None, filters=None,
start_time=None, end_time=None, tenant_safe=True,
start_time=None, end_time=None, project_safe=True,
show_deleted=False):
if limit is not None:
limit = utils.parse_int_param('limit', limit)
@ -352,7 +352,7 @@ class EngineService(service.Service):
filters=filters,
start_time=start_time,
end_time=end_time,
tenant_safe=tenant_safe,
project_safe=project_safe,
show_deleted=show_deleted)
return [e.to_dict() for e in events]

6
bilean/engine/user.py
View File

@ -121,14 +121,14 @@ class User(object):
@classmethod
def load(cls, context, user_id=None, user=None, realtime=False,
show_deleted=False, tenant_safe=True):
show_deleted=False, project_safe=True):
'''Retrieve a user from database.'''
if context.is_admin:
tenant_safe = False
project_safe = False
if user is None:
user = db_api.user_get(context, user_id,
show_deleted=show_deleted,
tenant_safe=tenant_safe)
project_safe=project_safe)
if user is None:
raise exception.UserNotFound(user=user_id)

8
bilean/rpc/client.py
View File

@ -110,13 +110,13 @@ class EngineClient(object):
def resource_list(self, ctxt, user_id=None, limit=None, marker=None,
sort_keys=None, sort_dir=None, filters=None,
tenant_safe=True, show_deleted=False):
project_safe=True, show_deleted=False):
return self.call(ctxt, self.make_msg('resource_list', user_id=user_id,
limit=limit, marker=marker,
sort_keys=sort_keys,
sort_dir=sort_dir,
filters=filters,
tenant_safe=tenant_safe,
project_safe=project_safe,
show_deleted=show_deleted))
def resource_get(self, ctxt, resource_id):
@ -139,7 +139,7 @@ class EngineClient(object):
def event_list(self, ctxt, user_id=None, limit=None, marker=None,
sort_keys=None, sort_dir=None, filters=None,
start_time=None, end_time=None, tenant_safe=True,
start_time=None, end_time=None, project_safe=True,
show_deleted=False):
return self.call(ctxt, self.make_msg('event_list', user_id=user_id,
limit=limit, marker=marker,
@ -148,7 +148,7 @@ class EngineClient(object):
filters=filters,
start_time=start_time,
end_time=end_time,
tenant_safe=tenant_safe,
project_safe=project_safe,
show_deleted=show_deleted))
def validate_creation(self, cnxt, resources):

12
tools/setup-service
View File

@ -36,18 +36,18 @@ if [[ -z $SERVICE_ID ]]; then
fi
#openstack endpoint create \
# --adminurl "http://$HOST:$PORT/v1/\$(tenant_id)s" \
# --publicurl "http://$HOST:$PORT/v1/\$(tenant_id)s" \
# --internalurl "http://$HOST:$PORT/v1/\$(tenant_id)s" \
# --adminurl "http://$HOST:$PORT/v1/\$(project_id)s" \
# --publicurl "http://$HOST:$PORT/v1/\$(project_id)s" \
# --internalurl "http://$HOST:$PORT/v1/\$(project_id)s" \
# --region RegionOne \
# bilean
openstack endpoint create bilean admin \
"http://$HOST:$PORT/v1/\$(tenant_id)s" --region RegionOne
"http://$HOST:$PORT/v1/\$(project_id)s" --region RegionOne
openstack endpoint create bilean public \
"http://$HOST:$PORT/v1/\$(tenant_id)s" --region RegionOne
"http://$HOST:$PORT/v1/\$(project_id)s" --region RegionOne
openstack endpoint create bilean internal \
"http://$HOST:$PORT/v1/\$(tenant_id)s" --region RegionOne
"http://$HOST:$PORT/v1/\$(project_id)s" --region RegionOne
openstack user create \
--password "$SVC_PASSWD" \