Add missing setters to VnfDictionary and AccessConfig, update VnfService with state-based queries, fix Logger calls

Author: Build2 CI

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

@@ -16,6 +16,16 @@ public class AccessConfig {
     public void setPort(int port) { this.port = port; }
     public AuthType getAuthType() { return authType; }
     public void setAuthType(AuthType authType) { this.authType = authType; }
+    public String getBasePath() { return basePath; }
+    public void setBasePath(String basePath) { this.basePath = basePath; }
+    public String getUsernameRef() { return usernameRef; }
+    public void setUsernameRef(String usernameRef) { this.usernameRef = usernameRef; }
+    public String getPasswordRef() { return passwordRef; }
+    public void setPasswordRef(String passwordRef) { this.passwordRef = passwordRef; }
+    public String getTokenRef() { return tokenRef; }
+    public void setTokenRef(String tokenRef) { this.tokenRef = tokenRef; }
+    public String getTokenHeader() { return tokenHeader; }
+    public void setTokenHeader(String tokenHeader) { this.tokenHeader = tokenHeader; }
 }
 /**
  * Service definition (e.g., Firewall, NAT)

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

@@ -27,6 +27,24 @@ public class VnfDictionary {
     public void setAccessConfig(AccessConfig config) { this.accessConfig = config; }
     public Map<String, ServiceDefinition> getServices() { return services; }
     public void setServices(Map<String, ServiceDefinition> services) { this.services = services; }
+    public String getUuid() { return uuid; }
+    public void setUuid(String uuid) { this.uuid = uuid; }
+    public Long getTemplateId() { return templateId; }
+    public void setTemplateId(Long templateId) { this.templateId = templateId; }
+    public Long getNetworkId() { return networkId; }
+    public void setNetworkId(Long networkId) { this.networkId = networkId; }
+    public String getName() { return name; }
+    public void setName(String name) { this.name = name; }
+    public String getYamlContent() { return yamlContent; }
+    public void setYamlContent(String yamlContent) { this.yamlContent = yamlContent; }
+    public String getVendor() { return vendor; }
+    public void setVendor(String vendor) { this.vendor = vendor; }
+    public String getProduct() { return product; }
+    public void setProduct(String product) { this.product = product; }
+    public Date getCreated() { return created; }
+    public void setCreated(Date created) { this.created = created; }
+    public Date getUpdated() { return updated; }
+    public void setUpdated(Date updated) { this.updated = updated; }
     public ServiceDefinition getService(String name) { return services.get(name); }
 }
 /**

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

@@ -2,6 +2,8 @@
 
 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 java.util.List;
 
 public interface VnfService {
@@ -10,12 +12,18 @@ public interface VnfService {
 
     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;
 
     List<VnfDictionary> listDictionaries(Long accountId) throws CloudException;
 
     VnfDictionary uploadDictionary(String dictionaryData, String vendor, Long accountId) throws CloudException;
 
+    VnfDictionary uploadVnfDictionary(UploadVnfDictionaryCmd cmd) throws CloudException;
+    
     VnfConnectivityResult testConnectivity(Long vnfApplianceId) throws CloudException;
 
     VnfReconciliationResult reconcileNetwork(Long networkId) throws CloudException;

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

@@ -19,7 +19,7 @@
  * Client for communicating with the VNF Broker service running on Virtual Router
  */
 public class VnfBrokerClient {
-    private static final Logger LOGGER = Logger.getLogger(VnfBrokerClient.class);
+    private static final Logger LOGGER = LogManager.getLogger(VnfBrokerClient.class);
     private static final ObjectMapper objectMapper = new ObjectMapper();
 
     private final String brokerUrl;

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

@@ -33,7 +33,7 @@
  * Enables CloudStack to apply network rules to VNF appliances
  */
 public class VnfNetworkElement implements NetworkElement, FirewallServiceProvider {
-    private static final Logger LOGGER = Logger.getLogger(VnfNetworkElement.class);
+    private static final Logger LOGGER = LogManager.getLogger(VnfNetworkElement.class);
 
     @Inject
     private VnfInstanceDao vnfInstanceDao;