github.com/xen-tools.xen-tools
1
0
Fork 0
mirror of synced 2026-04-26 12:26:54 +00:00
Code Releases Activity

Use $ips instead of $IP_ADDRESSES to keep variable names consistent

Browse Source 
Update t/xt-create-xen-config.t to cope with the new variable
This commit is contained in:
Axel Beckert
2012-05-07 22:55:33 +02:00
parent 6fe6f5b09f
commit 1b4edee2d3
3 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/xen-create-image
View File

@@ -3992,7 +3992,7 @@ sub runXenConfigCreation
#
# Make sure the template gets a list of all IPs
#
$ENV{ 'IP_ADDRESSES' } = $IP_ADDRESSES;
$ENV{ 'ips' } = $IP_ADDRESSES;
logprint("\nCreating Xen configuration file\n");

2
etc/xm.tmpl
View File

@@ -135,7 +135,7 @@ name = '{$hostname}'
$br = ",bridge=$bridge"
}
$OUT .= "vif = [ 'ip=$IP_ADDRESSES";
$OUT .= "vif = [ 'ip=$ips";
$OUT .= "$m";
$OUT .= "$vn";
$OUT .= "$br";

14
t/xt-create-xen-config.t
View File

@@ -36,28 +36,28 @@ noMentionOf( "ip=",
# is no mention of DHCP.
#
testOutputContains( "ip=192.168.1.1",
memory => 128, ip1 => '192.168.1.1', dir => '/tmp' );
memory => 128, ips => '192.168.1.1', dir => '/tmp' );
noMentionOf( "dhcp",
memory => 128, ip1 => '192.168.1.1', dir => '/tmp' );
memory => 128, ips => '192.168.1.1', dir => '/tmp' );
#
# SCSI based systems:
#
testOutputContains( "xvda",
memory => 128, ip1 => '192.168.1.1', dir => '/tmp' );
memory => 128, ips => '192.168.1.1', dir => '/tmp' );
testOutputContains( "/dev/xvda1 ro",
memory => 128, ip1 => '192.168.1.1', dir => '/tmp' );
memory => 128, ips => '192.168.1.1', dir => '/tmp' );
noMentionOf( "hda1",
memory => 128, ip1 => '192.168.1.1', dir => '/tmp' );
memory => 128, ips => '192.168.1.1', dir => '/tmp' );
#
# IDE based systems
#
testOutputContains( "hda1",
memory => 128, ip1 => '192.168.1.1', dir => '/tmp', ide => 1 );
memory => 128, ips => '192.168.1.1', dir => '/tmp', ide => 1 );
testOutputContains( "/dev/hda1 ro",
memory => 128, ip1 => '192.168.1.1', dir => '/tmp', ide => 1 );
memory => 128, ips => '192.168.1.1', dir => '/tmp', ide => 1 );