There was really no need for the init_guest() method
in RHEV-M, as the appropriate things could be done
at the beginning of build_image. Just remove init_guest()
and push the code down into build_image.
Signed-off-by: Chris Lalancette <clalance(a)redhat.com>
---
imgfac/builders/Fedora_rhevm_Builder.py | 16 +++++++++-------
imgfac/builders/RHEL5_rhevm_Builder.py | 10 ++--------
imgfac/builders/RHEL6_rhevm_Builder.py | 10 ++--------
3 files changed, 13 insertions(+), 23 deletions(-)
diff --git a/imgfac/builders/Fedora_rhevm_Builder.py
b/imgfac/builders/Fedora_rhevm_Builder.py
index b1a8345..171de52 100644
--- a/imgfac/builders/Fedora_rhevm_Builder.py
+++ b/imgfac/builders/Fedora_rhevm_Builder.py
@@ -14,7 +14,7 @@
# limitations under the License.
import zope
-import oz.Fedora
+import oz.GuestFactory
import oz.TDL
import re
import guestfs
@@ -46,13 +46,16 @@ class Fedora_rhevm_Builder(BaseBuilder):
# populate a config object to pass to OZ; this allows us to specify our
# own output dir but inherit other Oz behavior
- self.oz_config = ConfigParser.SafeConfigParser()
- self.oz_config.read("/etc/oz/oz.cfg")
- self.oz_config.set('paths', 'output_dir',
self.app_config["imgdir"])
+ oz_config = ConfigParser.SafeConfigParser()
+ oz_config.read("/etc/oz/oz.cfg")
+ oz_config.set('paths', 'output_dir',
self.app_config["imgdir"])
- def init_guest(self):
- self.guest = oz.Fedora.get_class(self.tdlobj, self.oz_config, None)
+ self.guest = oz.GuestFactory.guest_factory(self.tdlobj, oz_config, None)
self.guest.diskimage = self.app_config["imgdir"] +
"/base-image-" + self.new_image_id + ".dsk"
+ # Oz assumes unique names - TDL built for multiple backends guarantees
+ # they are not unique. We don't really care about the name so just
+ # force uniqueness
+ self.guest.name = self.guest.name + "-" + self.new_image_id
def log_exc(self):
self.log.debug("Exception caught in ImageFactory")
@@ -60,7 +63,6 @@ class Fedora_rhevm_Builder(BaseBuilder):
def build_image(self, build_id=None):
try:
- self.init_guest()
self.build_upload(build_id)
except:
self.log_exc()
diff --git a/imgfac/builders/RHEL5_rhevm_Builder.py
b/imgfac/builders/RHEL5_rhevm_Builder.py
index f5e86a1..a5b2101 100644
--- a/imgfac/builders/RHEL5_rhevm_Builder.py
+++ b/imgfac/builders/RHEL5_rhevm_Builder.py
@@ -12,14 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import oz.RHEL_5
-import ConfigParser
from Fedora_rhevm_Builder import Fedora_rhevm_Builder
class RHEL5_rhevm_Builder(Fedora_rhevm_Builder):
- def init_guest(self):
- self.guest = oz.RHEL_5.get_class(self.tdlobj, self.oz_config, None)
- self.guest.diskimage = self.app_config["imgdir"] +
"/base-image-" + self.new_image_id + ".dsk"
- # Oz assumes unique names - TDL built for multiple backends guarantees they are
not unique
- # We don't really care about the name so just force uniqueness
- self.guest.name = self.guest.name + "-" + self.new_image_id
+ def __init__(self, template, target):
+ super(RHEL5_rhevm_Builder, self).__init__(template, target)
diff --git a/imgfac/builders/RHEL6_rhevm_Builder.py
b/imgfac/builders/RHEL6_rhevm_Builder.py
index 1fa65e8..953b4b1 100644
--- a/imgfac/builders/RHEL6_rhevm_Builder.py
+++ b/imgfac/builders/RHEL6_rhevm_Builder.py
@@ -12,14 +12,8 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-import oz.RHEL_6
-import ConfigParser
from Fedora_rhevm_Builder import Fedora_rhevm_Builder
class RHEL6_rhevm_Builder(Fedora_rhevm_Builder):
- def init_guest(self):
- self.guest = oz.RHEL_6.get_class(self.tdlobj, self.oz_config, None)
- self.guest.diskimage = self.app_config["imgdir"] +
"/base-image-" + self.new_image_id + ".dsk"
- # Oz assumes unique names - TDL built for multiple backends guarantees they are
not unique
- # We don't really care about the name so just force uniqueness
- self.guest.name = self.guest.name + "-" + self.new_image_id
+ def __init__(self, template, target):
+ super(RHEL6_rhevm_Builder, self).__init__(template, target)
--
1.7.4.4