[WIP] apps CLI changes for karaf upgrade
Change-Id: I283efc39c7d4f4b31344f1d2d0cdd2b98a60932d
diff --git a/providers/bgp/cli/BUILD b/providers/bgp/cli/BUILD
index 4ac3704..51259bd 100644
--- a/providers/bgp/cli/BUILD
+++ b/providers/bgp/cli/BUILD
@@ -1,12 +1,10 @@
-COMPILE_DEPS = CORE_DEPS + [
- "@org_apache_karaf_shell_console//jar",
+COMPILE_DEPS = CORE_DEPS + CLI + [
"//incubator/api:onos-incubator-api",
"//providers/bgp/cfg:onos-providers-bgp-cfg",
"//providers/bgp/topology:onos-providers-bgp-topology",
"//protocols/bgp/api:onos-protocols-bgp-api",
"//protocols/bgp/ctl:onos-protocols-bgp-ctl",
"//protocols/bgp/bgpio:onos-protocols-bgp-bgpio",
- "//cli:onos-cli",
]
osgi_jar_with_tests(
diff --git a/providers/bgp/cli/src/main/java/org/onosproject/bgp/cli/BgpConfiguration.java b/providers/bgp/cli/src/main/java/org/onosproject/bgp/cli/BgpConfiguration.java
index 186fcd1..2608076 100644
--- a/providers/bgp/cli/src/main/java/org/onosproject/bgp/cli/BgpConfiguration.java
+++ b/providers/bgp/cli/src/main/java/org/onosproject/bgp/cli/BgpConfiguration.java
@@ -15,8 +15,8 @@
*/
package org.onosproject.bgp.cli;
-import org.apache.karaf.shell.commands.Argument;
-import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.api.action.Argument;
+import org.apache.karaf.shell.api.action.Command;
import org.onosproject.bgp.controller.BgpCfg;
import org.onosproject.bgp.controller.BgpConnectPeer;
import org.onosproject.bgp.controller.BgpController;
@@ -48,7 +48,7 @@
String peer = null;
@Override
- protected void execute() {
+ protected void doExecute() {
switch (name) {
case CONFIGURATION:
displayBgpConfiguration();
diff --git a/providers/bgp/cli/src/main/java/org/onosproject/bgp/cli/BgpExceptions.java b/providers/bgp/cli/src/main/java/org/onosproject/bgp/cli/BgpExceptions.java
index c145a45..742ce92 100644
--- a/providers/bgp/cli/src/main/java/org/onosproject/bgp/cli/BgpExceptions.java
+++ b/providers/bgp/cli/src/main/java/org/onosproject/bgp/cli/BgpExceptions.java
@@ -15,8 +15,8 @@
*/
package org.onosproject.bgp.cli;
-import org.apache.karaf.shell.commands.Argument;
-import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.api.action.Argument;
+import org.apache.karaf.shell.api.action.Command;
import org.onosproject.bgp.controller.BgpController;
import org.onosproject.cli.AbstractShellCommand;
import org.slf4j.Logger;
@@ -45,7 +45,7 @@
private Set<String> closedSessionExceptionKeySet;
@Override
- protected void execute() {
+ protected void doExecute() {
switch (name) {
case ACTIVESESSION:
displayActiveSessionException();
diff --git a/providers/bgp/cli/src/main/java/org/onosproject/bgp/cli/BgpLocalRibDisplay.java b/providers/bgp/cli/src/main/java/org/onosproject/bgp/cli/BgpLocalRibDisplay.java
index 3f1fee8..4eb7e41 100644
--- a/providers/bgp/cli/src/main/java/org/onosproject/bgp/cli/BgpLocalRibDisplay.java
+++ b/providers/bgp/cli/src/main/java/org/onosproject/bgp/cli/BgpLocalRibDisplay.java
@@ -15,8 +15,8 @@
*/
package org.onosproject.bgp.cli;
-import org.apache.karaf.shell.commands.Argument;
-import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.api.action.Argument;
+import org.apache.karaf.shell.api.action.Command;
import org.onosproject.bgp.controller.BgpController;
import org.onosproject.bgp.controller.BgpLocalRib;
import org.onosproject.bgpio.protocol.BgpLSNlri;
@@ -97,7 +97,7 @@
private int count = 0;
@Override
- protected void execute() {
+ protected void doExecute() {
switch (name) {
case NODETREE:
displayNodes();