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

diff --git a/o2ims/adapter/orm.py b/o2ims/adapter/orm.py
index 3bae4e8..7aafde5 100644
--- a/o2ims/adapter/orm.py
+++ b/o2ims/adapter/orm.py
@@ -12,31 +12,37 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 
-import logging
-
 from sqlalchemy import (
     Table,
     MetaData,
     Column,
-    # Integer,
+    Integer,
     String,
     # Date,
+    DateTime,
     ForeignKey,
     # engine,
     # event,
 )
 
 from sqlalchemy.orm import mapper, relationship
+# from sqlalchemy.sql.sqltypes import Integer
 
 from o2ims.domain import ocloud as ocloudModel
 
-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,6 +54,10 @@ ocloud = Table(
 resourcetype = Table(
     "resourcetype",
     metadata,
+    Column("updatetime", DateTime),
+    Column("createtime", DateTime),
+    Column("hash", String(255)),
+
     Column("resourceTypeId", String(255), primary_key=True),
     Column("oCloudId", ForeignKey("ocloud.oCloudId")),
     Column("name", String(255)),
@@ -61,6 +71,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,9 +89,15 @@ 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("globalAssetId", String(255)),
     # Column("oCloudId", ForeignKey("ocloud.oCloudId")),
     Column("parentId", String(255)),
     Column("description", String(255)),
@@ -87,6 +108,11 @@ resource = Table(
 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,6 +127,11 @@ 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)),