Frank Kobzik has uploaded a new change for review. Change subject: core: legacy VDSM fix - part 2 ......................................................................
core: legacy VDSM fix - part 2 Adding forgotten part of legacy vdsm fix to I48cd5f76ed870530208fcd0fc69c3d1a52b7249b which I forgot to fixup. Change-Id: I3b0cd1d109dae745c5a91e4f7a928457c9a7a9d3 Signed-off-by: Frantisek Kobzik <[email protected]> --- M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java 1 file changed, 26 insertions(+), 27 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/70/36870/1 diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java index c0f1a44..05268a8 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/vdsbroker/VdsBrokerObjectsBuilder.java @@ -352,36 +352,35 @@ return; } - GraphicsInfo graphicsInfo = vm.getGraphicsInfos().get(vmGraphicsType); - - if (graphicsInfo != null) { - if (xmlRpcStruct.containsKey(VdsProperties.display_port)) { - try { - graphicsInfo.setPort(Integer.parseInt(xmlRpcStruct.get(VdsProperties.display_port).toString())); - } catch (NumberFormatException e) { - log.error("vm display_port value illegal : {0}", xmlRpcStruct.get(VdsProperties.display_port)); - } - } else if (xmlRpcStruct.containsKey(VdsProperties.display)) { - try { - graphicsInfo - .setPort(VNC_START_PORT + Integer.parseInt(xmlRpcStruct.get(VdsProperties.display).toString())); - } catch (NumberFormatException e) { - log.error("vm display value illegal : {0}", xmlRpcStruct.get(VdsProperties.display)); - } + GraphicsInfo graphicsInfo = new GraphicsInfo(); + if (xmlRpcStruct.containsKey(VdsProperties.display_port)) { + try { + graphicsInfo.setPort(Integer.parseInt(xmlRpcStruct.get(VdsProperties.display_port).toString())); + } catch (NumberFormatException e) { + log.error("vm display_port value illegal : {0}", xmlRpcStruct.get(VdsProperties.display_port)); } - if (xmlRpcStruct.containsKey(VdsProperties.display_secure_port)) { - try { - graphicsInfo - .setTlsPort(Integer.parseInt(xmlRpcStruct.get(VdsProperties.display_secure_port).toString())); - } catch (NumberFormatException e) { - log.error("vm display_secure_port value illegal : {0}", - xmlRpcStruct.get(VdsProperties.display_secure_port)); - } - } - if (xmlRpcStruct.containsKey((VdsProperties.displayIp))) { - graphicsInfo.setIp((String) xmlRpcStruct.get(VdsProperties.displayIp)); + } else if (xmlRpcStruct.containsKey(VdsProperties.display)) { + try { + graphicsInfo + .setPort(VNC_START_PORT + Integer.parseInt(xmlRpcStruct.get(VdsProperties.display).toString())); + } catch (NumberFormatException e) { + log.error("vm display value illegal : {0}", xmlRpcStruct.get(VdsProperties.display)); } } + if (xmlRpcStruct.containsKey(VdsProperties.display_secure_port)) { + try { + graphicsInfo + .setTlsPort(Integer.parseInt(xmlRpcStruct.get(VdsProperties.display_secure_port).toString())); + } catch (NumberFormatException e) { + log.error("vm display_secure_port value illegal : {0}", + xmlRpcStruct.get(VdsProperties.display_secure_port)); + } + } + if (xmlRpcStruct.containsKey((VdsProperties.displayIp))) { + graphicsInfo.setIp((String) xmlRpcStruct.get(VdsProperties.displayIp)); + } + + vm.getGraphicsInfos().put(vmGraphicsType, graphicsInfo); } /** -- To view, visit http://gerrit.ovirt.org/36870 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I3b0cd1d109dae745c5a91e4f7a928457c9a7a9d3 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Frank Kobzik <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
