!27 Fix interface report error when emulatedMachine is null

From: @wang--ge
Reviewed-by: @jxy_git
Signed-off-by: @jxy_git

0002-add-support-running-on-kunpeng-platform.patch

@@ -144,7 +144,7 @@ index 6cd4419..40ab278 100644
                              s390CpuByNameDictionary.put(sc.getCpuName(), sc);
                              s390CpuByVdsNameDictionary.put(sc.getVdsVerbData(), sc);
 +                        } else if (sc.getFlags().contains(CpuVendor.KUNPENG.getFlag())) {
-+                            kunpengCpuByNameDictionary.put(sc.getVdsVerbData(), sc);
++                            kunpengCpuByNameDictionary.put(sc.getCpuName(), sc);
 +                            kunpengCpuByVdsNameDictionary.put(sc.getVdsVerbData(), sc);
                          }
  

0005-fix-interface-report-an-error-when-emulatedMachine-is-null.patch

@@ -0,0 +1,25 @@
+From 155932487ade8c3d05504434947eeb67fd76c59e Mon Sep 17 00:00:00 2001
+From: wang--ge <wang__ge@126.com>
+Date: Wed, 13 Oct 2021 09:43:38 +0800
+Subject: [PATCH] fix interface report an error when emulatedMachine is null
+
+---
+ .../ovirt/engine/core/common/utils/ClusterEmulatedMachines.java | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ClusterEmulatedMachines.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ClusterEmulatedMachines.java
+index 7d5c902..882b3be 100644
+--- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ClusterEmulatedMachines.java
++++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ClusterEmulatedMachines.java
+@@ -58,7 +58,7 @@ public class ClusterEmulatedMachines {
+     }
+ 
+     public static ClusterEmulatedMachines parse(String emulatedMachine) {
+-        if (emulatedMachine == null) {
++        if (emulatedMachine == null || emulatedMachine.equals("")) {
+             return new ClusterEmulatedMachines();
+         }
+         String[] em = emulatedMachine.split(";");
+-- 
+2.27.0
+

0006-add-arm-biostype-in-front-end-api.patch

@@ -0,0 +1,24 @@
+From 0bae3aa6270eb2843a8e6aaaea6690350511233f Mon Sep 17 00:00:00 2001
+From: wang--ge <wang__ge@126.com>
+Date: Tue, 12 Oct 2021 18:54:58 +0800
+Subject: [PATCH] add arm biostype in front end api
+
+---
+ src/main/java/types/BiosType.java | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/main/java/types/BiosType.java b/src/main/java/types/BiosType.java
+index 9044d90..786eafd 100644
+--- a/src/main/java/types/BiosType.java
++++ b/src/main/java/types/BiosType.java
+@@ -79,5 +79,6 @@ public enum BiosType {
+      * @status added
+      * @since 4.3
+      */
+-    Q35_SECURE_BOOT;
++    Q35_SECURE_BOOT,
++    VIRT_OVMF;
+ }
+-- 
+2.27.0
+

ovirt-engine.spec

@@ -176,7 +176,7 @@ getent passwd %1 >/dev/null || useradd -r -u %2 -g %3 -c %5 -s /sbin/nologin -d
 
 Name:		ovirt-engine
 Version:	4.4.4.1
-Release:	1
+Release:	2
 Summary:	Management server for Open Virtualization
 Group:		%{ovirt_product_group}
 License:	Apache 2.0
@@ -188,11 +188,13 @@ Source1:        xalan-2.7.1.jbossorg-2.jar
 # sed -i "s/$version/5.10.3/g" libsass-maven-plugin-0.2.8-libsass_3.4.4.pom
 Source2:        libsass-maven-plugin-0.2.8-libsass_3.4.4.pom
 Source3:        https://github.com/oVirt/ovirt-engine-api-model/archive/refs/tags/4.4.20.tar.gz
+Source4:        0006-add-arm-biostype-in-front-end-api.patch
 
 Patch1:         0001-add-dependent-package-to-lib.patch
 Patch2:         0002-add-support-running-on-kunpeng-platform.patch
 Patch3:         0003-add-virt-chipset-support.patch
 Patch4:         0004-fit-cluster-can-not-find-error-under-aarch64-platform.patch
+Patch5:         0005-fix-interface-report-an-error-when-emulatedMachine-is-null.patch
 BuildArch:	noarch
 
 BuildRequires:	assertj-core >= 2.2.0
@@ -646,6 +648,7 @@ Setup imageio service.
 %patch2 -p1
 %patch3 -p1
 %patch4 -p1
+%patch5 -p1
 sed -i '87s/@Test/\/\/@Test/g' backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/LibvirtVmXmlBuilderTest.java
 sed -i '88s/@MockedConfig/\/\/@MockedConfig/g' backend/manager/modules/vdsbroker/src/test/java/org/ovirt/engine/core/vdsbroker/builder/vminfo/LibvirtVmXmlBuilderTest.java
 sed -i '121s/@Test/\/\/@Test/g' backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/AddClusterCommandTest.java
@@ -666,6 +669,8 @@ pushd api-model
   mkdir -p ~/.gem/jruby/1.9
   cd ovirt-engine-api-model-4.4.20
   sed -i '/PPC64,/a\    AARCH64,' src/main/java/types/Architecture.java 
+  cp %{SOURCE4} ./
+  patch -p1 < 0006-add-arm-biostype-in-front-end-api.patch
   mvn clean install -DskipTests
 popd
 
@@ -677,15 +682,9 @@ sed -i 's/MAVEN_OPTS=\"/MAVEN_OPTS=\"-Xmx16384m -Xms16384m /g' Makefile
 sed -i 's/$(BUILD_FLAGS) \\/-Dgwt.compiler.localWorkers=2 $(BUILD_FLAGS) \\/g' Makefile
 sed -i 's/BUILD_ALL_USER_AGENTS=0/BUILD_ALL_USER_AGENTS=1/g' Makefile
 sed -i "s/'centos'/'centos', 'openEuler'/g" packaging/setup/ovirt_engine_setup/engine_common/postgres.py
-
-cat <<EOT >> 10-wsgi-python3.conf
-<IfModule !wsgi_module>
-  LoadModule wsgi_module modules/mod_wsgi_python3.so
-</IfModule>
-EOT
-
 sed -i "s/BUILD_LOCALES=0/BUILD_LOCALES=1/g" automation/build-artifacts.sh
 sed -i "s/BUILD_LOCALES=0/BUILD_LOCALES=1/g" Makefile
+sed -i '/slf4j/a\    <module name="com.fasterxml.jackson.core.jackson-databind"/>' backend/manager/modules/utils/src/main/modules/org/ovirt/engine/core/utils/main/module.xml
 
 %build
 pushd /usr/lib/jvm
@@ -857,8 +856,6 @@ common/org/aopalliance/main/aopalliance.jar
 common/org/apache/commons/compress/main/commons-compress.jar
 common/org/apache/commons/configuration/main/commons-configuration.jar
 common/org/apache/commons/jxpath/main/commons-jxpath.jar
-common/org/apache/sshd/main/sshd-core.jar apache-sshd/sshd-core.jar
-common/org/apache/sshd/main/sshd-common.jar apache-sshd/sshd-common.jar
 common/org/apache/ws/commons/main/ws-commons-util.jar
 common/org/apache/xmlrpc/main/xmlrpc-client.jar
 common/org/apache/xmlrpc/main/xmlrpc-common.jar
@@ -939,14 +936,13 @@ perl -i -pe 's/^SHA1-Digest: [^\n]+\n//g' "%{buildroot}%{engine_ear}/META-INF/MA
 
 %endif
 
-install -dm 755 "%{buildroot}%{_sysconfdir}/httpd/conf.modules.d"
-cp 10-wsgi-python3.conf %{buildroot}%{_sysconfdir}/httpd/conf.modules.d
-
 install -dm 755 "%{buildroot}%{engine_data}/modules/common/org/apache/sshd/main"
 cp backend/target/lib/sshd-core-2.5.0.jar %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main
 cp backend/target/lib/sshd-common-2.5.0.jar %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main
-sed -i '/sshd-core.jar/a\    <resource-root path="sshd-core-2.5.0.jar"/>' %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main/module.xml
+rm -rf %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main/sshd-core.jar
-sed -i '/sshd-common.jar/a\    <resource-root path="sshd-common-2.5.0.jar"/>' %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main/module.xml
+rm -rf %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main/sshd-common.jar
+sed -i 's/sshd-common.jar/sshd-common-2.5.0.jar/g' %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main/module.xml
+sed -i 's/sshd-core.jar/sshd-core-2.5.0.jar/g' %{buildroot}%{engine_data}/modules/common/org/apache/sshd/main/module.xml
 
 install -dm 755 "%{buildroot}%{_datadir}/java/ebay-cors-filter"
 cp backend/manager/modules/utils/target/lib/cors-filter-1.0.1.jar %{buildroot}%{_datadir}/java/ebay-cors-filter/cors-filter.jar
@@ -1134,7 +1130,6 @@ fi
 %files setup
 %license LICENSE
 %dir %{engine_rpm_state_dir}
-%config %{_sysconfdir}/httpd/conf.modules.d/10-wsgi-python3.conf
 
 
 %files setup-plugin-ovirt-engine
@@ -1301,5 +1296,8 @@ fi
 %{engine_data}/setup/bin/ovirt-engine-health
 
 %changelog
+* Wed Oct 13 2021 Ge Wang <wangge20@huawei.com> - 4.4.4.1-2
+- Fix interface report error when emulatedMachine is null
+
 * Thu Sep 23 2021 Python_Bot <Python_Bot@openeuler.org> - 4.4.4.1-1
 - Initial package