You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2015/11/03 13:06:06 UTC
[1/2] git commit: updated refs/heads/master to 0c62c61
Repository: cloudstack
Updated Branches:
refs/heads/master 20bbd342c -> 0c62c611d
CLOUDSTACK-9021 - Add right interface when test is executed against HyperV/VMware
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/86d1b963
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/86d1b963
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/86d1b963
Branch: refs/heads/master
Commit: 86d1b9632c0aecbc711f8f8243d56e7f515a1364
Parents: 20bbd34
Author: Wilder Rodrigues <wr...@schubergphilis.com>
Authored: Tue Nov 3 11:18:11 2015 +0100
Committer: Wilder Rodrigues <wr...@schubergphilis.com>
Committed: Tue Nov 3 11:18:11 2015 +0100
----------------------------------------------------------------------
test/integration/smoke/test_ssvm.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/86d1b963/test/integration/smoke/test_ssvm.py
----------------------------------------------------------------------
diff --git a/test/integration/smoke/test_ssvm.py b/test/integration/smoke/test_ssvm.py
index 9224893..81dba32 100644
--- a/test/integration/smoke/test_ssvm.py
+++ b/test/integration/smoke/test_ssvm.py
@@ -490,7 +490,7 @@ class TestSSVMs(cloudstackTestCase):
self.apiclient.connection.user,
self.apiclient.connection.passwd,
ssvm.privateip,
- "cat /var/cache/cloud/cmdline | xargs | sed \"s/ /\\n/g\" | grep eth0ip= | sed \"s/\=/ /g\" | awk '{print $2}'",
+ "cat /var/cache/cloud/cmdline | xargs | sed \"s/ /\\n/g\" | grep eth1ip= | sed \"s/\=/ /g\" | awk '{print $2}'",
hypervisor=self.hypervisor
)
else:
@@ -625,7 +625,7 @@ class TestSSVMs(cloudstackTestCase):
self.apiclient.connection.user,
self.apiclient.connection.passwd,
cpvm.privateip,
- "cat /var/cache/cloud/cmdline | xargs | sed \"s/ /\\n/g\" | grep eth0ip= | sed \"s/\=/ /g\" | awk '{print $2}'",
+ "cat /var/cache/cloud/cmdline | xargs | sed \"s/ /\\n/g\" | grep eth1ip= | sed \"s/\=/ /g\" | awk '{print $2}'",
hypervisor=self.hypervisor
)
else:
[2/2] git commit: updated refs/heads/master to 0c62c61
Posted by ra...@apache.org.
Merge pull request #1026 from ekholabs/fix/test_ssvm-CLOUDSTACK-9021
CLOUDSTACK-9021 - Add right interface when test is executed against HyperV/VMwareThe test now check the IP taking into account the right interface for VMware/HyperV (eth1).
@karuturi could you please have a look? Unfortunately, I do not have HyperV/VMware test environment.
* pr/1026:
CLOUDSTACK-9021 - Add right interface when test is executed against HyperV/VMware
Signed-off-by: Rajani Karuturi <ra...@citrix.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/0c62c611
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/0c62c611
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/0c62c611
Branch: refs/heads/master
Commit: 0c62c611ddf1761dd15cb7850b55021f746e579b
Parents: 20bbd34 86d1b96
Author: Rajani Karuturi <ra...@citrix.com>
Authored: Tue Nov 3 17:35:32 2015 +0530
Committer: Rajani Karuturi <ra...@citrix.com>
Committed: Tue Nov 3 17:35:32 2015 +0530
----------------------------------------------------------------------
test/integration/smoke/test_ssvm.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------