Revision 27d69b25 test/py/ganeti.block.bdev_unittest.py

b/test/py/ganeti.block.bdev_unittest.py
33 33
from ganeti import utils
34 34
from ganeti.block import bdev
35 35
from ganeti.block import drbd
36
from ganeti.block import drbd_info
36 37

  
37 38
import testutils
38 39

  
......
104 105

  
105 106
  def testParserCreation(self):
106 107
    """Test drbdsetup show parser creation"""
107
    drbd.DRBD8ShowInfo._GetShowParser()
108
    drbd_info.DRBD8ShowInfo._GetShowParser()
108 109

  
109 110
  def testParser80(self):
110 111
    """Test drbdsetup show parser for disk and network version 8.0"""
111 112
    data = testutils.ReadTestData("bdev-drbd-8.0.txt")
112
    result = drbd.DRBD8ShowInfo.GetDevInfo(data)
113
    result = drbd_info.DRBD8ShowInfo.GetDevInfo(data)
113 114
    self.failUnless(self._has_disk(result, "/dev/xenvg/test.data",
114 115
                                   "/dev/xenvg/test.meta"),
115 116
                    "Wrong local disk info")
......
120 121
  def testParser83(self):
121 122
    """Test drbdsetup show parser for disk and network version 8.3"""
122 123
    data = testutils.ReadTestData("bdev-drbd-8.3.txt")
123
    result = drbd.DRBD8ShowInfo.GetDevInfo(data)
124
    result = drbd_info.DRBD8ShowInfo.GetDevInfo(data)
124 125
    self.failUnless(self._has_disk(result, "/dev/xenvg/test.data",
125 126
                                   "/dev/xenvg/test.meta"),
126 127
                    "Wrong local disk info")
......
131 132
  def testParserNetIP4(self):
132 133
    """Test drbdsetup show parser for IPv4 network"""
133 134
    data = testutils.ReadTestData("bdev-drbd-net-ip4.txt")
134
    result = drbd.DRBD8ShowInfo.GetDevInfo(data)
135
    result = drbd_info.DRBD8ShowInfo.GetDevInfo(data)
135 136
    self.failUnless(("local_dev" not in result and
136 137
                     "meta_dev" not in result and
137 138
                     "meta_index" not in result),
......
143 144
  def testParserNetIP6(self):
144 145
    """Test drbdsetup show parser for IPv6 network"""
145 146
    data = testutils.ReadTestData("bdev-drbd-net-ip6.txt")
146
    result = drbd.DRBD8ShowInfo.GetDevInfo(data)
147
    result = drbd_info.DRBD8ShowInfo.GetDevInfo(data)
147 148
    self.failUnless(("local_dev" not in result and
148 149
                     "meta_dev" not in result and
149 150
                     "meta_index" not in result),
......
155 156
  def testParserDisk(self):
156 157
    """Test drbdsetup show parser for disk"""
157 158
    data = testutils.ReadTestData("bdev-drbd-disk.txt")
158
    result = drbd.DRBD8ShowInfo.GetDevInfo(data)
159
    result = drbd_info.DRBD8ShowInfo.GetDevInfo(data)
159 160
    self.failUnless(self._has_disk(result, "/dev/xenvg/test.data",
160 161
                                   "/dev/xenvg/test.meta"),
161 162
                    "Wrong local disk info")
......
289 290
    self.failUnless(not self.drbd_info80e.HasMinorStatus(3))
290 291

  
291 292
  def testLineNotMatch(self):
292
    """Test wrong line passed to drbd.DRBD8Status"""
293
    self.assertRaises(errors.BlockDeviceError, drbd.DRBD8Status, "foo")
293
    """Test wrong line passed to drbd_info.DRBD8Status"""
294
    self.assertRaises(errors.BlockDeviceError, drbd_info.DRBD8Status, "foo")
294 295

  
295 296
  def testMinor0(self):
296 297
    """Test connected, primary device"""

Also available in: Unified diff