diff --git a/api/src/com/cloud/network/ovs/OvsCreateTunnelAnswer.java b/api/src/com/cloud/network/ovs/OvsCreateTunnelAnswer.java index 2b6d2c9b14e..3d23463bf12 100644 --- a/api/src/com/cloud/network/ovs/OvsCreateTunnelAnswer.java +++ b/api/src/com/cloud/network/ovs/OvsCreateTunnelAnswer.java @@ -24,7 +24,7 @@ public class OvsCreateTunnelAnswer extends Answer { //for debug info String fromIp; String toIp; - String key; + int key; String bridge; public OvsCreateTunnelAnswer(Command cmd, boolean success, String details, String bridge) { @@ -70,7 +70,7 @@ public class OvsCreateTunnelAnswer extends Answer { return toIp; } - public String getKey() { + public int getKey() { return key; } @@ -79,3 +79,4 @@ public class OvsCreateTunnelAnswer extends Answer { } } + diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index 8164b57a521..8ec03fa67b9 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -660,6 +660,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe private synchronized Network configureTunnelNetwork(Connection conn, long networkId, long hostId, int key) { try { Network nw = findOrCreateTunnelNetwork(conn, networkId); + String nwName = "OVSTunnel" + key; //Invoke plugin to setup the bridge which will be used by this network String bridge = nw.getBridge(conn); Map nwOtherConfig = nw.getOtherConfig(conn);