mirrors/onos
1
0
Fork 0
mirror of https://github.com/opennetworkinglab/onos.git synced 2025-10-17 02:11:38 +02:00
Code Issues Projects Releases Wiki Activity

new optical app changes for karaf 4.2.1 CLI

Browse Source 
Change-Id: I2e1a39633f7a07610db90bb89864c6dc6d9b0917
This commit is contained in:
Ray Milkey 2018-10-09 15:06:38 -07:00
parent cd38125efd
commit c53a0d23d9
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/newoptical/BUILD
View File

@ -8,6 +8,7 @@ TEST_DEPS = TEST_ADAPTERS + [
] ]
osgi_jar_with_tests( osgi_jar_with_tests(
karaf_command_packages = ["org.onosproject.newoptical.cli"],
test_deps = TEST_DEPS, test_deps = TEST_DEPS,
deps = COMPILE_DEPS, deps = COMPILE_DEPS,
) )

3
apps/newoptical/src/main/java/org/onosproject/newoptical/cli/AddOpticalConnectivityCommand.java
View File

@ -17,6 +17,7 @@ package org.onosproject.newoptical.cli;
import org.apache.karaf.shell.api.action.Argument; import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command; import org.apache.karaf.shell.api.action.Command;
import org.apache.karaf.shell.api.action.Completion;
import org.apache.karaf.shell.api.action.lifecycle.Service; import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onlab.util.Bandwidth; import org.onlab.util.Bandwidth;
import org.onosproject.cli.AbstractShellCommand; import org.onosproject.cli.AbstractShellCommand;
@ -41,10 +42,12 @@ public class AddOpticalConnectivityCommand extends AbstractShellCommand {
@Argument(index = 0, name = "ingress", description = "Ingress connect point", @Argument(index = 0, name = "ingress", description = "Ingress connect point",
required = true, multiValued = false) required = true, multiValued = false)
@Completion(ConnectPointCompleter.class)
String ingressStr = null; String ingressStr = null;
@Argument(index = 1, name = "egress", description = "Egress connect point", @Argument(index = 1, name = "egress", description = "Egress connect point",
required = true, multiValued = false) required = true, multiValued = false)
@Completion(ConnectPointCompleter.class)
String egressStr = null; String egressStr = null;
@Argument(index = 2, name = "bandwidth", description = "Bandwidth", @Argument(index = 2, name = "bandwidth", description = "Bandwidth",

2
apps/newoptical/src/main/java/org/onosproject/newoptical/cli/OpticalConnectivityIdCompleter.java
View File

@ -18,6 +18,7 @@ package org.onosproject.newoptical.cli;
import java.util.List; import java.util.List;
import java.util.stream.Collectors; import java.util.stream.Collectors;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onlab.util.Identifier; import org.onlab.util.Identifier;
import org.onosproject.cli.AbstractChoicesCompleter; import org.onosproject.cli.AbstractChoicesCompleter;
import org.onosproject.newoptical.OpticalConnectivity; import org.onosproject.newoptical.OpticalConnectivity;
@ -28,6 +29,7 @@ import static org.onosproject.cli.AbstractShellCommand.get;
/** /**
* Completer for OpticalConnectivityId. * Completer for OpticalConnectivityId.
*/ */
@Service
public class OpticalConnectivityIdCompleter extends AbstractChoicesCompleter { public class OpticalConnectivityIdCompleter extends AbstractChoicesCompleter {
@Override @Override

2
apps/newoptical/src/main/java/org/onosproject/newoptical/cli/RemoveOpticalConnectivityCommand.java
View File

@ -17,6 +17,7 @@ package org.onosproject.newoptical.cli;
import org.apache.karaf.shell.api.action.Argument; import org.apache.karaf.shell.api.action.Argument;
import org.apache.karaf.shell.api.action.Command; import org.apache.karaf.shell.api.action.Command;
import org.apache.karaf.shell.api.action.Completion;
import org.apache.karaf.shell.api.action.lifecycle.Service; import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onosproject.cli.AbstractShellCommand; import org.onosproject.cli.AbstractShellCommand;
import org.onosproject.newoptical.api.OpticalConnectivityId; import org.onosproject.newoptical.api.OpticalConnectivityId;
@ -28,6 +29,7 @@ import org.onosproject.newoptical.api.OpticalPathService;
public class RemoveOpticalConnectivityCommand extends AbstractShellCommand { public class RemoveOpticalConnectivityCommand extends AbstractShellCommand {
@Argument(index = 0, name = "id", description = "ID of optical connectivity", @Argument(index = 0, name = "id", description = "ID of optical connectivity",
required = true, multiValued = false) required = true, multiValued = false)
@Completion(OpticalConnectivityIdCompleter.class)
String idStr = null; String idStr = null;
@Override @Override