You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ek...@apache.org on 2015/06/08 11:45:23 UTC
[02/50] [abbrv] git commit: updated refs/heads/feature/vpc-ipv6 to
6140db5
CLOUDSTACK-8526: Use more memory for VM deployment on HyperV when SSH is tried to VM
Signed-off-by: Gaurav Aradhye <ga...@clogeny.com>
Reviewed-by: Gaurav
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/3e21c9bf
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/3e21c9bf
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/3e21c9bf
Branch: refs/heads/feature/vpc-ipv6
Commit: 3e21c9bf2b48510002709b73d834bd307e70353a
Parents: 900b656
Author: Gaurav Aradhye <ga...@clogeny.com>
Authored: Fri May 29 16:35:08 2015 +0530
Committer: Gaurav Aradhye <ga...@clogeny.com>
Committed: Fri May 29 16:40:33 2015 +0530
----------------------------------------------------------------------
test/integration/testpaths/testpath_stopped_vm.py | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3e21c9bf/test/integration/testpaths/testpath_stopped_vm.py
----------------------------------------------------------------------
diff --git a/test/integration/testpaths/testpath_stopped_vm.py b/test/integration/testpaths/testpath_stopped_vm.py
index 7d8886c..927dbd9 100644
--- a/test/integration/testpaths/testpath_stopped_vm.py
+++ b/test/integration/testpaths/testpath_stopped_vm.py
@@ -148,9 +148,13 @@ class TestAdvancedZoneStoppedVM(cloudstackTestCase):
# Create 2 service offerings with different values for
# for cpunumber, cpuspeed, and memory
- cls.testdata["service_offering"]["cpunumber"] = "1"
- cls.testdata["service_offering"]["cpuspeed"] = "128"
- cls.testdata["service_offering"]["memory"] = "256"
+ cls.testdata["service_offering"]["cpunumber"] = 1
+ cls.testdata["service_offering"]["cpuspeed"] = 128
+ cls.testdata["service_offering"]["memory"] = 256
+
+ if cls.hypervisor.lower() == "hyperv":
+ cls.testdata["service_offering"]["cpuspeed"] = 1024
+ cls.testdata["service_offering"]["memory"] = 1024
cls.service_offering = ServiceOffering.create(
cls.apiclient,
@@ -158,9 +162,7 @@ class TestAdvancedZoneStoppedVM(cloudstackTestCase):
)
cls._cleanup.append(cls.service_offering)
- cls.testdata["service_offering"]["cpunumber"] = "2"
- cls.testdata["service_offering"]["cpuspeed"] = "256"
- cls.testdata["service_offering"]["memory"] = "512"
+ cls.testdata["service_offering"]["cpunumber"] = 2
cls.service_offering_2 = ServiceOffering.create(
cls.apiclient,