홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
tom
91c7bd03 1 parent 2d6d397b

Removed a cyclic dependency in the CLI code.

Inline Side-by-side
Showing 9 changed files with 7 additions and 3 deletions
1 -package org.onlab.onos.cli.net; 1 +package org.onlab.onos.cli;
2 2
3 import org.onlab.onos.cluster.ControllerNode; 3 import org.onlab.onos.cluster.ControllerNode;
4 import org.onlab.onos.net.Element; 4 import org.onlab.onos.net.Element;
......
...@@ -2,7 +2,6 @@ package org.onlab.onos.cli; ...@@ -2,7 +2,6 @@ package org.onlab.onos.cli;
2 2
3 import com.google.common.collect.Lists; 3 import com.google.common.collect.Lists;
4 import org.apache.karaf.shell.commands.Command; 4 import org.apache.karaf.shell.commands.Command;
5 -import org.onlab.onos.cli.net.Comparators;
6 import org.onlab.onos.cluster.ClusterService; 5 import org.onlab.onos.cluster.ClusterService;
7 import org.onlab.onos.cluster.ControllerNode; 6 import org.onlab.onos.cluster.ControllerNode;
8 import org.onlab.onos.cluster.MastershipService; 7 import org.onlab.onos.cluster.MastershipService;
......
1 package org.onlab.onos.cli; 1 package org.onlab.onos.cli;
2 2
3 import org.apache.karaf.shell.commands.Command; 3 import org.apache.karaf.shell.commands.Command;
4 -import org.onlab.onos.cli.net.Comparators;
5 import org.onlab.onos.cluster.ClusterService; 4 import org.onlab.onos.cluster.ClusterService;
6 import org.onlab.onos.cluster.ControllerNode; 5 import org.onlab.onos.cluster.ControllerNode;
7 6
......
...@@ -3,6 +3,7 @@ package org.onlab.onos.cli.net; ...@@ -3,6 +3,7 @@ package org.onlab.onos.cli.net;
3 import com.google.common.collect.Lists; 3 import com.google.common.collect.Lists;
4 import org.apache.karaf.shell.commands.Argument; 4 import org.apache.karaf.shell.commands.Argument;
5 import org.apache.karaf.shell.commands.Command; 5 import org.apache.karaf.shell.commands.Command;
6 +import org.onlab.onos.cli.Comparators;
6 import org.onlab.onos.net.DeviceId; 7 import org.onlab.onos.net.DeviceId;
7 import org.onlab.onos.net.topology.TopologyCluster; 8 import org.onlab.onos.net.topology.TopologyCluster;
8 9
......
...@@ -2,6 +2,7 @@ package org.onlab.onos.cli.net; ...@@ -2,6 +2,7 @@ package org.onlab.onos.cli.net;
2 2
3 import com.google.common.collect.Lists; 3 import com.google.common.collect.Lists;
4 import org.apache.karaf.shell.commands.Command; 4 import org.apache.karaf.shell.commands.Command;
5 +import org.onlab.onos.cli.Comparators;
5 import org.onlab.onos.net.topology.TopologyCluster; 6 import org.onlab.onos.net.topology.TopologyCluster;
6 7
7 import java.util.Collections; 8 import java.util.Collections;
......
...@@ -2,6 +2,7 @@ package org.onlab.onos.cli.net; ...@@ -2,6 +2,7 @@ package org.onlab.onos.cli.net;
2 2
3 import org.apache.karaf.shell.commands.Argument; 3 import org.apache.karaf.shell.commands.Argument;
4 import org.apache.karaf.shell.commands.Command; 4 import org.apache.karaf.shell.commands.Command;
5 +import org.onlab.onos.cli.Comparators;
5 import org.onlab.onos.net.Device; 6 import org.onlab.onos.net.Device;
6 import org.onlab.onos.net.Port; 7 import org.onlab.onos.net.Port;
7 import org.onlab.onos.net.device.DeviceService; 8 import org.onlab.onos.net.device.DeviceService;
......
...@@ -2,6 +2,7 @@ package org.onlab.onos.cli.net; ...@@ -2,6 +2,7 @@ package org.onlab.onos.cli.net;
2 2
3 import org.apache.karaf.shell.commands.Command; 3 import org.apache.karaf.shell.commands.Command;
4 import org.onlab.onos.cli.AbstractShellCommand; 4 import org.onlab.onos.cli.AbstractShellCommand;
5 +import org.onlab.onos.cli.Comparators;
5 import org.onlab.onos.net.Device; 6 import org.onlab.onos.net.Device;
6 import org.onlab.onos.net.device.DeviceService; 7 import org.onlab.onos.net.device.DeviceService;
7 8
......
...@@ -9,6 +9,7 @@ import java.util.Map; ...@@ -9,6 +9,7 @@ import java.util.Map;
9 import org.apache.karaf.shell.commands.Argument; 9 import org.apache.karaf.shell.commands.Argument;
10 import org.apache.karaf.shell.commands.Command; 10 import org.apache.karaf.shell.commands.Command;
11 import org.onlab.onos.cli.AbstractShellCommand; 11 import org.onlab.onos.cli.AbstractShellCommand;
12 +import org.onlab.onos.cli.Comparators;
12 import org.onlab.onos.net.Device; 13 import org.onlab.onos.net.Device;
13 import org.onlab.onos.net.DeviceId; 14 import org.onlab.onos.net.DeviceId;
14 import org.onlab.onos.net.device.DeviceService; 15 import org.onlab.onos.net.device.DeviceService;
......
...@@ -2,6 +2,7 @@ package org.onlab.onos.cli.net; ...@@ -2,6 +2,7 @@ package org.onlab.onos.cli.net;
2 2
3 import org.apache.karaf.shell.commands.Command; 3 import org.apache.karaf.shell.commands.Command;
4 import org.onlab.onos.cli.AbstractShellCommand; 4 import org.onlab.onos.cli.AbstractShellCommand;
5 +import org.onlab.onos.cli.Comparators;
5 import org.onlab.onos.net.Host; 6 import org.onlab.onos.net.Host;
6 import org.onlab.onos.net.host.HostService; 7 import org.onlab.onos.net.host.HostService;
7 8
......