You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by pr...@apache.org on 2013/04/05 23:03:07 UTC
[12/50] [abbrv] git commit: updated refs/heads/affinity_groups to
ca1a794
With commit 16216720c6e981af4860ba83426b5ce91de1dc81 autoscanning is
removed so Nicira needs to be properly added to the componentContext
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8bb28fd7
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8bb28fd7
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8bb28fd7
Branch: refs/heads/affinity_groups
Commit: 8bb28fd7134626b3a967474abf3ae418aace72be
Parents: 04a511a
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Wed Apr 3 08:35:39 2013 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Wed Apr 3 09:20:21 2013 +0200
----------------------------------------------------------------------
client/tomcatconf/componentContext.xml.in | 17 +++++++++++++++++
client/tomcatconf/nonossComponentContext.xml.in | 7 +++++++
2 files changed, 24 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bb28fd7/client/tomcatconf/componentContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in
index 18d21c0..51980c9 100644
--- a/client/tomcatconf/componentContext.xml.in
+++ b/client/tomcatconf/componentContext.xml.in
@@ -140,6 +140,7 @@
<ref bean="DirectNetworkGuru"/>
<ref bean="OvsGuestNetworkGuru"/>
<ref bean="PrivateNetworkGuru"/>
+ <ref bean="NiciraNvpGuestNetworkGuru"/>
</list>
</property>
<property name="NetworkElements">
@@ -148,6 +149,7 @@
<ref bean="Ovs"/>
<ref bean="SecurityGroupProvider"/>
<ref bean="VpcVirtualRouter"/>
+ <ref bean="NiciraNvp"/>
<!--
<ref bean="BareMetalDhcp"/>
<ref bean="BareMetalPxe"/>
@@ -180,6 +182,7 @@
<ref bean="Ovs"/>
<ref bean="SecurityGroupProvider"/>
<ref bean="VpcVirtualRouter"/>
+ <ref bean="NiciraNvp" />
<!--
<ref bean="BareMetalDhcp"/>
<ref bean="BareMetalPxe"/>
@@ -191,4 +194,18 @@
<bean id="GlobalLoadBalancingRulesServiceImpl" class ="org.apache.cloudstack.region.gslb.GlobalLoadBalancingRulesServiceImpl" />
+ <!--
+ Nicira support components
+ -->
+ <bean id="niciraNvpDaoImpl" class="com.cloud.network.dao.NiciraNvpDaoImpl" />
+ <bean id="niciraNvpNicMappingDaoImpl" class="com.cloud.network.dao.NiciraNvpNicMappingDaoImpl" />
+ <bean id="niciraNvpRouterMappingDaoImpl" class="com.cloud.network.dao.NiciraNvpRouterMappingDaoImpl" />
+ <bean id="NiciraNvpGuestNetworkGuru" class="com.cloud.network.guru.NiciraNvpGuestNetworkGuru">
+ <property name="name" value="NiciraNvpGuestNetworkGuru"/>
+ </bean>
+ <bean id="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement">
+ <property name="name" value="NiciraNvp"/>
+ </bean>
+
+
</beans>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8bb28fd7/client/tomcatconf/nonossComponentContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in
index 11472ad..a9418d7 100644
--- a/client/tomcatconf/nonossComponentContext.xml.in
+++ b/client/tomcatconf/nonossComponentContext.xml.in
@@ -78,6 +78,10 @@
<bean id="NiciraNvp" class="com.cloud.network.element.NiciraNvpElement">
<property name="name" value="NiciraNvp"/>
</bean>
+
+ <!--
+ BigSwitch Components
+ -->
<bean id="BigSwitchVns" class="com.cloud.network.element.BigSwitchVnsElement">
<property name="name" value="BigSwitchVns"/>
</bean>
@@ -230,6 +234,7 @@
<ref bean="DirectNetworkGuru"/>
<ref bean="OvsGuestNetworkGuru"/>
<ref bean="PrivateNetworkGuru"/>
+ <ref bean="NiciraNvpGuestNetworkGuru" />
</list>
</property>
<property name="NetworkElements">
@@ -238,6 +243,7 @@
<ref bean="Netscaler"/>
<ref bean="F5BigIP"/>
<ref bean="CiscoNexus1000vVSM"/>
+ <ref bean="NiciraNvp" />
<ref bean="bigSwitchVnsElement"/>
<ref bean="VirtualRouter"/>
<ref bean="Ovs"/>
@@ -275,6 +281,7 @@
<ref bean="Netscaler"/>
<ref bean="F5BigIP"/>
<ref bean="CiscoNexus1000vVSM"/>
+ <ref bean="NiciraNvp" />
<ref bean="bigSwitchVnsElement"/>
<ref bean="VirtualRouter"/>
<ref bean="Ovs"/>