Revision 5af3da74 lib/cmdlib.py

b/lib/cmdlib.py
1486 1486
                                     (node, vgstatus))
1487 1487

  
1488 1488
    self.cluster = cluster = self.cfg.GetClusterInfo()
1489
    # validate beparams changes
1489
    # validate params changes
1490 1490
    if self.op.beparams:
1491 1491
      utils.ForceDictType(self.op.beparams, constants.BES_PARAMETER_TYPES)
1492 1492
      self.new_beparams = objects.FillDict(
1493 1493
        cluster.beparams[constants.PP_DEFAULT], self.op.beparams)
1494 1494

  
1495
    if self.op.nicparams:
1496
      utils.ForceDictType(self.op.nicparams, constants.NICS_PARAMETER_TYPES)
1497
      self.new_nicparams = objects.FillDict(
1498
        cluster.nicparams[constants.PP_DEFAULT], self.op.nicparams)
1499
      objects.NIC.CheckParameterSyntax(self.new_nicparams)
1500

  
1495 1501
    # hypervisor list/parameters
1496 1502
    self.new_hvparams = objects.FillDict(cluster.hvparams, {})
1497 1503
    if self.op.hvparams:
......
1539 1545
      self.cluster.enabled_hypervisors = self.op.enabled_hypervisors
1540 1546
    if self.op.beparams:
1541 1547
      self.cluster.beparams[constants.PP_DEFAULT] = self.new_beparams
1548
    if self.op.nicparams:
1549
      self.cluster.nicparams[constants.PP_DEFAULT] = self.new_nicparams
1550

  
1542 1551
    if self.op.candidate_pool_size is not None:
1543 1552
      self.cluster.candidate_pool_size = self.op.candidate_pool_size
1544 1553

  

Also available in: Unified diff