skip external guest network guru if 'Connectivy' service is present in network offering
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/c3993c02 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/c3993c02 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/c3993c02 Branch: refs/heads/regionvpc Commit: c3993c0205803bfff43b1c56bc8728c93a1b7cd1 Parents: 2697d58 Author: Murali Reddy <[email protected]> Authored: Fri Feb 7 15:33:50 2014 +0530 Committer: Murali Reddy <[email protected]> Committed: Tue Mar 11 19:52:20 2014 +0530 ---------------------------------------------------------------------- server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java | 4 ++++ 1 file changed, 4 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c3993c02/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java b/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java index 414eb7b..6a974a6 100644 --- a/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java +++ b/server/src/com/cloud/network/guru/ExternalGuestNetworkGuru.java @@ -123,6 +123,10 @@ public class ExternalGuestNetworkGuru extends GuestNetworkGuru { throws InsufficientVirtualNetworkCapcityException { assert (config.getState() == State.Implementing) : "Why are we implementing " + config; + if (_networkModel.areServicesSupportedInNetwork(config.getId(), Network.Service.Connectivity)) { + return null; + } + if (!_networkModel.networkIsConfiguredForExternalNetworking(config.getDataCenterId(), config.getId())) { return super.implement(config, offering, dest, context); }
