You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by mc...@apache.org on 2014/01/22 20:27:54 UTC
[29/53] [abbrv] git commit: updated refs/heads/rbac to 33cd1ab
Fix noredist build issue
Introduced by:
commit ac65f8fddf182534a2dbea81c7e155b80e7c98ea
Author: Hugo Trippaers <ht...@schubergphilis.com>
Date: Mon Jan 20 18:03:02 2014 +0100
CLOUDSTACK-5884 make getTargetSwitch(NicTO nicTo) do all the work to select
switch name, type and vlan token. Change preference to use the tags set on the
physical network.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d4e069ec
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d4e069ec
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d4e069ec
Branch: refs/heads/rbac
Commit: d4e069ecc8708ca37785a82fa8c6442d47363974
Parents: 0e714626
Author: Sheng Yang <sh...@citrix.com>
Authored: Tue Jan 21 11:31:40 2014 -0800
Committer: Sheng Yang <sh...@citrix.com>
Committed: Tue Jan 21 11:31:40 2014 -0800
----------------------------------------------------------------------
.../src/com/cloud/hypervisor/vmware/resource/VmwareResource.java | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d4e069ec/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
----------------------------------------------------------------------
diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
index 566d175..d906a8c 100755
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java
@@ -3570,7 +3570,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
if (VirtualSwitchType.StandardVirtualSwitch == switchType) {
synchronized(hostMo.getMor().getValue().intern()) {
networkInfo = HypervisorHostHelper.prepareNetwork(switchName, namePrefix, hostMo, getVlanInfo(nicTo, vlanToken), nicTo.getNetworkRateMbps(),
- nicTo.getNetworkRateMulticastMbps(), _ops_timeout,
+ nicTo.getNetworkRateMulticastMbps(), _opsTimeout,
!namePrefix.startsWith("cloud.private"), nicTo.getBroadcastType(), nicTo.getUuid());
}
}
@@ -3586,7 +3586,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa
svlanId = getPvlanInfo(nicTo);
}
networkInfo = HypervisorHostHelper.prepareNetwork(switchName, namePrefix, hostMo, vlanId, svlanId,
- nicTo.getNetworkRateMbps(), nicTo.getNetworkRateMulticastMbps(), _ops_timeout, switchType,
+ nicTo.getNetworkRateMbps(), nicTo.getNetworkRateMulticastMbps(), _opsTimeout, switchType,
_portsPerDvPortGroup, nicTo.getGateway(), configureVServiceInNexus, nicTo.getBroadcastType());
}