diff -uNr keystone-2012.1/keystone/backends/sqlalchemy/api/endpoint_template.py keystone-2012.1.new/keystone/backends/sqlalchemy/api/endpoint_template.py --- keystone-2012.1/keystone/backends/sqlalchemy/api/endpoint_template.py 2011-12-14 15:01:28.000000000 -0500 +++ keystone-2012.1.new/keystone/backends/sqlalchemy/api/endpoint_template.py 2012-01-09 17:48:24.848871979 -0500 @@ -69,12 +69,12 @@ filter("id>:marker").params(\ marker='%s' % marker).filter_by(\ service_id=service_id).order_by(\ - models.EndpointTemplates.id.desc()).limit(limit).all() + models.EndpointTemplates.id.desc()).limit(int(limit)).all() else: return session.query(models.EndpointTemplates).filter_by(\ service_id=service_id).order_by(\ models.EndpointTemplates.id.desc()).\ - limit(limit).all() + limit(int(limit)).all() def get_by_service_get_page_markers(self, service_id, marker,\ limit, session=None): @@ -95,7 +95,7 @@ filter_by(service_id=service_id).\ params(marker='%s' % marker).\ order_by(models.EndpointTemplates.id).\ - limit(limit).\ + limit(int(limit)).\ all() prev_page = session.query(models.EndpointTemplates).\ filter("id < :marker").\ @@ -132,11 +132,11 @@ return session.query(models.EndpointTemplates).\ filter("id>:marker").params(\ marker='%s' % marker).order_by(\ - models.EndpointTemplates.id.desc()).limit(limit).all() + models.EndpointTemplates.id.desc()).limit(int(limit)).all() else: return session.query(models.EndpointTemplates).order_by(\ models.EndpointTemplates.id.desc()).\ - limit(limit).all() + limit(int(limit)).all() def get_page_markers(self, marker, limit, session=None): if not session: @@ -153,7 +153,7 @@ filter("id > :marker").\ params(marker='%s' % marker).\ order_by(models.EndpointTemplates.id).\ - limit(limit).\ + limit(int(limit)).\ all() prev_page = session.query(models.EndpointTemplates).\ filter("id < :marker").\ @@ -190,11 +190,11 @@ filter(models.Endpoints.tenant_id == tenant_id).\ filter("id >= :marker").params( marker='%s' % marker).order_by( - models.Endpoints.id).limit(limit).all() + models.Endpoints.id).limit(int(limit)).all() else: return session.query(models.Endpoints).\ filter(models.Endpoints.tenant_id == tenant_id).\ - order_by(models.Endpoints.id).limit(limit).all() + order_by(models.Endpoints.id).limit(int(limit)).all() def endpoint_get_by_tenant_get_page_markers(self, tenant_id, marker, limit, session=None): diff -uNr keystone-2012.1/keystone/backends/sqlalchemy/api/role.py keystone-2012.1.new/keystone/backends/sqlalchemy/api/role.py --- keystone-2012.1/keystone/backends/sqlalchemy/api/role.py 2011-12-14 15:01:28.000000000 -0500 +++ keystone-2012.1.new/keystone/backends/sqlalchemy/api/role.py 2012-01-09 17:46:08.319892586 -0500 @@ -63,10 +63,10 @@ if marker: return session.query(models.Role).filter("id>:marker").params(\ marker='%s' % marker).order_by(\ - models.Role.id.desc()).limit(limit).all() + models.Role.id.desc()).limit(int(limit)).all() else: return session.query(models.Role).order_by(\ - models.Role.id.desc()).limit(limit).all() + models.Role.id.desc()).limit(int(limit)).all() def ref_get_page(self, marker, limit, user_id, tenant_id, session=None): if not session: @@ -80,10 +80,10 @@ if marker: return query.filter("id>:marker").params(\ marker='%s' % marker).order_by(\ - models.UserRoleAssociation.id.desc()).limit(limit).all() + models.UserRoleAssociation.id.desc()).limit(int(limit)).all() else: return query.order_by(\ - models.UserRoleAssociation.id.desc()).limit(limit).all() + models.UserRoleAssociation.id.desc()).limit(int(limit)).all() def ref_get_all_global_roles(self, user_id, session=None): if not session: @@ -124,7 +124,7 @@ marker = first.id next_page = session.query(models.Role).filter("id > :marker").params(\ marker='%s' % marker).order_by(\ - models.Role.id).limit(limit).all() + models.Role.id).limit(int(limit)).all() prev_page = session.query(models.Role).filter("id < :marker").params(\ marker='%s' % marker).order_by(\ models.Role.id.desc()).limit(int(limit)).all() @@ -170,7 +170,7 @@ filter("id > :marker").\ params(marker='%s' % marker).\ order_by(models.UserRoleAssociation.id).\ - limit(limit).\ + limit(int(limit)).\ all() prev_page = query.\ filter("id < :marker").\ diff -uNr keystone-2012.1/keystone/backends/sqlalchemy/api/service.py keystone-2012.1.new/keystone/backends/sqlalchemy/api/service.py --- keystone-2012.1/keystone/backends/sqlalchemy/api/service.py 2011-12-14 15:01:28.000000000 -0500 +++ keystone-2012.1.new/keystone/backends/sqlalchemy/api/service.py 2012-01-09 17:44:43.233878185 -0500 @@ -59,10 +59,10 @@ if marker: return session.query(models.Service).filter("id>:marker").params(\ marker='%s' % marker).order_by(\ - models.Service.id.desc()).limit(limit).all() + models.Service.id.desc()).limit(int(limit)).all() else: return session.query(models.Service).order_by(\ - models.Service.id.desc()).limit(limit).all() + models.Service.id.desc()).limit(int(limit)).all() def get_page_markers(self, marker, limit, session=None): if not session: @@ -78,7 +78,7 @@ next_page = session.query(models.Service).\ filter("id > :marker").params(\ marker='%s' % marker).order_by(\ - models.Service.id).limit(limit).all() + models.Service.id).limit(int(limit)).all() prev_page = session.query(models.Service).\ filter("id < :marker").params(\ marker='%s' % marker).order_by(\ diff -uNr keystone-2012.1/keystone/backends/sqlalchemy/api/tenant.py keystone-2012.1.new/keystone/backends/sqlalchemy/api/tenant.py --- keystone-2012.1/keystone/backends/sqlalchemy/api/tenant.py 2011-12-14 15:01:28.000000000 -0500 +++ keystone-2012.1.new/keystone/backends/sqlalchemy/api/tenant.py 2012-01-09 17:44:43.234892759 -0500 @@ -52,9 +52,9 @@ if marker: return q3.filter("tenant.id>:marker").params(\ marker='%s' % marker).order_by(\ - tenant.id.desc()).limit(limit).all() + tenant.id.desc()).limit(int(limit)).all() else: - return q3.order_by(tenant.id.desc()).limit(limit).all() + return q3.order_by(tenant.id.desc()).limit(int(limit)).all() def tenants_for_user_get_page_markers(self, user, marker, limit, session=None): @@ -76,7 +76,7 @@ if marker is None: marker = first.id next_page = q3.filter(tenant.id > marker).order_by(\ - tenant.id).limit(limit).all() + tenant.id).limit(int(limit)).all() prev_page = q3.filter(tenant.id > marker).order_by(\ tenant.id.desc()).limit(int(limit)).all() if len(next_page) == 0: @@ -106,10 +106,10 @@ if marker: return session.query(models.Tenant).filter("id>:marker").params(\ marker='%s' % marker).order_by(\ - models.Tenant.id.desc()).limit(limit).all() + models.Tenant.id.desc()).limit(int(limit)).all() else: return session.query(models.Tenant).order_by(\ - models.Tenant.id.desc()).limit(limit).all() + models.Tenant.id.desc()).limit(int(limit)).all() def get_page_markers(self, marker, limit, session=None): if not session: @@ -126,7 +126,7 @@ filter("id > :marker").\ params(marker='%s' % marker).\ order_by(models.Tenant.id).\ - limit(limit).\ + limit(int(limit)).\ all() prev_page = session.query(models.Tenant).\ filter("id < :marker").\ diff -uNr keystone-2012.1/keystone/backends/sqlalchemy/api/user.py keystone-2012.1.new/keystone/backends/sqlalchemy/api/user.py --- keystone-2012.1/keystone/backends/sqlalchemy/api/user.py 2011-12-14 15:01:28.000000000 -0500 +++ keystone-2012.1.new/keystone/backends/sqlalchemy/api/user.py 2012-01-09 17:47:09.952841682 -0500 @@ -59,10 +59,10 @@ if marker: return session.query(models.User).filter("id>:marker").params(\ marker='%s' % marker).order_by(\ - models.User.id.desc()).limit(limit).all() + models.User.id.desc()).limit(int(limit)).all() else: return session.query(models.User).order_by(\ - models.User.id.desc()).limit(limit).all() + models.User.id.desc()).limit(int(limit)).all() def get_page_markers(self, marker, limit, session=None): if not session: @@ -77,7 +77,7 @@ marker = first.id next_page = session.query(models.User).filter("id > :marker").params(\ marker='%s' % marker).order_by(\ - models.User.id).limit(limit).all() + models.User.id).limit(int(limit)).all() prev_page = session.query(models.User).filter("id < :marker").params(\ marker='%s' % marker).order_by(\ models.User.id.desc()).limit(int(limit)).all() @@ -177,10 +177,10 @@ return session.query(user).\ filter("id>=:marker").params( marker='%s' % marker).order_by( - "id").limit(limit).all() + "id").limit(int(limit)).all() else: return session.query(user).\ - order_by("id").limit(limit).all() + order_by("id").limit(int(limit)).all() def users_get_page_markers(self, marker, limit, \ session=None): @@ -246,12 +246,12 @@ rv = query.filter("id>=:marker").\ params(marker='%s' % marker).\ order_by("id").\ - limit(limit).\ + limit(int(limit)).\ all() else: rv = query.\ order_by("id").\ - limit(limit).\ + limit(int(limit)).\ all() user_ids = set([str(assoc.user_id) for assoc in rv])