X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fadapter%2Fclients%2Form_stx.py;h=dd65402102a50ec0eed0311919061c8aaa682c04;hb=84867b76a65efc4e9add52c86eae7e451c4a038d;hp=4b825c4fa762b2840ad080a12b55b3d291cfab63;hpb=f10107e78b324fc607fe06486764588f38fc220d;p=pti%2Fo2.git

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