홍길동 / onos

Go to a project
Toggle navigation Toggle navigation pinning
Jonathan Hart
9a4157bb 1 parent e33889d5

Update AddSinglePointToMultiPointIntentCommand help string 

to include ingressDevice.

Also modified help strings for consistency.

Change-Id: I9c35fdbdae539f92411da089ff48b4c0951e8481
Inline Side-by-side
Showing 2 changed files with 17 additions and 17 deletions
...@@ -15,13 +15,6 @@ ...@@ -15,13 +15,6 @@
15 */ 15 */
16 package org.onosproject.cli.net; 16 package org.onosproject.cli.net;
17 17
18 -import static org.onosproject.net.DeviceId.deviceId;
19 -import static org.onosproject.net.PortNumber.portNumber;
20 -
21 -import java.util.HashSet;
22 -import java.util.List;
23 -import java.util.Set;
24 -
25 import org.apache.karaf.shell.commands.Argument; 18 import org.apache.karaf.shell.commands.Argument;
26 import org.apache.karaf.shell.commands.Command; 19 import org.apache.karaf.shell.commands.Command;
27 import org.onosproject.net.ConnectPoint; 20 import org.onosproject.net.ConnectPoint;
...@@ -34,6 +27,13 @@ import org.onosproject.net.intent.Intent; ...@@ -34,6 +27,13 @@ import org.onosproject.net.intent.Intent;
34 import org.onosproject.net.intent.IntentService; 27 import org.onosproject.net.intent.IntentService;
35 import org.onosproject.net.intent.MultiPointToSinglePointIntent; 28 import org.onosproject.net.intent.MultiPointToSinglePointIntent;
36 29
30 +import java.util.HashSet;
31 +import java.util.List;
32 +import java.util.Set;
33 +
34 +import static org.onosproject.net.DeviceId.deviceId;
35 +import static org.onosproject.net.PortNumber.portNumber;
36 +
37 /** 37 /**
38 * Installs point-to-point connectivity intents. 38 * Installs point-to-point connectivity intents.
39 */ 39 */
...@@ -41,8 +41,8 @@ import org.onosproject.net.intent.MultiPointToSinglePointIntent; ...@@ -41,8 +41,8 @@ import org.onosproject.net.intent.MultiPointToSinglePointIntent;
41 description = "Installs point-to-point connectivity intent") 41 description = "Installs point-to-point connectivity intent")
42 public class AddMultiPointToSinglePointIntentCommand extends ConnectivityIntentCommand { 42 public class AddMultiPointToSinglePointIntentCommand extends ConnectivityIntentCommand {
43 43
44 - @Argument(index = 0, name = "ingressDevices", 44 + @Argument(index = 0, name = "ingressDevices egressDevice",
45 - description = "Ingress Device/Port Description", 45 + description = "ingressDevice/Port..ingressDevice/Port egressDevice/Port",
46 required = true, multiValued = true) 46 required = true, multiValued = true)
47 String[] deviceStrings = null; 47 String[] deviceStrings = null;
48 48
......
...@@ -15,13 +15,6 @@ ...@@ -15,13 +15,6 @@
15 */ 15 */
16 package org.onosproject.cli.net; 16 package org.onosproject.cli.net;
17 17
18 -import static org.onosproject.net.DeviceId.deviceId;
19 -import static org.onosproject.net.PortNumber.portNumber;
20 -
21 -import java.util.HashSet;
22 -import java.util.List;
23 -import java.util.Set;
24 -
25 import org.apache.karaf.shell.commands.Argument; 18 import org.apache.karaf.shell.commands.Argument;
26 import org.apache.karaf.shell.commands.Command; 19 import org.apache.karaf.shell.commands.Command;
27 import org.onosproject.net.ConnectPoint; 20 import org.onosproject.net.ConnectPoint;
...@@ -34,12 +27,19 @@ import org.onosproject.net.intent.Constraint; ...@@ -34,12 +27,19 @@ import org.onosproject.net.intent.Constraint;
34 import org.onosproject.net.intent.IntentService; 27 import org.onosproject.net.intent.IntentService;
35 import org.onosproject.net.intent.SinglePointToMultiPointIntent; 28 import org.onosproject.net.intent.SinglePointToMultiPointIntent;
36 29
30 +import java.util.HashSet;
31 +import java.util.List;
32 +import java.util.Set;
33 +
34 +import static org.onosproject.net.DeviceId.deviceId;
35 +import static org.onosproject.net.PortNumber.portNumber;
36 +
37 37
38 @Command(scope = "onos", name = "add-single-to-multi-intent", 38 @Command(scope = "onos", name = "add-single-to-multi-intent",
39 description = "Installs connectivity intent between multiple egress devices and a single ingress device") 39 description = "Installs connectivity intent between multiple egress devices and a single ingress device")
40 public class AddSinglePointToMultiPointIntentCommand extends ConnectivityIntentCommand { 40 public class AddSinglePointToMultiPointIntentCommand extends ConnectivityIntentCommand {
41 @Argument(index = 0, name = "egressDevices ingressDevice", 41 @Argument(index = 0, name = "egressDevices ingressDevice",
42 - description = "egress Device/Port...egress Device/Port ingressDevice/port", 42 + description = "egressDevice/Port...egressDevice/Port ingressDevice/port",
43 required = true, multiValued = true) 43 required = true, multiValued = true)
44 String[] deviceStrings = null; 44 String[] deviceStrings = null;
45 45
......