Revision 4256f8fe

b/test/py/cmdlib/cluster_unittest.py
262 262

  
263 263
class TestLUClusterRename(CmdlibTestCase):
264 264
  NEW_NAME = "new-name.example.com"
265
  NEW_IP = "203.0.113.1"
265
  NEW_IP = "203.0.113.100"
266 266

  
267 267
  def testNoChanges(self):
268 268
    op = opcodes.OpClusterRename(name=self.cfg.GetClusterName())
b/test/py/cmdlib/instance_unittest.py
708 708
nic0_mode=bridged
709 709
nic0_link=br_mock
710 710
nic0_mac=f6:ab:f4:45:d1:af
711
nic0_ip=198.51.100.1
711
nic0_ip=192.0.2.1
712 712
tags=tag1 tag2
713 713
hypervisor=xen-hvm
714 714
[hypervisor]
......
2004 2004
    self.cfg.ConnectNetworkToGroup(old_net, self.group)
2005 2005
    inst = self.cfg.AddNewInstance(nics=[
2006 2006
      self.cfg.CreateNic(network=old_net,
2007
                         ip="192.168.123.2")])
2007
                         ip="198.51.100.2")])
2008 2008

  
2009 2009
    new_net = self.cfg.AddNewNetwork(mac_prefix="be")
2010 2010
    self.cfg.ConnectNetworkToGroup(new_net, self.group)
b/test/py/cmdlib/testsupport/config_mock.py
142 142
    if name is None:
143 143
      name = "mock_node_%d.example.com" % node_id
144 144
    if primary_ip is None:
145
      primary_ip = "192.168.0.%d" % node_id
145
      primary_ip = "192.0.2.%d" % node_id
146 146
    if secondary_ip is None:
147
      secondary_ip = "192.168.1.%d" % node_id
147
      secondary_ip = "203.0.113.%d" % node_id
148 148
    if group is None:
149 149
      group = self._default_group.uuid
150 150
    group = self._GetObjUuid(group)
......
281 281
    if name is None:
282 282
      name = "mock_net_%d" % net_id
283 283
    if network is None:
284
      network = "192.168.123.0/24"
284
      network = "198.51.100.0/24"
285 285
    if gateway is None:
286 286
      if network[-3:] == "/24":
287 287
        gateway = network[:-4] + "1"
288 288
      else:
289
        gateway = "192.168.123.1"
289
        gateway = "198.51.100.1"
290 290
    if network[-3:] == "/24" and gateway == network[:-4] + "1":
291 291
      if reservations is None:
292 292
        reservations = "0" * 256
......
555 555
      reserved_lvs=None,
556 556
      drbd_usermode_helper="/bin/true",
557 557
      master_node=master_node_uuid,
558
      master_ip="192.168.0.254",
558
      master_ip="192.0.2.254",
559 559
      master_netdev=constants.DEFAULT_BRIDGE,
560 560
      master_netmask=None,
561 561
      use_external_mip_script=None,

Also available in: Unified diff