summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
413424d)
Signed-off-by: Zhang Rong(Jon) <rong.zhang@windriver.com>
Change-Id: I52f7440061810fc08d4bd4730a816684925537c6
with uow:
alarm = uow.alarm_event_records.get(data.id)
if alarm is None:
with uow:
alarm = uow.alarm_event_records.get(data.id)
if alarm is None:
- logger.debug('Alarm Event {} does not exists.'.format(data.id))
+ logger.warning('Alarm Event {} does not exists.'.format(data.id))
return
subs = uow.alarm_subscriptions.list()
return
subs = uow.alarm_subscriptions.list()
}
# logger.warning(callback)
callback_data = json.dumps(callback)
}
# logger.warning(callback)
callback_data = json.dumps(callback)
- logger.info('URL: {}, data: {}'.format(
- sub_data['callback'], callback_data))
+ logger.info('URL: {}'.format(sub_data['callback']))
+ logger.debug('callback data: {}'.format(callback_data))
o = urlparse(sub_data['callback'])
if o.scheme == 'https':
o = urlparse(sub_data['callback'])
if o.scheme == 'https':
sub_data['subscriptionId'],
sub_data['filter']))
continue
sub_data['subscriptionId'],
sub_data['filter']))
continue
- if len(args) == 0:
- continue
+ if len(args) == 0 and 'objectType' in filter:
+ filter_effect += 1
+ break
args.append(ocloud.ResourceType.resourceTypeId == data.id)
ret = uow.resource_types.list_with_count(*args)
if ret[0] > 0:
args.append(ocloud.ResourceType.resourceTypeId == data.id)
ret = uow.resource_types.list_with_count(*args)
if ret[0] > 0:
sub_data['subscriptionId'],
sub_data['filter']))
continue
sub_data['subscriptionId'],
sub_data['filter']))
continue
- if len(args) == 0:
- continue
+ if len(args) == 0 and 'objectType' in filter:
+ filter_effect += 1
+ break
args.append(ocloud.ResourcePool.resourcePoolId == data.id)
ret = uow.resource_pools.list_with_count(*args)
if ret[0] > 0:
args.append(ocloud.ResourcePool.resourcePoolId == data.id)
ret = uow.resource_pools.list_with_count(*args)
if ret[0] > 0:
sub_data['subscriptionId'],
sub_data['filter']))
continue
sub_data['subscriptionId'],
sub_data['filter']))
continue
- if len(args) == 0:
- continue
+ if len(args) == 0 and 'objectType' in filter:
+ filter_effect += 1
+ break
args.append(
ocloud.DeploymentManager.deploymentManagerId == data.id)
ret = uow.deployment_managers.list_with_count(*args)
args.append(
ocloud.DeploymentManager.deploymentManagerId == data.id)
ret = uow.deployment_managers.list_with_count(*args)
sub_data['subscriptionId'],
sub_data['filter']))
continue
sub_data['subscriptionId'],
sub_data['filter']))
continue
- if len(args) == 0:
- continue
+ if len(args) == 0 and 'objectType' in filter:
+ filter_effect += 1
+ break
args.append(ocloud.Resource.resourceId == data.id)
ret = uow.resources.list_with_count(res_pool_id, *args)
if ret[0] > 0:
args.append(ocloud.Resource.resourceId == data.id)
ret = uow.resources.list_with_count(res_pool_id, *args)
if ret[0] > 0:
}
if msg.notificationEventType in [NotificationEventEnum.DELETE,
NotificationEventEnum.MODIFY]:
}
if msg.notificationEventType in [NotificationEventEnum.DELETE,
NotificationEventEnum.MODIFY]:
- callback['priorObjectState'] = obj_dict
+ callback['priorObjectState'] = json.dumps(obj_dict)
if msg.notificationEventType in [NotificationEventEnum.CREATE,
NotificationEventEnum.MODIFY]:
if msg.notificationEventType in [NotificationEventEnum.CREATE,
NotificationEventEnum.MODIFY]:
- callback['postObjectState'] = obj_dict
+ callback['postObjectState'] = json.dumps(obj_dict)
if msg.notificationEventType == NotificationEventEnum.DELETE:
callback.pop('objectRef')
callback_data = json.dumps(callback)
if msg.notificationEventType == NotificationEventEnum.DELETE:
callback.pop('objectRef')
callback_data = json.dumps(callback)
- logger.info('URL: {}, data: {}'.format(
- sub_data['callback'], callback_data))
+ logger.info('URL: {}'.format(sub_data['callback']))
+ logger.debug('callback data: {}'.format(callback_data))
# Call SMO through the SMO callback url
o = urlparse(sub_data['callback'])
# Call SMO through the SMO callback url
o = urlparse(sub_data['callback'])