Skip to content
Snippets Groups Projects
Commit 1f4ae1a6 authored by Nathan Hertz's avatar Nathan Hertz
Browse files

Finished adding enabled column to Capability

parent 427fc99a
No related branches found
No related tags found
No related merge requests found
......@@ -22,7 +22,7 @@ def upgrade():
sa.Column("capability_name", sa.String, primary_key=True),
sa.Column("capability_steps", sa.String),
sa.Column("max_jobs", sa.Integer),
sa.Column("enabled", sa.Boolean, server_default="True"),
sa.Column("enabled", sa.Boolean, default=True, server_default="true"),
)
op.create_table(
......
def test_placeholder():
pass
\ No newline at end of file
......@@ -54,7 +54,7 @@ class Capability(Base, CapabilityIF):
name = sa.Column("capability_name", sa.String, primary_key=True)
steps = sa.Column("capability_steps", sa.String)
max_jobs = sa.Column("max_jobs", sa.Integer)
enabled = sa.Column("enabled", sa.Boolean, default=True)
enabled = sa.Column("enabled", sa.Boolean, default=True, server_default="true")
requests = relationship("CapabilityRequest", back_populates="capability")
@classmethod
......@@ -82,6 +82,8 @@ class Capability(Base, CapabilityIF):
self.name = json_dict["name"]
self.max_jobs = json_dict["max_jobs"]
self.steps = json_dict["steps"]
self.enabled = json_dict.get("enabled", True)
return self
@staticmethod
......@@ -119,11 +121,12 @@ class Capability(Base, CapabilityIF):
"name": self.name,
"max_jobs": self.max_jobs,
"steps": str(self.steps),
"enabled": self.enabled,
}
def __str__(self):
return (
f"Capability object with name {self.name} and max simultaneous jobs of {self.max_jobs}"
f"Capability: {self.name}, max concurrent jobs of {self.max_jobs}"
f"\nSequence: {self.steps}"
)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment