You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ch...@apache.org on 2013/01/08 00:22:53 UTC
[7/7] git commit: Forgot some element adapters + dont add JuniperSRX
by default
Updated Branches:
refs/heads/network-refactor a64b38671 -> af1abe405
Forgot some element adapters + dont add JuniperSRX by default
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/af1abe40
Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/af1abe40
Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/af1abe40
Branch: refs/heads/network-refactor
Commit: af1abe4056dfe00bd3b6f070fce19b2beb1bfc81
Parents: e262eef
Author: Chiradeep Vittal <ch...@apache.org>
Authored: Mon Jan 7 14:57:40 2013 -0800
Committer: Chiradeep Vittal <ch...@apache.org>
Committed: Mon Jan 7 15:21:57 2013 -0800
----------------------------------------------------------------------
client/tomcatconf/components.xml.in | 22 +++++++++++----
.../configuration/DefaultComponentLibrary.java | 2 +
2 files changed, 18 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af1abe40/client/tomcatconf/components.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/components.xml.in b/client/tomcatconf/components.xml.in
index 49c075b..48b1e8a 100755
--- a/client/tomcatconf/components.xml.in
+++ b/client/tomcatconf/components.xml.in
@@ -161,11 +161,6 @@ under the License.
</adapters>
<adapters key="com.cloud.network.element.FirewallServiceProvider">
<adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/>
- <adapter name="VirtualRouter" class="com.cloud.network.element.JuniperSRXExternalFirewallElement"/>
- </adapters>
- <adapters key="com.cloud.network.element.FirewallServiceProvider">
- <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/>
- <adapter name="JuniperSRXExternalFirewallElement" class="com.cloud.network.element.JuniperSRXExternalFirewallElement"/>
</adapters>
<adapters key="com.cloud.network.element.DhcpServiceProvider">
<adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/>
@@ -176,14 +171,15 @@ under the License.
</adapters>
<adapters key="com.cloud.network.element.SourceNatServiceProvider">
<adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/>
- <adapter name="JuniperSRXExternalFirewallElement" class="com.cloud.network.element.JuniperSRXExternalFirewallElement"/>
<adapter name="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement"/>
</adapters>
<adapters key="com.cloud.network.element.StaticNatServiceProvider">
<adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/>
+ <adapter name="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement"/>
</adapters>
<adapters key="com.cloud.network.element.PortForwardingServiceProvider">
<adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/>
+ <adapter name="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement"/>
</adapters>
<adapters key="com.cloud.network.element.LoadBalancingServiceProvider">
<adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/>
@@ -191,9 +187,23 @@ under the License.
<adapters key="com.cloud.network.element.RemoteAccessVPNServiceProvider">
<adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/>
</adapters>
+ <adapters key="com.cloud.network.element.Site2SiteVpnServiceProvider">
+ <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement" />
+ </adapters>
<adapters key="com.cloud.network.element.IpDeployer">
<adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/>
+ <adapter name="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement"/>
+ </adapters>
+ <adapters key="com.cloud.network.element.ConnectivityProvider">
+ <adapter name="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement"/>
+ </adapters>
+ <adapters key="com.cloud.network.element.NetworkACLServiceProvider">
+ <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/>
</adapters>
+ <adapters key="com.cloud.network.element.VpcProvider">
+ <adapter name="VirtualRouter" class="com.cloud.network.element.VirtualRouterElement"/>
+ </adapters>
+
<adapters key="com.cloud.cluster.agentlb.AgentLoadBalancerPlanner">
<adapter name="ClusterBasedAgentLbPlanner" class="com.cloud.cluster.agentlb.ClusterBasedAgentLoadBalancerPlanner"/>
</adapters>
http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/af1abe40/server/src/com/cloud/configuration/DefaultComponentLibrary.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/DefaultComponentLibrary.java b/server/src/com/cloud/configuration/DefaultComponentLibrary.java
index 226ca49..32a6be7 100755
--- a/server/src/com/cloud/configuration/DefaultComponentLibrary.java
+++ b/server/src/com/cloud/configuration/DefaultComponentLibrary.java
@@ -74,6 +74,7 @@ import com.cloud.maint.UpgradeManagerImpl;
import com.cloud.maint.dao.AgentUpgradeDaoImpl;
import com.cloud.network.ExternalLoadBalancerUsageManagerImpl;
import com.cloud.network.NetworkManagerImpl;
+import com.cloud.network.NetworkServiceImpl;
import com.cloud.network.StorageNetworkManagerImpl;
import com.cloud.network.as.AutoScaleManagerImpl;
import com.cloud.network.as.dao.AutoScalePolicyConditionMapDaoImpl;
@@ -379,6 +380,7 @@ public class DefaultComponentLibrary extends ComponentLibraryBase implements Com
addManager("account manager", AccountManagerImpl.class);
addManager("domain manager", DomainManagerImpl.class);
addManager("resource limit manager", ResourceLimitManagerImpl.class);
+ addManager("network service", NetworkServiceImpl.class);
addManager("network manager", NetworkManagerImpl.class);
addManager("download manager", DownloadMonitorImpl.class);
addManager("upload manager", UploadMonitorImpl.class);