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
Update accelerator resource
[pti/o2.git]
/
o2ims
/
service
/
auditor
/
pserver_handler.py
diff --git
a/o2ims/service/auditor/pserver_handler.py
b/o2ims/service/auditor/pserver_handler.py
index
f5f526a
..
4d9da9c
100644
(file)
--- a/
o2ims/service/auditor/pserver_handler.py
+++ b/
o2ims/service/auditor/pserver_handler.py
@@
-16,9
+16,11
@@
from __future__ import annotations
import uuid
# import json
from __future__ import annotations
import uuid
# import json
+from typing import Callable
-from o2ims.domain import commands
+from o2ims.domain import commands
, events
from o2ims.domain.stx_object import StxGenericModel
from o2ims.domain.stx_object import StxGenericModel
+from o2ims.domain.subscription_obj import NotificationEventEnum
from o2common.service.unit_of_work import AbstractUnitOfWork
from o2ims.domain.resource_type import MismatchedModel
from o2ims.domain.ocloud import Resource, ResourceType
from o2common.service.unit_of_work import AbstractUnitOfWork
from o2ims.domain.resource_type import MismatchedModel
from o2ims.domain.ocloud import Resource, ResourceType
@@
-33,7
+35,8
@@
class InvalidResourceType(Exception):
def update_pserver(
cmd: commands.UpdatePserver,
def update_pserver(
cmd: commands.UpdatePserver,
- uow: AbstractUnitOfWork
+ uow: AbstractUnitOfWork,
+ publish: Callable
):
stxobj = cmd.data
with uow:
):
stxobj = cmd.data
with uow:
@@
-44,18
+47,21
@@
def update_pserver(
res = uow.session.execute(
'''
SELECT "resourceTypeId", "oCloudId", "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:
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'
+ resourcetype_id = str(uuid.uuid3(
+ uuid.NAMESPACE_URL, res_type_name))
uow.resource_types.add(ResourceType(
resourcetype_id,
uow.resource_types.add(ResourceType(
resourcetype_id,
- 'pserver', stxobj.type,
- resourcepool.oCloudId))
+ res_type_name, stxobj.type,
+ resourcepool.oCloudId,
+ description='The Physical Server resource type'))
else:
resourcetype_id = first['resourceTypeId']
else:
resourcetype_id = first['resourceTypeId']
@@
-94,11
+100,12
@@
def create_by(stxobj: StxGenericModel, parentid: str, resourcetype_id: str) \
# content = json.loads(stxobj.content)
resourcetype_id = resourcetype_id
resourcepool_id = parentid
# content = json.loads(stxobj.content)
resourcetype_id = resourcetype_id
resourcepool_id = parentid
- parent_id =
parent
id
+ parent_id =
None # the root of the resource has no parent
id
gAssetId = '' # TODO: global ID
gAssetId = '' # TODO: global ID
- description = "
A physical server resource"
+ description = "
%s : A physical server resource" % stxobj.name
resource = Resource(stxobj.id, resourcetype_id, resourcepool_id,
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
resource.createtime = stxobj.createtime
resource.updatetime = stxobj.updatetime
resource.hash = stxobj.hash
@@
-114,4
+121,9
@@
def update_by(target: Resource, stxobj: StxGenericModel,
target.updatetime = stxobj.updatetime
target.hash = stxobj.hash
target.version_number = target.version_number + 1
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
+ ))