You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by sa...@apache.org on 2014/07/28 13:30:01 UTC
git commit: updated refs/heads/master to 57ee142
Repository: cloudstack
Updated Branches:
refs/heads/master d4cebbdc8 -> 57ee142de
CLOUDSTACK-7190: Fix Hyper-V issue when attempting SSH to System VMs
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/57ee142d
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/57ee142d
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/57ee142d
Branch: refs/heads/master
Commit: 57ee142dede5be035a4501dcfb0816c9bfb8ddaa
Parents: d4cebbd
Author: John Dilley <jo...@citrix.com>
Authored: Mon Jul 28 10:28:48 2014 +0000
Committer: sanjeev <sa...@apache.org>
Committed: Mon Jul 28 16:59:34 2014 +0530
----------------------------------------------------------------------
.../component/maint/test_redundant_router.py | 4 ++--
test/integration/component/test_VirtualRouter_alerts.py | 2 +-
.../component/test_deploy_vm_userdata_reg.py | 2 +-
test/integration/component/test_persistent_networks.py | 8 ++++----
test/integration/smoke/test_routers.py | 8 ++++----
test/integration/smoke/test_ssvm.py | 12 ++++++------
6 files changed, 18 insertions(+), 18 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/57ee142d/test/integration/component/maint/test_redundant_router.py
----------------------------------------------------------------------
diff --git a/test/integration/component/maint/test_redundant_router.py b/test/integration/component/maint/test_redundant_router.py
index 66bb477..991fc6f 100644
--- a/test/integration/component/maint/test_redundant_router.py
+++ b/test/integration/component/maint/test_redundant_router.py
@@ -843,7 +843,7 @@ class TestRVRInternals(cloudstackTestCase):
self.debug(master_router.linklocalip)
# Check eth2 port for master router
- if self.hypervisor.lower() == 'vmware':
+ if self.hypervisor.lower() in ('vmware', 'hyperv'):
result = get_process_status(
self.apiclient.connection.mgtSvr,
22,
@@ -879,7 +879,7 @@ class TestRVRInternals(cloudstackTestCase):
)
# Check eth2 port for backup router
- if self.hypervisor.lower() == 'vmware':
+ if self.hypervisor.lower() in ('vmware', 'hyperv'):
result = get_process_status(
self.apiclient.connection.mgtSvr,
22,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/57ee142d/test/integration/component/test_VirtualRouter_alerts.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_VirtualRouter_alerts.py b/test/integration/component/test_VirtualRouter_alerts.py
index e6f0a82..bff12f9 100644
--- a/test/integration/component/test_VirtualRouter_alerts.py
+++ b/test/integration/component/test_VirtualRouter_alerts.py
@@ -208,7 +208,7 @@ class TestVRServiceFailureAlerting(cloudstackTestCase):
alertSubject = "Monitoring Service on VR " + router.name
- if self.hypervisor.lower() == 'vmware':
+ if self.hypervisor.lower() in ('vmware', 'hyperv'):
result = get_process_status(
self.apiclient.connection.mgtSvr,
22,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/57ee142d/test/integration/component/test_deploy_vm_userdata_reg.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_deploy_vm_userdata_reg.py b/test/integration/component/test_deploy_vm_userdata_reg.py
index 1c9f35c..31735d2 100755
--- a/test/integration/component/test_deploy_vm_userdata_reg.py
+++ b/test/integration/component/test_deploy_vm_userdata_reg.py
@@ -179,7 +179,7 @@ class TestDeployVmWithUserData(cloudstackTestCase):
host.passwd="password"
cmd="cat /var/www/html/userdata/"+deployVmResponse.ipaddress+"/user-data"
- if self.hypervisor.lower() == 'vmware':
+ if self.hypervisor.lower() in ('vmware', 'hyperv'):
try:
result = get_process_status(
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/57ee142d/test/integration/component/test_persistent_networks.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_persistent_networks.py b/test/integration/component/test_persistent_networks.py
index b90d621..016a391 100644
--- a/test/integration/component/test_persistent_networks.py
+++ b/test/integration/component/test_persistent_networks.py
@@ -131,8 +131,8 @@ class TestPersistentNetworks(cloudstackTestCase):
hypervisor = str(get_hypervisor_type(self.api_client))
- if hypervisor.lower() == 'vmware':
- #SSH is done via management server for Vmware
+ if hypervisor.lower() in ('vmware', 'hyperv'):
+ #SSH is done via management server for Vmware and Hyper-V
sourceip = self.api_client.connection.mgtSvr
else:
#For others, we will have to get the ipaddress of host connected to vm
@@ -1410,8 +1410,8 @@ class TestRestartPersistentNetwork(cloudstackTestCase):
hypervisor = str(get_hypervisor_type(self.api_client))
- if hypervisor.lower() == 'vmware':
- #SSH is done via management server for Vmware
+ if hypervisor.lower() in ('vmware', 'hyperv'):
+ #SSH is done via management server for Vmware and Hyper-V
sourceip = self.api_client.connection.mgtSvr
else:
#For others, we will have to get the ipaddress of host connected to vm
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/57ee142d/test/integration/smoke/test_routers.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_routers.py b/test/integration/smoke/test_routers.py
index f77d11a..7d5f267 100644
--- a/test/integration/smoke/test_routers.py
+++ b/test/integration/smoke/test_routers.py
@@ -148,7 +148,7 @@ class TestRouterServices(cloudstackTestCase):
"Check list router response for router state"
)
- if self.hypervisor.lower() == 'vmware':
+ if self.hypervisor.lower() in ('vmware', 'hyperv'):
result = get_process_status(
self.apiclient.connection.mgtSvr,
22,
@@ -227,7 +227,7 @@ class TestRouterServices(cloudstackTestCase):
"Check list router response for router state"
)
- if self.hypervisor.lower() == 'vmware':
+ if self.hypervisor.lower() in ('vmware', 'hyperv'):
result = get_process_status(
self.apiclient.connection.mgtSvr,
22,
@@ -258,7 +258,7 @@ class TestRouterServices(cloudstackTestCase):
"Check dnsmasq service is running or not"
)
- if self.hypervisor.lower() == 'vmware':
+ if self.hypervisor.lower() in ('vmware', 'hyperv'):
result = get_process_status(
self.apiclient.connection.mgtSvr,
22,
@@ -437,7 +437,7 @@ class TestRouterServices(cloudstackTestCase):
)
host = hosts[0]
- if self.hypervisor.lower() == 'vmware':
+ if self.hypervisor.lower() in ('vmware', 'hyperv'):
res = get_process_status(
self.apiclient.connection.mgtSvr,
22,
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/57ee142d/test/integration/smoke/test_ssvm.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_ssvm.py b/test/integration/smoke/test_ssvm.py
index 9b8d19d..ac4079e 100644
--- a/test/integration/smoke/test_ssvm.py
+++ b/test/integration/smoke/test_ssvm.py
@@ -319,8 +319,8 @@ class TestSSVMs(cloudstackTestCase):
self.debug("Running SSVM check script")
- if self.hypervisor.lower() == 'vmware':
- #SSH into SSVMs is done via management server for Vmware
+ if self.hypervisor.lower() in ('vmware', 'hyperv'):
+ #SSH into SSVMs is done via management server for Vmware and Hyper-V
result = get_process_status(
self.apiclient.connection.mgtSvr,
22,
@@ -359,8 +359,8 @@ class TestSSVMs(cloudstackTestCase):
)
#Check status of cloud service
- if self.hypervisor.lower() == 'vmware':
- #SSH into SSVMs is done via management server for Vmware
+ if self.hypervisor.lower() in ('vmware', 'hyperv'):
+ #SSH into SSVMs is done via management server for Vmware and Hyper-V
result = get_process_status(
self.apiclient.connection.mgtSvr,
22,
@@ -443,8 +443,8 @@ class TestSSVMs(cloudstackTestCase):
self.debug("Checking cloud process status")
- if self.hypervisor.lower() == 'vmware':
- #SSH into SSVMs is done via management server for vmware
+ if self.hypervisor.lower() in ('vmware', 'hyperv'):
+ #SSH into SSVMs is done via management server for Vmware and Hyper-V
result = get_process_status(
self.apiclient.connection.mgtSvr,
22,