Add missing imports and fields to VNF classes - VnfOperationVO State enum, VnfService methods, ApiErrorCode, EventTypes

Build2 CI · Build2 CI · commit 67308881594c · 2025-11-07T09:46:17.000Z
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/CommunicationException.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/CommunicationException.java
@@ -1,5 +1,6 @@
 package org.apache.cloudstack.vnf;
 
+import com.cloud.exception.CloudException;
 public class CommunicationException extends CloudException {
     private boolean retriable;
     public CommunicationException(String message, boolean retriable) {
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/DictionaryParseException.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/DictionaryParseException.java
@@ -1,5 +1,8 @@
 package org.apache.cloudstack.vnf;
 
+import java.util.List;
+
+import com.cloud.exception.CloudException;
 public class DictionaryParseException extends CloudException {
     private List<String> errors;
     public DictionaryParseException(String message) {
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/DictionaryValidationResult.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/DictionaryValidationResult.java
@@ -1,5 +1,9 @@
 package org.apache.cloudstack.vnf;
 
+import java.util.ArrayList;
+
+import java.util.List;
+
 public class DictionaryValidationResult {
     private boolean valid;
     private List<String> errors;
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/OperationDefinition.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/OperationDefinition.java
@@ -1,5 +1,7 @@
 package org.apache.cloudstack.vnf;
 
+import java.util.Map;
+
 public class OperationDefinition {
     private String method;       // HTTP method or "SSH"
     private String endpoint;     // URL path or CLI command
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/RequestBuildException.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/RequestBuildException.java
@@ -1,5 +1,7 @@
 package org.apache.cloudstack.vnf;
 
+import com.cloud.exception.CloudException;
+
 public class RequestBuildException extends CloudException {
     public RequestBuildException(String message) {
         super(message);
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/ResponseMapping.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/ResponseMapping.java
@@ -1,5 +1,7 @@
 package org.apache.cloudstack.vnf;
 
+import java.util.Map;
+
 public class ResponseMapping {
     private int successCode = 200;
     private String idPath;           // JSONPath to extract ID
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/ServiceDefinition.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/ServiceDefinition.java
@@ -1,5 +1,7 @@
 package org.apache.cloudstack.vnf;
 
+import java.util.Map;
+
 public class ServiceDefinition {
     private String name;
     private Map<String, OperationDefinition> operations;
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/TemplateContext.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/TemplateContext.java
@@ -1,5 +1,8 @@
 package org.apache.cloudstack.vnf;
 
+import java.util.Map;
+import java.util.HashMap;
+
 public class TemplateContext {
     private Map<String, Object> variables;
     public TemplateContext() {
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfAppliance.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfAppliance.java
@@ -1,5 +1,8 @@
 package org.apache.cloudstack.vnf;
 
+import java.util.Date;
+import com.cloud.vm.VirtualMachine;
+import com.cloud.network.Network;
 public class VnfAppliance {
     private Long id;
     private String uuid;
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfDeviceRule.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfDeviceRule.java
@@ -1,5 +1,7 @@
 package org.apache.cloudstack.vnf;
 
+import java.util.Map;
+
 public class VnfDeviceRule {
     private String externalId;
     private String serviceName;  // "Firewall", "NAT", etc.
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfDictionary.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfDictionary.java
@@ -1,5 +1,8 @@
 package org.apache.cloudstack.vnf;
 
+import java.util.Date;
+import java.util.Map;
+
 public class VnfDictionary {
     private String id;
     private String uuid;
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfDictionaryManager.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfDictionaryManager.java
@@ -1,5 +1,7 @@
 package org.apache.cloudstack.vnf;
 
+import com.cloud.exception.CloudException;
+
 public interface VnfDictionaryManager {
     /**
      * Load and parse a YAML dictionary
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfFrameworkConfig.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfFrameworkConfig.java
@@ -1,8 +1,5 @@
 // Licensed to the Apache Software Foundation (ASF) under one
 
-import com.cloud.utils.component.Configurable;
-import org.apache.cloudstack.config.Configuration;
-import org.apache.cloudstack.framework.config.ConfigKey;
 // or more contributor license agreements.  See the NOTICE file
 // distributed with this work for additional information
 // regarding copyright ownership.  The ASF licenses this file
@@ -21,6 +18,10 @@
 
 package org.apache.cloudstack.vnf;
 
+import org.apache.cloudstack.framework.config.Configurable;
+import org.apache.cloudstack.config.Configuration;
+import org.apache.cloudstack.framework.config.ConfigKey;
+
 public class VnfFrameworkConfig implements Configurable {
     public static final ConfigKey<Boolean> VnfFrameworkEnabled = new ConfigKey<>(
             "Advanced",
@@ -58,4 +59,4 @@ public ConfigKey<?>[] getConfigKeys() {
             VnfMaxRetries
         };
     }
-}
+}
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfProvider.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfProvider.java
@@ -1,5 +1,13 @@
 package org.apache.cloudstack.vnf;
 
+import com.cloud.exception.CloudException;
+import com.cloud.network.Network;
+
+import com.cloud.network.element.NetworkElement;
+import com.cloud.network.element.FirewallServiceProvider;
+import com.cloud.network.element.PortForwardingServiceProvider;
+import com.cloud.network.element.StaticNatServiceProvider;
+import com.cloud.network.element.LoadBalancingServiceProvider;
 public interface VnfProvider extends NetworkElement,
                                       FirewallServiceProvider,
                                       PortForwardingServiceProvider,
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfReconciliationResult.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfReconciliationResult.java
@@ -1,5 +1,7 @@
 package org.apache.cloudstack.vnf;
 
+import java.util.List;
+
 public class VnfReconciliationResult {
     private boolean success;
     private boolean driftDetected;
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfRequest.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfRequest.java
@@ -1,5 +1,7 @@
 package org.apache.cloudstack.vnf;
 
+import java.util.Map;
+
 public class VnfRequest {
     private String targetIp;
     private String protocol;
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfRequestBuilder.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfRequestBuilder.java
@@ -1,5 +1,10 @@
 package org.apache.cloudstack.vnf;
 
+import com.cloud.network.rules.FirewallRule;
+import com.cloud.network.rules.PortForwardingRule;
+
+import com.cloud.network.lb.LoadBalancingRule;
+
 public interface VnfRequestBuilder {
     /**
      * Build a request for a firewall rule operation
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfResponse.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfResponse.java
@@ -1,5 +1,7 @@
 package org.apache.cloudstack.vnf;
 
+import java.util.Map;
+
 public class VnfResponse {
     private int statusCode;
     private String body;
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfService.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfService.java
@@ -1,50 +1,22 @@
-// Licensed to the Apache Software Foundation (ASF) under one
-// or more contributor license agreements.  See the NOTICE file
-// distributed with this work for additional information
-// regarding copyright ownership.  The ASF licenses this file
-// to you 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.apache.cloudstack.vnf;
 
-import org.apache.cloudstack.vnf.dao.VnfOperationVO;
 import com.cloud.exception.CloudException;
+import org.apache.cloudstack.vnf.dao.VnfOperationVO;
 import java.util.List;
 
 public interface VnfService {
     
-    /**
-     * Find VNF operation by rule ID
-     */
     VnfOperationVO findOperationByRuleId(String ruleId) throws CloudException;
     
-    /**
-     * List all VNF dictionaries
-     */
-    List<VnfDictionary> listDictionaries(Long zoneId);
+    List<VnfOperationVO> listOperationsByVnfInstance(Long vnfInstanceId) throws CloudException;
+    
+    List<VnfOperationVO> listAllOperations(Long startIndex, Long pageSize) throws CloudException;
+    
+    List<VnfDictionary> listDictionaries(Long accountId) throws CloudException;
     
-    /**
-     * Upload VNF dictionary
-     */
-    VnfDictionary uploadDictionary(String name, String content, Long zoneId) throws CloudException;
+    VnfDictionary uploadDictionary(String dictionaryData, String vendor, Long accountId) throws CloudException;
     
-    /**
-     * Test VNF connectivity
-     */
-    VnfConnectivityResult testConnectivity(Long applianceId) throws CloudException;
+    VnfConnectivityResult testConnectivity(Long vnfApplianceId) throws CloudException;
     
-    /**
-     * Reconcile VNF network
-     */
     VnfReconciliationResult reconcileNetwork(Long networkId) throws CloudException;
 }
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfTemplate.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/VnfTemplate.java
@@ -0,0 +1,16 @@
+package org.apache.cloudstack.vnf;
+
+public class VnfTemplate {
+    private Long templateId;
+    private String templateName;
+    private String vendor;
+    
+    public Long getTemplateId() { return templateId; }
+    public void setTemplateId(Long templateId) { this.templateId = templateId; }
+    
+    public String getTemplateName() { return templateName; }
+    public void setTemplateName(String templateName) { this.templateName = templateName; }
+    
+    public String getVendor() { return vendor; }
+    public void setVendor(String vendor) { this.vendor = vendor; }
+}
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/api/command/ListVnfOperationsCmd.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/api/command/ListVnfOperationsCmd.java
@@ -18,12 +18,14 @@
 package org.apache.cloudstack.vnf.api.command;
 
 import com.cloud.exception.InvalidParameterValueException;
+import org.apache.cloudstack.api.BaseListCmd;
 import org.apache.cloudstack.acl.RoleType;
 import org.apache.cloudstack.api.APICommand;
 import org.apache.cloudstack.api.ApiConstants;
 import org.apache.cloudstack.api.BaseAsyncCmd;
 import org.apache.cloudstack.api.BaseCmd;
 import org.apache.cloudstack.api.Parameter;
+import org.apache.cloudstack.api.BaseCmd.CommandType;
 import org.apache.cloudstack.api.ServerApiException;
 import org.apache.cloudstack.api.response.SuccessResponse;
 import org.apache.cloudstack.api.response.ListResponse;
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/dao/VnfOperationVO.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/dao/VnfOperationVO.java
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/dictionary/VnfDictionaryParserImpl.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/dictionary/VnfDictionaryParserImpl.java
diff --git a/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/dictionary/VnfTemplateRenderer.java b/plugins/vnf-framework/src/main/java/org/apache/cloudstack/vnf/dictionary/VnfTemplateRenderer.java
