DaanHoogland commented on a change in pull request #4068:
URL: https://github.com/apache/cloudstack/pull/4068#discussion_r462802219
##########
File path: agent/bindir/libvirtqemuhook.in
##########
@@ -76,7 +76,7 @@ def handleMigrateBegin():
continue
newBrName = "br" + phyDev + "-" + vlanId
source.setAttribute("bridge", newBrName)
- print(domain.toxml())
+ print((domain.toxml()))
Review comment:
why is this needed @davidjumani ?
##########
File path: test/integration/smoke/test_vm_snapshots.py
##########
@@ -316,11 +325,20 @@ def setUpClass(cls):
cls.testClient.getZoneForTests()
)
cls.services["small"]["zoneid"] = cls.zone.id
- cls.template = get_template(
- cls.api_client,
- cls.zone.id,
- cls.services["ostype"]
- )
+
+ cls.template = FAILED
+ if cls.hypervisor.lower() in ["xenserver"]:
+ cls.template = get_test_template(
+ cls.api_client,
+ cls.zone.id,
+ cls.hypervisor
+ )
+ if cls.template == FAILED:
Review comment:
6
##########
File path: scripts/vm/hypervisor/vmware/discover_networks.py
##########
@@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.
-from __future__ import print_function
+
Review comment:
why not remove this line?
##########
File path: test/integration/smoke/test_vm_snapshots.py
##########
@@ -50,11 +51,19 @@ def setUpClass(cls):
cls.domain = get_domain(cls.apiclient)
cls.zone = get_zone(cls.apiclient, testClient.getZoneForTests())
- template = get_template(
- cls.apiclient,
- cls.zone.id,
- cls.services["ostype"]
- )
+ template = FAILED
+ if cls.hypervisor.lower() in ["xenserver"]:
+ template = get_test_template(
+ cls.apiclient,
+ cls.zone.id,
+ cls.hypervisor
+ )
+ if template == FAILED:
Review comment:
and the same code in a different file...
##########
File path: test/integration/smoke/test_volumes.py
##########
@@ -302,17 +312,25 @@ def setUpClass(cls):
custom=True
)
- template = get_template(
- cls.apiclient,
- cls.zone.id,
- cls.services["ostype"]
- )
- if template == FAILED:
+ cls.template = FAILED
+ if cls.hypervisor.lower() in ["xenserver"]:
+ cls.template = get_test_template(
+ cls.apiclient,
+ cls.zone.id,
+ cls.hypervisor
+ )
+ if cls.template == FAILED:
Review comment:
you get the message by now
##########
File path: test/integration/smoke/test_vm_life_cycle.py
##########
@@ -850,11 +875,19 @@ def setUpClass(cls):
0].__dict__
cls.management_ip =
cls.config.__dict__["mgtSvr"][0].__dict__["mgtSvrIp"]
- template = get_template(
- cls.apiclient,
- cls.zone.id,
- cls.services["ostype"]
- )
+ template = FAILED
+ if cls.hypervisor.lower() in ["xenserver"]:
+ template = get_test_template(
+ cls.apiclient,
+ cls.zone.id,
+ cls.hypervisor
+ )
+ if template == FAILED:
Review comment:
meaning if xenserver try again?
##########
File path: test/integration/smoke/test_vm_life_cycle.py
##########
@@ -1334,11 +1375,19 @@ def setUpClass(cls):
0].__dict__
cls.management_ip =
cls.config.__dict__["mgtSvr"][0].__dict__["mgtSvrIp"]
- template = get_template(
- cls.apiclient,
- cls.zone.id,
- cls.services["ostype"]
- )
+ template = FAILED
+ if cls.hypervisor.lower() in ["xenserver"]:
+ template = get_test_template(
+ cls.apiclient,
+ cls.zone.id,
+ cls.hypervisor
+ )
+ if template == FAILED:
Review comment:
3rd
##########
File path: test/integration/smoke/test_vm_life_cycle.py
##########
@@ -1533,13 +1582,20 @@ def setUpClass(cls):
cls.domain = get_domain(cls.apiclient)
cls.zone = get_zone(cls.apiclient, cls.testClient.getZoneForTests())
cls.services['mode'] = cls.zone.networktype
-
- cls.template = get_template(
- cls.apiclient,
- cls.zone.id,
- cls.services["ostype"],
- hypervisor=cls.hypervisor.lower()
- )
+ template = FAILED
+ if cls.hypervisor.lower() in ["xenserver"]:
+ cls.template = get_test_template(
+ cls.apiclient,
+ cls.zone.id,
+ cls.hypervisor
+ )
+ if cls.template == FAILED:
Review comment:
4th now it really starts paying off
##########
File path: test/integration/smoke/test_vm_life_cycle.py
##########
@@ -1122,11 +1155,19 @@ def setUpClass(cls):
0].__dict__
cls.management_ip =
cls.config.__dict__["mgtSvr"][0].__dict__["mgtSvrIp"]
- template = get_template(
- cls.apiclient,
- cls.zone.id,
- cls.services["ostype"]
- )
+ template = FAILED
+ if cls.hypervisor.lower() in ["xenserver"]:
+ template = get_test_template(
+ cls.apiclient,
+ cls.zone.id,
+ cls.hypervisor
+ )
+ if template == FAILED:
Review comment:
same code as above make a method?
##########
File path: test/integration/smoke/test_volumes.py
##########
@@ -83,11 +84,20 @@ def setUpClass(cls):
cls.services["disk_offering"],
custom=True
)
- template = get_template(
- cls.apiclient,
- cls.zone.id,
- cls.services["ostype"]
- )
+
+ template = FAILED
+ if cls.hypervisor.lower() in ["xenserver"]:
+ template = get_test_template(
+ cls.apiclient,
+ cls.zone.id,
+ cls.hypervisor
+ )
+ if template == FAILED:
Review comment:
3rd file #7
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
[email protected]
