X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fadapter%2Form.py;h=f59a235bb5e19f572ee1fc2c715a73239a50c710;hb=209f349b35b0919ac133bc2264f25753a73e5b8f;hp=05a8dc7fb2d5fd5dddd7759dcaddba99df656b50;hpb=f73c8e3b01b8f5b7438ba544870e06d8f30cdea0;p=pti%2Fo2.git diff --git a/o2ims/adapter/orm.py b/o2ims/adapter/orm.py index 05a8dc7..f59a235 100644 --- a/o2ims/adapter/orm.py +++ b/o2ims/adapter/orm.py @@ -24,6 +24,7 @@ from sqlalchemy import ( # Date, DateTime, ForeignKey, + # Boolean, # engine, # event, ) @@ -32,6 +33,8 @@ from sqlalchemy.orm import mapper, relationship # from sqlalchemy.sql.sqltypes import Integer from o2ims.domain import ocloud as ocloudModel +from o2ims.domain import subscription_obj as subModel +from o2ims.domain import configuration_obj as confModel from o2ims.domain.resource_type import ResourceTypeEnum from o2common.helper import o2logging @@ -102,6 +105,7 @@ resource = Table( Column("resourceId", String(255), primary_key=True), Column("resourceTypeId", ForeignKey("resourcetype.resourceTypeId")), Column("resourcePoolId", ForeignKey("resourcepool.resourcePoolId")), + Column("name", String(255)), # Column("globalAssetId", String(255)), Column("parentId", String(255)), Column("description", String(255)), @@ -142,6 +146,19 @@ subscription = Table( Column("filter", String(255)), ) +configuration = Table( + "configuration", + metadata, + Column("updatetime", DateTime), + Column("createtime", DateTime), + + Column("configurationId", String(255), primary_key=True), + Column("conftype", String(255)), + Column("callback", String(255)), + Column("status", String(255)), + Column("comments", String(255)), +) + def start_o2ims_mappers(engine=None): logger.info("Starting O2 IMS mappers") @@ -165,7 +182,8 @@ def start_o2ims_mappers(engine=None): "resourcePools": relationship(resourcepool_mapper) } ) - mapper(ocloudModel.Subscription, subscription) + mapper(subModel.Subscription, subscription) + mapper(confModel.Configuration, configuration) if engine is not None: metadata.create_all(engine)