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

data/model/blob.py

@@ -17,7 +17,8 @@ def get_repo_blob_by_digest(namespace, repo_name, blob_digest):
                     .join(Repository)
                     .join(Namespace, on=(Namespace.id == Repository.namespace_user))
                     .where(Repository.name == repo_name, Namespace.username == namespace,
-                           ImageStorage.checksum == blob_digest, ImageStorage.uploading == False))
+                           ImageStorage.content_checksum == blob_digest,
+                           ImageStorage.uploading == False))
   if not placements:
     raise BlobDoesNotExist('Blob does not exist with digest: {0}'.format(blob_digest))
 
@@ -35,13 +36,14 @@ def store_blob_record_and_temp_link(namespace, repo_name, blob_digest, location_
   with db_transaction():
     repo = _basequery.get_existing_repository(namespace, repo_name)
     try:
-      storage = ImageStorage.get(checksum=blob_digest)
+      storage = ImageStorage.get(content_checksum=blob_digest)
       storage.image_size = byte_count
       storage.save()
 
       ImageStoragePlacement.get(storage=storage, location=location_obj)
     except ImageStorage.DoesNotExist:
-      storage = ImageStorage.create(checksum=blob_digest, uploading=False, image_size=byte_count)
+      storage = ImageStorage.create(content_checksum=blob_digest, uploading=False,
+                                    image_size=byte_count)
       ImageStoragePlacement.create(storage=storage, location=location_obj)
     except ImageStoragePlacement.DoesNotExist:
       ImageStoragePlacement.create(storage=storage, location=location_obj)

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,

data/model/notification.py

@@ -113,12 +113,13 @@ def delete_matching_notifications(target, kind_name, **kwargs):
     notification.delete_instance()
 
 
-def create_repo_notification(repo, event_name, method_name, config, title=None):
+def create_repo_notification(repo, event_name, method_name, method_config, event_config, title=None):
   event = ExternalNotificationEvent.get(ExternalNotificationEvent.name == event_name)
   method = ExternalNotificationMethod.get(ExternalNotificationMethod.name == method_name)
 
   return RepositoryNotification.create(repository=repo, event=event, method=method,
-                                       config_json=json.dumps(config), title=title)
+                                       config_json=json.dumps(method_config), title=title,
+                                       event_config_json=json.dumps(event_config))
 
 
 def get_repo_notification(uuid):

data/model/storage.py

@@ -209,33 +209,18 @@ def get_storage_by_uuid(storage_uuid):
     raise InvalidImageException('No storage found with uuid: %s', storage_uuid)
 
 
-def get_repo_storage_by_checksum(namespace, repository_name, checksum):
-  def filter_to_repo_and_checksum(query):
-    return (query
-            .join(Image)
-            .join(Repository)
-            .join(Namespace, on=(Repository.namespace_user == Namespace.id))
-            .where(Repository.name == repository_name, Namespace.username == namespace,
-                   ImageStorage.checksum == checksum))
-
-  try:
-    return _get_storage(filter_to_repo_and_checksum)
-  except InvalidImageException:
-    raise InvalidImageException('No storage found with checksum {0}'.format(checksum))
-
-
 def get_layer_path(storage_record):
   """ Returns the path in the storage engine to the layer data referenced by the storage row. """
   store = config.store
   if not storage_record.cas_path:
     return store.v1_image_layer_path(storage_record.uuid)
 
-  return store.blob_path(storage_record.checksum)
+  return store.blob_path(storage_record.content_checksum)
 
-def lookup_repo_storages_by_checksum(repo, checksums):
+def lookup_repo_storages_by_content_checksum(repo, checksums):
   """ Looks up repository storages (without placements) matching the given repository
       and checksum. """
   return (ImageStorage
           .select()
           .join(Image)
-          .where(Image.repository == repo, ImageStorage.checksum << checksums))
+          .where(Image.repository == repo, ImageStorage.content_checksum << checksums))