From a0ffb47157c7a14429fddf926a331dc0dacc8c85 Mon Sep 17 00:00:00 2001
From: Hugo Trippaers <htrippaers@schubergphilis.com>
Date: Sat, 6 Apr 2013 11:32:40 +0200
Subject: [PATCH] CLOUDSTACK-1917: Update componentContext with the missing
 Nicira elements in both the normal and nonoss build

---
 client/tomcatconf/componentContext.xml.in       | 16 ++++++++++++++++
 client/tomcatconf/nonossComponentContext.xml.in |  2 ++
 2 files changed, 18 insertions(+)

diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in
index 48a6d75df20..8005022a43a 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"/>
diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in
index c81f100cf5b..80f1b2154e7 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"/>