Fixup e2e tests for running with multiple zones

Author: vishesh92

test/integration/component/test_affinity_groups_projects.py

@@ -1065,7 +1065,7 @@ def test_02_deploy_vm_anti_affinity_group_fail_on_not_enough_hosts(self):
         """
         test DeployVM in anti-affinity groups with more vms than hosts.
         """
-        hosts = list_hosts(self.api_client, type="routing")
+        hosts = list_hosts(self.api_client, type="routing", zoneid=self.zone.id)
         aff_grp = self.create_aff_grp(self.account_api_client)
         vms = []
         for host in hosts:

test/integration/smoke/test_secondary_storage.py

@@ -340,7 +340,7 @@ def test_05_migrate_to_less_free_space(self):
         # 1. Try complete migration from a storage with more (or equal) free space - migration should be refused
 
         storages = self.list_secondary_storages(self.apiclient)
-        if (len(storages)) < 2:
+        if (len(storages)) < 2 or (storages[0]['zoneid'] != storages[1]['zoneid']):
             self.skipTest(
                 "This test requires more than one secondary storage")
 

test/integration/smoke/test_templates.py

@@ -1156,7 +1156,7 @@ def test_09_copy_delete_template(self):
 
         list_template_response = Template.list(
             self.apiclient,
-            templatefilter=self.services["template"]["templatefilter"],
+            templatefilter=self.services["templatefilter"],
             id=self.template.id,
             zoneid=self.destZone.id
         )