core: fix NPE in CreateOvaCommand

Prevent failure of ova export when tpm or nvram value are `null`.

Signed-off-by: Peter Boden <[email protected]>

Author: peter-boden

backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/CreateOvaCommand.java

@@ -6,6 +6,7 @@
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import javax.enterprise.inject.Instance;
@@ -207,8 +208,12 @@ private AnsibleCommandParameters createPackOvaParameters(String ovf,
         vars.put("ova_name", getParameters().getName());
         vars.put("ovirt_ova_pack_ovf", encodedOvf);
         vars.put("ovirt_ova_pack_disks", genDiskParameters(disks, diskIdToPath));
-        vars.put("ovirt_ova_pack_tpm", tpmData.getValue());
-        vars.put("ovirt_ova_pack_nvram", nvramData.getValue());
+        if (!SecretValue.isNull(tpmData) && !tpmData.getValue().isEmpty()) {
+            vars.put("ovirt_ova_pack_tpm", tpmData.getValue());
+        }
+        if (!SecretValue.isNull(nvramData) && !nvramData.getValue().isEmpty()) {
+            vars.put("ovirt_ova_pack_nvram", nvramData.getValue());
+        }
         vars.put("ovirt_ova_pack_padding", Boolean.toString(compatibilityVersion.greater(Version.v4_6)));
         params.setVariables(vars);
         return params;