[Port Mgr] Support multiple ResourceOperation types (futurewei-cloud#603

)
LynRodWS · Apr 29, 2021 · 5f71b54 · 5f71b54
1 parent a9e3d8b
commit 5f71b54
Show file tree

Hide file tree

Showing 4 changed files with 63 additions and 10 deletions.
diff --git a/lib/src/main/java/com/futurewei/alcor/common/utils/CommonUtil.java b/lib/src/main/java/com/futurewei/alcor/common/utils/CommonUtil.java
@@ -90,4 +90,13 @@ public static String[] getBeanNullPropertyNames(Object bean){
                     }
                 }).toArray(String[]::new);
     }
+
+    /**
+     * Determine if a given string is empty or null
+     * @param an input string
+     * @return a boolean value, true if null or empty
+     */
+    public static boolean isNullOrEmpty(String string) {
+        return string == null || string.trim().isEmpty();
+    }
 }
diff --git a/...t_manager/src/main/java/com/futurewei/alcor/portmanager/processor/DataPlaneProcessor.java b/...t_manager/src/main/java/com/futurewei/alcor/portmanager/processor/DataPlaneProcessor.java
@@ -16,6 +16,7 @@ free of charge, to any person obtaining a copy of this software and associated d
 package com.futurewei.alcor.portmanager.processor;
 
 import com.futurewei.alcor.common.enumClass.StatusEnum;
+import com.futurewei.alcor.common.utils.CommonUtil;
 import com.futurewei.alcor.common.utils.SpringContextUtil;
 import com.futurewei.alcor.portmanager.exception.GetNodeInfoException;
 import com.futurewei.alcor.portmanager.exception.NodeInfoNotFound;
@@ -229,6 +230,38 @@ private void setTheMissingFields(PortContext context, List<PortEntity> portEntit
 
     }
 
+    private List<ResourceOperation> initializeResourceOperationTypes(PortContext context, List<PortEntity> portEntities) {
+        List<ResourceOperation> resourceOperationTypes = new ArrayList<>();
+        resourceOperationTypes.add(new ResourceOperation(Common.ResourceType.PORT, Common.OperationType.CREATE));
+        resourceOperationTypes.add(new ResourceOperation(Common.ResourceType.NEIGHBOR, Common.OperationType.CREATE));
+
+        // TODO: to enable full sg support, we will need to add full security group entities to context and check context here
+        for (PortEntity port : portEntities) {
+            if (!CommonUtil.isNullOrEmpty(context.getDefaultSgId()) && port.getPortSecurityEnabled()) {
+                resourceOperationTypes.add(new ResourceOperation(Common.ResourceType.SECURITYGROUP, Common.OperationType.CREATE));
+                break;
+            }
+        }
+
+        if (context.containRouters()) {
+            resourceOperationTypes.add(new ResourceOperation(Common.ResourceType.NEIGHBOR, Common.OperationType.CREATE));
+        }
+
+        return resourceOperationTypes;
+    }
+
+    private void markOperationTypes(NetworkConfiguration networkConfig, Common.OperationType operationType) {
+        if (networkConfig == null || networkConfig.getRsOpTypes() == null) {
+            return;
+        }
+
+        List<ResourceOperation> resourceOperationTypes = networkConfig.getRsOpTypes();
+        for (ResourceOperation type : resourceOperationTypes) {
+            type.setOpType(operationType);
+        }
+    }
+
+
     private NetworkConfiguration buildNetworkConfig(PortContext context, List<PortEntity> portEntities) throws Exception {
         /**
          DataPlaneProcessor needs to wait for all previous Processor runs to
@@ -245,9 +278,11 @@ private NetworkConfiguration buildNetworkConfig(PortContext context, List<PortEn
         }
 
         setTheMissingFields(context, portEntities);
+        List<ResourceOperation> resourceOperationTypes = initializeResourceOperationTypes(context, portEntities);
 
         NetworkConfiguration networkConfiguration = new NetworkConfiguration();
         networkConfiguration.setRsType(Common.ResourceType.PORT);
+        networkConfiguration.setRsOpTypes(resourceOperationTypes);
         networkConfiguration.setVpcs(networkConfig.getVpcEntities());
         networkConfiguration.setSubnets(networkConfig.getSubnetEntities());
         networkConfiguration.setSecurityGroups(networkConfig.getSecurityGroups());
@@ -267,8 +302,8 @@ private void createNetworkConfig(PortContext context, NetworkConfiguration netwo
             networkConfig.setOpType(Common.OperationType.CREATE);
             IRestRequest createNetworkConfigRequest =
                     new CreateNetworkConfigRequest(context, networkConfig);
-            context.getRequestManager().sendRequestAsync(createNetworkConfigRequest, request -> portService.updatePortStatus(request,networkConfig,null));
-            portService.updatePortStatus(createNetworkConfigRequest,networkConfig, StatusEnum.CREATED.getStatus());
+            context.getRequestManager().sendRequestAsync(createNetworkConfigRequest, request -> portService.updatePortStatus(request, networkConfig, null));
+            portService.updatePortStatus(createNetworkConfigRequest, networkConfig, StatusEnum.CREATED.getStatus());
         }
     }
 
@@ -278,14 +313,15 @@ private void updateNetworkConfig(PortContext context, NetworkConfiguration netwo
             networkConfig.setOpType(Common.OperationType.UPDATE);
             IRestRequest updateNetworkConfigRequest =
                     new UpdateNetworkConfigRequest(context, networkConfig);
-            context.getRequestManager().sendRequestAsync(updateNetworkConfigRequest, request -> portService.updatePortStatus(request,networkConfig,null));
-            portService.updatePortStatus(updateNetworkConfigRequest,networkConfig, StatusEnum.PENDING.getStatus());
+            context.getRequestManager().sendRequestAsync(updateNetworkConfigRequest, request -> portService.updatePortStatus(request, networkConfig, null));
+            portService.updatePortStatus(updateNetworkConfigRequest, networkConfig, StatusEnum.PENDING.getStatus());
         }
     }
 
     private void deleteNetworkConfig(PortContext context, NetworkConfiguration networkConfig) {
         if (networkConfig != null) {
             networkConfig.setOpType(Common.OperationType.DELETE);
+            markOperationTypes(networkConfig, Common.OperationType.DELETE);
             IRestRequest deleteNetworkConfigRequest =
                     new DeleteNetworkConfigRequest(context, networkConfig);
             context.getRequestManager().sendRequestAsync(deleteNetworkConfigRequest, null);

diff --git a/...ces/port_manager/src/main/java/com/futurewei/alcor/portmanager/processor/PortContext.java b/...ces/port_manager/src/main/java/com/futurewei/alcor/portmanager/processor/PortContext.java
@@ -175,6 +175,14 @@ public InternalRouterInfo getRouterByVpcOrSubnetId(String vpcOrSubnetId) {
         return (this.routers != null) ? this.routers.get(vpcOrSubnetId) : null;
     }
 
+    public boolean containRouters() {
+        if (this.routers == null || this.routers.isEmpty()) {
+            return false;
+        }
+
+        return true;
+    }
+
     public void setRouters(Map<String, InternalRouterInfo> routers) {
         this.routers = routers;
     }

diff --git a/web/src/main/java/com/futurewei/alcor/web/entity/dataplane/ResourceOperation.java b/web/src/main/java/com/futurewei/alcor/web/entity/dataplane/ResourceOperation.java
@@ -31,6 +31,11 @@ public class ResourceOperation {
     public ResourceOperation() {
     }
 
+    public ResourceOperation(ResourceType rsType, OperationType opType) {
+        this.rsType = rsType;
+        this.opType = opType;
+    }
+
     public ResourceType getRsType() {
         return this.rsType;
     }
@@ -43,12 +48,7 @@ public OperationType getOpType() {
         return this.opType;
     }
 
-    public void setHostId(OperationType opType) {
-        this.opType = opType;
-    }
-
-    public ResourceOperation(ResourceType rsType, OperationType opType) {
-        this.rsType = rsType;
+    public void setOpType(OperationType opType) {
         this.opType = opType;
     }
 }