Fix: INF-254 ENUM type create failed while re-creating a pod

1. Stop using psql 'type' creation that maps the object to DB, replace to varchar

Issue-ID: INF-254
Signed-off-by: Zhang Rong(Jon) <rong.zhang@windriver.com>
Change-Id: Ic841e08ed2186bab2c2f70fb274178aec81a9d4d

diff --git a/o2ims/adapter/clients/orm_stx.py b/o2ims/adapter/clients/orm_stx.py
index dd65402..2d58b8b 100644 (file)
--- a/o2ims/adapter/clients/orm_stx.py
+++ b/o2ims/adapter/clients/orm_stx.py
@@ -44,7 +44,7 @@ stxobject = Table(
     "stxcache",\r
     metadata,\r
     Column("id", String(255), primary_key=True),\r
-    Column("type", Enum(ResourceTypeEnum)),\r
+    Column("type", Enum(ResourceTypeEnum, native_enum=False)),\r
     Column("name", String(255)),\r
     Column("updatetime", DateTime),\r
     Column("createtime", DateTime),\r

diff --git a/o2ims/adapter/orm.py b/o2ims/adapter/orm.py
index 0e03727..6c4a678 100644 (file)
--- a/o2ims/adapter/orm.py
+++ b/o2ims/adapter/orm.py
@@ -66,7 +66,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