Fix: the resource's parameter 'parentId' is resourcepool ID

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

diff --git a/o2ims/adapter/orm.py b/o2ims/adapter/orm.py
index 29fff79..43b48b0 100644 (file)
--- a/o2ims/adapter/orm.py
+++ b/o2ims/adapter/orm.py
@@ -13,6 +13,7 @@
 #  limitations under the License.\r
 \r
 # from typing_extensions import Required\r
+from retry import retry\r
 from sqlalchemy import (\r
     Table,\r
     MetaData,\r
@@ -27,6 +28,7 @@ from sqlalchemy import (
     # Boolean,\r
     # engine,\r
     # event,\r
+    exc,\r
 )\r
 \r
 from sqlalchemy.orm import mapper, relationship\r
@@ -34,6 +36,7 @@ from sqlalchemy.orm import mapper, relationship
 \r
 from o2ims.domain import ocloud as ocloudModel\r
 from o2ims.domain import subscription_obj as subModel\r
+from o2ims.domain import configuration_obj as confModel\r
 from o2ims.domain.resource_type import ResourceTypeEnum\r
 \r
 from o2common.helper import o2logging\r
@@ -65,7 +68,8 @@ resourcetype = Table(
     Column("hash", String(255)),\r
 \r
     Column("resourceTypeId", String(255), primary_key=True),\r
-    Column("resourceTypeEnum", Enum(ResourceTypeEnum), nullable=False),\r
+    Column("resourceTypeEnum", Enum(\r
+        ResourceTypeEnum, native_enum=False), nullable=False),\r
     Column("oCloudId", ForeignKey("ocloud.oCloudId")),\r
     Column("name", String(255)),\r
     Column("vendor", String(255)),\r
@@ -145,19 +149,27 @@ subscription = Table(
     Column("filter", String(255)),\r
 )\r
 \r
-registration = Table(\r
-    "registration",\r
+configuration = Table(\r
+    "configuration",\r
     metadata,\r
     Column("updatetime", DateTime),\r
     Column("createtime", DateTime),\r
 \r
-    Column("registrationId", String(255), primary_key=True),\r
+    Column("configurationId", String(255), primary_key=True),\r
+    Column("conftype", String(255)),\r
     Column("callback", String(255)),\r
     Column("status", String(255)),\r
     Column("comments", String(255)),\r
 )\r
 \r
 \r
+@retry((exc.IntegrityError), tries=3, delay=2)\r
+def wait_for_metadata_ready(engine):\r
+    # wait for mapper ready\r
+    metadata.create_all(engine, checkfirst=True)\r
+    logger.info("metadata is ready")\r
+\r
+\r
 def start_o2ims_mappers(engine=None):\r
     logger.info("Starting O2 IMS mappers")\r
 \r
@@ -181,7 +193,7 @@ def start_o2ims_mappers(engine=None):
         }\r
     )\r
     mapper(subModel.Subscription, subscription)\r
-    mapper(subModel.Registration, registration)\r
+    mapper(confModel.Configuration, configuration)\r
 \r
     if engine is not None:\r
-        metadata.create_all(engine)\r
+        wait_for_metadata_ready(engine)\r