fixup

Author: vishesh92

engine/schema/src/main/java/com/cloud/host/HostVO.java

@@ -45,6 +45,7 @@
 import org.apache.cloudstack.util.HypervisorTypeConverter;
 import org.apache.cloudstack.utils.jsinterpreter.TagAsRuleHelper;
 import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
+import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.lang.BooleanUtils;
 import org.apache.commons.lang3.StringUtils;
 
@@ -772,7 +773,8 @@ private Set<String> getHostServiceOfferingAndTemplateStrictTags(ServiceOffering
         if (StringUtils.isEmpty(serviceOffering.getHostTag()) && StringUtils.isEmpty(template.getTemplateTag())) {
             return new HashSet<>();
         }
-        HashSet<String> hostTagsSet = new HashSet<>(getHostTags());
+        List<String> hostTagsList = getHostTags();
+        HashSet<String> hostTagsSet = CollectionUtils.isNotEmpty(hostTagsList) ? new HashSet<>(getHostTags()) : new HashSet<>();
         HashSet<String> tags = new HashSet<>();
         if (StringUtils.isNotEmpty(serviceOffering.getHostTag())) {
             tags.addAll(Arrays.asList(serviceOffering.getHostTag().split(",")));

server/src/main/java/com/cloud/deploy/DeploymentPlanningManagerImpl.java

@@ -283,7 +283,7 @@ protected void avoidOtherClustersForDeploymentIfMigrationDisabled(VirtualMachine
         boolean storageMigrationNeededDuringClusterMigration = false;
         for (Volume volume : volumes) {
             StoragePoolVO pool = _storagePoolDao.findById(volume.getPoolId());
-            if (List.of(ScopeType.HOST, ScopeType.CLUSTER).contains(pool.getScope())) {
+            if (pool != null && List.of(ScopeType.HOST, ScopeType.CLUSTER).contains(pool.getScope())) {
                 storageMigrationNeededDuringClusterMigration = true;
                 break;
             }

test/integration/smoke/test_vm_strict_host_tags.py

@@ -166,7 +166,7 @@ def test_06_deploy_vm_on_any_host_with_strict_tags_failure(self):
             self._cleanup.append(vm)
             self.fail("VM should not be deployed")
         except Exception as e:
-            self.assertTrue("No suitable host found for follow compute offering tags: t2" in str(e))
+            self.assertTrue("No suitable host found for vm " in str(e))
 
 
 class TestScaleVMStrictTags(cloudstackTestCase):
@@ -261,7 +261,7 @@ def test_02_scale_vm_strict_tags_failure(self):
             vm.start(self.apiclient)
             self.fail("VM should not be be able scale and start")
         except Exception as e:
-            self.assertTrue("No suitable host found for follow compute offering tags: h2" in str(e))
+            self.assertTrue("No suitable host found for vm " in str(e))
 
 
 class TestRestoreVMStrictTags(cloudstackTestCase):
@@ -333,7 +333,7 @@ def test_01_restore_vm_strict_tags_success(self):
 
         vm.restore(self.apiclient, templateid=self.template_t2.id, expunge=True)
         restored_vm = VirtualMachine.list(self.apiclient, id=vm.id, listall=True)[0]
-        self.assertEqual(restored_vm.templateid, self.template_t2.id, "VM was not scaled")
+        self.assertEqual(restored_vm.templateid, self.template_t2.id, "VM was not restored")
 
     @attr(tags=["advanced", "advancedns", "ssh", "smoke"], required_hardware="false")
     def test_02_restore_vm_strict_tags_failure(self):
@@ -349,7 +349,7 @@ def test_02_restore_vm_strict_tags_failure(self):
             vm.restore(self.apiclient, templateid=self.template_t2.id, expunge=True)
             self.fail("VM should not be restored")
         except Exception as e:
-            self.assertTrue("No suitable host found for follow compute offering tags: t2" in str(e))
+            self.assertTrue("No suitable host found for vm " in str(e))
 
 class TestMigrateVMStrictTags(cloudstackTestCase):
     @classmethod