BUG-6801: Remove deprecated bgpcep *-all features

Remove deprecated bgpcep *-all features

Change-Id: Ib87ea2d091e2eead955b8cf959a02f071365a7f9
Signed-off-by: Claudio D. Gasparini <claudio.gasparini@pantheon.tech>

diff --git a/features/bgp/features-bgp/src/main/features/features.xml b/features/bgp/features-bgp/src/main/features/features.xml
index 66c79d8a949d139b21ad3aab43d4b75bcf3cf385..e4c03f53f00df99d98e223e8659464e2ff293226 100644 (file)
--- a/features/bgp/features-bgp/src/main/features/features.xml
+++ b/features/bgp/features-bgp/src/main/features/features.xml
@@ -19,11 +19,6 @@
     <repository>mvn:org.opendaylight.bgpcep/features-rsvp/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.odlparent/features-odlparent/{{VERSION}}/xml/features</repository>
 
-
-    <feature name='odl-bgpcep-bgp-all' version='${project.version}'>
-        <feature version='${project.version}'>odl-bgpcep-bgp</feature>
-    </feature>
-
     <feature name='odl-bgpcep-bgp' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-bgp-parser</feature>
         <feature version='${project.version}'>odl-bgpcep-bgp-rib-api</feature>

diff --git a/features/pcep/features-pcep/src/main/features/features.xml b/features/pcep/features-pcep/src/main/features/features.xml
index e43f22337c2492df39ff498f29744e8e69a8659a..38c0b5abbc68b459224ff338291cc5ba2f3d5eb4 100644 (file)
--- a/features/pcep/features-pcep/src/main/features/features.xml
+++ b/features/pcep/features-pcep/src/main/features/features.xml
@@ -18,10 +18,6 @@
     <repository>mvn:org.opendaylight.mdsal.model/features-mdsal-model/{{VERSION}}/xml/features</repository>
     <repository>mvn:org.opendaylight.odlparent/features-odlparent/{{VERSION}}/xml/features</repository>
 
-    <feature name='odl-bgpcep-pcep-all' version='${project.version}'>
-        <feature version='${project.version}'>odl-bgpcep-pcep</feature>
-    </feature>
-
     <feature name='odl-bgpcep-pcep' version='${project.version}'>
         <feature version='${project.version}'>odl-bgpcep-pcep-api</feature>
         <feature version='${project.version}'>odl-bgpcep-pcep-impl</feature>

diff --git a/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/AbstractPcepOsgiTest.java b/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/AbstractPcepOsgiTest.java
index 1222f94e594f3fc95f9c8b4a7df7346b0799be55..2582779055ca51ae68958bd4a314a45f33da1b3c 100644 (file)
--- a/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/AbstractPcepOsgiTest.java
+++ b/integration-tests/src/test/java/org/opendaylight/protocol/integration/pcep/AbstractPcepOsgiTest.java
@@ -54,7 +54,7 @@ public class AbstractPcepOsgiTest extends AbstractMdsalTestBase {
 
     @Override
     public String getFeatureName() {
-        return "odl-bgpcep-pcep-all";
+        return "odl-bgpcep-pcep";
     }
 
     TopologyKey getTopologyId(final String id) {