CLOUDSTACK-1572: Remove references to netscalar vpc provider. NetworkElement is not implemented yet
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/99066060 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/99066060 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/99066060 Branch: refs/heads/gslb-wip Commit: 99066060cd2e1a9f7ca71edf12e319f4ddecd5a7 Parents: a8b5440 Author: Kishan Kavala <kis...@cloud.com> Authored: Thu Mar 7 16:42:21 2013 +0530 Committer: Kishan Kavala <kis...@cloud.com> Committed: Thu Mar 7 16:42:39 2013 +0530 ---------------------------------------------------------------------- api/src/com/cloud/network/Network.java | 1 - .../src/com/cloud/network/vpc/VpcManagerImpl.java | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/99066060/api/src/com/cloud/network/Network.java ---------------------------------------------------------------------- diff --git a/api/src/com/cloud/network/Network.java b/api/src/com/cloud/network/Network.java index e584e8d..efed5cd 100644 --- a/api/src/com/cloud/network/Network.java +++ b/api/src/com/cloud/network/Network.java @@ -138,7 +138,6 @@ public interface Network extends ControlledEntity, StateObject<Network.State>, I // NiciraNvp is not an "External" provider, otherwise we get in trouble with NetworkServiceImpl.providersConfiguredForExternalNetworking public static final Provider NiciraNvp = new Provider("NiciraNvp", false); public static final Provider MidokuraMidonet = new Provider("MidokuraMidonet", true); - public static final Provider VPCNetscaler = new Provider("VPCNetscaler", true); private String name; private boolean isExternal; http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/99066060/server/src/com/cloud/network/vpc/VpcManagerImpl.java ---------------------------------------------------------------------- diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index de6707e..fee4ef3 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -1164,7 +1164,6 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager{ if (vpcElements == null) { vpcElements = new ArrayList<VpcProvider>(); vpcElements.add((VpcProvider)_ntwkModel.getElementImplementingProvider(Provider.VPCVirtualRouter.getName())); - vpcElements.add((VpcProvider)_ntwkModel.getElementImplementingProvider(Provider.VPCNetscaler.getName())); } if (vpcElements == null) {
