Create AuthType enum, complete VnfService with all command methods, add ResponseMapping setters

Author: Build2 CI

plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/AuthType.java

@@ -1,9 +1,8 @@
 package org.apache.cloudstack.vnf;
 
 public enum AuthType {
-    NONE,
     BASIC,
     TOKEN,
-    SSH_KEY,
-    SSH_PASSWORD
-}
+    API_KEY,
+    NONE
+}

plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/ResponseMapping.java

@@ -11,6 +11,10 @@ public class ResponseMapping {
     public void setSuccessCode(int code) { this.successCode = code; }
     public String getIdPath() { return idPath; }
     public void setIdPath(String path) { this.idPath = path; }
+    public String getListPath() { return listPath; }
+    public void setListPath(String listPath) { this.listPath = listPath; }
+    public Map<String, String> getItemPaths() { return itemPaths; }
+    public void setItemPaths(Map<String, String> itemPaths) { this.itemPaths = itemPaths; }
 }
 /**
  * Represents a VNF appliance instance

plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfService.java

@@ -3,28 +3,37 @@
 import com.cloud.exception.CloudException;
 import org.apache.cloudstack.vnf.dao.VnfOperationVO;
 import org.apache.cloudstack.vnf.dao.VnfOperationVO.State;
-import org.apache.cloudstack.vnf.api.command.UploadVnfDictionaryCmd;
+import org.apache.cloudstack.vnf.api.command.*;
 import java.util.List;
 
 public interface VnfService {
 
+    // Operation queries
     VnfOperationVO findOperationByRuleId(String ruleId) throws CloudException;
-    
     List<VnfOperationVO> listOperationsByVnfInstance(Long vnfInstanceId) throws CloudException;
-    
     List<VnfOperationVO> listOperationsByVnfInstanceAndState(Long vnfInstanceId, State state) throws CloudException;
-    
     List<VnfOperationVO> listOperationsByState(State state) throws CloudException;
-    
     List<VnfOperationVO> listAllOperations(Long startIndex, Long pageSize) throws CloudException;
 
+    // Dictionary management
     List<VnfDictionary> listDictionaries(Long accountId) throws CloudException;
-    
+    List<VnfDictionary> listVnfDictionaries(ListVnfDictionariesCmd cmd) throws CloudException;
     VnfDictionary uploadDictionary(String dictionaryData, String vendor, Long accountId) throws CloudException;
-    
     VnfDictionary uploadVnfDictionary(UploadVnfDictionaryCmd cmd) throws CloudException;
 
-    VnfConnectivityResult testConnectivity(Long vnfApplianceId) throws CloudException;
+    // Firewall rules
+    String createVnfFirewallRule(CreateVnfFirewallRuleCmd cmd) throws CloudException;
+    String deleteVnfFirewallRule(DeleteVnfFirewallRuleCmd cmd) throws CloudException;
+    String updateVnfFirewallRule(UpdateVnfFirewallRuleCmd cmd) throws CloudException;
+    
+    // NAT rules
+    String createVnfNATRule(CreateVnfNATRuleCmd cmd) throws CloudException;
 
+    // Network operations
+    VnfReconciliationResult reconcileVnfNetwork(ReconcileVnfNetworkCmd cmd) throws CloudException;
     VnfReconciliationResult reconcileNetwork(Long networkId) throws CloudException;
+    
+    // Connectivity testing
+    VnfConnectivityResult testConnectivity(Long vnfApplianceId) throws CloudException;
+    VnfConnectivityResult testVnfConnectivity(TestVnfConnectivityCmd cmd) throws CloudException;
 }

plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/api/command/CreateVnfNATRuleCmd.java

@@ -1,4 +1,5 @@
 package org.apache.cloudstack.vnf.api.command;
+import com.cloud.event.EventTypes;
 
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;

plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/api/command/DeleteVnfFirewallRuleCmd.java

@@ -1,4 +1,5 @@
 package org.apache.cloudstack.vnf.api.command;
+import com.cloud.event.EventTypes;
 
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.ResourceUnavailableException;

plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/api/command/UpdateVnfFirewallRuleCmd.java

@@ -1,4 +1,5 @@
 package org.apache.cloudstack.vnf.api.command;
+import com.cloud.event.EventTypes;
 
 import com.cloud.exception.ConcurrentOperationException;
 import com.cloud.exception.InsufficientCapacityException;

plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/service/VnfServiceImpl.java

@@ -27,7 +27,7 @@
 
 @Component
 public class VnfServiceImpl extends ManagerBase implements VnfService {
-    private static final Logger LOGGER = Logger.getLogger(VnfServiceImpl.class);
+    private static final Logger LOGGER = LogManager.getLogger(VnfServiceImpl.class);
     private static final ObjectMapper objectMapper = new ObjectMapper();
 
     @Inject