diff --git a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index 54403b38612..50f505025fc 100644 --- a/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/core/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -1317,7 +1317,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR if ("untagged".equalsIgnoreCase(vlanId)) { vifr.network = Network.getByUuid(conn, _host.publicNetwork); } else { - Network vlanNetwork = enableVlanNetwork(Long.valueOf(vlanId), _host.publicNetwork, _host.publicPif); + Network vlanNetwork = enableVlanNetwork(Long.valueOf(vlanId), _host.publicPif); if (vlanNetwork == null) { throw new InternalErrorException("Failed to enable VLAN network with tag: " + vlanId); @@ -1975,7 +1975,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR } else { continue; } - Network vlanNetwork = enableVlanNetwork(vlan, nwuuid, pifuuid); + Network vlanNetwork = enableVlanNetwork(vlan, pifuuid); if (vlanNetwork == null) { throw new InternalErrorException("Failed to enable VLAN network with tag: " + vlan); @@ -2845,7 +2845,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR if ("untagged".equalsIgnoreCase(vlanTag)) { vlanNetwork = Network.getByUuid(conn, nwUuid); } else { - vlanNetwork = enableVlanNetwork(Long.valueOf(vlanTag), nwUuid, pifUuid); + vlanNetwork = enableVlanNetwork(Long.valueOf(vlanTag), pifUuid); } if (vlanNetwork == null) { @@ -3069,7 +3069,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR Connection conn = getConnection(); network = Network.getByUuid(conn, _host.guestNetwork); } else { - network = enableVlanNetwork(Long.parseLong(tag), _host.guestNetwork, _host.guestPif); + network = enableVlanNetwork(Long.parseLong(tag), _host.guestPif); } if (network == null) { @@ -3190,7 +3190,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR if ("untagged".equalsIgnoreCase(vlanId)) { vifr.network = Network.getByUuid(conn, _host.publicNetwork); } else { - Network vlanNetwork = enableVlanNetwork(Long.valueOf(vlanId), _host.publicNetwork, _host.publicPif); + Network vlanNetwork = enableVlanNetwork(Long.valueOf(vlanId), _host.publicPif); if (vlanNetwork == null) { throw new InternalErrorException("Failed to enable VLAN network with tag: " + vlanId); @@ -3658,7 +3658,7 @@ public abstract class CitrixResourceBase implements StoragePoolResource, ServerR return found; } - protected Network enableVlanNetwork(long tag, String networkUuid, String pifUuid) throws XenAPIException, XmlRpcException { + protected Network enableVlanNetwork(long tag, String pifUuid) throws XenAPIException, XmlRpcException { // In XenServer, vlan is added by // 1. creating a network. // 2. creating a vlan associating network with the pif.