From 5fa5fcdd061de0dcbb420bc3d4dda46535df7f63 Mon Sep 17 00:00:00 2001
From: Adam Miller <admiller@redhat.com>
Date: Jun 06 2015 18:45:48 +0000
Subject: Update compose, phases{buildinstall,createiso,gather/__ini__} to use correct productmd API calls


---

diff --git a/pungi/compose.py b/pungi/compose.py
index 654527a..eaf1113 100644
--- a/pungi/compose.py
+++ b/pungi/compose.py
@@ -27,27 +27,28 @@ import tempfile
 import shutil
 
 import kobo.log
-from productmd.composeinfo import Compose
+from productmd.composeinfo import ComposeInfo
 from productmd.images import Images
 
 from pungi.wrappers.variants import VariantsXmlParser
 from pungi.paths import Paths
 from pungi.wrappers.scm import get_file_from_scm
 from pungi.util import makedirs
-from pungi.metadata import compose_to_composeinfo
 
 
 def get_compose_dir(topdir, conf, compose_type="production", compose_date=None, compose_respin=None, compose_label=None, already_exists_callbacks=None):
-    topdir = os.path.abspath(topdir)
     already_exists_callbacks = already_exists_callbacks or []
 
     # create an incomplete composeinfo to generate compose ID
-    ci = Compose()
-    ci.product.name = conf["product_name"]
-    ci.product.short = conf["product_short"]
-    ci.product.version = conf["product_version"]
-    ci.product.is_layered = bool(conf.get("product_is_layered", False))
-    if ci.product.is_layered:
+    ci = ComposeInfo()
+    ci.compose.name = conf["product_name"]
+    ci.release.name = conf["product_name"]
+    ci.compose.short = conf["product_short"]
+    ci.release.short = conf["product_short"]
+    ci.compose.version = conf["product_version"]
+    ci.release.version = conf["product_version"]
+    ci.compose.is_layered = bool(conf.get("product_is_layered", False))
+    if ci.compose.is_layered:
         ci.base_product.name = conf["base_product_name"]
         ci.base_product.short = conf["base_product_short"]
         ci.base_product.version = conf["base_product_version"]
@@ -57,9 +58,6 @@ def get_compose_dir(topdir, conf, compose_type="production", compose_date=None, 
     ci.compose.date = compose_date or time.strftime("%Y%m%d", time.localtime())
     ci.compose.respin = compose_respin or 0
 
-    # HACK - add topdir for callbacks
-    ci.topdir = topdir
-
     while 1:
         ci.compose.id = ci.create_compose_id()
 
@@ -113,7 +111,7 @@ class Compose(kobo.log.LoggingBase):
         self.paths = Paths(self)
 
         # to provide compose_id, compose_date and compose_respin
-        self.ci_base = Compose()
+        self.ci_base = ComposeInfo()
         self.ci_base.load(os.path.join(self.paths.work.topdir(arch="global"), "composeinfo-base.json"))
 
         self.supported = supported
@@ -121,7 +119,7 @@ class Compose(kobo.log.LoggingBase):
             self.log_info("Automatically setting 'supported' flag for a Release Candidate (%s) compose." % self.compose_label)
             self.supported = True
 
-        self.im = ImageManifest()
+        self.im = Images()
         if self.DEBUG:
             try:
                 self.im.load(self.paths.compose.metadata("images.json"))
@@ -198,7 +196,10 @@ class Compose(kobo.log.LoggingBase):
         self.variants = VariantsXmlParser(file_obj, tree_arches).parse()
 
         # populate ci_base with variants - needed for layered-products (compose_id)
-        self.ci_base = compose_to_composeinfo(self)
+        ####FIXME - compose_to_composeinfo is no longer needed and has been
+        ####        removed, but I'm not entirely sure what this is needed for
+        ####        or if it is at all
+        #self.ci_base = compose_to_composeinfo(self)
 
     def get_variants(self, types=None, arch=None, recursive=False):
         result = []
diff --git a/pungi/phases/buildinstall.py b/pungi/phases/buildinstall.py
index 1a60607..a1d5d7a 100644
--- a/pungi/phases/buildinstall.py
+++ b/pungi/phases/buildinstall.py
@@ -26,7 +26,7 @@ import errno
 
 from kobo.threads import ThreadPool, WorkerThread
 from kobo.shortcuts import run, read_checksum_file, relative_path
-from productmd.imagemanifest import Image
+from productmd.images import Image
 
 from pungi.util import get_buildroot_rpms, get_volid
 from pungi.wrappers.lorax import LoraxWrapper
diff --git a/pungi/phases/createiso.py b/pungi/phases/createiso.py
index 79ed6f5..551f85f 100644
--- a/pungi/phases/createiso.py
+++ b/pungi/phases/createiso.py
@@ -23,7 +23,7 @@ import shutil
 
 import koji
 import productmd.treeinfo
-from productmd.imagemanifest import Image
+from productmd.images import Image
 from kobo.threads import ThreadPool, WorkerThread
 from kobo.shortcuts import run, read_checksum_file, relative_path
 
diff --git a/pungi/phases/gather/__init__.py b/pungi/phases/gather/__init__.py
index 9bed7b0..5677ec4 100644
--- a/pungi/phases/gather/__init__.py
+++ b/pungi/phases/gather/__init__.py
@@ -21,7 +21,7 @@ import shutil
 import json
 
 from kobo.rpmlib import parse_nvra
-from productmd import RpmManifest
+from productmd.rpms import Rpms
 
 from pungi.wrappers.scm import get_file_from_scm
 from link import link_files
@@ -112,7 +112,7 @@ class GatherPhase(PhaseBase):
         pkg_map = gather_wrapper(self.compose, self.pkgset_phase.package_sets, self.pkgset_phase.path_prefix)
 
         manifest_file = self.compose.paths.compose.metadata("rpms.json")
-        manifest = RpmManifest()
+        manifest = Rpms()
         manifest.compose.id = self.compose.compose_id
         manifest.compose.type = self.compose.compose_type
         manifest.compose.date = self.compose.compose_date