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
Move registration API to configuration
[pti/o2.git]
/
o2ims
/
adapter
/
orm.py
diff --git
a/o2ims/adapter/orm.py
b/o2ims/adapter/orm.py
index
29fff79
..
f59a235
100644
(file)
--- a/
o2ims/adapter/orm.py
+++ b/
o2ims/adapter/orm.py
@@
-34,6
+34,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
@@
-145,13
+146,14
@@
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("status", String(255)),
\r
Column("comments", String(255)),
\r
Column("callback", String(255)),
\r
Column("status", String(255)),
\r
Column("comments", String(255)),
\r
@@
-181,7
+183,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
metadata.create_all(engine)
\r
\r
if engine is not None:
\r
metadata.create_all(engine)
\r