Move fibmanager-shell blueprint.xml from OSGI-INF/blueprint to org/opendaylight/blueprint

This may (?) fix the SFT failing to find the DataBroker, as discussed on follow-up to
https://lists.opendaylight.org/pipermail/netvirt-dev/2017-June/004770.html; and if
this does fix that SFT problem, then this was an indirect impact of
https://git.opendaylight.org/gerrit/#/c/54885/.

This also reverts both https://git.opendaylight.org/gerrit/#/c/59105/ private field,
and the availability="optional" from https://git.opendaylight.org/gerrit/#/c/59051/

Change-Id: I856c0f4311a02a5380512496619aee74cf70ee2e
Signed-off-by: Michael Vorburger <vorburger@redhat.com>

diff --git a/vpnservice/fibmanager/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowFibCommand.java b/vpnservice/fibmanager/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowFibCommand.java
index 2fed841b81d7afffb7aa9c23ab4a1e6546e3e3b4..3c0fce3d0a3c403bf449c1aafdba793d2558fa53 100644 (file)
--- a/vpnservice/fibmanager/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowFibCommand.java
+++ b/vpnservice/fibmanager/fibmanager-shell/src/main/java/org/opendaylight/netvirt/fibmanager/shell/ShowFibCommand.java
@@ -35,7 +35,6 @@ public class ShowFibCommand extends OsgiCommandSupport {
                                            + "\n   -------------------------------------------------------------------";
 
     private SingleTransactionDataBroker singleTxDb;
-    private DataBroker dataBroker;
 
     public void setDataBroker(DataBroker dataBroker) {
         this.singleTxDb = new SingleTransactionDataBroker(dataBroker);
@@ -43,7 +42,6 @@ public class ShowFibCommand extends OsgiCommandSupport {
 
     @Override
     protected Object doExecute() throws Exception {
-
         PrintStream console = session.getConsole();
         console.println(HEADER);
 

diff --git a/vpnservice/fibmanager/fibmanager-shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml b/vpnservice/fibmanager/fibmanager-shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml
similarity index 90%
rename from vpnservice/fibmanager/fibmanager-shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml
rename to vpnservice/fibmanager/fibmanager-shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml
index ea5d3a1de13a4624ff8e1048cd44825e54da0956..34ac4562f92dd6bd8962c44facd1c7ff270f57ec 100644 (file)
--- a/vpnservice/fibmanager/fibmanager-shell/src/main/resources/OSGI-INF/blueprint/blueprint.xml
+++ b/vpnservice/fibmanager/fibmanager-shell/src/main/resources/org/opendaylight/blueprint/blueprint.xml
@@ -9,10 +9,8 @@
            xmlns:odl="http://opendaylight.org/xmlns/blueprint/v1.0.0"
            odl:use-default-for-reference-types="true">
 
-  <reference id="fibManagerRef" interface="org.opendaylight.netvirt.fibmanager.api.IFibManager"
-             availability="optional"/>
-  <reference id="dataBrokerRef" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker"
-             availability="optional"/>
+  <reference id="fibManagerRef" interface="org.opendaylight.netvirt.fibmanager.api.IFibManager" />
+  <reference id="dataBrokerRef" interface="org.opendaylight.controller.md.sal.binding.api.DataBroker" />
   <command-bundle xmlns="http://karaf.apache.org/xmlns/shell/v1.1.0">
 
     <command>