X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fadapter%2Form.py;h=43b48b001b6ebafeffdfb92ffbebcbfd1d91e469;hb=23021f6c24ad8722495fc42f98a18cc650906bca;hp=0e037277c0894f1d82a07cdc30e7657b3bc7d9ae;hpb=e8b92f588d57297d7435d3d230b89c22111cb719;p=pti%2Fo2.git

diff --git a/o2ims/adapter/orm.py b/o2ims/adapter/orm.py
index 0e03727..43b48b0 100644
--- a/o2ims/adapter/orm.py
+++ b/o2ims/adapter/orm.py
@@ -13,6 +13,7 @@
 #  limitations under the License.
 
 # from typing_extensions import Required
+from retry import retry
 from sqlalchemy import (
     Table,
     MetaData,
@@ -27,6 +28,7 @@ from sqlalchemy import (
     # Boolean,
     # engine,
     # event,
+    exc,
 )
 
 from sqlalchemy.orm import mapper, relationship
@@ -66,7 +68,8 @@ resourcetype = Table(
     Column("hash", String(255)),
 
     Column("resourceTypeId", String(255), primary_key=True),
-    Column("resourceTypeEnum", Enum(ResourceTypeEnum), nullable=False),
+    Column("resourceTypeEnum", Enum(
+        ResourceTypeEnum, native_enum=False), nullable=False),
     Column("oCloudId", ForeignKey("ocloud.oCloudId")),
     Column("name", String(255)),
     Column("vendor", String(255)),
@@ -160,6 +163,13 @@ configuration = Table(
 )
 
 
+@retry((exc.IntegrityError), tries=3, delay=2)
+def wait_for_metadata_ready(engine):
+    # wait for mapper ready
+    metadata.create_all(engine, checkfirst=True)
+    logger.info("metadata is ready")
+
+
 def start_o2ims_mappers(engine=None):
     logger.info("Starting O2 IMS mappers")
 
@@ -186,4 +196,4 @@ def start_o2ims_mappers(engine=None):
     mapper(confModel.Configuration, configuration)
 
     if engine is not None:
-        metadata.create_all(engine, checkfirst=True)
+        wait_for_metadata_ready(engine)