Synchronize Run

python/lsst/butler/registry.py

@@ -267,15 +267,15 @@ def makeRun(self, collection):
         run: `Run`
             A new `Run` instance.
         """
-        run = Run(runId=Run.getNewId(), registryId=self.id, collection=collection, environmentId=None, pipelineId=None)
+        run = Run(runId=Run.getNewId(), registryId=self.id, collection=collection, environment=None, pipeline=None)
 
         with self.engine.begin() as connection:
             insert = RunTable.insert().values(
                 run_id=run.runId,
                 registry_id=run.registryId,
                 collection=run.collection,
-                environment_id=run.environmentId,
-                pipeline_id=run.pipelineId
+                environment_id=run.environment,
+                pipeline_id=run.pipeline
             )
             connection.execute(insert)
 
@@ -293,7 +293,7 @@ def updateRun(self, run):
         with self.engine.begin() as connection:
             # TODO: should it also update the collection?
             connection.execute(RunTable.update().where(and_(RunTable.c.run_id == run.runId, RunTable.c.registry_id == run.registryId)).values(
-                environment_id = run.environmentId, pipeline_id = run.pipelineId))
+                environment_id = run.environment, pipeline_id = run.pipeline))
 
     def getRun(self, collection=None, id=None):
         """
@@ -320,10 +320,10 @@ def getRun(self, collection=None, id=None):
                 runId = result[RunTable.c.run_id]
                 registryId = result[RunTable.c.registry_id]
                 collection = result[RunTable.c.collection]
-                environmentId = result[RunTable.c.environment_id]
-                pipelineId = result[RunTable.c.pipeline_id]
+                environment = result[RunTable.c.environment_id]
+                pipeline = result[RunTable.c.pipeline_id]
 
-                return Run(runId, self.id, collection, environmentId, pipelineId)
+                return Run(runId, self.id, collection, environment, pipeline)
             else:
                 return None
 

python/lsst/butler/run.py

@@ -32,16 +32,16 @@ def getNewId(cls):
         cls._currentId += 1
         return cls._currentId
 
-    __slots__ = ("_runId", "_registryId", "_collection", "_environmentId", "_pipelineId")
+    __slots__ = ("_runId", "_registryId", "_collection", "_environment", "_pipeline")
     __eq__ = slotValuesAreEqual
     __hash__ = slotValuesToHash
 
-    def __init__(self, runId, registryId, collection, environmentId, pipelineId):
+    def __init__(self, runId, registryId, collection, environment, pipeline):
         self._runId = runId
         self._registryId = registryId
         self._collection = collection
-        self._environmentId = environmentId
-        self._pipelineId = pipelineId
+        self._environment = environment
+        self._pipeline = pipeline
 
     @property
     def pkey(self):
@@ -60,9 +60,9 @@ def collection(self):
         return self._collection
 
     @property
-    def environmentId(self):
-        return self._environmentId
+    def environment(self):
+        return self._environment
 
     @property
-    def pipelineId(self):
-        return self._pipelineId
+    def pipeline(self):
+        return self._pipeline