From 856bbb009a47077d00fd7a1950c4d9fb2b0e6d6e Mon Sep 17 00:00:00 2001 From: Serg Melikyan Date: Mon, 11 Mar 2013 15:01:47 +0400 Subject: [PATCH] Issue with deleting Environment --- portas/portas/db/models.py | 24 ++---------------------- 1 file changed, 2 insertions(+), 22 deletions(-) diff --git a/portas/portas/db/models.py b/portas/portas/db/models.py index 51eb965..3ad8e87 100644 --- a/portas/portas/db/models.py +++ b/portas/portas/db/models.py @@ -111,26 +111,6 @@ class Environment(BASE, ModelBase): return dictionary -class Service(BASE, ModelBase): - """ - Represents an instance of service. - - :var name: string - :var type: string - type of service (e.g. Active Directory) - """ - - __tablename__ = 'service' - - id = Column(String(32), primary_key=True, default=uuidutils.generate_uuid) - name = Column(String(255), index=True, nullable=False) - type = Column(String(255), index=True, nullable=False) - environment_id = Column(String(32), ForeignKey('environment.id')) - environment = relationship(Environment, - backref=backref('service'), - uselist=False) - description = Column(JsonBlob(), nullable=False) - - class Session(BASE, ModelBase): __tablename__ = 'session' @@ -164,7 +144,7 @@ def register_models(engine): """ Creates database tables for all models with the given engine """ - models = (Environment, Service) + models = (Environment, Status, Session) for model in models: model.metadata.create_all(engine) @@ -173,6 +153,6 @@ def unregister_models(engine): """ Drops database tables for all models with the given engine """ - models = (Environment, Service) + models = (Environment, Status, Session) for model in models: model.metadata.drop_all(engine)