Add get detail of a resource to API; remove the dependency of the domain in the view...

[pti/o2.git] / o2ims / service / auditor / pserver_port_handler.py

diff --git a/o2ims/service/auditor/pserver_port_handler.py b/o2ims/service/auditor/pserver_port_handler.py
index df62f14..41bed8e 100644 (file)
--- a/o2ims/service/auditor/pserver_port_handler.py
+++ b/o2ims/service/auditor/pserver_port_handler.py
@@ -32,7 +32,7 @@ class InvalidResourceType(Exception):
 
 
 def update_pserver_port(
-    cmd: commands.UpdatePserverPort,
+    cmd: commands.UpdatePserverIfPort,
     uow: AbstractUnitOfWork
 ):
     stxobj = cmd.data
@@ -53,33 +53,33 @@ def update_pserver_port(
             resourcetype_id = str(uuid.uuid4())
             uow.resource_types.add(ResourceType(
                 resourcetype_id,
-                'pserver_port', stxobj.type,
+                'pserver_if_port', stxobj.type,
                 resourcepool.oCloudId))
         else:
             resourcetype_id = first['resourceTypeId']
 
         resource = uow.resources.get(stxobj.id)
         if not resource:
-            logger.info("add the port of pserver:" + stxobj.name
+            logger.info("add the port of pserver interface:" + stxobj.name
                         + " update_at: " + str(stxobj.updatetime)
                         + " id: " + str(stxobj.id)
                         + " hash: " + str(stxobj.hash))
             localmodel = create_by(stxobj, p_resource, resourcetype_id)
             uow.resources.add(localmodel)
 
-            logger.info("Add the port of pserver: " + stxobj.id
+            logger.info("Add the port of pserver interface: " + stxobj.id
                         + ", name: " + stxobj.name)
         else:
             localmodel = resource
             if is_outdated(localmodel, stxobj):
-                logger.info("update port of pserver:" + stxobj.name
+                logger.info("update port of pserver interface:" + stxobj.name
                             + " update_at: " + str(stxobj.updatetime)
                             + " id: " + str(stxobj.id)
                             + " hash: " + str(stxobj.hash))
                 update_by(localmodel, stxobj, p_resource)
                 uow.resources.update(localmodel)
 
-            logger.info("Update the port of pserver: " + stxobj.id
+            logger.info("Update the port of pserver interface: " + stxobj.id
                         + ", name: " + stxobj.name)
         uow.commit()
 
@@ -95,9 +95,10 @@ def create_by(stxobj: StxGenericModel, parent: Resource, resourcetype_id: str)\
     resourcepool_id = parent.resourcePoolId
     parent_id = parent.resourceId
     gAssetId = ''  # TODO: global ID
-    description = "A port resource of the physical server"
+    description = "A port resource of the interface"
     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