Merge remote-tracking branch 'upstream/phase4-11-07-2015' into python-registry-v2

data/model/image.py

@@ -281,10 +281,7 @@ def set_image_metadata(docker_image_id, namespace_name, repository_name, created
     except Image.DoesNotExist:
       raise DataModelException('No image with specified id and repository')
 
-    # We cleanup any old checksum in case it's a retry after a fail
-    fetched.storage.checksum = None
     fetched.created = datetime.now()
-
     if created_date_str is not None:
       try:
         fetched.created = dateutil.parser.parse(created_date_str).replace(tzinfo=None)
@@ -292,12 +289,17 @@ def set_image_metadata(docker_image_id, namespace_name, repository_name, created
         # parse raises different exceptions, so we cannot use a specific kind of handler here.
         pass
 
+    # We cleanup any old checksum in case it's a retry after a fail
+    fetched.v1_checksum = None
+    fetched.storage.content_checksum = None
+
     fetched.comment = comment
     fetched.command = command
     fetched.v1_json_metadata = v1_json_metadata
 
     if parent:
       fetched.ancestors = '%s%s/' % (parent.ancestors, parent.id)
+      fetched.parent = parent
 
     fetched.save()
     return fetched
@@ -363,7 +365,8 @@ def get_repo_image_by_storage_checksum(namespace, repository_name, storage_check
             .join(Repository)
             .join(Namespace, on=(Namespace.id == Repository.namespace_user))
             .where(Repository.name == repository_name, Namespace.username == namespace,
-                   ImageStorage.checksum == storage_checksum, ImageStorage.uploading == False)
+                   ImageStorage.content_checksum == storage_checksum,
+                   ImageStorage.uploading == False)
             .get())
   except Image.DoesNotExist:
     msg = 'Image with storage checksum {0} does not exist in repo {1}/{2}'.format(storage_checksum,