cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alena1...@apache.org
Subject [6/6] git commit: VPC: added missing FirewallService to the VR provider
Date Wed, 04 Jul 2012 00:27:53 GMT
VPC: added missing FirewallService to the VR provider


Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/2b799aa9
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/2b799aa9
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/2b799aa9

Branch: refs/heads/vpc
Commit: 2b799aa9ac0f4e554eec1aaf742656751bf6c843
Parents: 5bcf730
Author: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Authored: Tue Jul 3 09:34:17 2012 -0700
Committer: Alena Prokharchyk <alena.prokharchyk@citrix.com>
Committed: Tue Jul 3 17:22:41 2012 -0700

----------------------------------------------------------------------
 .../network/element/VpcVirtualRouterElement.java   |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/2b799aa9/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
index 2e9ef12..1be7b0b 100644
--- a/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
+++ b/server/src/com/cloud/network/element/VpcVirtualRouterElement.java
@@ -35,9 +35,9 @@ import com.cloud.network.Network.Provider;
 import com.cloud.network.Network.Service;
 import com.cloud.network.NetworkService;
 import com.cloud.network.PublicIpAddress;
-import com.cloud.network.VirtualRouterProvider.VirtualRouterProviderType;
 import com.cloud.network.Site2SiteVpnConnection;
 import com.cloud.network.Site2SiteVpnGateway;
+import com.cloud.network.VirtualRouterProvider.VirtualRouterProviderType;
 import com.cloud.network.dao.IPAddressDao;
 import com.cloud.network.dao.Site2SiteCustomerGatewayDao;
 import com.cloud.network.dao.Site2SiteVpnConnectionDao;
@@ -294,7 +294,8 @@ public class VpcVirtualRouterElement extends VirtualRouterElement implements
Vpc
     }
     
     private static Map<Service, Map<Capability, String>> setCapabilities() {
-        Map<Service, Map<Capability, String>> capabilities = VirtualRouterElement.capabilities;
+        Map<Service, Map<Capability, String>> capabilities = new HashMap<Service,
Map<Capability, String>>();
+        capabilities.putAll(VirtualRouterElement.capabilities);
         
         Map<Capability, String> sourceNatCapabilities = capabilities.get(Service.SourceNat);
         sourceNatCapabilities.put(Capability.RedundantRouter, "false");


Mime
View raw message