Remove Ovm/Ovm3 leftovers from core code

api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java

@@ -65,7 +65,7 @@ public class AddClusterCmd extends BaseCmd {
     @Parameter(name = ApiConstants.HYPERVISOR,
                type = CommandType.STRING,
                required = true,
-               description = "Hypervisor type of the cluster: XenServer,KVM,VMware,BareMetal,Simulator,Ovm3,External")
+               description = "Hypervisor type of the cluster: XenServer,KVM,VMware,BareMetal,Simulator,External")
     private String hypervisor;
 
     @Parameter(name = ApiConstants.ARCH, type = CommandType.STRING,

api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java

@@ -73,6 +73,7 @@
                description = "The network name label of the physical device dedicated to this traffic on a Hyperv host")
     private String hypervLabel;
 
+    @Deprecated
     @Parameter(name = ApiConstants.OVM3_NETWORK_LABEL,
                type = CommandType.STRING,
                description = "The network name of the physical device dedicated to this traffic on an OVM3 host")
@@ -114,9 +115,6 @@
         return null;
     }
 
-    public String getOvm3Label() {
-        return ovm3Label;
-    }
 
     public void setVlan(String vlan) {
         this.vlan = vlan;
@@ -160,7 +158,7 @@
     public void create() throws ResourceAllocationException {
         PhysicalNetworkTrafficType result =
             _networkService.addTrafficTypeToPhysicalNetwork(getPhysicalNetworkId(), getTrafficType(), getIsolationMethod(), getXenLabel(), getKvmLabel(), getVmwareLabel(),
-                getSimulatorLabel(), getVlan(), null, getOvm3Label());
+                getSimulatorLabel(), getVlan(), null, null);
         if (result != null) {
             setEntityId(result.getId());
             setEntityUuid(result.getUuid());

api/src/main/java/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java

@@ -63,6 +63,7 @@
                description = "The network name label of the physical device dedicated to this traffic on a Hyperv host")
     private String hypervLabel;
 
+    @Deprecated
     @Parameter(name = ApiConstants.OVM3_NETWORK_LABEL,
                type = CommandType.STRING,
                description = "The network name of the physical device dedicated to this traffic on an OVM3 host")
@@ -88,9 +89,6 @@
         return vmwareLabel;
     }
 
-    public String getOvm3Label() {
-        return ovm3Label;
-    }
 
     /////////////////////////////////////////////////////
     /////////////// API Implementation///////////////////
@@ -103,7 +101,7 @@
 
     @Override
     public void execute() {
-        PhysicalNetworkTrafficType result = _networkService.updatePhysicalNetworkTrafficType(getId(), getXenLabel(), getKvmLabel(), getVmwareLabel(), null, getOvm3Label());
+        PhysicalNetworkTrafficType result = _networkService.updatePhysicalNetworkTrafficType(getId(), getXenLabel(), getKvmLabel(), getVmwareLabel(), null, null);
         if (result != null) {
             TrafficTypeResponse response = _responseGenerator.createTrafficTypeResponse(result);
             response.setResponseName(getCommandName());

api/src/main/java/org/apache/cloudstack/api/response/TrafficTypeResponse.java

@@ -60,10 +60,6 @@ public class TrafficTypeResponse extends BaseResponse {
     @Param(description = "isolation methods for the physical network traffic")
     private String isolationMethods;
 
-    @SerializedName(ApiConstants.OVM3_NETWORK_LABEL)
-    @Param(description = "The Network name of the physical device dedicated to this traffic on an OVM3 host")
-    private String ovm3NetworkLabel;
-
     @Override
     public String getObjectId() {
         return this.id;
@@ -117,14 +113,6 @@ public String getVmwareLabel() {
         return vmwareNetworkLabel;
     }
 
-    public String getOvm3Label() {
-        return ovm3NetworkLabel;
-    }
-
-    public void setOvm3Label(String ovm3Label) {
-        this.ovm3NetworkLabel = ovm3Label;
-    }
-
     public String getIsolationMethods() {
         return isolationMethods;
     }

engine/schema/pom.xml

@@ -109,7 +109,6 @@
                                     templateList.add("systemvmtemplate-${csVersion}.${patch}-x86_64-kvm")
                                     templateList.add("systemvmtemplate-${csVersion}.${patch}-x86_64-vmware")
                                     templateList.add("systemvmtemplate-${csVersion}.${patch}-x86_64-xen")
-                                    templateList.add("systemvmtemplate-${csVersion}.${patch}-x86_64-ovm")
                                     File file = new File("./engine/schema/dist/systemvm-templates/sha512sum.txt")
                                     def lines = file.readLines()
                                     for (template in templateList) {
@@ -303,41 +302,5 @@
                 </plugins>
             </build>
         </profile>
-        <profile>
-            <id>download-ovm-systemvm-template</id>
-            <activation>
-                <property>
-                    <name>systemvm-ovm</name>
-                </property>
-            </activation>
-            <build>
-                <plugins>
-                    <plugin>
-                        <groupId>org.apache.maven.plugins</groupId>
-                        <artifactId>maven-resources-plugin</artifactId>
-                        <version>${cs.resources-plugin.version}</version>
-                    </plugin>
-                    <plugin>
-                        <groupId>com.googlecode.maven-download-plugin</groupId>
-                        <artifactId>download-maven-plugin</artifactId>
-                        <version>1.6.3</version>
-                        <executions>
-                            <execution>
-                                <id>download-ovm-template</id>
-                                <goals>
-                                    <goal>wget</goal>
-                                </goals>
-                                <configuration>
-                                    <checkSignature>true</checkSignature>
-                                    <url>${project.systemvm.template.location}/${cs.version}/systemvmtemplate-${cs.version}.${patch.version}-x86_64-ovm.raw.bz2</url>
-                                    <outputDirectory>${basedir}/dist/systemvm-templates/</outputDirectory>
-                                    <sha512>${ovm.checksum}</sha512>
-                                </configuration>
-                            </execution>
-                        </executions>
-                    </plugin>
-                </plugins>
-            </build>
-        </profile>
     </profiles>
 </project>

engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java

@@ -123,12 +123,8 @@ public String getNetworkTag(long physicalNetworkId, TrafficType trafficType, Hyp
             sc = vmWareAllFieldsSearch.create();
         } else if (hType == HypervisorType.Simulator) {
             sc = simulatorAllFieldsSearch.create();
-        } else if (hType == HypervisorType.Ovm) {
-            sc = ovmAllFieldsSearch.create();
         } else if (hType == HypervisorType.BareMetal || hType == HypervisorType.External) {
             return null;
-        } else if (hType == HypervisorType.Ovm3) {
-            sc = ovm3AllFieldsSearch.create();
         } else {
             assert (false) : "We don't handle this hypervisor type";
             return null;

engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java

@@ -309,8 +309,7 @@ public void setUpdated(Date updated) {
             new Pair<>(Hypervisor.HypervisorType.KVM, CPU.CPUArch.arm64),
             new Pair<>(Hypervisor.HypervisorType.VMware, CPU.CPUArch.amd64),
             new Pair<>(Hypervisor.HypervisorType.XenServer, CPU.CPUArch.amd64),
-            new Pair<>(Hypervisor.HypervisorType.LXC, CPU.CPUArch.amd64),
-            new Pair<>(Hypervisor.HypervisorType.Ovm3, CPU.CPUArch.amd64)
+            new Pair<>(Hypervisor.HypervisorType.LXC, CPU.CPUArch.amd64)
     );
 
     protected static final List<MetadataTemplateDetails> METADATA_TEMPLATE_LIST = new ArrayList<>();
@@ -321,7 +320,6 @@ public void setUpdated(Date updated) {
         ROUTER_TEMPLATE_CONFIGURATION_NAMES.put(Hypervisor.HypervisorType.VMware, "router.template.vmware");
         ROUTER_TEMPLATE_CONFIGURATION_NAMES.put(Hypervisor.HypervisorType.XenServer, "router.template.xenserver");
         ROUTER_TEMPLATE_CONFIGURATION_NAMES.put(Hypervisor.HypervisorType.LXC, "router.template.lxc");
-        ROUTER_TEMPLATE_CONFIGURATION_NAMES.put(Hypervisor.HypervisorType.Ovm3, "router.template.ovm3");
     }
 
     protected static final Map<Hypervisor.HypervisorType, ImageFormat> HYPERVISOR_IMAGE_FORMAT_MAP = new HashMap<>();
@@ -330,7 +328,6 @@ public void setUpdated(Date updated) {
         HYPERVISOR_IMAGE_FORMAT_MAP.put(Hypervisor.HypervisorType.XenServer, ImageFormat.VHD);
         HYPERVISOR_IMAGE_FORMAT_MAP.put(Hypervisor.HypervisorType.VMware, ImageFormat.OVA);
         HYPERVISOR_IMAGE_FORMAT_MAP.put(Hypervisor.HypervisorType.LXC, ImageFormat.QCOW2);
-        HYPERVISOR_IMAGE_FORMAT_MAP.put(Hypervisor.HypervisorType.Ovm3, ImageFormat.RAW);
     }
 
     public static Map<Hypervisor.HypervisorType, Integer> hypervisorGuestOsMap = new HashMap<>();
@@ -339,7 +336,6 @@ public void setUpdated(Date updated) {
         hypervisorGuestOsMap.put(Hypervisor.HypervisorType.XenServer, OTHER_LINUX_ID);
         hypervisorGuestOsMap.put(Hypervisor.HypervisorType.VMware, OTHER_LINUX_ID);
         hypervisorGuestOsMap.put(Hypervisor.HypervisorType.LXC, LINUX_12_ID);
-        hypervisorGuestOsMap.put(Hypervisor.HypervisorType.Ovm3, LINUX_12_ID);
     }
 
     private static boolean isRunningInTest() {
@@ -701,7 +697,6 @@ protected void updateHypervisorGuestOsMap() {
             SystemVmTemplateRegistration.LINUX_12_ID = Math.toIntExact(guestOS.getId());
             hypervisorGuestOsMap.put(Hypervisor.HypervisorType.KVM, LINUX_12_ID);
             hypervisorGuestOsMap.put(Hypervisor.HypervisorType.LXC, LINUX_12_ID);
-            hypervisorGuestOsMap.put(Hypervisor.HypervisorType.Ovm3, LINUX_12_ID);
         } catch (Exception e) {
             LOGGER.warn("Couldn't update System VM template guest OS ID, due to {}", e.getMessage());
         }

engine/schema/src/main/resources/META-INF/db/schema-42300to2400.sql

@@ -243,3 +243,8 @@ CREATE TABLE IF NOT EXISTS `cloud`.`instance_boot_group_details` (
 -- UCS and Hyper-V hypervisor plugins are no longer built
 DELETE FROM `cloud`.`configuration` WHERE name = 'ucs.sync.blade.interval';
 DELETE FROM `cloud`.`configuration` WHERE name IN ('hyperv.public.network.device', 'hyperv.private.network.device', 'hyperv.guest.network.device', 'router.template.hyperv');
+
+-- OVM and OVM3 hypervisor plugins are no longer built
+DELETE FROM `cloud`.`configuration` WHERE name IN ('ovm.public.network.device', 'ovm.private.network.device', 'ovm.guest.network.device',
+    'ovm3.public.network.device', 'ovm3.private.network.device', 'ovm3.guest.network.device', 'ovm3.storage.network.device',
+    'ovm3.heartbeat.timeout', 'ovm3.heartbeat.interval', 'router.template.ovm3');

engine/schema/src/test/java/com/cloud/upgrade/SystemVmTemplateRegistrationTest.java

@@ -1554,7 +1554,6 @@ public void updateHypervisorGuestOsMap_UpdatesGuestOsMapSuccessfully() {
         assertEquals(10, SystemVmTemplateRegistration.LINUX_12_ID.intValue());
         assertEquals(10, SystemVmTemplateRegistration.hypervisorGuestOsMap.get(Hypervisor.HypervisorType.KVM).intValue());
         assertEquals(10, SystemVmTemplateRegistration.hypervisorGuestOsMap.get(Hypervisor.HypervisorType.LXC).intValue());
-        assertEquals(10, SystemVmTemplateRegistration.hypervisorGuestOsMap.get(Hypervisor.HypervisorType.Ovm3).intValue());
     }
 
     @Test

engine/schema/templateConfig.sh

@@ -56,9 +56,7 @@ function getTemplateVersion() {
 
 function getGenericName() {
   hypervisor=$(echo "$1" | tr "[:upper:]" "[:lower:]")
-  if [[ "$hypervisor" == "ovm3" ]]; then
-    echo "ovm"
-  elif [[ "$hypervisor" == "lxc" ]]; then
+  if [[ "$hypervisor" == "lxc" ]]; then
     echo "kvm"
   elif [[ "$hypervisor" == "xenserver" ]]; then
     echo "xen"
@@ -115,7 +113,6 @@ if [[ "${BASH_SOURCE[0]}" == "${0}" ]]; then
     [vmware]="x86_64-vmware.ova"
     [xenserver]="x86_64-xen.vhd.bz2"
     [lxc]="x86_64-kvm.qcow2.bz2"
-    [ovm3]="x86_64-ovm.raw.bz2"
   )
 
   templates=()

packaging/package.sh

@@ -36,7 +36,7 @@ Optional arguments:
    -s, --simulator string                  Build package for Simulator ("default"|"DEFAULT"|"simulator"|"SIMULATOR") (default "default")
    -b, --brand string                      Set branding to be used in package name (it will override any branding string in POM version)
    -T, --use-timestamp                     Use epoch timestamp instead of SNAPSHOT in the package name (if not provided, use "SNAPSHOT")
-   -t --templates                          Passes necessary flag to package the required templates. Comma separated string - kvm,xen,vmware,ovm
+   -t --templates                          Passes necessary flag to package the required templates. Comma separated string - kvm,xen,vmware
 
 Other arguments:
    -h, --help                              Display this help message and exit

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

@@ -3379,7 +3379,6 @@ public TrafficTypeResponse createTrafficTypeResponse(PhysicalNetworkTrafficType
         response.setXenLabel(result.getXenNetworkLabel());
         response.setKvmLabel(result.getKvmNetworkLabel());
         response.setVmwareLabel(result.getVmwareNetworkLabel());
-        response.setOvm3Label(result.getOvm3NetworkLabel());
         response.setVlan(result.getVlan());
 
         response.setObjectName("traffictype");

server/src/main/java/com/cloud/configuration/Config.java

@@ -548,7 +548,7 @@ public enum Config {
             String.class,
             "hypervisor.list",
             HypervisorType.KVM + "," + HypervisorType.VMware + "," + HypervisorType.XenServer + "," +
-                    HypervisorType.BareMetal + "," + HypervisorType.Ovm + "," + HypervisorType.LXC + "," + HypervisorType.Ovm3 + "," + HypervisorType.External,
+                    HypervisorType.BareMetal + "," + HypervisorType.LXC + "," + HypervisorType.External,
                     "The list of hypervisors that this deployment will use.",
             "hypervisorList",
             ConfigKey.Kind.CSV,
@@ -884,33 +884,6 @@ public enum Config {
             "5",
             "Incorrect login attempts allowed before the user is disabled (when value > 0). If value <=0 users are not disabled after failed login attempts",
             null),
-    // Ovm
-    OvmPublicNetwork("Hidden", ManagementServer.class, String.class, "ovm.public.network.device", null, "Specify the public bridge on host for public network", null),
-    OvmPrivateNetwork("Hidden", ManagementServer.class, String.class, "ovm.private.network.device", null, "Specify the private bridge on host for private network", null),
-    OvmGuestNetwork("Hidden", ManagementServer.class, String.class, "ovm.guest.network.device", null, "Specify the private bridge on host for private network", null),
-
-    // Ovm3
-    Ovm3PublicNetwork("Hidden", ManagementServer.class, String.class, "ovm3.public.network.device", null, "Specify the public bridge on host for public network", null),
-    Ovm3PrivateNetwork("Hidden", ManagementServer.class, String.class, "ovm3.private.network.device", null, "Specify the private bridge on host for private network", null),
-    Ovm3GuestNetwork("Hidden", ManagementServer.class, String.class, "ovm3.guest.network.device", null, "Specify the guest bridge on host for guest network", null),
-    Ovm3StorageNetwork("Hidden", ManagementServer.class, String.class, "ovm3.storage.network.device", null, "Specify the storage bridge on host for storage network", null),
-    Ovm3HeartBeatTimeout(
-            "Advanced",
-            ManagementServer.class,
-            Integer.class,
-            "ovm3.heartbeat.timeout",
-            "120",
-            "timeout used for primary storage check, upon timeout a panic is triggered.",
-            null),
-    Ovm3HeartBeatInterval(
-            "Advanced",
-            ManagementServer.class,
-            Integer.class,
-            "ovm3.heartbeat.interval",
-            "1",
-            "interval used to check primary storage availability.",
-            null),
-
 
     // XenServer
     XenServerPublicNetwork(

server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java

@@ -1741,7 +1741,7 @@ protected String validateRangePrivateIp(String name, String value) {
     }
 
     /**
-     * Valid values are XenServer, KVM, VMware, VirtualBox, Parralels, BareMetal, Simulator, Ovm, Ovm3, LXC.
+     * Valid values are XenServer, KVM, VMware, VirtualBox, Parralels, BareMetal, Simulator, LXC.
      * Inputting "Any" will return the hypervisor type Any, other inputs will result in the hypervisor type none.
      * Both of these are invalid values and will return an error message.
      */

server/src/main/java/com/cloud/network/NetworkModelImpl.java

@@ -1573,8 +1573,6 @@ public String getDefaultManagementTrafficLabel(long zoneId, HypervisorType hyper
                     label = mgmtTraffic.getKvmNetworkLabel();
                 } else if (hypervisorType.equals(HypervisorType.VMware)) {
                     label = mgmtTraffic.getVmwareNetworkLabel();
-                } else if (hypervisorType.equals(HypervisorType.Ovm3)) {
-                    label = mgmtTraffic.getOvm3NetworkLabel();
                 }
                 return label;
             }
@@ -1601,8 +1599,6 @@ public String getDefaultStorageTrafficLabel(long zoneId, HypervisorType hypervis
                     label = storageTraffic.getKvmNetworkLabel();
                 } else if (hypervisorType.equals(HypervisorType.VMware)) {
                     label = storageTraffic.getVmwareNetworkLabel();
-                } else if (hypervisorType.equals(HypervisorType.Ovm3)) {
-                    label = storageTraffic.getOvm3NetworkLabel();
                 }
                 return label;
             }
@@ -2167,8 +2163,6 @@ public String getDefaultPublicTrafficLabel(long dcId, HypervisorType hypervisorT
                     label = publicTraffic.getKvmNetworkLabel();
                 } else if (hypervisorType.equals(HypervisorType.VMware)) {
                     label = publicTraffic.getVmwareNetworkLabel();
-                } else if (hypervisorType.equals(HypervisorType.Ovm3)) {
-                    label = publicTraffic.getOvm3NetworkLabel();
                 }
                 return label;
             }
@@ -2195,8 +2189,6 @@ public String getDefaultGuestTrafficLabel(long dcId, HypervisorType hypervisorTy
                     label = guestTraffic.getKvmNetworkLabel();
                 } else if (hypervisorType.equals(HypervisorType.VMware)) {
                     label = guestTraffic.getVmwareNetworkLabel();
-                } else if (hypervisorType.equals(HypervisorType.Ovm3)) {
-                    label = guestTraffic.getOvm3NetworkLabel();
                 }
                 return label;
             }

server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java

@@ -191,7 +191,6 @@ protected void setupHypervisorsMap() {
         hypervisorsMap.put(HypervisorType.KVM, VirtualNetworkApplianceManager.RouterTemplateKvm);
         hypervisorsMap.put(HypervisorType.VMware, VirtualNetworkApplianceManager.RouterTemplateVmware);
         hypervisorsMap.put(HypervisorType.LXC, VirtualNetworkApplianceManager.RouterTemplateLxc);
-        hypervisorsMap.put(HypervisorType.Ovm3, VirtualNetworkApplianceManager.RouterTemplateOvm3);
     }
 
     @Override

server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManager.java

@@ -40,7 +40,6 @@ public interface VirtualNetworkApplianceManager extends Manager, VirtualNetworkA
     String RouterTemplateKvmCK = "router.template.kvm";
     String RouterTemplateVmwareCK = "router.template.vmware";
     String RouterTemplateLxcCK = "router.template.lxc";
-    String RouterTemplateOvm3CK = "router.template.ovm3";
     String SetServiceMonitorCK = "network.router.EnableServiceMonitoring";
     String RouterAlertsCheckIntervalCK = "router.alerts.check.interval";
     String VirtualRouterServiceOfferingCK = "router.service.offering";
@@ -58,8 +57,6 @@ public interface VirtualNetworkApplianceManager extends Manager, VirtualNetworkA
             "Name of the default router template on Vmware.", true, ConfigKey.Scope.Zone, null);
     ConfigKey<String> RouterTemplateLxc = new ConfigKey<>(String.class, RouterTemplateLxcCK, "Advanced", "SystemVM Template (LXC)",
             "Name of the default router template on LXC.", true, ConfigKey.Scope.Zone, null);
-    ConfigKey<String> RouterTemplateOvm3 = new ConfigKey<>(String.class, RouterTemplateOvm3CK, "Advanced", "SystemVM Template (Ovm3)",
-            "Name of the default router template on Ovm3.", true, ConfigKey.Scope.Zone, null);
 
     ConfigKey<String> VirtualRouterUserData = new ConfigKey<>(String.class, "virtual.router.userdata",
             ConfigKey.CATEGORY_ADVANCED, "",