Add auditor for resource pool, pserver and cpu/memory/port/interface for pserver...

[pti/o2.git] / o2ims / adapter / orm.py

diff --git a/o2ims/adapter/orm.py b/o2ims/adapter/orm.py
index 7aafde5..05a8dc7 100644 (file)
--- a/o2ims/adapter/orm.py
+++ b/o2ims/adapter/orm.py
@@ -12,12 +12,15 @@
 #  See the License for the specific language governing permissions and\r
 #  limitations under the License.\r
 \r
+# from typing_extensions import Required\r
 from sqlalchemy import (\r
     Table,\r
     MetaData,\r
     Column,\r
     Integer,\r
     String,\r
+    Text,\r
+    Enum,\r
     # Date,\r
     DateTime,\r
     ForeignKey,\r
@@ -29,6 +32,7 @@ from sqlalchemy.orm import mapper, relationship
 # from sqlalchemy.sql.sqltypes import Integer\r
 \r
 from o2ims.domain import ocloud as ocloudModel\r
+from o2ims.domain.resource_type import ResourceTypeEnum\r
 \r
 from o2common.helper import o2logging\r
 logger = o2logging.get_logger(__name__)\r
@@ -59,6 +63,7 @@ resourcetype = Table(
     Column("hash", String(255)),\r
 \r
     Column("resourceTypeId", String(255), primary_key=True),\r
+    Column("resourceTypeEnum", Enum(ResourceTypeEnum), nullable=False),\r
     Column("oCloudId", ForeignKey("ocloud.oCloudId")),\r
     Column("name", String(255)),\r
     Column("vendor", String(255)),\r
@@ -98,10 +103,9 @@ resource = Table(
     Column("resourceTypeId", ForeignKey("resourcetype.resourceTypeId")),\r
     Column("resourcePoolId", ForeignKey("resourcepool.resourcePoolId")),\r
     # Column("globalAssetId", String(255)),\r
-    # Column("oCloudId", ForeignKey("ocloud.oCloudId")),\r
     Column("parentId", String(255)),\r
     Column("description", String(255)),\r
-    # Column("elements", String(255))\r
+    Column("elements", Text())\r
     # Column("extensions", String(1024))\r
 )\r
 \r