Enhancing null providers for use in demos.
Change-Id: I079d19a98fba2312bd4b17d2e275b34f4dee6f19
diff --git a/providers/null/src/main/java/org/onosproject/provider/nil/cli/CreateNullDevice.java b/providers/null/src/main/java/org/onosproject/provider/nil/cli/CreateNullDevice.java
new file mode 100644
index 0000000..86b12f0
--- /dev/null
+++ b/providers/null/src/main/java/org/onosproject/provider/nil/cli/CreateNullDevice.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2016 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.onosproject.provider.nil.cli;
+
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.Device;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.config.NetworkConfigService;
+import org.onosproject.net.config.basics.BasicDeviceConfig;
+import org.onosproject.provider.nil.CustomTopologySimulator;
+import org.onosproject.provider.nil.NullProviders;
+import org.onosproject.provider.nil.TopologySimulator;
+
+/**
+ * Adds a simulated device to the custom topology simulation.
+ */
+@Command(scope = "onos", name = "null-create-device",
+ description = "Adds a simulated device to the custom topology simulation")
+public class CreateNullDevice extends AbstractShellCommand {
+
+ @Argument(index = 0, name = "type", description = "Device type, e.g. switch, roadm",
+ required = true, multiValued = false)
+ String type = null;
+
+ @Argument(index = 1, name = "name", description = "Device name",
+ required = true, multiValued = false)
+ String name = null;
+
+ @Argument(index = 2, name = "portCount", description = "Port count",
+ required = true, multiValued = false)
+ Integer portCount = null;
+
+ @Argument(index = 3, name = "latitude", description = "Geo latitude",
+ required = true, multiValued = false)
+ Double latitude = null;
+
+ @Argument(index = 4, name = "longitude", description = "Geo longitude",
+ required = true, multiValued = false)
+ Double longitude = null;
+
+ @Override
+ protected void execute() {
+ NullProviders service = get(NullProviders.class);
+ NetworkConfigService cfgService = get(NetworkConfigService.class);
+
+ TopologySimulator simulator = service.currentSimulator();
+ if (!(simulator instanceof CustomTopologySimulator)) {
+ error("Custom topology simulator is not active.");
+ return;
+ }
+
+ CustomTopologySimulator sim = (CustomTopologySimulator) simulator;
+ DeviceId deviceId = sim.nextDeviceId();
+ BasicDeviceConfig cfg = cfgService.addConfig(deviceId, BasicDeviceConfig.class);
+ cfg.name(name);
+ cfg.latitude(latitude);
+ cfg.longitude(longitude);
+ cfg.apply();
+
+ sim.createDevice(deviceId, name, Device.Type.valueOf(type.toUpperCase()), portCount);
+ }
+
+}
diff --git a/providers/null/src/main/java/org/onosproject/provider/nil/cli/CreateNullLink.java b/providers/null/src/main/java/org/onosproject/provider/nil/cli/CreateNullLink.java
new file mode 100644
index 0000000..575319d
--- /dev/null
+++ b/providers/null/src/main/java/org/onosproject/provider/nil/cli/CreateNullLink.java
@@ -0,0 +1,78 @@
+/*
+ * Copyright 2016 Open Networking Laboratory
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.onosproject.provider.nil.cli;
+
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.commands.Option;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.ConnectPoint;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.Link;
+import org.onosproject.net.edge.EdgePortService;
+import org.onosproject.provider.nil.CustomTopologySimulator;
+import org.onosproject.provider.nil.NullProviders;
+import org.onosproject.provider.nil.TopologySimulator;
+
+import java.util.Iterator;
+
+/**
+ * Adds a simulated link to the custom topology simulation.
+ */
+@Command(scope = "onos", name = "null-create-link",
+ description = "Adds a simulated link to the custom topology simulation")
+public class CreateNullLink extends AbstractShellCommand {
+
+ @Argument(index = 0, name = "type", description = "Link type, e.g. direct, indirect, optical",
+ required = true, multiValued = false)
+ String type = null;
+
+ @Argument(index = 1, name = "src", description = "Source device name",
+ required = true, multiValued = false)
+ String src = null;
+
+ @Argument(index = 2, name = "dst", description = "Destination device name",
+ required = true, multiValued = false)
+ String dst = null;
+
+ @Option(name = "-u", aliases = "--unidirectional", description = "Unidirectional link only",
+ required = false, multiValued = false)
+ private boolean unidirectional = false;
+
+ @Override
+ protected void execute() {
+ NullProviders service = get(NullProviders.class);
+
+ TopologySimulator simulator = service.currentSimulator();
+ if (!(simulator instanceof CustomTopologySimulator)) {
+ error("Custom topology simulator is not active.");
+ return;
+ }
+
+ CustomTopologySimulator sim = (CustomTopologySimulator) simulator;
+ ConnectPoint one = findAvailablePort(sim.deviceId(src));
+ ConnectPoint two = findAvailablePort(sim.deviceId(dst));
+ sim.createLink(one, two, Link.Type.valueOf(type.toUpperCase()), !unidirectional);
+ }
+
+ private ConnectPoint findAvailablePort(DeviceId deviceId) {
+ EdgePortService eps = get(EdgePortService.class);
+ Iterator<ConnectPoint> points = eps.getEdgePoints(deviceId).iterator();
+ return points.hasNext() ? points.next() : null;
+ }
+
+}
diff --git a/providers/null/src/main/java/org/onosproject/provider/nil/cli/NullDeviceCommand.java b/providers/null/src/main/java/org/onosproject/provider/nil/cli/NullDeviceCommand.java
index bf08232..ef1a70e 100644
--- a/providers/null/src/main/java/org/onosproject/provider/nil/cli/NullDeviceCommand.java
+++ b/providers/null/src/main/java/org/onosproject/provider/nil/cli/NullDeviceCommand.java
@@ -25,10 +25,10 @@
import static org.onosproject.cli.UpDownCompleter.UP;
/**
- * Servers or repairs a simulated link.
+ * Downs or repairs a simulated device.
*/
@Command(scope = "onos", name = "null-device",
- description = "Severs or repairs a simulated link")
+ description = "Downs or repairs a simulated device")
public class NullDeviceCommand extends AbstractShellCommand {
@Argument(index = 0, name = "id", description = "Device identifier",
diff --git a/providers/null/src/main/java/org/onosproject/provider/nil/cli/NullLinkCommand.java b/providers/null/src/main/java/org/onosproject/provider/nil/cli/NullLinkCommand.java
index b857dc8..8e8f198 100644
--- a/providers/null/src/main/java/org/onosproject/provider/nil/cli/NullLinkCommand.java
+++ b/providers/null/src/main/java/org/onosproject/provider/nil/cli/NullLinkCommand.java
@@ -25,7 +25,7 @@
import static org.onosproject.cli.UpDownCompleter.UP;
/**
- * Servers or repairs a simulated link.
+ * Severs or repairs a simulated link.
*/
@Command(scope = "onos", name = "null-link",
description = "Severs or repairs a simulated link")