Bug 6714 - Use singleton service in clustered netconf topology

[netconf.git] / features / netconf-connector / src / main / features / features.xml

diff --git a/features/netconf-connector/src/main/features/features.xml b/features/netconf-connector/src/main/features/features.xml
index 28d4dbcaaa271d7740d6a44b5decb27cca0d4418..16ce9eeaf9730a25fd450a9f17d53317095eb421 100644 (file)
--- a/features/netconf-connector/src/main/features/features.xml
+++ b/features/netconf-connector/src/main/features/features.xml
@@ -34,6 +34,7 @@
         <feature version='${project.version}'>odl-netconf-notifications-api</feature>
         <feature version='${project.version}'>odl-netconf-client</feature>
         <feature version='${mdsal.model.version}'>odl-mdsal-models</feature>
+        <bundle>mvn:com.google.code.gson/gson/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.netconf/sal-netconf-connector/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.controller.model/model-inventory/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.netconf/netconf-topology/{{VERSION}}</bundle>
@@ -44,8 +45,7 @@
     </feature>
 
     <feature name='odl-netconf-connector-ssh' version='${project.version}' description="OpenDaylight :: Netconf Connector :: Netconf Connector + Netconf SSH Server + loopback connection configuration">
-        <feature version='${project.version}'>odl-netconf-ssh</feature>
-        <feature version='${project.version}'>odl-netconf-connector</feature>
+        <feature version='${project.version}'>odl-netconf-topology</feature>
         <configfile finalname="${config.configfile.directory}/${config.netconf.connector.configfile}">mvn:org.opendaylight.netconf/netconf-connector-config/{{VERSION}}/xml/config</configfile>
     </feature>
 
@@ -55,10 +55,18 @@
         <configfile finalname='${config.configfile.directory}/${config.netconf.topology.configfile}'>mvn:org.opendaylight.netconf/netconf-topology-config/{{VERSION}}/xml/config</configfile>
     </feature>
 
-    <feature name='odl-netconf-clustered-topology' version='${project.version}' description="OpenDaylight :: Clustered Netconf Topology :: Netconf Connector + Netconf SSH Server + Clustered Netconf configuration via config topology datastore">
-        <feature version='${netconf.version}'>odl-netconf-ssh</feature>
+    <feature name='odl-netconf-clustered-topology' version='${project.version}' description="OpenDaylight :: Clustered Netconf Topology :: Netconf Connector + Netconf SSH Server">
+        <feature version='${project.version}'>odl-netconf-ssh</feature>
         <feature version='${project.version}'>odl-netconf-connector</feature>
-        <configfile finalname='${config.configfile.directory}/${config.netconf.topology.configfile}'>mvn:org.opendaylight.netconf/netconf-topology-config/{{VERSION}}/xml/clustered-config</configfile>
+        <bundle>mvn:org.opendaylight.netconf/netconf-topology-singleton/{{VERSION}}</bundle>
+    </feature>
+
+    <feature name='odl-netconf-console' version='${project.version}' description="OpenDaylight :: Netconf Console + Karaf CLI for netconf CRUD operations">
+       <feature version='${controller.mdsal.version}'>odl-netconf-mdsal</feature>
+       <feature version='${project.version}'>odl-netconf-connector-all</feature>
+       <feature version='${project.version}'>odl-netconf-topology</feature>
+       <bundle>mvn:org.opendaylight.netconf/netconf-console/{{VERSION}}</bundle>
+       <configfile finalname='${config.configfile.directory}/${config.netconf.console.configfile}'>mvn:org.opendaylight.netconf/netconf-console/{{VERSION}}/xml/config</configfile>
     </feature>
 
 </features>