You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by hu...@apache.org on 2013/04/06 11:43:37 UTC
git commit: updated refs/heads/4.1 to a0ffb47
Updated Branches:
refs/heads/4.1 57937b6cf -> a0ffb4715
CLOUDSTACK-1917: Update componentContext with the missing Nicira elements in both the normal and nonoss build
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a0ffb471
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a0ffb471
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a0ffb471
Branch: refs/heads/4.1
Commit: a0ffb47157c7a14429fddf926a331dc0dacc8c85
Parents: 57937b6
Author: Hugo Trippaers <ht...@schubergphilis.com>
Authored: Sat Apr 6 11:32:40 2013 +0200
Committer: Hugo Trippaers <ht...@schubergphilis.com>
Committed: Sat Apr 6 11:32:40 2013 +0200
----------------------------------------------------------------------
client/tomcatconf/componentContext.xml.in | 16 ++++++++++++++++
client/tomcatconf/nonossComponentContext.xml.in | 2 ++
2 files changed, 18 insertions(+), 0 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0ffb471/client/tomcatconf/componentContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in
index 48a6d75..8005022 100644
--- a/client/tomcatconf/componentContext.xml.in
+++ b/client/tomcatconf/componentContext.xml.in
@@ -43,6 +43,20 @@
<bean id="databaseUpgradeChecker" class="com.cloud.upgrade.DatabaseUpgradeChecker" />
<bean id="configurationDaoImpl" class="com.cloud.configuration.dao.ConfigurationDaoImpl" />
+
+ <!--
+ 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>
+
<!--
@@ -184,6 +198,7 @@
<ref bean="DirectNetworkGuru"/>
<ref bean="OvsGuestNetworkGuru"/>
<ref bean="PrivateNetworkGuru"/>
+ <ref bean="NiciraNvpGuestNetworkGuru"/>
</list>
</property>
</bean>
@@ -195,6 +210,7 @@
<ref bean="Ovs"/>
<ref bean="SecurityGroupProvider"/>
<ref bean="VpcVirtualRouter"/>
+ <ref bean="NiciraNvp"/>
<!--
<ref bean="BareMetalDhcp"/>
<ref bean="BareMetalPxe"/>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a0ffb471/client/tomcatconf/nonossComponentContext.xml.in
----------------------------------------------------------------------
diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in
index c81f100..80f1b21 100644
--- a/client/tomcatconf/nonossComponentContext.xml.in
+++ b/client/tomcatconf/nonossComponentContext.xml.in
@@ -273,6 +273,7 @@
<ref bean="DirectNetworkGuru"/>
<ref bean="OvsGuestNetworkGuru"/>
<ref bean="PrivateNetworkGuru"/>
+ <ref bean="NiciraNvpGuestNetworkGuru"/>
</list>
</property>
</bean>
@@ -280,6 +281,7 @@
<bean id="networkElements" class="com.cloud.utils.component.AdapterList">
<property name="Adapters">
<list>
+ <ref bean="NiciraNvp"/>
<ref bean="JuniperSRX"/>
<ref bean="Netscaler"/>
<ref bean="F5BigIP"/>