[libqb] [PATCH 1/2] TEST: add support for services

[Angus Salkeld]

Signed-off-by: Angus Salkeld <asalkeld(a)redhat.com&gt;
---
 tests/assembly.py   |   12 ++++++++++++
 tests/deployable.py |   14 +++-----------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/tests/assembly.py b/tests/assembly.py
index cc6f819..d21bc2a 100644
--- a/tests/assembly.py
+++ b/tests/assembly.py
@@ -26,6 +26,7 @@ class Assembly(FedoraGuest):
     def __init__(self, name, number, config, tdl):
         self.name = name
         self.number = number
+        self.services = {}
 
         tdl_filename = '%s/%d.tdl' % (name, number)
         kickstart_filename = '%s/%d.ks' % (name, number)
@@ -46,6 +47,14 @@ class Assembly(FedoraGuest):
     def __del__(self):
         self.stop()
 
+    def insert_service_config(self, ass_node):
+            servs = ass_node.newChild(None, "services", None)
+
+            for n, a in self.services.iteritems():
+                srv = servs.newChild(None, 'service', None)
+                srv.setProp("name", n)
+                srv.setProp("monitor_interval", "30s")
+
     def rsh(self, command):
         if self.guestaddr is None:
             retcode = 1
@@ -79,6 +88,9 @@ class Assembly(FedoraGuest):
     def ipaddr_get(self):
         return self.guestaddr
 
+    def service_add(self, srv):
+        self.services[srv.name] = srv
+
     def start(self):
 
         print '%s fix_network ' % self.name
diff --git a/tests/deployable.py b/tests/deployable.py
index 9eecf36..bbea1c6 100644
--- a/tests/deployable.py
+++ b/tests/deployable.py
@@ -120,7 +120,6 @@ class Deployable(object):
         self.name = name
         self.uuid = name # TODO
         self.assemblies = {}
-        self.services = {}
         self.cpe = Cpe()
         self.l = logging.getLogger()
 
@@ -131,27 +130,20 @@ class Deployable(object):
     def assembly_add(self, ass):
         self.assemblies[ass.name] = ass
 
-    def service_add(self, srv):
-        self.services[srv.name] = srv
-
     def generate_config(self):
         doc = libxml2.newDoc("1.0")
         dep = doc.newChild(None, "deployable", None)
         dep.setProp("name", self.name)
+        dep.setProp("uuid", self.uuid)
         asses = dep.newChild(None, "assemblies", None)
-        servs = dep.newChild(None, "services", None)
         constraints = dep.newChild(None, 'constraints', None)
 
         for n, a in self.assemblies.iteritems():
             ass = asses.newChild(None, 'assembly', None)
             ass.setProp("name", n)
-#            ass.setProp("uuid", 'TODO')
+            ass.setProp("uuid", n) # TODO
             ass.setProp("ipaddr", a.ipaddr_get())
-
-        for n, a in self.services.iteritems():
-            srv = servs.newChild(None, 'service', None)
-            srv.setProp("name", n)
-            srv.setProp("HA", "True")
+            a.insert_service_config(ass)
 
         open(self.name + '.xml', 'w').write(doc.serialize(None, 1))
         doc.freeDoc()
-- 
1.7.5.2