Standardize s390x naming in UI and use CPUArch in KVM

Author: root

plugins/hypervisors/kvm/src/main/java/com/cloud/hypervisor/kvm/resource/LibvirtVMDef.java

@@ -27,6 +27,7 @@
 import java.util.List;
 import java.util.Map;
 
+import com.cloud.cpu.CPU;
 import org.apache.cloudstack.api.ApiConstants.IoDriverPolicy;
 import org.apache.cloudstack.utils.qemu.QemuObject;
 import org.apache.commons.lang.StringEscapeUtils;
@@ -420,7 +421,7 @@ public String toString() {
                         guestDef.append("<boot dev='" + bo + "'/>\n");
                     }
                 }
-                if (!(_arch != null && _arch.equals("s390x"))) {
+                if (!CPU.CPUArch.s390x.getType().equalsIgnoreCase(_arch)) {
                     guestDef.append("<smbios mode='sysinfo'/>\n");
                 }
                 guestDef.append("</os>\n");

plugins/hypervisors/kvm/src/test/java/com/cloud/hypervisor/kvm/resource/LibvirtComputingResourceTest.java

@@ -61,6 +61,7 @@
 import javax.xml.xpath.XPathExpressionException;
 import javax.xml.xpath.XPathFactory;
 
+import com.cloud.cpu.CPU;
 import com.cloud.utils.net.NetUtils;
 
 import com.cloud.vm.VmDetailConstants;
@@ -865,7 +866,7 @@ private void verifyPoliticOn_(Document domainDoc) {
     private void verifyFeatures(Document domainDoc) {
         assertNodeExists(domainDoc, "/domain/features/pae");
         assertNodeExists(domainDoc, "/domain/features/apic");
-        if (!"s390x".equals(System.getProperty("os.arch"))) {
+        if (!CPU.CPUArch.s390x.getType().equalsIgnoreCase(System.getProperty("os.arch"))) {
             assertNodeExists(domainDoc, "/domain/features/acpi");
         }
     }

ui/src/utils/plugins.js

@@ -558,7 +558,7 @@ export const cpuArchitectureUtilPlugin = {
       const architectures = [
         { id: 'x86_64', name: 'Intel/AMD 64 bits (x86_64)' },
         { id: 'aarch64', name: 'ARM 64 bits (aarch64)' },
-        { id: 's390x', name: 'IBM Z/Architecture 64 bits (s390x)' }
+        { id: 's390x', name: 'IBM Z 64 bits (s390x)' }
       ]
       return architectures.map(item => ({ ...item, description: item.name }))
     }

ui/src/views/infra/ClusterUpdate.vue

@@ -170,7 +170,7 @@ export default {
       })
       typesList.push({
         id: 's390x',
-        description: 'S390X 64 bits (s390x)'
+        description: 'IBM Z 64 bits (s390x)'
       })
       this.architectureTypes.opts = typesList
     },

ui/src/views/infra/zone/ZoneWizardAddResources.vue

@@ -867,7 +867,7 @@ export default {
         description: 'ARM 64 bits (aarch64)'
       }, {
         id: 's390x',
-        description: 'S390X 64 bits (s390x)'
+        description: 'IBM Z 64 bits (s390x)'
       }],
       storageProviders: [],
       currentStep: null,