From 08467ee30709268b536e649b24ad029db792934c Mon Sep 17 00:00:00 2001 From: Koushik Das Date: Mon, 8 Apr 2013 16:04:54 +0530 Subject: [PATCH] Fixed compilation issues, incorrect merges from last commit --- api/src/com/cloud/network/Network.java | 1 + .../apache/cloudstack/network/ExternalNetworkDeviceManager.java | 1 + 2 files changed, 2 insertions(+) diff --git a/api/src/com/cloud/network/Network.java b/api/src/com/cloud/network/Network.java index ffe70d19dc0..773be7d635f 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, 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; diff --git a/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java b/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java index 29ce2e3971d..70c61dc625e 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) {