Revision d3b51156

b/test/ganeti.query_unittest.py
955 955
class TestGroupQuery(unittest.TestCase):
956 956

  
957 957
  def setUp(self):
958
    self.custom_diskparams = {
959
      constants.DT_DRBD8: {
960
        constants.DRBD_DEFAULT_METAVG: "foobar",
961
      },
962
    }
963

  
958 964
    self.groups = [
959 965
      objects.NodeGroup(name="default",
960 966
                        uuid="c0e89160-18e7-11e0-a46e-001d0904baeb",
......
968 974
                        alloc_policy=constants.ALLOC_POLICY_LAST_RESORT,
969 975
                        ipolicy=objects.MakeEmptyIPolicy(),
970 976
                        ndparams={},
971
                        diskparams={},
977
                        diskparams=self.custom_diskparams,
972 978
                        ),
973 979
      ]
974 980
    self.cluster = objects.Cluster(cluster_name="testcluster",
......
1048 1054
                       ],
1049 1055
                      ])
1050 1056

  
1057
  def testDiskparams(self):
1058
    q = self._Create(["name", "uuid", "diskparams", "custom_diskparams"])
1059
    gqd = query.GroupQueryData(self.cluster, self.groups, None, None, True)
1060

  
1061
    self.assertEqual(q.RequestedData(),
1062
                     set([query.GQ_CONFIG, query.GQ_DISKPARAMS]))
1063

  
1064
    self.assertEqual(q.Query(gqd),
1065
      [[(constants.RS_NORMAL, "default"),
1066
        (constants.RS_NORMAL, "c0e89160-18e7-11e0-a46e-001d0904baeb"),
1067
        (constants.RS_NORMAL, constants.DISK_DT_DEFAULTS),
1068
        (constants.RS_NORMAL, {}),
1069
        ],
1070
       [(constants.RS_NORMAL, "restricted"),
1071
        (constants.RS_NORMAL, "d2a40a74-18e7-11e0-9143-001d0904baeb"),
1072
        (constants.RS_NORMAL, objects.FillDiskParams(constants.DISK_DT_DEFAULTS,
1073
                                                     self.custom_diskparams)),
1074
        (constants.RS_NORMAL, self.custom_diskparams),
1075
        ],
1076
       ])
1077

  
1051 1078

  
1052 1079
class TestOsQuery(unittest.TestCase):
1053 1080
  def _Create(self, selected):

Also available in: Unified diff