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(
- *args).order_by('resourceId')
+ *args1).order_by('resourceId')
count = result.count()
if size is not None and size != -1:
return (count, result.limit(size).offset(offset))
self.seen.add(alarm_event_record)
return alarm_event_record
- def list(self, **kwargs) -> List[obj.AlarmEventRecord]:
- return self._list(*[], **kwargs)[1]
+ def list(self, *args) -> List[obj.AlarmEventRecord]:
+ return self._list(*args)[1]
def list_with_count(self, *args, **kwargs) -> \
Tuple[int, List[obj.AlarmEventRecord]]:
self.seen.add(subscription)
return subscription
- def list(self, **kwargs) -> List[obj.AlarmSubscription]:
- return self._list(*[], **kwargs)[1]
+ def list(self, *args) -> List[obj.AlarmSubscription]:
+ return self._list(*args)[1]
def list_with_count(self, *args, **kwargs) -> \
Tuple[int, List[obj.AlarmSubscription]]:
self.seen.add(resource_type)
return resource_type
- def list(self, **kwargs) -> List[ocloud.ResourceType]:
- return self._list(*[], **kwargs)[1]
+ def list(self, *args) -> List[ocloud.ResourceType]:
+ return self._list(*args)[1]
def list_with_count(self, *args, **kwargs) -> \
Tuple[int, List[ocloud.ResourceType]]:
self.seen.add(resource_pool)
return resource_pool
- def list(self, **kwargs) -> List[ocloud.ResourcePool]:
- return self._list(*[], **kwargs)[1]
+ def list(self, *args) -> List[ocloud.ResourcePool]:
+ return self._list(*args)[1]
def list_with_count(self, *args, **kwargs) -> \
Tuple[int, List[ocloud.ResourcePool]]:
self.seen.add(resource)
return resource
- def list(self, resourcepool_id, **kwargs) -> List[ocloud.Resource]:
- return self._list(resourcepool_id, *[], **kwargs)[1]
+ def list(self, resourcepool_id, *args) -> List[ocloud.Resource]:
+ return self._list(resourcepool_id, *args)[1]
def list_with_count(self, resourcepool_id, *args, **kwargs) -> \
Tuple[int, List[ocloud.Resource]]:
self.seen.add(deployment_manager)
return deployment_manager
- def list(self, **kwargs) -> List[ocloud.DeploymentManager]:
- return self._list(*[], **kwargs)[1]
+ def list(self, *args) -> List[ocloud.DeploymentManager]:
+ return self._list(*args)[1]
def list_with_count(self, *args, **kwargs) -> \
Tuple[int, List[ocloud.DeploymentManager]]:
# from o2common.config import config
# from o2common.service.messagebus import MessageBus
from o2common.service.unit_of_work import AbstractUnitOfWork
-from o2ims.domain import events, commands, alarm_obj
+from o2ims.domain import events, commands, alarm_obj, ocloud
from o2ims.domain.alarm_obj import AlarmEventRecord, FaultGenericModel,\
AlarmNotificationEventEnum
restype = uow.resource_types.get_by_name('pserver')
localmodel.resourceTypeId = restype.resourceTypeId
- hosts = uow.resources.list(resourcepool.resourcePoolId, **{
- 'resourceTypeId': restype.resourceTypeId
- })
+ args = [ocloud.Resource.resourceTypeId ==
+ restype.resourceTypeId]
+ hosts = uow.resources.list(resourcepool.resourcePoolId, *args)
for host in hosts:
+ logger.debug('host extensions: ' + host.extensions)
extensions = json.loads(host.extensions)
if extensions['hostname'] == hostname:
localmodel.resourceId = host.resourceId
uow.alarm_event_records.add(localmodel)
logger.info("Add the alarm event record: " + fmobj.id
+ ", name: " + fmobj.name)
- # localmodel.resourceTypeId = check_restype_id(uow, fmobj)
- # logger.debug("resource type ID: " + localmodel.resourceTypeId)
- # localmodel.resourceId = check_res_id(uow, fmobj)
- # logger.debug("resource ID: " + localmodel.resourceId)
- # uow.alarm_event_records.add(localmodel)
else:
restype = uow.resource_types.get_by_name('undefined_aggregate')
localmodel.resourceTypeId = restype.resourceTypeId
+ args = [ocloud.Resource.resourceTypeId ==
+ restype.resourceTypeId]
undefined_res = uow.resources.list(
- resourcepool.resourcePoolId, **{
- 'resourceTypeId': restype.resourceTypeId
- })
+ resourcepool.resourcePoolId, *args)
localmodel.resourceId = undefined_res[0].resourceId
uow.alarm_event_records.add(localmodel)
logger.info("Add the alarm event record: " + fmobj.id
query_kwargs['resourceTypeId'] = restype_id
args = gen_filter(
ocloud.Resource, kwargs['filter']) if 'filter' in kwargs else []
- args.append(ocloud.Resource.resourcePoolId == resourcePoolId)
- # args.append(ocloud.Resource.parentId == None)
if 'parentId' in kwargs:
query_kwargs['parentId'] = kwargs['parentId']