import uuid
# import json
-from o2ims.domain import commands
+from o2ims.domain import commands, events
from o2ims.domain.stx_object import StxGenericModel
from o2common.service.unit_of_work import AbstractUnitOfWork
from o2ims.domain.resource_type import MismatchedModel
from o2ims.domain.ocloud import Resource, ResourceType
+from o2ims.domain.subscription_obj import NotificationEventEnum
from o2common.helper import o2logging
logger = o2logging.get_logger(__name__)
res = uow.session.execute(
'''
SELECT "resourceTypeId", "oCloudId", "name"
- FROM resourcetype
+ FROM "resourceType"
WHERE "resourceTypeEnum" = :resource_type_enum
''',
dict(resource_type_enum=stxobj.type.name)
)
first = res.first()
if first is None:
- resourcetype_id = str(uuid.uuid4())
+ res_type_name = 'pserver_cpu'
+ resourcetype_id = str(uuid.uuid3(
+ uuid.NAMESPACE_URL, res_type_name))
uow.resource_types.add(ResourceType(
resourcetype_id,
- 'pserver_cpu', stxobj.type,
- resourcepool.oCloudId))
+ res_type_name, stxobj.type,
+ resourcepool.oCloudId,
+ description='A CPU resource type of the Physical Server'))
else:
resourcetype_id = first['resourceTypeId']
resourcepool_id = parent.resourcePoolId
parent_id = parent.resourceId
gAssetId = '' # TODO: global ID
- description = "A CPU resource of the physical server"
+ description = "%s : A CPU resource of the physical server" % stxobj.name
resource = Resource(stxobj.id, resourcetype_id, resourcepool_id,
- parent_id, gAssetId, stxobj.content, description)
+ stxobj.name, parent_id, gAssetId, stxobj.content,
+ description)
resource.createtime = stxobj.createtime
resource.updatetime = stxobj.updatetime
resource.hash = stxobj.hash
target.updatetime = stxobj.updatetime
target.hash = stxobj.hash
target.version_number = target.version_number + 1
- target.events = []
+ target.events.append(events.ResourceChanged(
+ id=stxobj.id,
+ resourcePoolId=target.resourcePoolId,
+ notificationEventType=NotificationEventEnum.MODIFY,
+ updatetime=stxobj.updatetime
+ ))