Fixed compilation issues, incorrect merges from last commit
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/08467ee3 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/08467ee3 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/08467ee3 Branch: refs/heads/cisco-vnmc-api-integration Commit: 08467ee30709268b536e649b24ad029db792934c Parents: 67f11d4 Author: Koushik Das <[email protected]> Authored: Mon Apr 8 16:04:54 2013 +0530 Committer: Koushik Das <[email protected]> Committed: Mon Apr 8 16:04:54 2013 +0530 ---------------------------------------------------------------------- api/src/com/cloud/network/Network.java | 1 + .../network/ExternalNetworkDeviceManager.java | 1 + 2 files changed, 2 insertions(+), 0 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/08467ee3/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 ffe70d1..773be7d 100644 --- a/api/src/com/cloud/network/Network.java +++ b/api/src/com/cloud/network/Network.java @@ -137,6 +137,7 @@ public interface Network extends ControlledEntity, StateObject<Network.State>, I public static final Provider None = new Provider("None", false); // 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 CiscoVnmc = new Provider("CiscoVnmc", true); private String name; http://git-wip-us.apache.org/repos/asf/cloudstack/blob/08467ee3/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java ---------------------------------------------------------------------- diff --git a/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java b/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java index 29ce2e3..70c61dc 100644 --- a/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java +++ b/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java @@ -43,6 +43,7 @@ public interface ExternalNetworkDeviceManager extends Manager { public static final NetworkDevice F5BigIpLoadBalancer = new NetworkDevice("F5BigIpLoadBalancer", Network.Provider.F5BigIp.getName()); public static final NetworkDevice JuniperSRXFirewall = new NetworkDevice("JuniperSRXFirewall", Network.Provider.JuniperSRX.getName()); public static final NetworkDevice NiciraNvp = new NetworkDevice("NiciraNvp", Network.Provider.NiciraNvp.getName()); + public static final NetworkDevice MidokuraMidonet = new NetworkDevice("MidokuraMidonet", Network.Provider.MidokuraMidonet.getName()); public static final NetworkDevice CiscoVnmc = new NetworkDevice("CiscoVnmc", Network.Provider.CiscoVnmc.getName()); public NetworkDevice(String deviceName, String ntwkServiceprovider) {
