diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java index 021870ec189e..68de3836321c 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/AddClusterCmd.java +++ b/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, diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java index a36b5f754ea7..9918fea8dbfb 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/AddTrafficTypeCmd.java @@ -73,6 +73,7 @@ public class AddTrafficTypeCmd extends BaseAsyncCreateCmd { 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 @@ public String getSimulatorLabel() { return null; } - public String getOvm3Label() { - return ovm3Label; - } public void setVlan(String vlan) { this.vlan = vlan; @@ -160,7 +158,7 @@ public void execute() { 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()); diff --git a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java index 7d5bebd398fb..ca4cfcf3594d 100644 --- a/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java +++ b/api/src/main/java/org/apache/cloudstack/api/command/admin/usage/UpdateTrafficTypeCmd.java @@ -63,6 +63,7 @@ public class UpdateTrafficTypeCmd extends BaseAsyncCmd { 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 @@ public String getVmwareLabel() { return vmwareLabel; } - public String getOvm3Label() { - return ovm3Label; - } ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// @@ -103,7 +101,7 @@ public long getEntityOwnerId() { @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()); diff --git a/api/src/main/java/org/apache/cloudstack/api/response/TrafficTypeResponse.java b/api/src/main/java/org/apache/cloudstack/api/response/TrafficTypeResponse.java index 33b8d2b8df4e..9d00d01eeb88 100644 --- a/api/src/main/java/org/apache/cloudstack/api/response/TrafficTypeResponse.java +++ b/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; } diff --git a/engine/schema/pom.xml b/engine/schema/pom.xml index d8f3457256fc..cc1643ad8844 100644 --- a/engine/schema/pom.xml +++ b/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 @@ - - download-ovm-systemvm-template - - - systemvm-ovm - - - - - - org.apache.maven.plugins - maven-resources-plugin - ${cs.resources-plugin.version} - - - com.googlecode.maven-download-plugin - download-maven-plugin - 1.6.3 - - - download-ovm-template - - wget - - - true - ${project.systemvm.template.location}/${cs.version}/systemvmtemplate-${cs.version}.${patch.version}-x86_64-ovm.raw.bz2 - ${basedir}/dist/systemvm-templates/ - ${ovm.checksum} - - - - - - - diff --git a/engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java b/engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java index 2af47b37194a..1bf6ce078bca 100644 --- a/engine/schema/src/main/java/com/cloud/network/dao/PhysicalNetworkTrafficTypeDaoImpl.java +++ b/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; diff --git a/engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java b/engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java index 2143a17668f1..68c24a02254f 100644 --- a/engine/schema/src/main/java/com/cloud/upgrade/SystemVmTemplateRegistration.java +++ b/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 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_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 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()); } diff --git a/engine/schema/src/main/resources/META-INF/db/schema-42300to2400.sql b/engine/schema/src/main/resources/META-INF/db/schema-42300to2400.sql index 7a06c1052224..02afc7fa66d2 100644 --- a/engine/schema/src/main/resources/META-INF/db/schema-42300to2400.sql +++ b/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'); diff --git a/engine/schema/src/test/java/com/cloud/upgrade/SystemVmTemplateRegistrationTest.java b/engine/schema/src/test/java/com/cloud/upgrade/SystemVmTemplateRegistrationTest.java index e4ef0eddb7a4..c9b0a74fcc54 100644 --- a/engine/schema/src/test/java/com/cloud/upgrade/SystemVmTemplateRegistrationTest.java +++ b/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 diff --git a/engine/schema/templateConfig.sh b/engine/schema/templateConfig.sh index 3c732310a228..e97f95262a66 100755 --- a/engine/schema/templateConfig.sh +++ b/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=() diff --git a/packaging/package.sh b/packaging/package.sh index 84080978f2cc..11e7bdd4af55 100755 --- a/packaging/package.sh +++ b/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 diff --git a/server/src/main/java/com/cloud/api/ApiResponseHelper.java b/server/src/main/java/com/cloud/api/ApiResponseHelper.java index 1b2b3ecfad39..d0c6c140e521 100644 --- a/server/src/main/java/com/cloud/api/ApiResponseHelper.java +++ b/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"); diff --git a/server/src/main/java/com/cloud/configuration/Config.java b/server/src/main/java/com/cloud/configuration/Config.java index 717c8ea1710c..fa214476b862 100644 --- a/server/src/main/java/com/cloud/configuration/Config.java +++ b/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( diff --git a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java index 8bf8027e2173..8415bf8c9a68 100644 --- a/server/src/main/java/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/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. */ diff --git a/server/src/main/java/com/cloud/network/NetworkModelImpl.java b/server/src/main/java/com/cloud/network/NetworkModelImpl.java index 82cca4524edb..21993645de00 100644 --- a/server/src/main/java/com/cloud/network/NetworkModelImpl.java +++ b/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; } diff --git a/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java b/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java index a1a3c92c2ef2..4e2ac8e3fac8 100644 --- a/server/src/main/java/com/cloud/network/router/NetworkHelperImpl.java +++ b/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 diff --git a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManager.java b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManager.java index 36c644d5e831..05564923ae5f 100644 --- a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManager.java +++ b/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 RouterTemplateLxc = new ConfigKey<>(String.class, RouterTemplateLxcCK, "Advanced", "SystemVM Template (LXC)", "Name of the default router template on LXC.", true, ConfigKey.Scope.Zone, null); - ConfigKey RouterTemplateOvm3 = new ConfigKey<>(String.class, RouterTemplateOvm3CK, "Advanced", "SystemVM Template (Ovm3)", - "Name of the default router template on Ovm3.", true, ConfigKey.Scope.Zone, null); ConfigKey VirtualRouterUserData = new ConfigKey<>(String.class, "virtual.router.userdata", ConfigKey.CATEGORY_ADVANCED, "", diff --git a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index e7283b396f23..aac41233c237 100644 --- a/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/main/java/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -3366,7 +3366,6 @@ public ConfigKey[] getConfigKeys() { RouterTemplateKvm, RouterTemplateVmware, RouterTemplateLxc, - RouterTemplateOvm3, UseExternalDnsServers, RouterVersionCheckEnabled, SetServiceMonitor, diff --git a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java index c0cd3ecde86c..f7bf97f0b03a 100644 --- a/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/main/java/com/cloud/network/vpc/VpcManagerImpl.java @@ -354,7 +354,6 @@ protected void setupSupportedVpcHypervisorsList() { hTypes.add(HypervisorType.KVM); hTypes.add(HypervisorType.Simulator); hTypes.add(HypervisorType.LXC); - hTypes.add(HypervisorType.Ovm3); hTypes.add(HypervisorType.External); } diff --git a/server/src/main/java/com/cloud/server/ManagementServerImpl.java b/server/src/main/java/com/cloud/server/ManagementServerImpl.java index cad8fe7a789f..32fd931739b5 100644 --- a/server/src/main/java/com/cloud/server/ManagementServerImpl.java +++ b/server/src/main/java/com/cloud/server/ManagementServerImpl.java @@ -899,7 +899,7 @@ public class ManagementServerImpl extends MutualExclusiveIdsManagerBase implemen private static final VirtualMachine.Type []systemVmTypes = { VirtualMachine.Type.SecondaryStorageVm, VirtualMachine.Type.ConsoleProxy}; private static final List LIVE_MIGRATION_SUPPORTING_HYPERVISORS = List.of(HypervisorType.KVM, - HypervisorType.LXC, HypervisorType.Ovm, HypervisorType.Ovm3, HypervisorType.Simulator, HypervisorType.VMware, HypervisorType.XenServer); + HypervisorType.LXC, HypervisorType.Simulator, HypervisorType.VMware, HypervisorType.XenServer); @Inject public AccountManager _accountMgr; @@ -1463,13 +1463,13 @@ private void validateVmForHostMigration(VirtualMachine vm) { if (!LIVE_MIGRATION_SUPPORTING_HYPERVISORS.contains(vm.getHypervisorType())) { if (logger.isDebugEnabled()) { - logger.debug(vm + " is not XenServer/VMware/KVM/Ovm/Ovm3, cannot migrate this Instance."); + logger.debug(vm + " is not XenServer/VMware/KVM, cannot migrate this Instance."); } - throw new InvalidParameterValueException("Unsupported Hypervisor Type for Instance migration, we support " + "XenServer/VMware/KVM/Ovm/Ovm3 only"); + throw new InvalidParameterValueException("Unsupported Hypervisor Type for Instance migration, we support " + "XenServer/VMware/KVM only"); } if (VirtualMachine.Type.User.equals(vm.getType()) && HypervisorType.LXC.equals(vm.getHypervisorType())) { - throw new InvalidParameterValueException("Unsupported Hypervisor Type for User instance migration, we support XenServer/VMware/KVM/Ovm/Ovm3 only"); + throw new InvalidParameterValueException("Unsupported Hypervisor Type for User instance migration, we support XenServer/VMware/KVM only"); } } diff --git a/server/src/main/java/com/cloud/storage/listener/StoragePoolMonitor.java b/server/src/main/java/com/cloud/storage/listener/StoragePoolMonitor.java index c30e2d4314ee..4e5c7e665f70 100644 --- a/server/src/main/java/com/cloud/storage/listener/StoragePoolMonitor.java +++ b/server/src/main/java/com/cloud/storage/listener/StoragePoolMonitor.java @@ -117,8 +117,7 @@ public void processConnect(Host host, StartupCommand cmd, boolean forRebalance) StartupRoutingCommand scCmd = (StartupRoutingCommand)cmd; if (scCmd.getHypervisorType() == HypervisorType.XenServer || scCmd.getHypervisorType() == HypervisorType.KVM || scCmd.getHypervisorType() == HypervisorType.VMware || scCmd.getHypervisorType() == HypervisorType.Simulator || - scCmd.getHypervisorType() == HypervisorType.Ovm || - scCmd.getHypervisorType() == HypervisorType.LXC || scCmd.getHypervisorType() == HypervisorType.Ovm3) { + scCmd.getHypervisorType() == HypervisorType.LXC) { String sags[] = _storageManager.getStorageAccessGroups(null, null, null, host.getId()); List pools = new ArrayList<>(); diff --git a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java index 6f3c827fc4d0..5e8f8fbdbb5e 100644 --- a/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/main/java/com/cloud/vm/UserVmManagerImpl.java @@ -7548,12 +7548,12 @@ public VirtualMachine migrateVirtualMachine(Long vmId, Host destinationHost) thr } if (!isOnSupportedHypevisorForMigration(vm)) { - logger.error(vm + " is not XenServer/VMware/KVM/Ovm, cannot migrate this VM from hypervisor type " + vm.getHypervisorType()); - throw new InvalidParameterValueException("Unsupported Hypervisor Type for VM migration, we support XenServer/VMware/KVM/Ovm/Ovm3 only"); + logger.error(vm + " is not XenServer/VMware/KVM, cannot migrate this VM from hypervisor type " + vm.getHypervisorType()); + throw new InvalidParameterValueException("Unsupported Hypervisor Type for VM migration, we support XenServer/VMware/KVM only"); } if (vm.getType().equals(VirtualMachine.Type.User) && vm.getHypervisorType().equals(HypervisorType.LXC)) { - throw new InvalidParameterValueException("Unsupported Hypervisor Type for User VM migration, we support XenServer/VMware/KVM/Ovm/Ovm3 only"); + throw new InvalidParameterValueException("Unsupported Hypervisor Type for User VM migration, we support XenServer/VMware/KVM only"); } if (isVMUsingLocalStorage(vm)) { @@ -7711,10 +7711,8 @@ private boolean isOnSupportedHypevisorForMigration(VMInstanceVO vm) { return (vm.getHypervisorType().equals(HypervisorType.XenServer) || vm.getHypervisorType().equals(HypervisorType.VMware) || vm.getHypervisorType().equals(HypervisorType.KVM) || - vm.getHypervisorType().equals(HypervisorType.Ovm) || vm.getHypervisorType().equals(HypervisorType.LXC) || - vm.getHypervisorType().equals(HypervisorType.Simulator) || - vm.getHypervisorType().equals(HypervisorType.Ovm3)); + vm.getHypervisorType().equals(HypervisorType.Simulator)); } private boolean checkIfHostIsDedicated(HostVO host) { diff --git a/server/src/test/java/com/cloud/api/ApiResponseHelperTest.java b/server/src/test/java/com/cloud/api/ApiResponseHelperTest.java index 754ec6ea210b..291513027671 100644 --- a/server/src/test/java/com/cloud/api/ApiResponseHelperTest.java +++ b/server/src/test/java/com/cloud/api/ApiResponseHelperTest.java @@ -441,10 +441,9 @@ public void testCreateTrafficTypeResponse() { String kvmLabel = "kvm"; String vmwareLabel = "vmware"; String simulatorLabel = "simulator"; - String ovmLabel = "ovm"; String vlan = "vlan"; String trafficType = "Public"; - PhysicalNetworkTrafficType pnetTrafficType = new PhysicalNetworkTrafficTypeVO(pnet.getId(), Networks.TrafficType.getTrafficType(trafficType), xenLabel, kvmLabel, vmwareLabel, simulatorLabel, vlan, null, ovmLabel); + PhysicalNetworkTrafficType pnetTrafficType = new PhysicalNetworkTrafficTypeVO(pnet.getId(), Networks.TrafficType.getTrafficType(trafficType), xenLabel, kvmLabel, vmwareLabel, simulatorLabel, vlan, null, null); TrafficTypeResponse response = apiResponseHelper.createTrafficTypeResponse(pnetTrafficType); assertFalse(UUID.fromString(response.getId()).toString().isEmpty()); @@ -453,7 +452,6 @@ public void testCreateTrafficTypeResponse() { assertEquals(response.getXenLabel(), xenLabel); assertEquals(response.getKvmLabel(), kvmLabel); assertEquals(response.getVmwareLabel(), vmwareLabel); - assertEquals(response.getOvm3Label(), ovmLabel); assertEquals(response.getVlan(), vlan); assertEquals(response.getIsolationMethods(), "VXLAN,STT"); diff --git a/server/src/test/java/com/cloud/server/ManagementServerImplTest.java b/server/src/test/java/com/cloud/server/ManagementServerImplTest.java index 01547fab3162..9def06375215 100644 --- a/server/src/test/java/com/cloud/server/ManagementServerImplTest.java +++ b/server/src/test/java/com/cloud/server/ManagementServerImplTest.java @@ -1827,9 +1827,7 @@ public void testListHostsForMigrationOfVMWithAllSupportedHypervisors() { HypervisorType[] supportedTypes = { HypervisorType.XenServer, HypervisorType.VMware, - HypervisorType.KVM, - HypervisorType.Ovm, - HypervisorType.Ovm3 + HypervisorType.KVM }; for (HypervisorType hypervisorType : supportedTypes) {