[ONOS-6549] (vNet) Balance role commands for virtual netwrok
Change-Id: Iadf22cd735bed0b055ada5542be8b1d2edb8188e
diff --git a/cli/src/main/java/org/onosproject/cli/net/vnet/VirtualNetworkBalanceMastersCommand.java b/cli/src/main/java/org/onosproject/cli/net/vnet/VirtualNetworkBalanceMastersCommand.java
new file mode 100644
index 0000000..10f5cd7
--- /dev/null
+++ b/cli/src/main/java/org/onosproject/cli/net/vnet/VirtualNetworkBalanceMastersCommand.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2014-present 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.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.VirtualNetworkService;
+import org.onosproject.mastership.MastershipAdminService;
+
+/**
+ * Forces virtual network device mastership rebalancing.
+ */
+@Command(scope = "onos", name = "vnet-balance-masters",
+ description = "Forces virtual network device mastership rebalancing")
+public class VirtualNetworkBalanceMastersCommand extends AbstractShellCommand {
+ @Argument(index = 0, name = "networkId", description = "Network ID",
+ required = true, multiValued = false)
+ Long networkId = null;
+ @Override
+ protected void execute() {
+ VirtualNetworkService vnetService = get(VirtualNetworkService.class);
+ MastershipAdminService mastershipAdminService = vnetService
+ .get(NetworkId.networkId(networkId), MastershipAdminService.class);
+ mastershipAdminService.balanceRoles();
+ }
+}
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 2d0d048..d718406 100644
--- a/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
+++ b/cli/src/main/resources/OSGI-INF/blueprint/shell-config.xml
@@ -883,6 +883,13 @@
</optional-completers>
</command>
<command>
+ <action class="org.onosproject.cli.net.vnet.VirtualNetworkBalanceMastersCommand"/>
+ <completers>
+ <ref component-id="virtualNetworkCompleter"/>
+ <null/>
+ </completers>
+ </command>
+ <command>
<action class="org.onosproject.cli.net.DpisListCommand"/>
</command>
diff --git a/incubator/api/src/main/java/org/onosproject/incubator/net/virtual/VirtualNetworkService.java b/incubator/api/src/main/java/org/onosproject/incubator/net/virtual/VirtualNetworkService.java
index a303df2..a760282 100644
--- a/incubator/api/src/main/java/org/onosproject/incubator/net/virtual/VirtualNetworkService.java
+++ b/incubator/api/src/main/java/org/onosproject/incubator/net/virtual/VirtualNetworkService.java
@@ -111,6 +111,8 @@
* <li>{@link org.onosproject.net.flowobjective.FlowObjectiveService}</li>
* <li>{@link org.onosproject.net.intent.IntentService}</li>
* <li>{@link org.onosproject.mastership.MastershipService}</li>
+ * <li>{@link org.onosproject.mastership.MastershipAdminService}</li>
+ * <li>{@link org.onosproject.mastership.MastershipTermService}</li>
* </ul>
*
* @param networkId network identifier
diff --git a/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkManager.java b/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkManager.java
index fc0f9d6..b1b0080 100644
--- a/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkManager.java
+++ b/incubator/net/src/main/java/org/onosproject/incubator/net/virtual/impl/VirtualNetworkManager.java
@@ -51,7 +51,9 @@
import org.onosproject.incubator.net.virtual.provider.VirtualNetworkProvider;
import org.onosproject.incubator.net.virtual.provider.VirtualNetworkProviderRegistry;
import org.onosproject.incubator.net.virtual.provider.VirtualNetworkProviderService;
+import org.onosproject.mastership.MastershipAdminService;
import org.onosproject.mastership.MastershipService;
+import org.onosproject.mastership.MastershipTermService;
import org.onosproject.net.ConnectPoint;
import org.onosproject.net.DeviceId;
import org.onosproject.net.HostId;
@@ -431,7 +433,9 @@
service = new VirtualNetworkGroupManager(this, network.id());
} else if (serviceKey.serviceClass.equals(FlowObjectiveService.class)) {
service = new VirtualNetworkFlowObjectiveManager(this, network.id());
- } else if (serviceKey.serviceClass.equals(MastershipService.class)) {
+ } else if (serviceKey.serviceClass.equals(MastershipService.class) ||
+ serviceKey.serviceClass.equals(MastershipAdminService.class) ||
+ serviceKey.serviceClass.equals(MastershipTermService.class)) {
service = new VirtualNetworkMastershipManager(this, network.id());
} else {
return null;