X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fadapter%2Form.py;h=e8914e11c5c445fa9862c043be83e23f67c9c2d0;hb=f9746f13be900f5ad7e9e2a9dbf7527e74b5d428;hp=4775f29dd5941e807273858ba7916213920666ab;hpb=d2f6cc674bf3623caf114a8d7709e70d55ec9340;p=pti%2Fo2.git

diff --git a/o2ims/adapter/orm.py b/o2ims/adapter/orm.py
index 4775f29..e8914e1 100644
--- a/o2ims/adapter/orm.py
+++ b/o2ims/adapter/orm.py
@@ -36,9 +36,8 @@ from sqlalchemy.orm import mapper, relationship
 
 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 import alarm_obj as alarmModel
-from o2ims.domain.resource_type import ResourceTypeEnum
+from o2ims.domain.resource_type import ResourceTypeEnum, ResourceKindEnum
 # from o2ims.domain.alarm_obj import AlarmLastChangeEnum, PerceivedSeverityEnum
 
 from o2common.helper import o2logging
@@ -55,34 +54,39 @@ ocloud = Table(
     Column("version_number", Integer),
 
     Column("oCloudId", String(255), primary_key=True),
-    Column("globalcloudId", String(255)),
+    Column("globalCloudId", String(255)),
     Column("name", String(255)),
     Column("description", String(255)),
-    Column("infrastructureManagementServiceEndpoint", String(255))
+    Column("serviceUri", String(255)),
+    Column("smoRegistrationService", String(255))
     # Column("extensions", String(1024))
 )
 
 resourcetype = Table(
-    "resourcetype",
+    "resourceType",
     metadata,
     Column("updatetime", DateTime),
     Column("createtime", DateTime),
     Column("hash", String(255)),
+    Column("version_number", Integer),
 
     Column("resourceTypeId", String(255), primary_key=True),
     Column("resourceTypeEnum", Enum(
         ResourceTypeEnum, native_enum=False), nullable=False),
-    Column("oCloudId", ForeignKey("ocloud.oCloudId")),
     Column("name", String(255)),
+    Column("description", String(255)),
     Column("vendor", String(255)),
     Column("model", String(255)),
     Column("version", String(255)),
-    Column("description", String(255)),
+    Column("resourceKind", Enum(ResourceKindEnum)),
+    Column("resourceClass", Enum(ResourceTypeEnum)),
     # Column("extensions", String(1024))
+
+    Column("oCloudId", ForeignKey("ocloud.oCloudId")),
 )
 
 resourcepool = Table(
-    "resourcepool",
+    "resourcePool",
     metadata,
     Column("updatetime", DateTime),
     Column("createtime", DateTime),
@@ -108,18 +112,18 @@ resource = Table(
     Column("version_number", Integer),
 
     Column("resourceId", String(255), primary_key=True),
-    Column("resourceTypeId", ForeignKey("resourcetype.resourceTypeId")),
-    Column("resourcePoolId", ForeignKey("resourcepool.resourcePoolId")),
+    Column("resourceTypeId", ForeignKey("resourceType.resourceTypeId")),
+    Column("resourcePoolId", ForeignKey("resourcePool.resourcePoolId")),
     Column("name", String(255)),
-    # Column("globalAssetId", String(255)),
+    Column("globalAssetId", String(255)),
     Column("parentId", String(255)),
-    Column("description", String(255)),
-    Column("elements", Text())
-    # Column("extensions", String(1024))
+    Column("description", String()),
+    Column("elements", Text()),
+    Column("extensions", String())
 )
 
 deploymentmanager = Table(
-    "deploymentmanager",
+    "deploymentManager",
     metadata,
     Column("updatetime", DateTime),
     Column("createtime", DateTime),
@@ -130,7 +134,7 @@ deploymentmanager = Table(
     Column("oCloudId", ForeignKey("ocloud.oCloudId")),
     Column("name", String(255)),
     Column("description", String(255)),
-    Column("deploymentManagementServiceEndpoint", String(255)),
+    Column("serviceUri", String(255)),
     Column("supportedLocations", String(255)),
     Column("capabilities", String(255)),
     Column("capacity", String(255)),
@@ -152,19 +156,6 @@ 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)),
-)
-
 alarm_definition = Table(
     "alarmDefinition",
     metadata,
@@ -189,7 +180,7 @@ alarm_event_record = Table(
     Column("hash", String(255)),
 
     Column("alarmEventRecordId", String(255), primary_key=True),
-    Column("resourceTypeId", ForeignKey("resourcetype.resourceTypeId")),
+    Column("resourceTypeId", ForeignKey("resourceType.resourceTypeId")),
     Column("resourceId", ForeignKey("resource.resourceId")),
     Column("alarmDefinitionId", ForeignKey(
         "alarmDefinition.alarmDefinitionId")),
@@ -257,7 +248,6 @@ def start_o2ims_mappers(engine=None):
         }
     )
     mapper(subModel.Subscription, subscription)
-    mapper(confModel.Configuration, configuration)
 
     # IMS Infrastruture Monitoring Mappering
     mapper(alarmModel.AlarmEventRecord, alarm_event_record)