Fix verbs in manifestlist

All registry_tests now pass

image/appc/__init__.py

@@ -17,10 +17,10 @@ class AppCImageFormatter(TarImageFormatter):
   Image formatter which produces an tarball according to the AppC specification.
   """
 
-  def stream_generator(self, namespace, repository, tag, synthetic_image_id,
-                       layer_json, get_image_iterator, get_layer_iterator, get_image_json):
+  def stream_generator(self, namespace, repository, tag, repo_image,
+                       synthetic_image_id, get_image_iterator, get_layer_iterator):
     image_mtime = 0
-    created = next(get_image_iterator()).created
+    created = next(get_image_iterator()).v1_metadata.created
     if created is not None:
       image_mtime = calendar.timegm(created.utctimetuple())
 
@@ -29,7 +29,7 @@ class AppCImageFormatter(TarImageFormatter):
     #   rootfs - The root file system
 
     # Yield the manifest.
-    manifest = self._build_manifest(namespace, repository, tag, layer_json, synthetic_image_id)
+    manifest = self._build_manifest(namespace, repository, tag, repo_image, synthetic_image_id)
     yield self.tar_file('manifest', manifest, mtime=image_mtime)
 
     # Yield the merged layer dtaa.
@@ -168,9 +168,9 @@ class AppCImageFormatter(TarImageFormatter):
     return volumes
 
   @staticmethod
-  def _build_manifest(namespace, repository, tag, docker_layer_data, synthetic_image_id):
-    """ Builds an ACI manifest from the docker layer data. """
-
+  def _build_manifest(namespace, repository, tag, repo_image, synthetic_image_id):
+    """ Builds an ACI manifest of an existing repository image. """
+    docker_layer_data = repo_image.compat_metadata
     config = docker_layer_data.get('config', {})
 
     source_url = "%s://%s/%s/%s:%s" % (app.config['PREFERRED_URL_SCHEME'],

image/common.py

@@ -7,19 +7,18 @@ class TarImageFormatter(object):
   Base class for classes which produce a tar containing image and layer data.
   """
 
-  def build_stream(self, namespace, repository, tag, synthetic_image_id, layer_json,
-                   get_image_iterator, get_layer_iterator, get_image_json):
+  def build_stream(self, namespace, repository, tag, repo_image, synthetic_image_id,
+                   get_image_iterator, get_layer_iterator):
     """
     Builds and streams a synthetic .tar.gz that represents the formatted tar created by this class's
     implementation.
     """
-    return GzipWrap(self.stream_generator(namespace, repository, tag,
-                                          synthetic_image_id, layer_json,
-                                          get_image_iterator, get_layer_iterator,
-                                          get_image_json))
+    return GzipWrap(self.stream_generator(namespace, repository, tag, repo_image,
+                                          synthetic_image_id, get_image_iterator,
+                                          get_layer_iterator))
 
-  def stream_generator(self, namespace, repository, tag, synthetic_image_id,
-                       layer_json, get_image_iterator, get_layer_iterator, get_image_json):
+  def stream_generator(self, namespace, repository, tag, repo_image, synthetic_image_id,
+                       get_image_iterator, get_layer_iterator):
     raise NotImplementedError
 
   def tar_file(self, name, contents, mtime=None):

image/docker/schema1.py

@@ -88,7 +88,11 @@ class DockerSchema1Manifest(object):
     self._layers = None
     self._bytes = manifest_bytes
 
-    self._parsed = json.loads(manifest_bytes)
+    try:
+      self._parsed = json.loads(manifest_bytes)
+    except ValueError as ve:
+      raise MalformedSchema1Manifest('malformed manifest data: %s' % ve)
+
     self._signatures = self._parsed[DOCKER_SCHEMA1_SIGNATURES_KEY]
     self._tag = self._parsed[DOCKER_SCHEMA1_REPO_TAG_KEY]
 

image/docker/squashed.py

@@ -28,10 +28,10 @@ class SquashedDockerImageFormatter(TarImageFormatter):
   # daemon dies when trying to load the entire tar into memory.
   SIZE_MULTIPLIER = 1.2
 
-  def stream_generator(self, namespace, repository, tag, synthetic_image_id,
-                       layer_json, get_image_iterator, get_layer_iterator, get_image_json):
+  def stream_generator(self, namespace, repository, tag, repo_image, synthetic_image_id,
+                       get_image_iterator, get_layer_iterator):
     image_mtime = 0
-    created = next(get_image_iterator()).created
+    created = next(get_image_iterator()).v1_metadata.created
     if created is not None:
       image_mtime = calendar.timegm(created.utctimetuple())
 
@@ -58,7 +58,7 @@ class SquashedDockerImageFormatter(TarImageFormatter):
     yield self.tar_folder(synthetic_image_id, mtime=image_mtime)
 
     # Yield the JSON layer data.
-    layer_json = SquashedDockerImageFormatter._build_layer_json(layer_json, synthetic_image_id)
+    layer_json = SquashedDockerImageFormatter._build_layer_json(repo_image, synthetic_image_id)
     yield self.tar_file(synthetic_image_id + '/json', json.dumps(layer_json), mtime=image_mtime)
 
     # Yield the VERSION file.
@@ -70,10 +70,10 @@ class SquashedDockerImageFormatter(TarImageFormatter):
       # In V1 we have the actual uncompressed size, which is needed for back compat with
       # older versions of Docker.
       # In V2, we use the size given in the image JSON.
-      if image.storage.uncompressed_size:
-        estimated_file_size += image.storage.uncompressed_size
+      if image.blob.uncompressed_size:
+        estimated_file_size += image.blob.uncompressed_size
       else:
-        image_json = get_image_json(image)
+        image_json = image.compat_metadata
         estimated_file_size += image_json.get('Size', 0) * SquashedDockerImageFormatter.SIZE_MULTIPLIER
 
     # Make sure the estimated file size is an integer number of bytes.
@@ -112,7 +112,8 @@ class SquashedDockerImageFormatter(TarImageFormatter):
 
 
   @staticmethod
-  def _build_layer_json(layer_json, synthetic_image_id):
+  def _build_layer_json(repo_image, synthetic_image_id):
+    layer_json = repo_image.compat_metadata
     updated_json = copy.deepcopy(layer_json)
     updated_json['id'] = synthetic_image_id