[pkg-kolab] r1432 - pkg-kolab_testsuite
Mathieu Parent
sathieu at alioth.debian.org
Fri Nov 27 23:18:47 UTC 2009
Author: sathieu
Date: 2009-11-27 23:18:47 +0000 (Fri, 27 Nov 2009)
New Revision: 1432
Modified:
pkg-kolab_testsuite/testsuite
Log:
- refactoring of domain_name
- dont forget initial_check and vm connection
Modified: pkg-kolab_testsuite/testsuite
===================================================================
--- pkg-kolab_testsuite/testsuite 2009-11-27 23:10:56 UTC (rev 1431)
+++ pkg-kolab_testsuite/testsuite 2009-11-27 23:18:47 UTC (rev 1432)
@@ -132,8 +132,7 @@
my $hosts = "127.0.0.1 localhost\n";
for(my $domid = 0; $domid<=conf('slave_count'); $domid++) {
- my $domname = "kolab_test_slave$domid";
- $domname = "kolab_test_master" if $domid == 0;
+ my $domname = domain_name($domid);
my $domip = domain_ip($domid, $domname);
$hosts .= "$domip $domname.".conf('dns_domain')." $domname\n";
@@ -185,6 +184,13 @@
#=======================================================
# Domain functions
#-------------------------------------------------------
+sub domain_name
+{
+ my $domid = shift;
+ return "kolab_test_master" if $domid == 0;
+ return "kolab_test_slave$domid";
+}
+
sub domain_ip
{
my $domid = shift;
@@ -899,16 +905,16 @@
pod2usage(-exitstatus => 0, -verbose => 1) if $o_help;
#-------------------------------------------------------
-initial_check();
-$vmm = Sys::Virt->new(address => conf('virt_uri'));
-local_command("mkdir -p '".conf('storage_pool_dir')."'");
-#-------------------------------------------------------
-
sub process
{
my $action = shift;
+ if(!defined($vmm)) {
+ initial_check();
+ $vmm = Sys::Virt->new(address => conf('virt_uri'));
+ local_command("mkdir -p '".conf('storage_pool_dir')."'");
+ }
#Platform:
if($action eq 'list-platforms') {
print join("\n", $cfg->Sections)."\n";
@@ -931,8 +937,7 @@
#Main loop
for(my $domid = 0; $domid<=conf('slave_count'); $domid++) {
- my $domname = "kolab_test_slave$domid";
- $domname = "kolab_test_master" if $domid == 0;
+ my $domname = domain_name($domid);
print "Action $action for domain $domname:\n";
my $domip = domain_ip($domid, $domname);
if ($action eq 'bootstrap') {
More information about the pkg-kolab-devel
mailing list