cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From tall...@apache.org
Subject git commit: updated refs/heads/master to dc4578d
Date Fri, 13 Feb 2015 07:02:37 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master 7461297f3 -> dc4578dd4


CLOUDSTACK-8254: Choosing high end service offering for HyperV in case it tries to SSH to
VM because Hyperv needs more resources because it is GUI based VM

Signed-off-by: SrikanteswaraRao Talluri <talluri@apache.org>


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/dc4578dd
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/dc4578dd
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/dc4578dd

Branch: refs/heads/master
Commit: dc4578dd443ea29b7e7a79660faee4b4959b71f9
Parents: 7461297
Author: Gaurav Aradhye <gaurav.aradhye@clogeny.com>
Authored: Thu Feb 12 22:18:03 2015 -0800
Committer: SrikanteswaraRao Talluri <talluri@apache.org>
Committed: Fri Feb 13 12:30:47 2015 +0530

----------------------------------------------------------------------
 .../component/test_egress_fw_rules.py           | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc4578dd/test/integration/component/test_egress_fw_rules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_egress_fw_rules.py b/test/integration/component/test_egress_fw_rules.py
index 5f0ca92..de222d3 100755
--- a/test/integration/component/test_egress_fw_rules.py
+++ b/test/integration/component/test_egress_fw_rules.py
@@ -81,11 +81,11 @@ class Services:
                                                "privateport" : 22,
                                                "publicport"  : 22,
                                                "protocol"    : 'TCP',},
-                         "service_offering" : {"name"        : "Tiny Instance",
-                                               "displaytext" : "Tiny Instance",
-                                               "cpunumber"   : 1,
-                                               "cpuspeed"    : 100,# in MHz
-                                               "memory"      : 128},
+                         "service_offering" : {"name"        : "Medium Instance",
+                                               "displaytext" : "Medium Instance",
+                                               "cpunumber"   : 2,
+                                               "cpuspeed"    : 128,# in MHz
+                                               "memory"      : 256},
                          "network_offering":  {
                                                "name": 'Network offering-VR services',
                                                "displaytext": 'Network offering-VR services',
@@ -144,6 +144,16 @@ class TestEgressFWRules(cloudstackTestCase):
                                     cls.services["ostype"])
         cls.services["virtual_machine"]["zoneid"] = cls.zone.id
         cls.services["virtual_machine"]["template"] = cls.template.id
+
+        cls.hypervisor = cls.testClient.getHypervisorInfo()
+
+        # As Hyperv is GUI based VM, it requires more resources to be
+        # able to SSH properly to it
+        if cls.hypervisor.lower()  == 'hyperv':
+            cls.services["service_offering"]["name"] = "Medium Instance"
+            cls.services["service_offering"]["memory"] = "1024"
+            cls.services["service_offering"]["cpuspeed"] = "1024"
+
         # Create service offerings.
         cls.service_offering = ServiceOffering.create(cls.api_client,
                                                       cls.services["service_offering"])


Mime
View raw message