Revision 96ed3a3e test/py/cmdlib/instance_unittest.py

b/test/py/cmdlib/instance_unittest.py
1961 1961
                         nics=[(constants.DDM_ADD, -1, {})])
1962 1962
    self.ExecOpCode(op)
1963 1963

  
1964
  def testNoHotplugSupport(self):
1965
    op = self.CopyOpCode(self.op,
1966
                         nics=[(constants.DDM_ADD, -1, {})],
1967
                         hotplug=True)
1968
    self.rpc.call_hotplug_supported.return_value = \
1969
      self.RpcResultsBuilder() \
1970
        .CreateFailedNodeResult(self.master)
1971
    self.ExecOpCodeExpectOpPrereqError(op, "Hotplug is not possible")
1972
    self.assertTrue(self.rpc.call_hotplug_supported.called)
1973

  
1974
  def testHotplugIfPossible(self):
1975
    op = self.CopyOpCode(self.op,
1976
                         nics=[(constants.DDM_ADD, -1, {})],
1977
                         hotplug_if_possible=True)
1978
    self.rpc.call_hotplug_supported.return_value = \
1979
      self.RpcResultsBuilder() \
1980
        .CreateFailedNodeResult(self.master)
1981
    self.ExecOpCode(op)
1982
    self.assertTrue(self.rpc.call_hotplug_supported.called)
1983
    self.assertFalse(self.rpc.call_hotplug_device.called)
1984

  
1964 1985
  def testHotAddNic(self):
1965 1986
    op = self.CopyOpCode(self.op,
1966 1987
                         nics=[(constants.DDM_ADD, -1, {})],
1967 1988
                         hotplug=True)
1989
    self.rpc.call_hotplug_supported.return_value = \
1990
      self.RpcResultsBuilder() \
1991
        .CreateSuccessfulNodeResult(self.master)
1968 1992
    self.ExecOpCode(op)
1969 1993
    self.assertTrue(self.rpc.call_hotplug_supported.called)
1970 1994
    self.assertTrue(self.rpc.call_hotplug_device.called)
......
2056 2080
    op = self.CopyOpCode(self.op,
2057 2081
                         nics=[(constants.DDM_MODIFY, 0, {})],
2058 2082
                         hotplug=True)
2083
    self.rpc.call_hotplug_supported.return_value = \
2084
      self.RpcResultsBuilder() \
2085
        .CreateSuccessfulNodeResult(self.master)
2059 2086
    self.ExecOpCode(op)
2060 2087
    self.assertTrue(self.rpc.call_hotplug_supported.called)
2061 2088
    self.assertTrue(self.rpc.call_hotplug_device.called)
......
2081 2108
                         instance_name=inst.name,
2082 2109
                         nics=[(constants.DDM_REMOVE, 0, {})],
2083 2110
                         hotplug=True)
2111
    self.rpc.call_hotplug_supported.return_value = \
2112
      self.RpcResultsBuilder() \
2113
        .CreateSuccessfulNodeResult(self.master)
2084 2114
    self.ExecOpCode(op)
2085 2115
    self.assertTrue(self.rpc.call_hotplug_supported.called)
2086 2116
    self.assertTrue(self.rpc.call_hotplug_device.called)
......
2170 2200
                                   constants.IDISK_SIZE: 1024,
2171 2201
                                 }]],
2172 2202
                         hotplug=True)
2203
    self.rpc.call_hotplug_supported.return_value = \
2204
      self.RpcResultsBuilder() \
2205
        .CreateSuccessfulNodeResult(self.master)
2173 2206
    self.ExecOpCode(op)
2174 2207
    self.assertTrue(self.rpc.call_hotplug_supported.called)
2175 2208
    self.assertTrue(self.rpc.call_blockdev_create.called)
......
2184 2217
                         disks=[[constants.DDM_REMOVE, -1,
2185 2218
                                 {}]],
2186 2219
                         hotplug=True)
2220
    self.rpc.call_hotplug_supported.return_value = \
2221
      self.RpcResultsBuilder() \
2222
        .CreateSuccessfulNodeResult(self.master)
2187 2223
    self.ExecOpCode(op)
2188 2224
    self.assertTrue(self.rpc.call_hotplug_supported.called)
2189 2225
    self.assertTrue(self.rpc.call_hotplug_device.called)

Also available in: Unified diff