Summary: Remove useless and commented code Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/cc3d692a Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/cc3d692a Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/cc3d692a
Branch: refs/heads/ui-plugins Commit: cc3d692ab8cdb23ed468723d1021d0640bd390c4 Parents: 282eb5f Author: Hugo Trippaers <[email protected]> Authored: Thu Jan 3 11:51:44 2013 +0100 Committer: Hugo Trippaers <[email protected]> Committed: Thu Jan 3 11:57:37 2013 +0100 ---------------------------------------------------------------------- .../com/cloud/network/guru/GuestNetworkGuru.java | 20 +-------------- 1 files changed, 1 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/cc3d692a/server/src/com/cloud/network/guru/GuestNetworkGuru.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/guru/GuestNetworkGuru.java b/server/src/com/cloud/network/guru/GuestNetworkGuru.java index 2a8a092..91b95f9 100755 --- a/server/src/com/cloud/network/guru/GuestNetworkGuru.java +++ b/server/src/com/cloud/network/guru/GuestNetworkGuru.java @@ -153,25 +153,7 @@ public abstract class GuestNetworkGuru extends AdapterBase implements NetworkGur } protected abstract boolean canHandle(NetworkOffering offering, final NetworkType networkType, PhysicalNetwork physicalNetwork); -/* protected boolean canHandle(NetworkOffering offering, final NetworkType networkType, final List<String> isolationMethods) { - // This guru handles only Guest Isolated network that supports Source nat service -<<<<<<< HEAD - if (dc.getNetworkType() == NetworkType.Advanced && isMyTrafficType(offering.getTrafficType()) - && offering.getGuestType() == Network.GuestType.Isolated && !offering.isSystemOnly()) { -======= - if (networkType == NetworkType.Advanced - && isMyTrafficType(offering.getTrafficType()) - && offering.getGuestType() == Network.GuestType.Isolated - && isMyIsolationMethod(isolationMethods)) { ->>>>>>> master - return true; - } else { - s_logger.trace("We only take care of non-system Guest networks of type " + GuestType.Isolated + " in zone of type " - + NetworkType.Advanced); - return false; - } - } -*/ + @Override public Network design(NetworkOffering offering, DeploymentPlan plan, Network userSpecified, Account owner) { DataCenter dc = _dcDao.findById(plan.getDataCenterId());
