Revision fda3d987 test/py/cmdlib/instance_unittest.py

b/test/py/cmdlib/instance_unittest.py
1970 1970
                         nics=[(constants.DDM_ADD, -1, {})])
1971 1971
    self.ExecOpCode(op)
1972 1972

  
1973
  def testHotAddNic(self):
1974
    op = self.CopyOpCode(self.op,
1975
                         nics=[(constants.DDM_ADD, -1, {})],
1976
                         hotplug=True)
1977
    self.ExecOpCode(op)
1978
    self.assertTrue(self.rpc.call_hotplug_device.called)
1979

  
1973 1980
  def testAddNicWithIp(self):
1974 1981
    op = self.CopyOpCode(self.op,
1975 1982
                         nics=[(constants.DDM_ADD, -1,
......
2053 2060
                         nics=[(constants.DDM_MODIFY, 0, {})])
2054 2061
    self.ExecOpCode(op)
2055 2062

  
2063
  def testHotModifyNic(self):
2064
    op = self.CopyOpCode(self.op,
2065
                         nics=[(constants.DDM_MODIFY, 0, {})],
2066
                         hotplug=True)
2067
    self.ExecOpCode(op)
2068
    self.assertTrue(self.rpc.call_hotplug_device.called)
2069

  
2056 2070
  def testRemoveLastNic(self):
2057 2071
    op = self.CopyOpCode(self.op,
2058 2072
                         nics=[(constants.DDM_REMOVE, 0, {})])
......
2067 2081
                         nics=[(constants.DDM_REMOVE, 0, {})])
2068 2082
    self.ExecOpCode(op)
2069 2083

  
2084
  def testHotRemoveNic(self):
2085
    inst = self.cfg.AddNewInstance(nics=[self.cfg.CreateNic(),
2086
                                         self.cfg.CreateNic()])
2087
    op = self.CopyOpCode(self.op,
2088
                         instance_name=inst.name,
2089
                         nics=[(constants.DDM_REMOVE, 0, {})],
2090
                         hotplug=True)
2091
    self.ExecOpCode(op)
2092
    self.assertTrue(self.rpc.call_hotplug_device.called)
2093

  
2070 2094
  def testSetOffline(self):
2071 2095
    op = self.CopyOpCode(self.op,
2072 2096
                         offline=True)
......
2141 2165
                                 }]])
2142 2166
    self.ExecOpCode(op)
2143 2167

  
2168
  def testHotAddDisk(self):
2169
    self.rpc.call_blockdev_assemble.return_value = \
2170
      self.RpcResultsBuilder() \
2171
        .CreateSuccessfulNodeResult(self.master, ("/dev/mocked_path",
2172
                                    "/var/run/ganeti/instance-disks/mocked_d"))
2173
    op = self.CopyOpCode(self.op,
2174
                         disks=[[constants.DDM_ADD, -1,
2175
                                 {
2176
                                   constants.IDISK_SIZE: 1024,
2177
                                 }]],
2178
                         hotplug=True)
2179
    self.ExecOpCode(op)
2180
    self.assertTrue(self.rpc.call_blockdev_create.called)
2181
    self.assertTrue(self.rpc.call_blockdev_assemble.called)
2182
    self.assertTrue(self.rpc.call_hotplug_device.called)
2183

  
2184
  def testHotRemoveDisk(self):
2185
    inst = self.cfg.AddNewInstance(disks=[self.cfg.CreateDisk(),
2186
                                          self.cfg.CreateDisk()])
2187
    op = self.CopyOpCode(self.op,
2188
                         instance_name=inst.name,
2189
                         disks=[[constants.DDM_REMOVE, -1,
2190
                                 {}]],
2191
                         hotplug=True)
2192
    self.ExecOpCode(op)
2193
    self.assertTrue(self.rpc.call_hotplug_device.called)
2194
    self.assertTrue(self.rpc.call_blockdev_shutdown.called)
2195
    self.assertTrue(self.rpc.call_blockdev_remove.called)
2196

  
2144 2197
  def testModifyDiskWithSize(self):
2145 2198
    op = self.CopyOpCode(self.op,
2146 2199
                         disks=[[constants.DDM_MODIFY, 0,

Also available in: Unified diff