You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ko...@apache.org on 2013/02/11 19:40:16 UTC
[2/7] git commit: refs/heads/cisco-vnmc-api-integration - Added
support for network offering creation with VNMC as provider for firewall,
port forwarding, source nat
Added support for network offering creation with VNMC as provider for firewall, port forwarding, source nat
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/f9914363
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/f9914363
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/f9914363
Branch: refs/heads/cisco-vnmc-api-integration
Commit: f991436335254eae4dc11a9f089a5c6e94403cd3
Parents: 74de210
Author: Koushik Das <ko...@citrix.com>
Authored: Fri Feb 8 16:00:15 2013 +0530
Committer: Koushik Das <ko...@citrix.com>
Committed: Fri Feb 8 16:00:15 2013 +0530
----------------------------------------------------------------------
api/src/com/cloud/network/Network.java | 3 ++-
.../network/ExternalNetworkDeviceManager.java | 3 ++-
server/src/com/cloud/api/ApiResponseHelper.java | 4 ++--
.../configuration/ConfigurationManagerImpl.java | 4 ++--
4 files changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f9914363/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 c91f6a9..09d3a6a 100644
--- a/api/src/com/cloud/network/Network.java
+++ b/api/src/com/cloud/network/Network.java
@@ -125,7 +125,8 @@ public interface Network extends ControlledEntity, InternalIdentity, Identity {
public static final Provider None = new Provider("None", false);
public static final Provider NiciraNvp = new Provider("NiciraNvp", true);
public static final Provider MidokuraMidonet = new Provider("MidokuraMidonet", true);
-
+ public static final Provider CiscoVnmc = new Provider("CiscoVnmc", true);
+
private String name;
private boolean isExternal;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f9914363/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 426a3b5..1070355 100644
--- a/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java
+++ b/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java
@@ -43,7 +43,8 @@ public interface ExternalNetworkDeviceManager extends Manager {
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) {
_name = deviceName;
_provider = ntwkServiceprovider;
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f9914363/server/src/com/cloud/api/ApiResponseHelper.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java
index c346a6b..70bd4f1 100755
--- a/server/src/com/cloud/api/ApiResponseHelper.java
+++ b/server/src/com/cloud/api/ApiResponseHelper.java
@@ -2621,8 +2621,8 @@ public class ApiResponseHelper implements ResponseGenerator {
List<? extends Network.Provider> serviceProviders = ApiDBUtils.getProvidersForService(service);
List<ProviderResponse> serviceProvidersResponses = new ArrayList<ProviderResponse>();
for (Network.Provider serviceProvider : serviceProviders) {
- // return only Virtual Router/JuniperSRX as a provider for the firewall
- if (service == Service.Firewall && !(serviceProvider == Provider.VirtualRouter || serviceProvider == Provider.JuniperSRX)) {
+ // return only Virtual Router/JuniperSRX/CiscoVnmc as a provider for the firewall
+ if (service == Service.Firewall && !(serviceProvider == Provider.VirtualRouter || serviceProvider == Provider.JuniperSRX || serviceProvider == Provider.CiscoVnmc)) {
continue;
}
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/f9914363/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 9526279..829158d 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -3032,8 +3032,8 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura
throw new InvalidParameterValueException("Invalid service provider: " + prvNameStr);
}
- if (provider == Provider.JuniperSRX) {
- firewallProvider = Provider.JuniperSRX;
+ if (provider == Provider.JuniperSRX || provider == Provider.CiscoVnmc) {
+ firewallProvider = provider;
}
if ((service == Service.PortForwarding || service == Service.StaticNat) && provider == Provider.VirtualRouter){