Add subscription and notification for resource changes; fix a bug while pserver node...

[pti/o2.git] / o2ims / adapter / orm.py

diff --git a/o2ims/adapter/orm.py b/o2ims/adapter/orm.py
index 3bae4e8..bb5c984 100644 (file)
--- a/o2ims/adapter/orm.py
+++ b/o2ims/adapter/orm.py
@@ -12,31 +12,42 @@
 #  See the License for the specific language governing permissions and\r
 #  limitations under the License.\r
 \r
-import logging\r
-\r
+# from typing_extensions import Required\r
 from sqlalchemy import (\r
     Table,\r
     MetaData,\r
     Column,\r
-    # Integer,\r
+    Integer,\r
     String,\r
+    Text,\r
+    Enum,\r
     # Date,\r
+    DateTime,\r
     ForeignKey,\r
     # engine,\r
     # event,\r
 )\r
 \r
 from sqlalchemy.orm import mapper, relationship\r
+# from sqlalchemy.sql.sqltypes import Integer\r
 \r
 from o2ims.domain import ocloud as ocloudModel\r
+from o2ims.domain import subscription_obj as subModel\r
+from o2ims.domain.resource_type import ResourceTypeEnum\r
 \r
-logger = logging.getLogger(__name__)\r
+from o2common.helper import o2logging\r
+logger = o2logging.get_logger(__name__)\r
 \r
 metadata = MetaData()\r
 \r
 ocloud = Table(\r
     "ocloud",\r
     metadata,\r
+    Column("updatetime", DateTime),\r
+    Column("createtime", DateTime),\r
+    Column("hash", String(255)),\r
+    Column("version_number", Integer),\r
+\r
     Column("oCloudId", String(255), primary_key=True),\r
     Column("globalcloudId", String(255)),\r
     Column("name", String(255)),\r
@@ -48,7 +59,12 @@ ocloud = Table(
 resourcetype = Table(\r
     "resourcetype",\r
     metadata,\r
+    Column("updatetime", DateTime),\r
+    Column("createtime", DateTime),\r
+    Column("hash", String(255)),\r
+\r
     Column("resourceTypeId", String(255), primary_key=True),\r
+    Column("resourceTypeEnum", Enum(ResourceTypeEnum), nullable=False),\r
     Column("oCloudId", ForeignKey("ocloud.oCloudId")),\r
     Column("name", String(255)),\r
     Column("vendor", String(255)),\r
@@ -61,6 +77,11 @@ resourcetype = Table(
 resourcepool = Table(\r
     "resourcepool",\r
     metadata,\r
+    Column("updatetime", DateTime),\r
+    Column("createtime", DateTime),\r
+    Column("hash", String(255)),\r
+    Column("version_number", Integer),\r
+\r
     Column("resourcePoolId", String(255), primary_key=True),\r
     Column("oCloudId", ForeignKey("ocloud.oCloudId")),\r
     Column("globalLocationId", String(255)),\r
@@ -74,19 +95,30 @@ resourcepool = Table(
 resource = Table(\r
     "resource",\r
     metadata,\r
+    Column("updatetime", DateTime),\r
+    Column("createtime", DateTime),\r
+    Column("hash", String(255)),\r
+    Column("version_number", Integer),\r
+\r
     Column("resourceId", String(255), primary_key=True),\r
     Column("resourceTypeId", ForeignKey("resourcetype.resourceTypeId")),\r
     Column("resourcePoolId", ForeignKey("resourcepool.resourcePoolId")),\r
-    # Column("oCloudId", ForeignKey("ocloud.oCloudId")),\r
+    Column("name", String(255)),\r
+    # Column("globalAssetId", String(255)),\r
     Column("parentId", String(255)),\r
     Column("description", String(255)),\r
-    # Column("elements", String(255))\r
+    Column("elements", Text())\r
     # Column("extensions", String(1024))\r
 )\r
 \r
 deploymentmanager = Table(\r
     "deploymentmanager",\r
     metadata,\r
+    Column("updatetime", DateTime),\r
+    Column("createtime", DateTime),\r
+    Column("hash", String(255)),\r
+    Column("version_number", Integer),\r
+\r
     Column("deploymentManagerId", String(255), primary_key=True),\r
     Column("oCloudId", ForeignKey("ocloud.oCloudId")),\r
     Column("name", String(255)),\r
@@ -101,6 +133,11 @@ deploymentmanager = Table(
 subscription = Table(\r
     "subscription",\r
     metadata,\r
+    Column("updatetime", DateTime),\r
+    Column("createtime", DateTime),\r
+    Column("hash", String(255)),\r
+    Column("version_number", Integer),\r
+\r
     Column("subscriptionId", String(255), primary_key=True),\r
     Column("callback", String(255)),\r
     Column("consumerSubscriptionId", String(255)),\r
@@ -130,7 +167,7 @@ def start_o2ims_mappers(engine=None):
             "resourcePools": relationship(resourcepool_mapper)\r
         }\r
     )\r
-    mapper(ocloudModel.Subscription, subscription)\r
+    mapper(subModel.Subscription, subscription)\r
 \r
     if engine is not None:\r
         metadata.create_all(engine)\r