Revision 095e71aa test/ganeti.objects_unittest.py

b/test/ganeti.objects_unittest.py
76 76
      "ubuntu-hardy": {
77 77
        },
78 78
      }
79
    self.fake_cl = objects.Cluster(hvparams=hvparams, os_hvp=os_hvp)
79
    ndparams = {
80
        constants.ND_OOB_PROGRAM: "/bin/cluster-oob"
81
        }
82

  
83
    self.fake_cl = objects.Cluster(hvparams=hvparams, os_hvp=os_hvp,
84
                                   ndparams=ndparams)
80 85
    self.fake_cl.UpgradeConfig()
81 86

  
82 87
  def testGetHVDefaults(self):
......
141 146
    self.assertEqual(self.fake_cl.os_hvp[os][constants.HT_XEN_PVM],
142 147
                     self.fake_cl.FillHV(fake_inst))
143 148

  
149
  def testFillNdParamsCluster(self):
150
    fake_node = objects.Node(name="test",
151
                             ndparams={},
152
                             group="testgroup")
153
    fake_group = objects.NodeGroup(name="testgroup",
154
                                   ndparams={})
155
    self.assertEqual(self.fake_cl.ndparams,
156
                     self.fake_cl.FillND(fake_node, fake_group))
157

  
158
  def testFillNdParamsNodeGroup(self):
159
    fake_node = objects.Node(name="test",
160
                             ndparams={},
161
                             group="testgroup")
162
    group_ndparams = {
163
        constants.ND_OOB_PROGRAM: "/bin/group-oob"
164
        }
165
    fake_group = objects.NodeGroup(name="testgroup",
166
                                   ndparams=group_ndparams)
167
    self.assertEqual(group_ndparams,
168
                     self.fake_cl.FillND(fake_node, fake_group))
169

  
170
  def testFillNdParamsNode(self):
171
    node_ndparams = {
172
        constants.ND_OOB_PROGRAM: "/bin/node-oob"
173
        }
174
    fake_node = objects.Node(name="test",
175
                             ndparams=node_ndparams,
176
                             group="testgroup")
177
    fake_group = objects.NodeGroup(name="testgroup",
178
                                   ndparams={})
179
    self.assertEqual(node_ndparams,
180
                     self.fake_cl.FillND(fake_node, fake_group))
181

  
182
  def testFillNdParamsAll(self):
183
    node_ndparams = {
184
        constants.ND_OOB_PROGRAM: "/bin/node-oob"
185
        }
186
    fake_node = objects.Node(name="test",
187
                             ndparams=node_ndparams,
188
                             group="testgroup")
189
    group_ndparams = {
190
        constants.ND_OOB_PROGRAM: "/bin/group-oob"
191
        }
192
    fake_group = objects.NodeGroup(name="testgroup",
193
                                   ndparams=group_ndparams)
194
    self.assertEqual(node_ndparams,
195
                     self.fake_cl.FillND(fake_node, fake_group))
196

  
144 197

  
145 198
class TestOS(unittest.TestCase):
146 199
  ALL_DATA = [

Also available in: Unified diff