Merge branch 'apache:main' into main

Author: SadiJr

.travis.yml

@@ -64,7 +64,7 @@ env:
              smoke/test_dynamicroles
              smoke/test_global_settings
              smoke/test_guest_vlan_range
-             smoke/test_host_annotations
+             smoke/test_annotations
              smoke/test_host_maintenance
              smoke/test_hostha_simulator"
 

README.md

@@ -143,5 +143,5 @@ The following provides more details on the included cryptographic software:
 * CloudStack makes use of JaSypt cryptographic libraries.
 * CloudStack has a system requirement of MySQL, and uses native database encryption functionality.
 * CloudStack makes use of the Bouncy Castle general-purpose encryption library.
-* CloudStack can optionally interacts with and controls OpenSwan-based VPNs.
+* CloudStack can optionally interact with and control OpenSwan-based VPNs.
 * CloudStack has a dependency on and makes use of JSch - a java SSH2 implementation.

agent/conf/agent.properties

@@ -97,6 +97,12 @@ domr.scripts.dir=scripts/network/domr/kvm
 # migration will finish quickly.  Less than 1 means disabled.
 #vm.migrate.pauseafter=0
 
+# Time (in seconds) to wait for VM migrate finish. Less than 1 means disabled.
+# If vm migration is not finished in the time, the vm job will be cancelled by libvirt.
+# It will be configured by cloudstack management server when cloudstack agent connects.
+# please change the global setting 'migratewait' if needed (default value: 3600)
+#vm.migrate.wait=0
+
 # Agent hooks is the way to override default agent behavior to extend the functionality without excessive coding
 # for a custom deployment. The first hook promoted is libvirt-vm-xml-transformer which allows provider to modify
 # VM XML specification before send to libvirt. Hooks are implemented in Groovy and must be implemented in the way

api/src/main/java/com/cloud/agent/api/storage/OVFHelper.java

@@ -115,6 +115,20 @@ private String getChildNodeValue(Node node, String childNodeName) {
         return null;
     }
 
+    /**
+     * Check if there are elements matching the tag name, otherwise check prepending the prefix
+     */
+    public NodeList getElementsByTagNameAndPrefix(Document doc, String name, String prefix) {
+        if (doc == null) {
+            return null;
+        }
+        NodeList elementsByTagName = doc.getElementsByTagName(name);
+        if (elementsByTagName.getLength() > 0) {
+            return elementsByTagName;
+        }
+        return doc.getElementsByTagName(String.format("%s:%s", prefix, name));
+    }
+
     /**
      * Check if the attribute is present on the element, otherwise check preprending ':'
      */
@@ -179,7 +193,7 @@ public List<OVFPropertyTO> getConfigurableOVFPropertiesFromDocument(Document doc
             return props;
         }
         int propertyIndex = 0;
-        NodeList productSections = doc.getElementsByTagName("ProductSection");
+        NodeList productSections = getElementsByTagNameAndPrefix(doc, "ProductSection", "ovf");
         if (productSections != null) {
             String lastCategoryFound = null;
             for (int i = 0; i < productSections.getLength(); i++) {
@@ -193,10 +207,12 @@ public List<OVFPropertyTO> getConfigurableOVFPropertiesFromDocument(Document doc
                     if (child == null) {
                         continue;
                     }
-                    if (child.getNodeName().equalsIgnoreCase("Category")) {
+                    if (child.getNodeName().equalsIgnoreCase("Category") ||
+                            child.getNodeName().equalsIgnoreCase("ovf:Category")) {
                         lastCategoryFound = child.getTextContent();
                         s_logger.info("Category found " + lastCategoryFound);
-                    } else if (child.getNodeName().equalsIgnoreCase("Property")) {
+                    } else if (child.getNodeName().equalsIgnoreCase("Property") ||
+                            child.getNodeName().equalsIgnoreCase("ovf:Property")) {
                         OVFPropertyTO prop = createOVFPropertyFromNode(child, propertyIndex, lastCategoryFound);
                         if (prop != null && prop.isUserConfigurable()) {
                             props.add(prop);
@@ -398,7 +414,7 @@ protected List<OVFDisk> extractDisksFromOvfDocumentTree(Document doc) {
     }
 
     protected List<OVFFile> extractFilesFromOvfDocumentTree(File ovfFile, Document doc) {
-        NodeList files = doc.getElementsByTagName("File");
+        NodeList files = getElementsByTagNameAndPrefix(doc, "File", "ovf");
         ArrayList<OVFFile> vf = new ArrayList<>();
         boolean toggle = true;
         for (int j = 0; j < files.getLength(); j++) {
@@ -514,9 +530,9 @@ private OVFDiskController getController(Element controllerItem) {
     public void rewriteOVFFileForSingleDisk(final String origOvfFilePath, final String newOvfFilePath, final String diskName) {
         final Document doc = getDocumentFromFile(origOvfFilePath);
 
-        NodeList disks = doc.getElementsByTagName("Disk");
-        NodeList files = doc.getElementsByTagName("File");
-        NodeList items = doc.getElementsByTagName("Item");
+        NodeList disks = getElementsByTagNameAndPrefix(doc, "Disk", "ovf");
+        NodeList files = getElementsByTagNameAndPrefix(doc, "File", "ovf");
+        NodeList items = getElementsByTagNameAndPrefix(doc, "Item", "ovf");
         String keepfile = null;
         List<Element> toremove = new ArrayList<>();
         for (int j = 0; j < files.getLength(); j++) {
@@ -677,7 +693,7 @@ private void fillNicPrerequisites(OVFNetworkTO nic, Node parentNode) {
 
     private void checkForOnlyOneSystemNode(Document doc) throws InternalErrorException {
         // get hardware VirtualSystem, for now we support only one of those
-        NodeList systemElements = doc.getElementsByTagName("VirtualSystem");
+        NodeList systemElements = getElementsByTagNameAndPrefix(doc, "VirtualSystem", "ovf");
         if (systemElements.getLength() != 1) {
             String msg = "found " + systemElements.getLength() + " system definitions in OVA, can only handle exactly one.";
             s_logger.warn(msg);
@@ -686,7 +702,7 @@ private void checkForOnlyOneSystemNode(Document doc) throws InternalErrorExcepti
     }
 
     private Map<String, OVFNetworkTO> getNetworksFromDocumentTree(Document doc) {
-        NodeList networkElements = doc.getElementsByTagName("Network");
+        NodeList networkElements = getElementsByTagNameAndPrefix(doc,"Network", "ovf");
         Map<String, OVFNetworkTO> nets = new HashMap<>();
         for (int i = 0; i < networkElements.getLength(); i++) {
 
@@ -746,7 +762,7 @@ && hardwareItemContainsConfiguration(x, configuration.getId()))
     private String getMinimumHardwareVersionFromDocumentTree(Document doc) {
         String version = null;
         if (doc != null) {
-            NodeList systemNodeList = doc.getElementsByTagName("System");
+            NodeList systemNodeList = getElementsByTagNameAndPrefix(doc, "System", "ovf");
             if (systemNodeList.getLength() != 0) {
                 Node systemItem = systemNodeList.item(0);
                 String hardwareVersions = getChildNodeValue(systemItem, "VirtualSystemType");
@@ -766,7 +782,7 @@ private List<OVFConfigurationTO> getDeploymentOptionsFromDocumentTree(Document d
         if (doc == null) {
             return options;
         }
-        NodeList deploymentOptionSection = doc.getElementsByTagName("DeploymentOptionSection");
+        NodeList deploymentOptionSection = getElementsByTagNameAndPrefix(doc,"DeploymentOptionSection", "ovf");
         if (deploymentOptionSection.getLength() == 0) {
             return options;
         }
@@ -775,7 +791,7 @@ private List<OVFConfigurationTO> getDeploymentOptionsFromDocumentTree(Document d
         int index = 0;
         for (int i = 0; i < childNodes.getLength(); i++) {
             Node node = childNodes.item(i);
-            if (node != null && node.getNodeName().equals("Configuration")) {
+            if (node != null && (node.getNodeName().equals("Configuration") || node.getNodeName().equals("ovf:Configuration"))) {
                 Element configuration = (Element) node;
                 String configurationId = getNodeAttribute(configuration,"ovf","id");
                 String description = getChildNodeValue(configuration, "Description");
@@ -793,15 +809,15 @@ private List<OVFVirtualHardwareItemTO> getVirtualHardwareItemsFromDocumentTree(D
         if (doc == null) {
             return items;
         }
-        NodeList hardwareSection = doc.getElementsByTagName("VirtualHardwareSection");
+        NodeList hardwareSection = getElementsByTagNameAndPrefix(doc, "VirtualHardwareSection","ovf");
         if (hardwareSection.getLength() == 0) {
             return items;
         }
         Node hardwareSectionNode = hardwareSection.item(0);
         NodeList childNodes = hardwareSectionNode.getChildNodes();
         for (int i = 0; i < childNodes.getLength(); i++) {
             Node node = childNodes.item(i);
-            if (node != null && node.getNodeName().equals("Item")) {
+            if (node != null && (node.getNodeName().equals("Item") || node.getNodeName().equals("ovf:Item"))) {
                 Element configuration = (Element) node;
                 String configurationIds = getNodeAttribute(configuration, "ovf", "configuration");
                 String allocationUnits = getChildNodeValue(configuration, "AllocationUnits");
@@ -869,7 +885,7 @@ public List<OVFEulaSectionTO> getEulaSectionsFromDocument(Document doc) {
         if (doc == null) {
             return eulas;
         }
-        NodeList eulaSections = doc.getElementsByTagName("EulaSection");
+        NodeList eulaSections = getElementsByTagNameAndPrefix(doc, "EulaSection", "ovf");
         int eulaIndex = 0;
         if (eulaSections.getLength() > 0) {
             for (int index = 0; index < eulaSections.getLength(); index++) {
@@ -905,7 +921,7 @@ public Pair<String, String> getOperatingSystemInfoFromDocument(Document doc) {
         if (doc == null) {
             return null;
         }
-        NodeList guesOsList = doc.getElementsByTagName("OperatingSystemSection");
+        NodeList guesOsList = getElementsByTagNameAndPrefix(doc, "OperatingSystemSection", "ovf");
         if (guesOsList.getLength() == 0) {
             return null;
         }

api/src/main/java/com/cloud/configuration/ConfigurationService.java

@@ -24,6 +24,7 @@
 import org.apache.cloudstack.api.command.admin.network.DeleteManagementNetworkIpRangeCmd;
 import org.apache.cloudstack.api.command.admin.network.DeleteNetworkOfferingCmd;
 import org.apache.cloudstack.api.command.admin.network.UpdateNetworkOfferingCmd;
+import org.apache.cloudstack.api.command.admin.network.UpdatePodManagementNetworkIpRangeCmd;
 import org.apache.cloudstack.api.command.admin.offering.CreateDiskOfferingCmd;
 import org.apache.cloudstack.api.command.admin.offering.CreateServiceOfferingCmd;
 import org.apache.cloudstack.api.command.admin.offering.DeleteDiskOfferingCmd;
@@ -39,6 +40,7 @@
 import org.apache.cloudstack.api.command.admin.vlan.DedicatePublicIpRangeCmd;
 import org.apache.cloudstack.api.command.admin.vlan.DeleteVlanIpRangeCmd;
 import org.apache.cloudstack.api.command.admin.vlan.ReleasePublicIpRangeCmd;
+import org.apache.cloudstack.api.command.admin.vlan.UpdateVlanIpRangeCmd;
 import org.apache.cloudstack.api.command.admin.zone.CreateZoneCmd;
 import org.apache.cloudstack.api.command.admin.zone.DeleteZoneCmd;
 import org.apache.cloudstack.api.command.admin.zone.UpdateZoneCmd;
@@ -203,6 +205,14 @@ public interface ConfigurationService {
      */
     void deletePodIpRange(DeleteManagementNetworkIpRangeCmd cmd) throws ResourceUnavailableException, ConcurrentOperationException;
 
+    /**
+     * Updates a mutually exclusive IP range in the pod.
+     * @param cmd - The command specifying pod ID, current Start IP, current End IP, new Start IP, new End IP.
+     * @throws com.cloud.exception.ConcurrentOperationException
+     * @return Success
+     */
+    void updatePodIpRange(UpdatePodManagementNetworkIpRangeCmd cmd) throws ConcurrentOperationException;
+
     /**
      * Edits a pod in the database. Will not allow you to edit pods that are being used anywhere in the system.
      *
@@ -272,6 +282,12 @@ public interface ConfigurationService {
     Vlan createVlanAndPublicIpRange(CreateVlanIpRangeCmd cmd) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException,
         ResourceAllocationException;
 
+    /**
+     * Updates the IP address Range for the VLAN on the database
+     * @return The Updated Vlan Object
+     */
+    Vlan updateVlanAndPublicIpRange(UpdateVlanIpRangeCmd cmd) throws ConcurrentOperationException,
+            ResourceUnavailableException, ResourceAllocationException;
     /**
      * Marks the the account with the default zone-id.
      *

api/src/main/java/com/cloud/event/EventTypes.java

@@ -324,9 +324,11 @@ public class EventTypes {
     public static final String EVENT_VLAN_IP_RANGE_DELETE = "VLAN.IP.RANGE.DELETE";
     public static final String EVENT_VLAN_IP_RANGE_DEDICATE = "VLAN.IP.RANGE.DEDICATE";
     public static final String EVENT_VLAN_IP_RANGE_RELEASE = "VLAN.IP.RANGE.RELEASE";
+    public static final String EVENT_VLAN_IP_RANGE_UPDATE = "VLAN.IP.RANGE.UPDATE";
 
     public static final String EVENT_MANAGEMENT_IP_RANGE_CREATE = "MANAGEMENT.IP.RANGE.CREATE";
     public static final String EVENT_MANAGEMENT_IP_RANGE_DELETE = "MANAGEMENT.IP.RANGE.DELETE";
+    public static final String EVENT_MANAGEMENT_IP_RANGE_UPDATE = "MANAGEMENT.IP.RANGE.UPDATE";
 
     public static final String EVENT_STORAGE_IP_RANGE_CREATE = "STORAGE.IP.RANGE.CREATE";
     public static final String EVENT_STORAGE_IP_RANGE_DELETE = "STORAGE.IP.RANGE.DELETE";
@@ -493,6 +495,10 @@ public class EventTypes {
     public static final String EVENT_TAGS_CREATE = "CREATE_TAGS";
     public static final String EVENT_TAGS_DELETE = "DELETE_TAGS";
 
+    // resource icon related events
+    public static final String EVENT_RESOURCE_ICON_UPLOAD = "UPLOAD.RESOURCE.ICON";
+    public static final String EVENT_RESOURCE_ICON_DELETE = "DELETE.RESOURCE.ICON";
+
     // meta data related events
     public static final String EVENT_RESOURCE_DETAILS_CREATE = "CREATE_RESOURCE_DETAILS";
     public static final String EVENT_RESOURCE_DETAILS_DELETE = "DELETE_RESOURCE_DETAILS";

api/src/main/java/com/cloud/kubernetes/cluster/KubernetesClusterHelper.java

@@ -0,0 +1,25 @@
+// 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 com.cloud.kubernetes.cluster;
+
+import com.cloud.utils.component.Adapter;
+import org.apache.cloudstack.acl.ControlledEntity;
+
+public interface KubernetesClusterHelper extends Adapter {
+
+    ControlledEntity findByUuid(String uuid);
+}

api/src/main/java/com/cloud/network/vpc/StaticRouteProfile.java

@@ -106,4 +106,9 @@ public String getNetmask() {
     public Class<?> getEntityType() {
         return StaticRoute.class;
     }
+
+    @Override
+    public String getName() {
+        return null;
+    }
 }

api/src/main/java/com/cloud/server/ResourceIcon.java

@@ -0,0 +1,32 @@
+// 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 com.cloud.server;
+
+import org.apache.cloudstack.api.Identity;
+import org.apache.cloudstack.api.InternalIdentity;
+
+public interface ResourceIcon extends Identity, InternalIdentity {
+    long getResourceId();
+
+    void setResourceId(long resourceId);
+
+    ResourceTag.ResourceObjectType getResourceType();
+
+    String getResourceUuid();
+
+    String getIcon();
+}

api/src/main/java/com/cloud/server/ResourceIconManager.java

@@ -0,0 +1,28 @@
+// 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 com.cloud.server;
+
+import java.util.List;
+
+public interface ResourceIconManager {
+
+    boolean uploadResourceIcon(List<String> resourceIds, ResourceTag.ResourceObjectType resourceType, String base64Image);
+
+    boolean deleteResourceIcon(List<String> resourceIds, ResourceTag.ResourceObjectType resourceType);
+
+    ResourceIcon getByResourceTypeAndUuid(ResourceTag.ResourceObjectType type, String resourceId);
+}