Code Review
/
pti
/
o2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix nfdeployment uninstalling issue
[pti/o2.git]
/
o2ims
/
adapter
/
orm.py
diff --git
a/o2ims/adapter/orm.py
b/o2ims/adapter/orm.py
index
6b290a5
..
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
# 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
from sqlalchemy import (
\r
Table,
\r
MetaData,
\r
@@
-24,9
+25,10
@@
from sqlalchemy import (
# Date,
\r
DateTime,
\r
ForeignKey,
\r
# Date,
\r
DateTime,
\r
ForeignKey,
\r
- Boolean,
\r
+
#
Boolean,
\r
# engine,
\r
# event,
\r
# engine,
\r
# event,
\r
+ exc,
\r
)
\r
\r
from sqlalchemy.orm import mapper, relationship
\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
\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
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("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
Column("oCloudId", ForeignKey("ocloud.oCloudId")),
\r
Column("name", String(255)),
\r
Column("vendor", String(255)),
\r
@@
-145,18
+149,27
@@
subscription = Table(
Column("filter", String(255)),
\r
)
\r
\r
Column("filter", String(255)),
\r
)
\r
\r
-
regist
ration = Table(
\r
- "
regist
ration",
\r
+
configu
ration = Table(
\r
+ "
configu
ration",
\r
metadata,
\r
Column("updatetime", DateTime),
\r
Column("createtime", DateTime),
\r
\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("callback", String(255)),
\r
- Column("notified", Boolean),
\r
+ Column("status", String(255)),
\r
+ Column("comments", String(255)),
\r
)
\r
\r
\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
def start_o2ims_mappers(engine=None):
\r
logger.info("Starting O2 IMS mappers")
\r
\r
@@
-180,7
+193,7
@@
def start_o2ims_mappers(engine=None):
}
\r
)
\r
mapper(subModel.Subscription, subscription)
\r
}
\r
)
\r
mapper(subModel.Subscription, subscription)
\r
- mapper(
subModel.Registration, regist
ration)
\r
+ mapper(
confModel.Configuration, configu
ration)
\r
\r
if engine is not None:
\r
\r
if engine is not None:
\r
-
metadata.create_all
(engine)
\r
+
wait_for_metadata_ready
(engine)
\r