address review comments

Author: sudo87

api/src/main/java/org/apache/cloudstack/api/command/user/network/CreateNetworkACLCmd.java

@@ -58,7 +58,7 @@ public class CreateNetworkACLCmd extends BaseAsyncCreateCmd {
     private Integer publicEndPort;
 
     @Parameter(name = ApiConstants.CIDR_LIST, type = CommandType.LIST, collectionType = CommandType.STRING, description = "the CIDR list to allow traffic from/to. Multiple entries must be separated by a single comma character (,).")
-    private List<String> cidrlist;
+    private List<String> cidrList;
 
     @Parameter(name = ApiConstants.ICMP_TYPE, type = CommandType.INTEGER, description = "type of the ICMP message being sent")
     private Integer icmpType;
@@ -118,8 +118,8 @@ public void setProtocol(String protocol) {
     }
 
     public List<String> getSourceCidrList() {
-        if (cidrlist != null) {
-            return cidrlist;
+        if (cidrList != null) {
+            return cidrList;
         } else {
             List<String> oneCidrList = new ArrayList<String>();
             oneCidrList.add(NetUtils.ALL_IP4_CIDRS);
@@ -238,8 +238,8 @@ public String getReason() {
         return reason;
     }
 
-    public void setCidrlist(List<String> cidrlist) {
-        this.cidrlist = cidrlist;
+    public void setCidrList(List<String> cidrList) {
+        this.cidrList = cidrList;
     }
 
     public void setIcmpType(Integer icmpType) {

api/src/main/java/org/apache/cloudstack/api/command/user/network/ImportNetworkACLCmd.java

@@ -39,7 +39,8 @@
 
 @APICommand(name = "importNetworkACL", description = "Imports network ACL rules.",
         responseObject = NetworkACLItemResponse.class,
-        requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
+        requestHasSensitiveInfo = false, responseHasSensitiveInfo = false,
+        since = "4.22.1")
 public class ImportNetworkACLCmd extends BaseAsyncCmd {
 
     // ///////////////////////////////////////////////////
@@ -51,19 +52,17 @@ public class ImportNetworkACLCmd extends BaseAsyncCmd {
             type = CommandType.UUID,
             entityType = NetworkACLResponse.class,
             required = true,
-            description = "The ID of the network ACL to which the rules will be imported",
-            since = "4.22.0"
+            description = "The ID of the network ACL to which the rules will be imported"
     )
     private Long aclId;
 
     @Parameter(name = ApiConstants.RULES, type = CommandType.MAP, required = true,
-            description = "Rules param list, id and protocol are must. Example: " +
+            description = "Rules param list, id and protocol are must. Invalid rules will be discarded. Example: " +
                     "rules[0].id=101&rules[0].protocol=tcp&rules[0].traffictype=ingress&rules[0].state=active&rules[0].cidrlist=192.168.1.0/24" +
                     "&rules[0].tags=web&rules[0].aclid=acl-001&rules[0].aclname=web-acl&rules[0].number=1&rules[0].action=allow&rules[0].fordisplay=true" +
                     "&rules[0].description=allow%20web%20traffic&rules[1].id=102&rules[1].protocol=udp&rules[1].traffictype=egress&rules[1].state=enabled" +
                     "&rules[1].cidrlist=10.0.0.0/8&rules[1].tags=db&rules[1].aclid=acl-002&rules[1].aclname=db-acl&rules[1].number=2&rules[1].action=deny" +
-                    "&rules[1].fordisplay=false&rules[1].description=deny%20database%20traffic",
-    since = "4.22.0")
+                    "&rules[1].fordisplay=false&rules[1].description=deny%20database%20traffic")
     private Map rules;
 
 
@@ -112,7 +111,7 @@ public long getEntityOwnerId() {
 
     @Override
     public String getEventType() {
-        return EventTypes.EVENT_NETWORK_ACL_CREATE;
+        return EventTypes.EVENT_NETWORK_ACL_IMPORT;
     }
 
     @Override

server/src/main/java/com/cloud/network/vpc/NetworkACLServiceImpl.java

@@ -1101,7 +1101,7 @@ private NetworkACLItem createACLRuleFromMap(Map<String, Object> ruleMap, long ac
         }
         String action = (String) ruleMap.getOrDefault(ApiConstants.ACTION, "deny");
         String trafficType = (String) ruleMap.getOrDefault(ApiConstants.TRAFFIC_TYPE, NetworkACLItem.TrafficType.Ingress);
-        String forDisplay = (String ) ruleMap.getOrDefault(ApiConstants.FOR_DISPLAY, "true");
+        String forDisplay = (String) ruleMap.getOrDefault(ApiConstants.FOR_DISPLAY, "true");
 
         // Create ACL rule using the service
         CreateNetworkACLCmd cmd = new CreateNetworkACLCmd();
@@ -1122,7 +1122,7 @@ private NetworkACLItem createACLRuleFromMap(Map<String, Object> ruleMap, long ac
             } else if (cidrObj instanceof List) {
                 cidrList.addAll((List<String>) cidrObj);
             }
-            cmd.setCidrlist(cidrList);
+            cmd.setCidrList(cidrList);
         }
 
         if (ruleMap.containsKey(ApiConstants.START_PORT)) {

ui/public/locales/en.json

@@ -3640,6 +3640,7 @@
 "message.move.acl.order.processing": "Moving ACL rule...",
 "message.network.acl.default.allow": "Warning: With this policy all traffic will be allowed through the firewall to this VPC Network Tier. You should consider securing your Network.",
 "message.network.acl.default.deny": "Warning: With this policy all traffic will be denied through the firewall to this VPC Network Tier. In order to allow traffic through you will need to change policies.",
+"message.network.acl.import.note": "Note: Only valid rules from the CSV will be imported. Invalid entries will be discarded.",
 "message.network.addvm.desc": "Please specify the Network that you would like to add this Instance to. A new NIC will be added for this Network.",
 "message.network.description": "Setup Network and traffic.",
 "message.network.error": "Network Error",

ui/src/views/network/ImportNetworkACL.vue

@@ -36,7 +36,7 @@
           </a-descriptions>
         </div>
 
-         <a-form-item name="file" ref="file">
+        <a-form-item name="file" ref="file">
           <template #label>
             <tooltip-label :title="$t('label.rules.file')" :tooltip="$t('label.rules.file.to.import')"/>
           </template>
@@ -81,6 +81,8 @@
           </div>
         </a-form-item>
 
+        <span>{{ $t('message.network.acl.import.note') }}</span><br/>
+
         <div :span="24" class="action-button">
           <a-button class="button-cancel" @click="closeAction">{{ $t('label.cancel') }}</a-button>
           <a-button
@@ -99,7 +101,6 @@
 
 <script>
 import { ref, reactive, toRaw } from 'vue'
-// import { Tag } from 'ant-design-vue'
 import { postAPI } from '@/api'
 import TooltipLabel from '@/components/widgets/TooltipLabel'
 
@@ -182,7 +183,7 @@ export default {
       this.form = reactive({})
       this.rules = reactive({
         file: [
-          { required: true, message: this.$t('this.$message.error.required.input') },
+          { required: true, message: this.$t('message.error.required.input') },
           {
             validator: this.checkCsvRulesFile,
             message: this.$t('label.error.rules.file.import')
@@ -262,7 +263,7 @@ export default {
     readCsvFile (file) {
       return new Promise((resolve, reject) => {
         if (window.FileReader) {
-          var reader = new FileReader()
+          const reader = new FileReader()
           reader.onload = (event) => {
             const text = event.target.result
             const lines = text.split('\n').filter(line => line.trim() !== '')