X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=o2ims%2Fadapter%2Form.py;h=43b48b001b6ebafeffdfb92ffbebcbfd1d91e469;hb=7b80a6162b616d1cd33d3af4367abfb8d56622d8;hp=29fff79e4b9c5b9b67fa65f19ab3e861db5680e3;hpb=3da89330f3837ac6cffd2cad4c4018c9f8c3327d;p=pti%2Fo2.git

diff --git a/o2ims/adapter/orm.py b/o2ims/adapter/orm.py
index 29fff79..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
@@ -34,6 +36,7 @@ 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.resource_type import ResourceTypeEnum
 
 from o2common.helper import o2logging
@@ -65,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)),
@@ -145,19 +149,27 @@ subscription = Table(
     Column("filter", String(255)),
 )
 
-registration = Table(
-    "registration",
+configuration = Table(
+    "configuration",
     metadata,
     Column("updatetime", DateTime),
     Column("createtime", DateTime),
 
-    Column("registrationId", String(255), primary_key=True),
+    Column("configurationId", String(255), primary_key=True),
+    Column("conftype", String(255)),
     Column("callback", String(255)),
     Column("status", String(255)),
     Column("comments", String(255)),
 )
 
 
+@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")
 
@@ -181,7 +193,7 @@ def start_o2ims_mappers(engine=None):
         }
     )
     mapper(subModel.Subscription, subscription)
-    mapper(subModel.Registration, registration)
+    mapper(confModel.Configuration, configuration)
 
     if engine is not None:
-        metadata.create_all(engine)
+        wait_for_metadata_ready(engine)