Repository: cloudstack Updated Branches: refs/heads/master a49bb7e8e -> e1095b011
revert the change made by commit: a600d840 Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/e1095b01 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/e1095b01 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/e1095b01 Branch: refs/heads/master Commit: e1095b0110f08fb0c7965f9cf293a6073bbce511 Parents: a49bb7e Author: Edison Su <sudi...@gmail.com> Authored: Mon Jul 14 14:10:16 2014 -0700 Committer: Edison Su <sudi...@gmail.com> Committed: Mon Jul 14 14:10:16 2014 -0700 ---------------------------------------------------------------------- .../src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java | 4 ---- 1 file changed, 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e1095b01/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java ---------------------------------------------------------------------- diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java index 839cbaa..e684b8d 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/BridgeVifDriver.java @@ -101,10 +101,6 @@ public class BridgeVifDriver extends VifDriverBase { } else if (nic.getBroadcastType() == Networks.BroadcastDomainType.Lswitch) { throw new InternalErrorException("Nicira NVP Logicalswitches are not supported by the BridgeVifDriver"); } - if ((vNetId == null)||(protocol == null)) - { - throw new InternalErrorException("plug: protocol or vNetId value is null"); - } String trafficLabel = nic.getName(); if (nic.getType() == Networks.TrafficType.Guest) { Integer networkRateKBps = (nic.getNetworkRateMbps() != null && nic.getNetworkRateMbps().intValue() != -1) ? nic.getNetworkRateMbps().intValue() * 128 : 0;
