ONOS-7096 vCore suport VirtualPort enable/disable
Change-Id: Ifa004d47ecc66700f6e401f0c6a8ad242ca3f77a
diff --git a/cli/src/main/java/org/onosproject/cli/net/vnet/VirtualPortListCommand.java b/cli/src/main/java/org/onosproject/cli/net/vnet/VirtualPortListCommand.java
index 0524e31..7a0f2f0 100644
--- a/cli/src/main/java/org/onosproject/cli/net/vnet/VirtualPortListCommand.java
+++ b/cli/src/main/java/org/onosproject/cli/net/vnet/VirtualPortListCommand.java
@@ -37,7 +37,7 @@
public class VirtualPortListCommand extends AbstractShellCommand {
private static final String FMT_VIRTUAL_PORT =
- "virtual portNumber=%s, physical deviceId=%s, portNumber=%s";
+ "virtual portNumber=%s, physical deviceId=%s, portNumber=%s, isEnabled=%s";
@Argument(index = 0, name = "networkId", description = "Network ID",
required = true, multiValued = false)
@@ -75,11 +75,12 @@
*/
private void printVirtualPort(VirtualPort virtualPort) {
if (virtualPort.realizedBy() == null) {
- print(FMT_VIRTUAL_PORT, virtualPort.number(), "None", "None");
+ print(FMT_VIRTUAL_PORT, virtualPort.number(), "None", "None", virtualPort.isEnabled());
} else {
print(FMT_VIRTUAL_PORT, virtualPort.number(),
virtualPort.realizedBy().deviceId(),
- virtualPort.realizedBy().port());
+ virtualPort.realizedBy().port(),
+ virtualPort.isEnabled());
}
}
}
diff --git a/cli/src/main/java/org/onosproject/cli/net/vnet/VirtualPortStateCommand.java b/cli/src/main/java/org/onosproject/cli/net/vnet/VirtualPortStateCommand.java
new file mode 100644
index 0000000..d11e249
--- /dev/null
+++ b/cli/src/main/java/org/onosproject/cli/net/vnet/VirtualPortStateCommand.java
@@ -0,0 +1,91 @@
+/*
+ * Copyright 2017-present Open Networking Foundation
+ *
+ * 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.vnet;
+
+import org.apache.karaf.shell.commands.Argument;
+import org.apache.karaf.shell.commands.Command;
+import org.onosproject.cli.AbstractShellCommand;
+import org.onosproject.incubator.net.virtual.NetworkId;
+import org.onosproject.incubator.net.virtual.VirtualNetworkAdminService;
+import org.onosproject.incubator.net.virtual.VirtualNetworkService;
+import org.onosproject.incubator.net.virtual.VirtualPort;
+import org.onosproject.net.DeviceId;
+import org.onosproject.net.PortNumber;
+
+import java.util.Set;
+
+import static com.google.common.base.Preconditions.checkNotNull;
+
+/**
+ * Administratively enables or disables state of an existing virtual port.
+ */
+@Command(scope = "onos", name = "vnet-port-state",
+ description = "Administratively enables or disables state of an existing virtual port.")
+public class VirtualPortStateCommand extends AbstractShellCommand {
+ @Argument(index = 0, name = "networkId", description = "Network ID",
+ required = true, multiValued = false)
+ Long networkId = null;
+
+ @Argument(index = 1, name = "deviceId", description = "Virtual Device ID",
+ required = true, multiValued = false)
+ String deviceId = null;
+
+ @Argument(index = 2, name = "portNum", description = "Virtual device port number",
+ required = true, multiValued = false)
+ Integer portNum = null;
+
+ @Argument(index = 3, name = "portState",
+ description = "Desired State. Either \"enable\" or \"disable\".",
+ required = true, multiValued = false)
+ String portState = null;
+
+ @Override
+ protected void execute() {
+ VirtualNetworkAdminService service = get(VirtualNetworkAdminService.class);
+
+ VirtualPort vPort = getVirtualPort(PortNumber.portNumber(portNum));
+ checkNotNull(vPort, "The virtual Port does not exist");
+
+ boolean isEnabled;
+ if ("enable".equals(portState)) {
+ isEnabled = true;
+ } else if ("disable".equals(portState)) {
+ isEnabled = false;
+ } else {
+ print("State must be enable or disable");
+ return;
+ }
+
+ service.updatePortState(NetworkId.networkId(networkId),
+ DeviceId.deviceId(deviceId), vPort.number(), isEnabled);
+ print("Virtual port state updated.");
+ }
+
+ /**
+ * Returns the virtual port matching the device and port identifier.
+ *
+ * @param aPortNumber port identifier
+ * @return matching virtual port, or null.
+ */
+ private VirtualPort getVirtualPort(PortNumber aPortNumber) {
+ VirtualNetworkService service = get(VirtualNetworkService.class);
+ Set<VirtualPort> ports = service.getVirtualPorts(NetworkId.networkId(networkId),
+ DeviceId.deviceId(deviceId));
+ return ports.stream().filter(p -> p.number().equals(aPortNumber))
+ .findFirst().get();
+ }
+}
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 9e176b6..a401a1f 100644
--- a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -816,6 +816,15 @@
</completers>
</command>
<command>
+ <action class="org.onosproject.cli.net.vnet.VirtualPortStateCommand"/>
+ <completers>
+ <ref component-id="virtualNetworkCompleter"/>
+ <ref component-id="virtualDeviceCompleter"/>
+ <ref component-id="virtualPortCompleter"/>
+ <null/>
+ </completers>
+ </command>
+ <command>
<action class="org.onosproject.cli.net.vnet.VirtualPortRemoveCommand"/>
<completers>
<ref component-id="virtualNetworkCompleter"/>