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

mapping management app changes for karaf 4.2.1 CLI

Browse Source 
Change-Id: Id493f10c572efd2774c3cbb6386aeb8ab9dc7c57
This commit is contained in:
Ray Milkey 2018-10-09 14:08:21 -07:00
parent 9abe76fa56
commit 01ad6a49e2
3 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/mappingmanagement/cli/BUILD
View File

@ -5,6 +5,6 @@ COMPILE_DEPS = CORE_DEPS + JACKSON + CLI + REST + [
] ]
osgi_jar_with_tests( osgi_jar_with_tests(
import_packages = "*,org.onosproject.cli.net", karaf_command_packages = ["org.onosproject.mapping.cli"],
deps = COMPILE_DEPS, deps = COMPILE_DEPS,
) )

2
apps/mappingmanagement/cli/src/main/java/org/onosproject/mapping/cli/MappingStoreTypeCompleter.java
View File

@ -17,6 +17,7 @@ package org.onosproject.mapping.cli;
import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableList;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.karaf.shell.api.action.lifecycle.Service;
import org.onosproject.cli.AbstractChoicesCompleter; import org.onosproject.cli.AbstractChoicesCompleter;
import org.onosproject.mapping.MappingStore.Type; import org.onosproject.mapping.MappingStore.Type;
@ -26,6 +27,7 @@ import java.util.stream.Collectors;
/** /**
* Mapping store type completer. * Mapping store type completer.
*/ */
@Service
public class MappingStoreTypeCompleter extends AbstractChoicesCompleter { public class MappingStoreTypeCompleter extends AbstractChoicesCompleter {
private static final List<Type> STORE_TYPES = private static final List<Type> STORE_TYPES =

4
apps/mappingmanagement/cli/src/main/java/org/onosproject/mapping/cli/MappingsListCommand.java
View File

@ -21,9 +21,11 @@ import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode; import com.fasterxml.jackson.databind.node.ObjectNode;
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.Option; import org.apache.karaf.shell.api.action.Option;
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.cli.net.DeviceIdCompleter;
import org.onosproject.mapping.MappingEntry; import org.onosproject.mapping.MappingEntry;
import org.onosproject.mapping.MappingKey; import org.onosproject.mapping.MappingKey;
import org.onosproject.mapping.MappingTreatment; import org.onosproject.mapping.MappingTreatment;
@ -67,10 +69,12 @@ public class MappingsListCommand extends AbstractShellCommand {
@Argument(index = 0, name = "type", @Argument(index = 0, name = "type",
description = "Shows mappings with specified type", description = "Shows mappings with specified type",
required = true, multiValued = false) required = true, multiValued = false)
@Completion(MappingStoreTypeCompleter.class)
private String type = null; private String type = null;
@Argument(index = 1, name = "deviceId", description = "Device identity", @Argument(index = 1, name = "deviceId", description = "Device identity",
required = false, multiValued = false) required = false, multiValued = false)
@Completion(DeviceIdCompleter.class)
private String deviceId = null; private String deviceId = null;
@Option(name = "-s", aliases = "--short", @Option(name = "-s", aliases = "--short",