Reserve the vRouter IP from IP pool at network creation phase

Change-Id: I5ccbd83088f521f9386046efefa0d4f92a195c4c (cherry picked from commit a98e311)
santcorc · Apr 8, 2021 · fc7e6cf · fc7e6cf
1 parent c3d410a
commit fc7e6cf
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/...pp/src/main/java/org/onosproject/kubevirtnetworking/cli/KubevirtListIpAddressCommand.java b/...pp/src/main/java/org/onosproject/kubevirtnetworking/cli/KubevirtListIpAddressCommand.java
@@ -49,6 +49,12 @@ public class KubevirtListIpAddressCommand extends AbstractShellCommand {
     @Override
     protected void doExecute() throws Exception {
         KubevirtNetworkService service = get(KubevirtNetworkService.class);
+
+        if (networkId == null) {
+            error("No network identifier was specified");
+            return;
+        }
+
         KubevirtNetwork network = service.network(networkId);
 
         if (network == null) {

diff --git a/...ing/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtNetworkHandler.java b/...ing/app/src/main/java/org/onosproject/kubevirtnetworking/impl/KubevirtNetworkHandler.java
@@ -33,6 +33,7 @@
 import org.onosproject.core.CoreService;
 import org.onosproject.kubevirtnetworking.api.KubevirtFlowRuleService;
 import org.onosproject.kubevirtnetworking.api.KubevirtNetwork;
+import org.onosproject.kubevirtnetworking.api.KubevirtNetworkAdminService;
 import org.onosproject.kubevirtnetworking.api.KubevirtNetworkEvent;
 import org.onosproject.kubevirtnetworking.api.KubevirtNetworkListener;
 import org.onosproject.kubevirtnetworking.api.KubevirtNetworkService;
@@ -156,7 +157,7 @@ public class KubevirtNetworkHandler {
     protected KubevirtNodeService nodeService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY)
-    protected KubevirtNetworkService networkService;
+    protected KubevirtNetworkAdminService networkService;
 
     @Reference(cardinality = ReferenceCardinality.MANDATORY)
     protected KubevirtFlowRuleService flowService;
@@ -834,6 +835,13 @@ private void setGatewayIcmpRuleForProviderInternalNetwork(KubevirtRouter router,
                 install);
     }
 
+    private void reserveVrouterIp(KubevirtNetwork network) {
+        String networkId = network.networkId();
+        IpAddress vrouterIp = network.ipPool().start();
+
+        networkService.reserveIp(networkId, vrouterIp);
+    }
+
     private class InternalRouterEventListener implements KubevirtRouterListener {
         private boolean isRelevantHelper() {
             return Objects.equals(localNodeId, leadershipService.getLeader(appId.name()));
@@ -1097,6 +1105,8 @@ private void processNetworkCreation(KubevirtNetwork network) {
                     initIntegrationTunnelBridge(network);
                     break;
                 case FLAT:
+                    reserveVrouterIp(network);
+                    break;
                 case VLAN:
                     break;
                 default:
@@ -1194,6 +1204,8 @@ private void processNodeCompletion(KubevirtNode node) {
                             setDefaultGatewayRuleToWorkerNodeWhenNodeCreated(node, network);
                             break;
                         case FLAT:
+                            reserveVrouterIp(network);
+                            break;
                         case VLAN:
                         default:
                             // do nothing