ia64/xen-unstable

changeset 16739:33dcf04d7715

tools/docs: Fix example and default IP addresses.

In various places in documentation and code, IP addresses are provided
as examples, defaults, or dummy configuration. In general the
specific IP addresses used in Xen are not always appropriate. (For
example, 1.2.3.4 is used in a few places!)

The following addresses should be used:
* For examples and documentation, 192.0.2.0/24. (See RFC3330.)
* For defaults for private networks, a random network from RFC1918.
I have randomly selected 172.30.206.0/24 for this purpose and
documented this in at the only registry I know of,
www.ucam.org/cam-grin. This network should henceforth be used for
default configurations of local bridges, test networks, etc. in
Xen tools.

The following addresses should NOT be used:
* 10.0.*.*, 10.1.*.*, 192.168.0.*, 192.168.1.*, etc. Using these
addresses gives greatly increased likelihood of collision, as
ignorant network administrators and reckless middlebox vendors
often pick networks from the bottom of 10/8 and 192.168/16.
* 169.254.*.*. These are reserved for zeroconf (ad-hoc networking)
and should not be used for Xen private networks, bridges, etc.,
etc. Use of these addresses by Xen scripts causes trouble on hosts
(eg laptops) which find themselves in ad-hoc networking
environments. I think this is not hypothetical (!) since at least
one Linux distribution have specific code to detect this case and
cause Xen startup to fail iff the host already has an external
zeroconf address.
* 1.2.3.4. WTF !?

I have also used 127.0.255.255 in one place where apparently a dummy
address is needed (some Linux kernels won't accept a lack of an NFS
server address). If 127.0.255.255 is mistakenly used it is unlikely
to do any damage to real traffic even if it does escape into the
network at large.

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
author Keir Fraser <keir.fraser@citrix.com>
date Thu Jan 17 15:13:40 2008 +0000 (2008-01-17)
parents 2d9a8a4d7e73
children 68673ad57302
files docs/man/xend-config.sxp.pod.5 docs/src/user.tex tools/examples/network-nat tools/examples/xeninfo.pl tools/examples/xmexample1 tools/examples/xmexample2 tools/python/xen/sv/CreateDomain.py tools/python/xen/xm/create.py tools/python/xen/xm/tests/test_create.py tools/vnet/doc/man/vn.pod.1 tools/vnet/doc/vnet-xend.txt tools/xm-test/Writing_Tests_HOWTO tools/xm-test/configure.ac tools/xm-test/lib/XmTestLib/NetConfig.py tools/xm-test/tests/restore/04_restore_withdevices_pos.py tools/xm-test/tests/xapi/03_xapi-network_pos.py
line diff
     1.1 --- a/docs/man/xend-config.sxp.pod.5	Thu Jan 17 15:11:22 2008 +0000
     1.2 +++ b/docs/man/xend-config.sxp.pod.5	Thu Jan 17 15:13:40 2008 +0000
     1.3 @@ -124,7 +124,7 @@ An example configuration with relocation
     1.4  =over 4
     1.5  
     1.6   (xend-relocation-server yes)
     1.7 - (xend-relocation-address 192.168.1.1)
     1.8 + (xend-relocation-address 192.0.2.192)
     1.9   (network-script network-bridge)
    1.10   (vif-script vif-bridge)
    1.11   (dom0-min-mem 0)
     2.1 --- a/docs/src/user.tex	Thu Jan 17 15:11:22 2008 +0000
     2.2 +++ b/docs/src/user.tex	Thu Jan 17 15:13:40 2008 +0000
     2.3 @@ -1807,7 +1807,7 @@ network by adding a line to \path{/etc/e
     2.4  \begin{quote}
     2.5    \begin{small}
     2.6  \begin{verbatim}
     2.7 -/export/vm1root      1.2.3.4/24 (rw,sync,no_root_squash)
     2.8 +/export/vm1root      192.0.2.4/24 (rw,sync,no_root_squash)
     2.9  \end{verbatim}
    2.10    \end{small}
    2.11  \end{quote}
    2.12 @@ -2076,7 +2076,7 @@ iptables -A INPUT -p tcp --destination-p
    2.13  
    2.14  # this command enables Xen relocations only from the specific
    2.15  # subnet:
    2.16 -iptables -I INPUT -p tcp -{}-source 192.168.1.1/8 \
    2.17 +iptables -I INPUT -p tcp -{}-source 192.0.2.0/24 \
    2.18      --destination-port 8002 -j ACCEPT
    2.19  \end{verbatim}
    2.20  
    2.21 @@ -5121,9 +5121,9 @@ vnets are working by configuring IP addr
    2.22  and trying to ping them across the network. For example, using machines
    2.23  hostA and hostB:
    2.24  \begin{verbatim}
    2.25 -hostA# ifconfig vnif0004 10.0.0.100 up
    2.26 -hostB# ifconfig vnif0004 10.0.0.101 up
    2.27 -hostB# ping 10.0.0.100
    2.28 +hostA# ifconfig vnif0004 192.0.2.100 up
    2.29 +hostB# ifconfig vnif0004 192.0.2.101 up
    2.30 +hostB# ping 192.0.2.100
    2.31  \end{verbatim}
    2.32  
    2.33  The vnet implementation uses IP multicast to discover vnet interfaces, so
    2.34 @@ -5144,8 +5144,8 @@ on the vnet UDP port:
    2.35  \end{verbatim}
    2.36  
    2.37  If multicast is not being forwarded between machines you can configure
    2.38 -multicast forwarding using vn. Suppose we have machines hostA on 10.10.0.100
    2.39 -and hostB on 10.11.0.100 and that multicast is not forwarded between them.
    2.40 +multicast forwarding using vn. Suppose we have machines hostA on 192.0.2.200
    2.41 +and hostB on 192.0.2.211 and that multicast is not forwarded between them.
    2.42  We use vn to configure each machine to forward to the other:
    2.43  \begin{verbatim}
    2.44  hostA# vn peer-add hostB
     3.1 --- a/tools/examples/network-nat	Thu Jan 17 15:11:22 2008 +0000
     3.2 +++ b/tools/examples/network-nat	Thu Jan 17 15:13:40 2008 +0000
     3.3 @@ -43,9 +43,9 @@ fi
     3.4  
     3.5  function dhcp_start()
     3.6  {
     3.7 -  if ! grep -q "subnet 10.0.0.0" "$dhcpd_conf_file"
     3.8 +  if ! grep -q "subnet 192.0.2.0" "$dhcpd_conf_file"
     3.9    then
    3.10 -    echo >>"$dhcpd_conf_file" "subnet 10.0.0.0 netmask 255.255.0.0 {}"
    3.11 +    echo >>"$dhcpd_conf_file" "subnet 192.0.2.0 netmask 255.255.255.0 {}"
    3.12    fi
    3.13  
    3.14    "$dhcpd_init_file" restart
    3.15 @@ -55,7 +55,7 @@ function dhcp_start()
    3.16  function dhcp_stop()
    3.17  {
    3.18    local tmpfile=$(mktemp)
    3.19 -  grep -v "subnet 10.0.0.0" "$dhcpd_conf_file" >"$tmpfile"
    3.20 +  grep -v "subnet 192.0.2.0" "$dhcpd_conf_file" >"$tmpfile"
    3.21    if diff "$tmpfile" "$dhcpd_conf_file" >&/dev/null
    3.22    then
    3.23      rm "$tmpfile"
     4.1 --- a/tools/examples/xeninfo.pl	Thu Jan 17 15:11:22 2008 +0000
     4.2 +++ b/tools/examples/xeninfo.pl	Thu Jan 17 15:13:40 2008 +0000
     4.3 @@ -21,10 +21,10 @@ require RPC::XML::Client;
     4.4  
     4.5  ##### CONFIG ######
     4.6  
     4.7 -my %xenhosts = ("192.168.0.10" => {"port" => "9363"}, 
     4.8 -					 "192.168.0.11" => {"port" => "9363"}, 
     4.9 -					 "192.168.0.12" => {"port" => "9363"}, 
    4.10 -					 "192.168.0.13" => {"port" => "9363"});
    4.11 +my %xenhosts = ("192.0.2.10" => {"port" => "9363"}, 
    4.12 +					 "192.0.2.11" => {"port" => "9363"}, 
    4.13 +					 "192.0.2.12" => {"port" => "9363"}, 
    4.14 +					 "192.0.2.13" => {"port" => "9363"});
    4.15  
    4.16  ##### CONFIG END ###
    4.17  
     5.1 --- a/tools/examples/xmexample1	Thu Jan 17 15:11:22 2008 +0000
     5.2 +++ b/tools/examples/xmexample1	Thu Jan 17 15:13:40 2008 +0000
     5.3 @@ -135,7 +135,7 @@ root = "/dev/hda1 ro"
     5.4  # Root device for nfs.
     5.5  #root = "/dev/nfs"
     5.6  # The nfs server.
     5.7 -#nfs_server = '169.254.1.0'  
     5.8 +#nfs_server = '192.0.2.1'  
     5.9  # Root directory on the nfs server.
    5.10  #nfs_root   = '/full/path/to/root/directory'
    5.11  
     6.1 --- a/tools/examples/xmexample2	Thu Jan 17 15:11:22 2008 +0000
     6.2 +++ b/tools/examples/xmexample2	Thu Jan 17 15:13:40 2008 +0000
     6.3 @@ -171,7 +171,7 @@ root = "/dev/sda1 ro"
     6.4  # Root device for nfs.
     6.5  #root = "/dev/nfs"
     6.6  # The nfs server.
     6.7 -#nfs_server = '169.254.1.0'  
     6.8 +#nfs_server = '192.0.2.1'  
     6.9  # Root directory on the nfs server.
    6.10  #nfs_root   = '/full/path/to/root/directory'
    6.11  
     7.1 --- a/tools/python/xen/sv/CreateDomain.py	Thu Jan 17 15:11:22 2008 +0000
     7.2 +++ b/tools/python/xen/sv/CreateDomain.py	Thu Jan 17 15:13:40 2008 +0000
     7.3 @@ -103,10 +103,10 @@ class CreatePage4( Sheet ):
     7.4          Sheet.__init__( self, urlWriter, "Network settings", 4 )
     7.5          self.addControl( ListControl( 'dhcp', [('off', 'No'), ('dhcp', 'Yes')], 'Use DHCP:' ) )
     7.6          self.addControl( InputControl( 'hostname', 'hostname', 'VM Hostname:' ) )
     7.7 -        self.addControl( InputControl( 'ip_addr', '1.2.3.4', 'VM IP Address:' ) )
     7.8 +        self.addControl( InputControl( 'ip_addr', '192.168.1.1', 'VM IP Address:' ) )
     7.9          self.addControl( InputControl( 'ip_subnet', '255.255.255.0', 'VM Subnet Mask:' ) ) 
    7.10 -        self.addControl( InputControl( 'ip_gateway', '1.2.3.4', 'VM Gateway:' ) )           
    7.11 -        self.addControl( InputControl( 'ip_nfs', '1.2.3.4', 'NFS Server:' ) )  
    7.12 +        self.addControl( InputControl( 'ip_gateway', '192.168.1.1', 'VM Gateway:' ) )           
    7.13 +        self.addControl( InputControl( 'ip_nfs', '192.168.1.1', 'NFS Server:' ) )  
    7.14                   
    7.15  class CreateFinish( Sheet ):
    7.16  
     8.1 --- a/tools/python/xen/xm/create.py	Thu Jan 17 15:11:22 2008 +0000
     8.2 +++ b/tools/python/xen/xm/create.py	Thu Jan 17 15:13:40 2008 +0000
     8.3 @@ -886,7 +886,7 @@ def preprocess_access_control(vals):
     8.4  
     8.5  def preprocess_ip(vals):
     8.6      if vals.ip or vals.dhcp != 'off':
     8.7 -        dummy_nfs_server = '1.2.3.4'
     8.8 +        dummy_nfs_server = '127.0.255.255'
     8.9          ip = (vals.ip
    8.10            + ':' + (vals.nfs_server or dummy_nfs_server)
    8.11            + ':' + vals.gateway
     9.1 --- a/tools/python/xen/xm/tests/test_create.py	Thu Jan 17 15:11:22 2008 +0000
     9.2 +++ b/tools/python/xen/xm/tests/test_create.py	Thu Jan 17 15:13:40 2008 +0000
     9.3 @@ -68,7 +68,7 @@ vcpus = 4
     9.4  disk = ['phy:/dev/virt-blkdev-backend/dom1,sda1,w',
     9.5  'phy:/dev/virt-blkdev-backend/usr,sda2,r']
     9.6  root = "/dev/sda1 ro"
     9.7 -extra = " profile=1 GATEWAY=10.0.1.254 NETMASK=255.255.0.0 IPADDR=10.0.134.1 HOSTNAME=dom1"
     9.8 +extra = " profile=1 GATEWAY=192.0.2.254 NETMASK=255.255.255.0 IPADDR=192.0.2.1 HOSTNAME=dom1"
     9.9  on_poweroff = 'destroy'
    9.10  on_reboot   = 'destroy'
    9.11  on_crash    = 'destroy'
    9.12 @@ -83,7 +83,7 @@ on_crash    = 'destroy'
    9.13                   'vcpus'       : 4,
    9.14                   'nics'        : -1,
    9.15                   'root'        : '/dev/sda1 ro',
    9.16 -                 'extra'       : ' profile=1 GATEWAY=10.0.1.254 NETMASK=255.255.0.0 IPADDR=10.0.134.1 HOSTNAME=dom1',
    9.17 +                 'extra'       : ' profile=1 GATEWAY=192.0.2.254 NETMASK=255.255.255.0 IPADDR=192.0.2.1 HOSTNAME=dom1',
    9.18                   'on_poweroff' : 'destroy',
    9.19                   'on_reboot'   : 'destroy',
    9.20                   'on_crash'    : 'destroy',
    10.1 --- a/tools/vnet/doc/man/vn.pod.1	Thu Jan 17 15:11:22 2008 +0000
    10.2 +++ b/tools/vnet/doc/man/vn.pod.1	Thu Jan 17 15:13:40 2008 +0000
    10.3 @@ -48,9 +48,9 @@ The vnet devices are fully-functional ne
    10.4  to them and test connectivity without any vms running.
    10.5  For example, using vnif0004 on machines A and B:
    10.6  
    10.7 -        A> ifconfig vnif0004 10.0.0.11
    10.8 -        B> ifconfig vnif0004 10.0.0.12
    10.9 -        B> ping 10.0.0.11
   10.10 +        A> ifconfig vnif0004 192.0.2.11
   10.11 +        B> ifconfig vnif0004 192.0.2.12
   10.12 +        B> ping 192.0.2.11
   10.13  
   10.14  If the vnet device is enslaved to a bridge you will have to add the IP address
   10.15  to the bridge instead. Use C<brctl show> or C<vn vnets> to see if a vnet
    11.1 --- a/tools/vnet/doc/vnet-xend.txt	Thu Jan 17 15:11:22 2008 +0000
    11.2 +++ b/tools/vnet/doc/vnet-xend.txt	Thu Jan 17 15:13:40 2008 +0000
    11.3 @@ -108,19 +108,19 @@ Its bridge and interface should appear i
    11.4  It should also show in 'brctl show', with its attached interfaces.
    11.5  
    11.6  You can 'see into' a vnet from dom0 if you put an IP address on the bridge.
    11.7 -For example, if you have vnet97 and a vm with ip addr 10.0.0.12 connected to it,
    11.8 +For example, if you have vnet97 and a vm with ip addr 192.0.2.12 connected to it,
    11.9  then
   11.10  
   11.11 -ifconfig vnet97 10.0.0.20 up
   11.12 +ifconfig vnet97 192.0.2.20 up
   11.13  
   11.14 -should let you ping 10.0.0.12 via the vnet97 bridge.
   11.15 +should let you ping 192.0.2.12 via the vnet97 bridge.
   11.16  
   11.17  4) Examples
   11.18  -----------
   11.19  
   11.20  These assume a vnet with a bridge 'vnet97' has been created.
   11.21  
   11.22 -Here's the full config for a vm on vnet 97, using ip addr 10.0.0.12:
   11.23 +Here's the full config for a vm on vnet 97, using ip addr 192.0.2.12:
   11.24  
   11.25  (vm
   11.26   (name dom12)
   11.27 @@ -130,7 +130,7 @@ Here's the full config for a vm on vnet 
   11.28   (image
   11.29    (linux
   11.30     (kernel /boot/vmlinuz-2.6-xenU)
   11.31 -   (ip 10.0.0.12:1.2.3.4::::eth0:off)
   11.32 +   (ip 192.0.2.12:192.0.2.4::::eth0:off)
   11.33     (root /dev/sda1)
   11.34     (args 'rw fastboot 4')
   11.35    )
   11.36 @@ -149,7 +149,7 @@ If you run another vm on the same vnet:
   11.37   (image
   11.38    (linux
   11.39     (kernel /boot/vmlinuz-2.6-xenU)
   11.40 -   (ip 10.0.0.11:1.2.3.4::::eth0:off)
   11.41 +   (ip 192.0.2.11:192.0.2.4::::eth0:off)
   11.42     (root /dev/sda1)
   11.43     (args 'rw fastboot 4')
   11.44    )
    12.1 --- a/tools/xm-test/Writing_Tests_HOWTO	Thu Jan 17 15:11:22 2008 +0000
    12.2 +++ b/tools/xm-test/Writing_Tests_HOWTO	Thu Jan 17 15:13:40 2008 +0000
    12.3 @@ -104,12 +104,14 @@ routing environments in the future, the 
    12.4  a bridging environment. Xm-test currently only supports a range of
    12.5  IPs, the dhcp feature will be added soon.
    12.6  
    12.7 -The network tests will need to know what IPs to use. IPs are configured
    12.8 -when you build xm-test. Xm-test uses the zeroconf address range by
    12.9 -default, 169.254.0.1-169.254.255.255. If you'd like to set a new range,
   12.10 -do so at configure time, a netmask and network address must also be defined:
   12.11 +The network tests will need to know what IPs to use. IPs are
   12.12 +configured when you build xm-test. Xm-test by default a range chosen
   12.13 +at random from the RFC1918 private use space, and published at
   12.14 +www.ucam.org/cam-grin, 172.30.206.1-172.30.206.254 from
   12.15 +172.30.206.0/24. If you'd like to set a new range, do so at configure
   12.16 +time, a netmask and network address must also be defined:
   12.17  
   12.18 -    # ./configure --with-net-ip-range=192.168.1.1-192.168.1.100 --with-network-address=192.168.1.0 --with-netmask=255.255.255.0
   12.19 +    # ./configure --with-net-ip-range=192.0.2.1-192.0.2.100 --with-network-address=192.0.2.0 --with-netmask=255.255.255.0
   12.20  
   12.21  The tests will not need to set network information, this is done by 
   12.22  the library once it's configured.
    13.1 --- a/tools/xm-test/configure.ac	Thu Jan 17 15:11:22 2008 +0000
    13.2 +++ b/tools/xm-test/configure.ac	Thu Jan 17 15:13:40 2008 +0000
    13.3 @@ -56,24 +56,24 @@ else
    13.4  fi
    13.5  
    13.6  # Network needs to know ips to use: dhcp or a range of IPs in the form
    13.7 -# of: 192.168.1.1-192.168.1.100
    13.8 +# of: 192.0.2.1-192.0.2.100
    13.9  # If not dhcp, a netmask and network address must be supplied. Defaults to
   13.10 -# zeroconf range.
   13.11 -NET_IP_RANGE="169.254.0.1-169.254.255.255"
   13.12 +# range allocated in www.ucam.org/cam-grin.
   13.13 +NET_IP_RANGE="172.30.206.1-172.30.206.254"
   13.14  AC_ARG_WITH(net-ip-range,
   13.15 -	[  --with-net-ip-range=ip-range	Set a range of ip addresses to use for xm-test guest domain networks. Can specify dhcp or a range of IPs: 192.168.1.1-192.168.1.100 [[default="169.254.0.1-169.254.255.255"]]],
   13.16 +	[  --with-net-ip-range=ip-range	Set a range of ip addresses to use for xm-test guest domain networks. Can specify dhcp or a range of IPs: 192.0.2.1-192.0.2.100 [[default="172.30.206.1-172.30.206.254"]]],
   13.17  	[ NET_IP_RANGE="$withval" ])
   13.18  
   13.19  iprange=`echo $NET_IP_RANGE | perl -e 'while(<>) { print if /\d+\.\d+\.\d+\.\d+-\d+\.\d+\.\d+\.\d+/ }'`
   13.20  
   13.21 -NETWORK_ADDRESS="169.254.0.0"
   13.22 +NETWORK_ADDRESS="172.30.206.0"
   13.23  AC_ARG_WITH(network-address,
   13.24 -	[ --with-network-address=ip Set network address to use with ip range [[default="169.254.0.0"]]],
   13.25 +	[ --with-network-address=ip Set network address to use with ip range [[default="172.30.206.0"]]],
   13.26  	[ NETWORK_ADDRESS="$withval" ])
   13.27  
   13.28 -NETMASK="255.255.0.0"
   13.29 +NETMASK="255.255.255.0"
   13.30  AC_ARG_WITH(netmask,
   13.31 -	[ --with-netmask=mask Set netmask to use with ip range [[default="255.255.0.0"]]],
   13.32 +	[ --with-netmask=mask Set netmask to use with ip range [[default="255.255.255.0"]]],
   13.33  	[ NETMASK="$withval" ])
   13.34  
   13.35  if test "x$NET_IP_RANGE" != "xdhcp" && test -z "$iprange"
    14.1 --- a/tools/xm-test/lib/XmTestLib/NetConfig.py	Thu Jan 17 15:11:22 2008 +0000
    14.2 +++ b/tools/xm-test/lib/XmTestLib/NetConfig.py	Thu Jan 17 15:13:40 2008 +0000
    14.3 @@ -69,12 +69,6 @@ def getXendNetConfig():
    14.4      configfile.close()
    14.5      return netenv
    14.6  
    14.7 -def checkZeroconfAddresses():
    14.8 -    # Make sure there aren't existing zeroconf addresses.
    14.9 -    rc, out = traceCommand("ip addr show |grep \"inet 169.254\" | grep eth0")
   14.10 -    if rc == 0:
   14.11 -        raise NetworkError("Zeroconf addresses already used: %s" % out)
   14.12 -
   14.13  class NetConfig:
   14.14  
   14.15      def __init__(self):
   14.16 @@ -101,9 +95,6 @@ class NetConfig:
   14.17  
   14.18              self.__setMaxNumberIPs()
   14.19  
   14.20 -            if self.network == "169.254.0.0":
   14.21 -                checkZeroconfAddresses()
   14.22 -
   14.23              # Clean out any aliases in the network range for dom0's interface.
   14.24              # If an alias exists, a test xendevice add command could fail.
   14.25              if NETWORK_IP_RANGE != "dhcp":
    15.1 --- a/tools/xm-test/tests/restore/04_restore_withdevices_pos.py	Thu Jan 17 15:11:22 2008 +0000
    15.2 +++ b/tools/xm-test/tests/restore/04_restore_withdevices_pos.py	Thu Jan 17 15:13:40 2008 +0000
    15.3 @@ -48,11 +48,11 @@ try:
    15.4      if run["return"] != 0:
    15.5          FAIL("Unable to write to block device hdb2!")
    15.6  
    15.7 -    run = console.runCmd("ifconfig eth0 169.254.0.1 netmask 255.255.255.0")
    15.8 +    run = console.runCmd("ifconfig eth0 172.30.206.1 netmask 255.255.255.240")
    15.9      if run["return"] != 0:
   15.10          FAIL("Unable to configure DomU's eth0")
   15.11  
   15.12 -    run = console.runCmd("ifconfig eth1 169.254.1.1 netmask 255.255.255.0")
   15.13 +    run = console.runCmd("ifconfig eth1 172.30.206.17 netmask 255.255.255.240")
   15.14      if run["return"] != 0:
   15.15          FAIL("Unable to configure DomU's eth1")
   15.16  
   15.17 @@ -114,11 +114,11 @@ try:
   15.18      run = console.runCmd("ifconfig")
   15.19      if not re.search("eth0", run["output"]):
   15.20          FAIL("DomU's eth0 disappeared")
   15.21 -    if not re.search("169.254.0.1", run["output"]):
   15.22 +    if not re.search("172.30.206.1", run["output"]):
   15.23          FAIL("DomU's eth0 lost its IP")
   15.24      if not re.search("eth1", run["output"]):
   15.25          FAIL("DomU's eth1 disappeared")
   15.26 -    if not re.search("169.254.1.1", run["output"]):
   15.27 +    if not re.search("172.30.206.17", run["output"]):
   15.28          FAIL("DomU's eth1 lost its IP")
   15.29      if not re.search("Loopback", run["output"]):
   15.30          FAIL("DomU's lo disappeared")
    16.1 --- a/tools/xm-test/tests/xapi/03_xapi-network_pos.py	Thu Jan 17 15:11:22 2008 +0000
    16.2 +++ b/tools/xm-test/tests/xapi/03_xapi-network_pos.py	Thu Jan 17 15:13:40 2008 +0000
    16.3 @@ -39,18 +39,18 @@ if status:
    16.4  # Configure IP addresses on two domains
    16.5  try:
    16.6      # Run 'ls'
    16.7 -    run = console1.runCmd("ifconfig eth0 192.168.0.1 netmask 255.255.255.0 up")
    16.8 -    run = console2.runCmd("ifconfig eth0 192.168.0.2 netmask 255.255.255.0 up")
    16.9 +    run = console1.runCmd("ifconfig eth0 172.30.206.1 netmask 255.255.255.0 up")
   16.10 +    run = console2.runCmd("ifconfig eth0 172.30.206.2 netmask 255.255.255.0 up")
   16.11  except ConsoleError, e:
   16.12      saveLog(console.getHistory())
   16.13      FAIL(str(e))
   16.14  
   16.15  # Now ping...
   16.16  try:
   16.17 -    run = console1.runCmd("ping -c 4 192.168.0.2")
   16.18 +    run = console1.runCmd("ping -c 4 172.30.206.2")
   16.19      if run['return'] > 0:
   16.20          FAIL("Could not ping other host")
   16.21 -    run = console2.runCmd("ping -c 4 192.168.0.1")
   16.22 +    run = console2.runCmd("ping -c 4 172.30.206.1")
   16.23      if run['return'] > 0:
   16.24          FAIL("Could not pint other host")
   16.25  except ConsoleError, e: