diff options
| -rw-r--r-- | cobbler/commands.py | 2 | ||||
| -rw-r--r-- | cobbler/item_system.py | 19 | ||||
| -rw-r--r-- | cobbler/modules/cli_system.py | 3 | ||||
| -rw-r--r-- | cobbler/remote.py | 6 | ||||
| -rw-r--r-- | cobbler/webui/CobblerWeb.py | 2 | ||||
| -rw-r--r-- | webui_content/cobblerweb.css | 3 | ||||
| -rw-r--r-- | webui_templates/profile_edit.tmpl | 24 | ||||
| -rw-r--r-- | webui_templates/system_edit.tmpl | 57 |
8 files changed, 70 insertions, 46 deletions
diff --git a/cobbler/commands.py b/cobbler/commands.py index 6b0293e4..d2da685d 100644 --- a/cobbler/commands.py +++ b/cobbler/commands.py @@ -264,8 +264,6 @@ class CobblerFunction: Boilerplate for objects that offer add/edit/delete/remove/copy functionality. """ - print "DEBUG: args = %s" % self.args - if "dumpvars" in self.args: if not self.options.name: raise CX(_("name is required")) diff --git a/cobbler/item_system.py b/cobbler/item_system.py index d23d1df9..14a57ca6 100644 --- a/cobbler/item_system.py +++ b/cobbler/item_system.py @@ -504,8 +504,9 @@ class System(item.Item): def set_power_type(self, power_type): power_type = power_type.lower() - valid = "bullpap wti apc_snmp ether-wake ipmilan drac ipmitool ilo rsa" + valid = "bullpap wti apc_snmp ether-wake ipmilan drac ipmitool ilo rsai none" choices = valid.split(" ") + choices.sort() if power_type not in choices: raise CX("power type must be one of: %s" % ",".join(choices)) self.power_type = power_type @@ -584,6 +585,12 @@ class System(item.Item): buf = buf + _("virt ram : %s\n") % self.virt_ram buf = buf + _("virt type : %s\n") % self.virt_type + buf = buf + _("power type : %s\n") % self.power_type + buf = buf + _("power address : %s\n") % self.power_address + buf = buf + _("power user : %s\n") % self.power_user + buf = buf + _("power password : %s\n") % self.power_pass + buf = buf + _("power id : %s\n") % self.power_id + ikeys = self.interfaces.keys() ikeys.sort() for name in ikeys: @@ -665,11 +672,11 @@ class System(item.Item): 'template-files' : self.set_template_files, 'template_files' : self.set_template_files, 'comment' : self.set_comment, - 'power_type' : self.power_type, - 'power_address' : self.power_address, - 'power_user' : self.power_user, - 'power_pass' : self.power_pass, - 'power_id' : self.power_id + 'power_type' : self.set_power_type, + 'power_address' : self.set_power_address, + 'power_user' : self.set_power_user, + 'power_pass' : self.set_power_pass, + 'power_id' : self.set_power_id } diff --git a/cobbler/modules/cli_system.py b/cobbler/modules/cli_system.py index 92b37aa9..5fe6ec18 100644 --- a/cobbler/modules/cli_system.py +++ b/cobbler/modules/cli_system.py @@ -95,8 +95,7 @@ class SystemFunction(commands.CobblerFunction): p.add_option("--power-address", dest="power_address", help="address of power mgmt device, if required") p.add_option("--power-id", dest="power_id", help="plug-number or blade name, if required") p.add_option("--power-pass", dest="power_pass", help="password for power management interface") - - p.add_option("--power-type", dest="power_type", help="one of: none, bullpap, wti, apc_snmp, ether-wake, ipmilan, drac, ipmitool, ilo") + p.add_option("--power-type", dest="power_type", help="one of: none, apc_snmp, bullpap, drac, ether-wake, ilo, ipmilan, ipmitool, wti") p.add_option("--power-user", dest="power_user", help="username for power management interface, if required") diff --git a/cobbler/remote.py b/cobbler/remote.py index 088ab7f6..6cf27e70 100644 --- a/cobbler/remote.py +++ b/cobbler/remote.py @@ -1660,6 +1660,12 @@ def test_xmlrpc_rw(): server.modify_system(sid, "mgmt-classes", [ "one", "two", "three"], token) server.modify_system(sid, "template-files", {}, token) server.modify_system(sid, "comment", "...", token) + server.modify_system(sid, "power_address", "power.example.org", token) + server.modify_system(sid, "power_type", "ipmitool", token) + server.modify_system(sid, "power_user", "Admin", token) + server.modify_system(sid, "power_pass", "magic", token) + server.modify_system(sid, "power_id", "7", token) + server.save_system(sid,token) api.deserialize() diff --git a/cobbler/webui/CobblerWeb.py b/cobbler/webui/CobblerWeb.py index d2ed973d..f33dd6f3 100644 --- a/cobbler/webui/CobblerWeb.py +++ b/cobbler/webui/CobblerWeb.py @@ -399,7 +399,7 @@ class CobblerWeb(object): if power_id: self.remote.modify_system(system, 'power_id', power_id, self.token) if power_address: - self.remote.modify_sysetm(system, 'power_address', power_address, self.token) + self.remote.modify_system(system, 'power_address', power_address, self.token) interfaces = args.get("interface_list","") interfaces = interfaces.split(",") diff --git a/webui_content/cobblerweb.css b/webui_content/cobblerweb.css index e843db31..f9a46bbd 100644 --- a/webui_content/cobblerweb.css +++ b/webui_content/cobblerweb.css @@ -49,4 +49,7 @@ table.sortable caption { td.nicedit { background-color: #444444; } +td.virtedit { background-color: #000080; } + +td.poweredit { background-color: #8b8878; } diff --git a/webui_templates/profile_edit.tmpl b/webui_templates/profile_edit.tmpl index 10f34085..31866881 100644 --- a/webui_templates/profile_edit.tmpl +++ b/webui_templates/profile_edit.tmpl @@ -240,10 +240,10 @@ function disablename(value) </tr> <tr> - <td> + <td class="virtedit"> <label for="virtfilesize">Virt Disk (GB)</label> </td> - <td> + <td class="virtedit"> <input type="text" size="5" style="width: 150px;" name="virtfilesize" id="virtfilesize" #if $profile value="$profile.virt_file_size" @@ -254,10 +254,10 @@ function disablename(value) </tr> <tr> - <td> + <td class="virtedit"> <label for="virtram">Virt RAM (MB)</label> </td> - <td> + <td class="virtedit"> <input type="text" size="5" style="width: 150px;" name="virtram" id="virtram" #if $profile value="$profile.virt_ram" @@ -268,10 +268,10 @@ function disablename(value) </tr> <tr> - <td> + <td class="virtedit"> <label for="virttype">Virt Type</label> </td> - <td> + <td class="virtedit"> #if $profile and $profile.virt_type == "auto" <input type="radio" name="virttype" id="virttype" value="auto" checked>Any #else @@ -311,10 +311,10 @@ function disablename(value) </tr> <tr> - <td> + <td class="virtedit"> <label for="virtpath">Virt Path</label> </td> - <td> + <td class="virtedit"> <input type="text" size="255" style="width: 400px;" name="virtpath" id="virtpath" #if $profile value="$profile.virt_path" @@ -325,10 +325,10 @@ function disablename(value) </tr> <tr> - <td> + <td class="virtedit"> <label for="virtpath">Virt Bridge</label> </td> - <td> + <td class="virtedit"> <input type="text" size="255" style="width: 150px;" name="virtbridge" id="virtbridge" #if $profile value="$profile.virt_bridge" @@ -339,10 +339,10 @@ function disablename(value) </tr> <tr> - <td> + <td class="virtedit"> <label for="virtpath">Virt CPUs</label> </td> - <td> + <td class="virtedit"> <input type="text" size="255" style="width: 150px;" name="virtcpus" id="virtcpus" #if $profile value="$profile.virt_cpus" diff --git a/webui_templates/system_edit.tmpl b/webui_templates/system_edit.tmpl index bd085bc8..68823db5 100644 --- a/webui_templates/system_edit.tmpl +++ b/webui_templates/system_edit.tmpl @@ -155,7 +155,16 @@ function save_intf(which) itable["virtbridge"] = document.getElementById("virtbridge").value itable["subnet"] = document.getElementById("subnet").value itable["gateway"] = document.getElementById("gateway").value - itable["bonding"] = document.getElementById("bonding").value + + var bond = "na" + if (document.getElementById("bonding_is_master").checked == true) { + bond = "master" + } else if (document.getElementById("bonding_is_slave").checked == true) { + bond = "slave" + } + + itable["bonding"] = bond + itable["bondingmaster"] = document.getElementById("bondingmaster").value itable["bondingopts"] = document.getElementById("bondingopts").value itable["static"] = document.getElementById("static").checked @@ -209,7 +218,9 @@ function clear_intf() document.getElementById("virtbridge").value = "" document.getElementById("subnet").value = "" document.getElementById("gateway").value = "" - document.getElementById("bonding").value = "" + + document.getElementById("bonding_is_na").checked = True + document.getElementById("bondingmaster").value = "" document.getElementById("bondingopts").value = "" document.getElementById("present").value = "1" @@ -513,10 +524,10 @@ function page_onload() { <tr> - <td> + <td class="virtedit"> <label for="virtfilesize">Virt Disk (GB)</label> </td> - <td> + <td class="virtedit"> <input type="text" size="5" style="width: 150px;" name="virtfilesize" id="virtfilesize" #if $system value="$system.virt_file_size" @@ -527,10 +538,10 @@ function page_onload() { </tr> <tr> - <td> + <td class="virtedit"> <label for="virtram">Virt RAM (MB)</label> </td> - <td> + <td class="virtedit"> <input type="text" size="5" style="width: 150px;" name="virtram" id="virtram" #if $system value="$system.virt_ram" @@ -541,10 +552,10 @@ function page_onload() { </tr> <tr> - <td> + <td class="virtedit"> <label for="virttype">Virt Type</label> </td> - <td> + <td class="virtedit"> #if $system and $system.virt_type == "<<inherit>>" <input type="radio" name="virttype" id="virttype" value="<<inherit>>" checked>Inherit @@ -583,10 +594,10 @@ function page_onload() { </tr> <tr> - <td> + <td class="virtedit"> <label for="virtpath">Virt Path</label> </td> - <td> + <td class="virtedit"> <input type="text" size="255" style="width: 400px;" name="virtpath" id="virtpath" #if $system value="$system.virt_path" @@ -597,10 +608,10 @@ function page_onload() { </tr> <tr> - <td> + <td class="virtedit"> <label for="virtpath">Virt CPUs</label> </td> - <td> + <td class="virtedit"> <input type="text" size="255" style="width: 150px;" name="virtcpus" id="virtcpus" #if $system value="$system.virt_cpus" @@ -611,12 +622,12 @@ function page_onload() { </tr> <tr> - <td> + <td class="poweredit"> <label for="power_type">Power Type</label> </td> - <td> + <td class="poweredit"> <select name="power_type" id="power_type"> - #set valid_power = [ "bullpap", "wti", "apc_snmp", "ether-wake", "ipmilan", "drac", "ipmitool", "ilo", "rsa" + #set valid_power = [ "bullpap", "wti", "apc_snmp", "ether-wake", "ipmilan", "drac", "ipmitool", "ilo", "rsa" ] #set nothing = valid_power.sort() #for $value in $valid_power: @@ -632,10 +643,10 @@ function page_onload() { </tr> <tr> - <td> + <td class="poweredit"> <label for="power_address">Power Address</label> </td> - <td> + <td class="poweredit"> <input type="text" size="255" style="width: 150px;" name="power_address" id="power_address" #if $system value="$system.power_address" @@ -646,10 +657,10 @@ function page_onload() { </tr> <tr> - <td> + <td class="poweredit"> <label for="power_id">Power Id</label> </td> - <td> + <td class="poweredit"> <input type="text" size="255" style="width: 150px;" name="power_id" id="power_id" #if $system value="$system.power_id" @@ -660,10 +671,10 @@ function page_onload() { </tr> <tr> - <td> + <td class="poweredit"> <label for="power_user">Power User</label> </td> - <td> + <td class="poweredit"> <input type="text" size="255" style="width: 150px;" name="power_user" id="power_user" #if $system value="$system.power_user" @@ -674,10 +685,10 @@ function page_onload() { </tr> <tr> - <td> + <td class="poweredit"> <label for="power_pass">Power Password</label> </td> - <td> + <td class="poweredit"> <input type="text" size="255" style="width: 150px;" name="power_pass" id="power_pass" #if $system value="$system.power_pass" |