Return-Path: 
 <commits-return-15642-apmail-cloudstack-commits-archive=cloudstack.apache.org@cloudstack.apache.org>
X-Original-To: apmail-cloudstack-commits-archive@www.apache.org
Delivered-To: apmail-cloudstack-commits-archive@www.apache.org
Received: from mail.apache.org (hermes.apache.org [140.211.11.3])
	by minotaur.apache.org (Postfix) with SMTP id 7CAF0F31A
	for <apmail-cloudstack-commits-archive@www.apache.org>;
 Fri,  5 Apr 2013 21:03:01 +0000 (UTC)
Received: (qmail 74525 invoked by uid 500); 5 Apr 2013 21:02:58 -0000
Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org
Received: (qmail 74424 invoked by uid 500); 5 Apr 2013 21:02:58 -0000
Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm
Precedence: bulk
List-Help: <mailto:commits-help@cloudstack.apache.org>
List-Unsubscribe: <mailto:commits-unsubscribe@cloudstack.apache.org>
List-Post: <mailto:commits@cloudstack.apache.org>
List-Id: <commits.cloudstack.apache.org>
Reply-To: dev@cloudstack.apache.org
Delivered-To: mailing list commits@cloudstack.apache.org
Received: (qmail 73906 invoked by uid 99); 5 Apr 2013 21:02:57 -0000
Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org)
 (140.211.11.114)
    by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 05 Apr 2013 21:02:57 +0000
Received: by tyr.zones.apache.org (Postfix, from userid 65534)
	id 4763F1EBF7; Fri,  5 Apr 2013 21:02:57 +0000 (UTC)
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
From: prachidamle@apache.org
To: commits@cloudstack.apache.org
Date: Fri, 05 Apr 2013 21:03:07 -0000
Message-Id: <67463ce833964c56a82cea9a9a7634b9@git.apache.org>
In-Reply-To: <50a0b3e8441e465e86a772c009e58d65@git.apache.org>
References: <50a0b3e8441e465e86a772c009e58d65@git.apache.org>
X-Mailer: ASF-Git Admin Mailer
Subject: [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 <htrippaers@schubergphilis.com>
Authored: Wed Apr 3 08:35:39 2013 +0200
Committer: Hugo Trippaers <htrippaers@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"/>