java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java | 39 ++++------ 1 file changed, 17 insertions(+), 22 deletions(-)
New commits: commit e8f6177222045bc30a6e0818cdd3aa36bea2d659 Author: Partha Aji paji@redhat.com Date: Fri Jul 24 00:05:45 2009 -0400
515539 - Made the cobbler create system record command always delete and create a new version of system
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java index 00b7abe..09ad45d 100644 --- a/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java +++ b/java/code/src/com/redhat/rhn/manager/kickstart/cobbler/CobblerSystemCreateCommand.java @@ -150,14 +150,7 @@ public class CobblerSystemCreateCommand extends CobblerCommand { sysname = (String) sysmap.get("name"); } } - if (sysname != null) { - String handle = (String) invokeXMLRPC("get_system_handle", - sysname, xmlRpcToken); - log.debug("getSystemHandleByMAC.returning handle: " + handle); - return handle; - } - - return null; + return sysname; }
private Map getSystemMapByMac() { @@ -209,27 +202,30 @@ public class CobblerSystemCreateCommand extends CobblerCommand { * @return ValidatorError if the store failed. */ public ValidatorError store() { - String handle = null; // First lookup by MAC addr - handle = lookupExisting(); - if (handle == null) { + String sysName = lookupExisting(); + if (sysName == null) { // Next try by name try { - handle = (String) invokeXMLRPC("get_system_handle", + String handle = (String) invokeXMLRPC("get_system_handle", getCobblerSystemRecordName(), xmlRpcToken); + if (!StringUtils.isBlank(handle)) { + sysName = getCobblerSystemRecordName(); + } log.debug("Did we find handle by name: " + handle); } catch (RuntimeException e) { log.debug("No system by that name either. create a new one"); } } - // Else, lets make a new system - if (handle == null) { - handle = (String) invokeXMLRPC("new_system", xmlRpcToken); - log.debug("handle: " + handle); - invokeXMLRPC("modify_system", handle, "name", getCobblerSystemRecordName(), - xmlRpcToken); + if (!StringUtils.isBlank(sysName)) { + invokeXMLRPC("remove_system", sysName, xmlRpcToken); + invokeCobblerUpdate(); } + String handle = (String) invokeXMLRPC("new_system", xmlRpcToken); + log.debug("handle: " + handle); + invokeXMLRPC("modify_system", handle, "name", getCobblerSystemRecordName(), + xmlRpcToken);
if (this.server.getNetworkInterfaces() != null && !this.server.getNetworkInterfaces().isEmpty()) { @@ -321,10 +317,9 @@ public class CobblerSystemCreateCommand extends CobblerCommand { if (!StringUtils.isBlank(n.getNetmask())) { inet.put("subnet-" + n.getName(), n.getNetmask()); } - if (!StringUtils.isBlank(staticNetwork) && - n.getName().equals(staticNetwork)) { - inet.put("static-" + n.getName(), Boolean.TRUE); - } + inet.put("static-" + n.getName(), + !StringUtils.isBlank(staticNetwork) && + n.getName().equals(staticNetwork)); } } log.debug("Networks: " + inet);
spacewalk-commits@lists.fedorahosted.org