BUG-7558: BGP SingleFeatureTest Failure

BGP SingleFeatureTest Failure fix by
create an specific feature for all
config-file and added as a dependency
for Config-loader feature.

Change-Id: Ifb79c898ea8cba4e68fdd257c2d8c3498ebb559b
Signed-off-by: Claudio D. Gasparini <cgaspari@cisco.com>

diff --git a/features/bgp/src/main/features/features.xml b/features/bgp/src/main/features/features.xml
index d5f5dae757e7ee0dc232fc62eeb60b6364dd1215..0ac6b0b0a2286515900879ed374e5138b61a49e2 100644 (file)
--- a/features/bgp/src/main/features/features.xml
+++ b/features/bgp/src/main/features/features.xml
@@ -39,7 +39,11 @@
         <feature version='${project.version}'>odl-bgpcep-bgp-path-selection-mode</feature>
         <feature version='${project.version}'>odl-bgpcep-bgp-topology</feature>
         <feature version='${project.version}'>odl-bgpcep-bgp-cli</feature>
+        <feature version='${project.version}'>odl-bgpcep-config-files</feature>
         <configfile finalname="etc/opendaylight/karaf/31-bgp.xml">mvn:org.opendaylight.bgpcep/bgp-controller-config/{{VERSION}}/xml/config</configfile>
+    </feature>
+
+    <feature name="odl-bgpcep-config-files" version='${project.version}'>
         <configfile finalname="etc/opendaylight/bgp/protocols-config.xml">mvn:org.opendaylight.bgpcep/bgp-controller-config/{{VERSION}}/xml/bgp-initial-config</configfile>
         <configfile finalname="etc/opendaylight/bgp/network-topology-config.xml">mvn:org.opendaylight.bgpcep/bgp-controller-config/{{VERSION}}/xml/network-topology-initial-config</configfile>
     </feature>
@@ -176,6 +180,7 @@
     </feature>
 
     <feature name="odl-bgpcep-bgp-config-loader" version='${project.version}'>
+        <feature version='${project.version}'>odl-bgpcep-config-files</feature>
         <feature version='${mdsal.common.version}'>odl-mdsal-binding-runtime</feature>
         <bundle>mvn:org.opendaylight.bgpcep/bgp-config-loader-spi/{{VERSION}}</bundle>
         <bundle>mvn:org.opendaylight.bgpcep/bgp-config-loader-impl/{{VERSION}}</bundle>