Changed naming of some schema columns

shared/workspaces/src/workspaces/schema.py

@@ -13,7 +13,7 @@ from sqlalchemy import create_engine
 from sqlalchemy.orm import relationship, sessionmaker
 from sqlalchemy.ext.declarative import declarative_base
 
-from .capability_interfaces import CapabilityIF, CapabilityExecutionIF, ParametersIF, \
+from .capability_interfaces import CapabilityIF, CapabilityExecutionIF, ParameterIF, \
     CapabilityRequestIF
 from .product_interfaces import FutureProductIF
 
@@ -106,18 +106,18 @@ class Capability(Base, CapabilityIF):
     """
     __tablename__ = 'capabilities'
     id = sa.Column('capability_id', sa.Integer, primary_key=True)
-    capability_name = sa.Column('capability_name', sa.String)
-    capability_steps = sa.Column('capability_steps', sa.String)
+    name = sa.Column('capability_name', sa.String)
+    steps = sa.Column('capability_steps', sa.String)
     max_jobs = sa.Column('max_jobs', sa.Integer)
 
     def create_request(
-            self, parameters: ParametersIF, future_products: FutureProductIF, versions: str
+            self, parameters: ParameterIF, future_products: FutureProductIF, versions: str
     ):
         """
         Create a new request for this capability with specific options
         """
         return CapabilityRequest(
-            capability=self.capability_name,
+            capability=self.id,
             parameters=parameters.json(),
             future_products=future_products,
             versions=versions
@@ -132,9 +132,9 @@ class CapabilityRequest(Base, CapabilityRequestIF):
     __tablename__ = 'capability_requests'
     id = sa.Column('request_id', sa.Integer, primary_key=True)
     capability = sa.Column(
-        'capability_name',
-        sa.String,
-        sa.ForeignKey('capabilities.capability_name')
+        'capability',
+        sa.Integer,
+        sa.ForeignKey('capabilities.id')
     )
     parameters = sa.Column('parameters', sa.String)
     # FIXME: This needs to be changed to properly keep track of product locators.