[GEANT] Remove configuration from device interfaces.
Change-Id: Ie382a645c2ec8677ccd9ba6ed4b881e38686c1b9
diff --git a/cli/src/main/java/org/onosproject/cli/net/DeviceInterfaceAddCommand.java b/cli/src/main/java/org/onosproject/cli/net/DeviceInterfaceAddCommand.java
index 9ceeb65..f2a0bbc 100644
--- a/cli/src/main/java/org/onosproject/cli/net/DeviceInterfaceAddCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/DeviceInterfaceAddCommand.java
@@ -33,14 +33,14 @@
public class DeviceInterfaceAddCommand extends AbstractShellCommand {
private static final String CONFIG_VLAN_SUCCESS =
- "VLAN %s set on device %s interface %s.";
+ "VLAN %s added on device %s interface %s.";
private static final String CONFIG_VLAN_FAILURE =
- "Failed to set VLAN %s on device %s interface %s.";
+ "Failed to add VLAN %s on device %s interface %s.";
private static final String CONFIG_TRUNK_SUCCESS =
- "Trunk mode set for VLAN %s on device %s interface %s.";
+ "Trunk mode added for VLAN %s on device %s interface %s.";
private static final String CONFIG_TRUNK_FAILURE =
- "Failed to set trunk mode for VLAN %s on device %s interface %s.";
+ "Failed to add trunk mode for VLAN %s on device %s interface %s.";
@Argument(index = 0, name = "uri", description = "Device ID",
required = true, multiValued = false)
diff --git a/cli/src/main/java/org/onosproject/cli/net/DeviceInterfaceRemoveCommand.java b/cli/src/main/java/org/onosproject/cli/net/DeviceInterfaceRemoveCommand.java
new file mode 100644
index 0000000..1f727cb
--- /dev/null
+++ b/cli/src/main/java/org/onosproject/cli/net/DeviceInterfaceRemoveCommand.java
@@ -0,0 +1,91 @@
+/*
+ * 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.cli.net;
+
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
+import org.apache.karaf.shell.commands.Option;
+import org.onlab.packet.VlanId;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.behaviour.InterfaceConfig;
+import org.onosproject.net.driver.DriverHandler;
+import org.onosproject.net.driver.DriverService;
+
+/**
+ * Removes configured interface from a device.
+ */
+@Command(scope = "onos", name = "device-remove-interface",
+ description = "Removes an interface configuration from a device")
+public class DeviceInterfaceRemoveCommand extends AbstractShellCommand {
+
+ private static final String REMOVE_VLAN_SUCCESS =
+ "VLAN %s removed from device %s interface %s.";
+ private static final String REMOVE_VLAN_FAILURE =
+ "Failed to remove VLAN %s from device %s interface %s.";
+
+ private static final String REMOVE_TRUNK_SUCCESS =
+ "Trunk mode removed for VLAN %s on device %s interface %s.";
+ private static final String REMOVE_TRUNK_FAILURE =
+ "Failed to remove trunk mode for VLAN %s on device %s interface %s.";
+
+ @Argument(index = 0, name = "uri", description = "Device ID",
+ required = true, multiValued = false)
+ private String uri = null;
+
+ @Argument(index = 1, name = "interface",
+ description = "Interface name",
+ required = true, multiValued = false)
+ private String portName = null;
+
+ @Argument(index = 2, name = "vlan",
+ description = "VLAN ID",
+ required = true, multiValued = false)
+ private String vlanString = null;
+
+ @Option(name = "-t", aliases = "--trunk",
+ description = "Remove trunk mode for VLAN",
+ required = false, multiValued = false)
+ private boolean trunkMode = false;
+
+ @Override
+ protected void execute() {
+ DriverService service = get(DriverService.class);
+ DeviceId deviceId = DeviceId.deviceId(uri);
+ DriverHandler h = service.createHandler(deviceId);
+ InterfaceConfig interfaceConfig = h.behaviour(InterfaceConfig.class);
+
+ VlanId vlanId = VlanId.vlanId(Short.parseShort(vlanString));
+
+ if (trunkMode) {
+ // Trunk mode for VLAN to be removed.
+ if (interfaceConfig.removeTrunkInterface(deviceId, portName, vlanId)) {
+ print(REMOVE_TRUNK_SUCCESS, vlanId, deviceId, portName);
+ } else {
+ print(REMOVE_TRUNK_FAILURE, vlanId, deviceId, portName);
+ }
+ return;
+ }
+
+ // Interface to be removed from VLAN.
+ if (interfaceConfig.removeInterfaceFromVlan(deviceId, portName, vlanId)) {
+ print(REMOVE_VLAN_SUCCESS, vlanId, deviceId, portName);
+ } else {
+ print(REMOVE_VLAN_FAILURE, vlanId, deviceId, portName);
+ }
+ }
+
+}
diff --git a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
index d57dcb2..a98a38a 100644
--- a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -161,6 +161,12 @@
</completers>
</command>
<command>
+ <action class="org.onosproject.cli.net.DeviceInterfaceRemoveCommand"/>
+ <completers>
+ <ref component-id="deviceIdCompleter"/>
+ </completers>
+ </command>
+ <command>
<action class="org.onosproject.cli.net.AddMeter"/>
<completers>
<ref component-id="deviceIdCompleter"/>