Revision 9ca8a7c5 lib/objects.py

b/lib/objects.py
744 744
    "hvparams",
745 745
    "beparams",
746 746
    "osparams",
747
    "admin_up",
747
    "admin_state",
748 748
    "nics",
749 749
    "disks",
750 750
    "disk_template",
......
884 884
    """Custom function for instances.
885 885

  
886 886
    """
887
    if "admin_state" not in val:
888
      if val.get("admin_up", False):
889
        val["admin_state"] = constants.ADMINST_UP
890
      else:
891
        val["admin_state"] = constants.ADMINST_DOWN
892
    if "admin_up" in val:
893
      del val["admin_up"]
887 894
    obj = super(Instance, cls).FromDict(val)
888 895
    obj.nics = cls._ContainerFromDicts(obj.nics, list, NIC)
889 896
    obj.disks = cls._ContainerFromDicts(obj.disks, list, Disk)

Also available in: Unified diff