Refactor code layout

[pti/o2.git] / o2ims / adapter / clients / orm_stx.py

diff --git a/o2ims/adapter/clients/orm_stx.py b/o2ims/adapter/clients/orm_stx.py
index 02f9bec..dd65402 100644 (file)
--- a/o2ims/adapter/clients/orm_stx.py
+++ b/o2ims/adapter/clients/orm_stx.py
@@ -13,8 +13,6 @@
 #  limitations under the License.\r
 \r
 # from datetime import datetime\r
-import logging\r
-\r
 from sqlalchemy import (\r
     Table,\r
     MetaData,\r
@@ -23,16 +21,22 @@ from sqlalchemy import (
     String,\r
     # Date,\r
     DateTime,\r
+    # engine,\r
     # ForeignKey,\r
     # event,\r
+    Enum\r
 )\r
 \r
-from sqlalchemy.orm import mapper\r
-# from sqlalchemy.sql.expression import true\r
+# from sqlalchemy.orm import mapper\r
+\r
+# from o2ims.domain import stx_object as ocloudModel\r
 \r
-from o2ims.domain import stx_object as ocloudModel\r
+from o2common.service.unit_of_work import AbstractUnitOfWork\r
+# from o2ims.adapter.unit_of_work import SqlAlchemyUnitOfWork\r
+from o2ims.domain.resource_type import ResourceTypeEnum\r
 \r
-logger = logging.getLogger(__name__)\r
+from o2common.helper import o2logging\r
+logger = o2logging.get_logger(__name__)\r
 \r
 metadata = MetaData()\r
 \r
@@ -40,12 +44,21 @@ stxobject = Table(
     "stxcache",\r
     metadata,\r
     Column("id", String(255), primary_key=True),\r
+    Column("type", Enum(ResourceTypeEnum)),\r
     Column("name", String(255)),\r
-    Column("lastupdate", DateTime),\r
-    Column("content", String(255))\r
+    Column("updatetime", DateTime),\r
+    Column("createtime", DateTime),\r
+    Column("hash", String(255)),\r
+    Column("content", String)\r
 )\r
 \r
 \r
-def start_o2ims_stx_mappers():\r
-    logger.info("Starting O2 IMS Stx mappers")\r
-    mapper(ocloudModel.StxGenericModel, stxobject)\r
+def start_o2ims_stx_mappers(uow: AbstractUnitOfWork):\r
+    return\r
+    # logger.info("Starting O2 IMS Stx mappers")\r
+    # mapper(ocloudModel.StxGenericModel, stxobject)\r
+\r
+    # with uow:\r
+    #     engine1 = uow.session.get_bind()\r
+    #     metadata.create_all(engine1)\r
+    #     uow.commit()\r