From 661f8b5325e29691af54aa0994362d4f20345ca0 Mon Sep 17 00:00:00 2001
From: Andre Fredette <afredette@redhat.com>
Date: Mon, 21 Mar 2016 17:24:28 -0400
Subject: [PATCH] odl-netvirt feature fixes.

onSessionInitiated was not getting called for the neutron or hwgw
renderers.  Added config dependencies for each.  Also needed another
change due to the "netvirt-neutron" module name change.

These fixes were worked out jointly with Victor Pickard.

Change-Id: Idb3c6a5cbb1cc728a4baf680f69f15df63a08aac
Signed-off-by: Andre Fredette <afredette@redhat.com>
---
 features/pom.xml                                   | 14 ++++++++++++++
 features/src/main/features/features.xml            |  3 ++-
 .../neutron/src/main/config/default-config.xml     |  6 +++---
 3 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/features/pom.xml b/features/pom.xml
index f1a9292f1c..fd0ff87899 100644
--- a/features/pom.xml
+++ b/features/pom.xml
@@ -279,6 +279,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>hwgw</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>hwgw</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
     <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>hwvtepsouthbound-features</artifactId>
@@ -291,6 +298,13 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
       <artifactId>neutron</artifactId>
       <version>${project.version}</version>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>neutron</artifactId>
+      <version>${project.version}</version>
+      <type>xml</type>
+      <classifier>config</classifier>
+    </dependency>
     <!-- DLUX dependency for the UI -->
     <dependency>
       <groupId>org.opendaylight.dlux</groupId>
diff --git a/features/src/main/features/features.xml b/features/src/main/features/features.xml
index f35b313826..3780e5bfd9 100644
--- a/features/src/main/features/features.xml
+++ b/features/src/main/features/features.xml
@@ -87,12 +87,13 @@
     <feature version="${project.version}">odl-netvirt-api</feature>
     <feature version='${project.version}'>odl-ovsdb-hwvtepsouthbound</feature>
     <bundle>mvn:org.opendaylight.ovsdb/hwgw/{{VERSION}}</bundle>
+    <configfile finalname="etc/opendaylight/karaf/hwgw-default-config.xml">mvn:org.opendaylight.ovsdb/hwgw/{{VERSION}}/xml/config</configfile>
   </feature>
     <feature name='odl-netvirt-neutron' version='${project.version}' description='OpenDaylight :: netvirt :: Neutron Renderer'>
     <feature version="${neutron.version}">odl-neutron-service</feature>
     <feature version="${project.version}">odl-netvirt-ui</feature>
     <bundle>mvn:org.opendaylight.ovsdb/neutron/{{VERSION}}</bundle>
+    <configfile finalname="etc/opendaylight/karaf/netvirt-neutron-default-config.xml">mvn:org.opendaylight.ovsdb/neutron/{{VERSION}}/xml/config</configfile>
   </feature>
 
-
 </features>
diff --git a/netvirt/renderers/neutron/src/main/config/default-config.xml b/netvirt/renderers/neutron/src/main/config/default-config.xml
index 4d91221a4c..09551676a5 100644
--- a/netvirt/renderers/neutron/src/main/config/default-config.xml
+++ b/netvirt/renderers/neutron/src/main/config/default-config.xml
@@ -9,7 +9,7 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
 -->
 <snapshot>
   <required-capabilities>
-      <capability>urn:opendaylight:params:xml:ns:yang:netvirt:neutron?module=neutron&amp;revision=2016-03-08</capability>
+      <capability>urn:opendaylight:params:xml:ns:yang:netvirt:neutron?module=netvirt-neutron&amp;revision=2016-03-08</capability>
       <capability>urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding?module=opendaylight-md-sal-binding&amp;revision=2013-10-28</capability>
   </required-capabilities>
   <configuration>
@@ -17,8 +17,8 @@ and is available at http://www.eclipse.org/legal/epl-v10.html
     <data xmlns="urn:ietf:params:xml:ns:netconf:base:1.0">
       <modules xmlns="urn:opendaylight:params:xml:ns:yang:controller:config">
         <module>
-          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:netvirt:neutron">prefix:neutron</type>
-          <name>neutron-default</name>
+          <type xmlns:prefix="urn:opendaylight:params:xml:ns:yang:netvirt:neutron">prefix:netvirt-neutron</type>
+          <name>netvirt-neutron-default</name>
           <broker>
             <type xmlns:binding="urn:opendaylight:params:xml:ns:yang:controller:md:sal:binding">binding:binding-broker-osgi-registry</type>
             <name>binding-osgi-broker</name>
-- 
2.36.6