Code Review
/
pti
/
o2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix the new base image to support helm cli ssh login
[pti/o2.git]
/
o2ims
/
adapter
/
ocloud_repository.py
diff --git
a/o2ims/adapter/ocloud_repository.py
b/o2ims/adapter/ocloud_repository.py
index
dba4c24
..
a026629
100644
(file)
--- a/
o2ims/adapter/ocloud_repository.py
+++ b/
o2ims/adapter/ocloud_repository.py
@@
-35,8
+35,9
@@
class OcloudSqlAlchemyRepository(OcloudRepository):
return self.session.query(ocloud.Ocloud).filter_by(
oCloudId=ocloud_id).first()
return self.session.query(ocloud.Ocloud).filter_by(
oCloudId=ocloud_id).first()
- def _list(self) -> List[ocloud.Ocloud]:
- return self.session.query(ocloud.Ocloud)
+ def _list(self, *args) -> List[ocloud.Ocloud]:
+ return self.session.query(ocloud.Ocloud).filter(*args).order_by(
+ 'oCloudId')
def _update(self, ocloud: ocloud.Ocloud):
self.session.add(ocloud)
def _update(self, ocloud: ocloud.Ocloud):
self.session.add(ocloud)
@@
-138,8
+139,9
@@
class ResourceSqlAlchemyRepository(ResourceRepository):
size = kwargs.pop('limit') if 'limit' in kwargs else None
offset = kwargs.pop('start') if 'start' in kwargs else 0
size = kwargs.pop('limit') if 'limit' in kwargs else None
offset = kwargs.pop('start') if 'start' in kwargs else 0
+ args1 = args + (ocloud.Resource.resourcePoolId == resourcepool_id,)
result = self.session.query(ocloud.Resource).filter(
result = self.session.query(ocloud.Resource).filter(
- *args).order_by('resourceId')
+ *args
1
).order_by('resourceId')
count = result.count()
if size is not None and size != -1:
return (count, result.limit(size).offset(offset))
count = result.count()
if size is not None and size != -1:
return (count, result.limit(size).offset(offset))