X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fadapter%2Form.py;h=f59a235bb5e19f572ee1fc2c715a73239a50c710;hb=209f349b35b0919ac133bc2264f25753a73e5b8f;hp=3bae4e8c0035a9c0700a92ee9029fc7c7e0c218c;hpb=38646c684a13536146ecf16a35e6e33d614b29e9;p=pti%2Fo2.git

diff --git a/o2ims/adapter/orm.py b/o2ims/adapter/orm.py
index 3bae4e8..f59a235 100644
--- a/o2ims/adapter/orm.py
+++ b/o2ims/adapter/orm.py
@@ -12,31 +12,44 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-import logging
-
+# from typing_extensions import Required
 from sqlalchemy import (
     Table,
     MetaData,
     Column,
-    # Integer,
+    Integer,
     String,
+    Text,
+    Enum,
     # Date,
+    DateTime,
     ForeignKey,
+    # Boolean,
     # engine,
     # event,
 )
 
 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
 
-logger = logging.getLogger(__name__)
+from o2common.helper import o2logging
+logger = o2logging.get_logger(__name__)
 
 metadata = MetaData()
 
 ocloud = Table(
     "ocloud",
     metadata,
+    Column("updatetime", DateTime),
+    Column("createtime", DateTime),
+    Column("hash", String(255)),
+    Column("version_number", Integer),
+
     Column("oCloudId", String(255), primary_key=True),
     Column("globalcloudId", String(255)),
     Column("name", String(255)),
@@ -48,7 +61,12 @@ ocloud = Table(
 resourcetype = Table(
     "resourcetype",
     metadata,
+    Column("updatetime", DateTime),
+    Column("createtime", DateTime),
+    Column("hash", String(255)),
+
     Column("resourceTypeId", String(255), primary_key=True),
+    Column("resourceTypeEnum", Enum(ResourceTypeEnum), nullable=False),
     Column("oCloudId", ForeignKey("ocloud.oCloudId")),
     Column("name", String(255)),
     Column("vendor", String(255)),
@@ -61,6 +79,11 @@ resourcetype = Table(
 resourcepool = Table(
     "resourcepool",
     metadata,
+    Column("updatetime", DateTime),
+    Column("createtime", DateTime),
+    Column("hash", String(255)),
+    Column("version_number", Integer),
+
     Column("resourcePoolId", String(255), primary_key=True),
     Column("oCloudId", ForeignKey("ocloud.oCloudId")),
     Column("globalLocationId", String(255)),
@@ -74,19 +97,30 @@ resourcepool = Table(
 resource = Table(
     "resource",
     metadata,
+    Column("updatetime", DateTime),
+    Column("createtime", DateTime),
+    Column("hash", String(255)),
+    Column("version_number", Integer),
+
     Column("resourceId", String(255), primary_key=True),
     Column("resourceTypeId", ForeignKey("resourcetype.resourceTypeId")),
     Column("resourcePoolId", ForeignKey("resourcepool.resourcePoolId")),
-    # Column("oCloudId", ForeignKey("ocloud.oCloudId")),
+    Column("name", String(255)),
+    # Column("globalAssetId", String(255)),
     Column("parentId", String(255)),
     Column("description", String(255)),
-    # Column("elements", String(255))
+    Column("elements", Text())
     # Column("extensions", String(1024))
 )
 
 deploymentmanager = Table(
     "deploymentmanager",
     metadata,
+    Column("updatetime", DateTime),
+    Column("createtime", DateTime),
+    Column("hash", String(255)),
+    Column("version_number", Integer),
+
     Column("deploymentManagerId", String(255), primary_key=True),
     Column("oCloudId", ForeignKey("ocloud.oCloudId")),
     Column("name", String(255)),
@@ -101,12 +135,30 @@ deploymentmanager = Table(
 subscription = Table(
     "subscription",
     metadata,
+    Column("updatetime", DateTime),
+    Column("createtime", DateTime),
+    Column("hash", String(255)),
+    Column("version_number", Integer),
+
     Column("subscriptionId", String(255), primary_key=True),
     Column("callback", String(255)),
     Column("consumerSubscriptionId", String(255)),
     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")
@@ -130,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)