cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e...@apache.org
Subject git commit: updated refs/heads/master to 7ba2f22
Date Wed, 10 Jun 2015 20:01:37 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master de6538c9e -> 7ba2f2274


Allow test to run on tiny linux templates using busybox

Signed-off-by: wilderrodrigues <wrodrigues@schubergphilis.com>

This closes #381


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

Branch: refs/heads/master
Commit: 7ba2f2274aeef8944535e1417ac0e3a7d19206b5
Parents: de6538c
Author: Ian Southam <isoutham@schubergphilis.com>
Authored: Wed Jun 10 05:12:17 2015 -0400
Committer: wilderrodrigues <wrodrigues@schubergphilis.com>
Committed: Wed Jun 10 22:00:54 2015 +0200

----------------------------------------------------------------------
 .../component/test_vpc_network_pfrules.py       | 51 ++++++++++++++------
 1 file changed, 35 insertions(+), 16 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7ba2f227/test/integration/component/test_vpc_network_pfrules.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_vpc_network_pfrules.py b/test/integration/component/test_vpc_network_pfrules.py
index 3f3f988..e5fca1a 100644
--- a/test/integration/component/test_vpc_network_pfrules.py
+++ b/test/integration/component/test_vpc_network_pfrules.py
@@ -39,6 +39,7 @@ from marvin.lib.common import (get_domain,
 from marvin.lib.utils import cleanup_resources
 import socket
 import time
+import sys
 
 
 class Services:
@@ -163,7 +164,7 @@ class Services:
                 "username": "root",
                 "password": "password",
                 "ssh_port": 22,
-                "hypervisor": 'XenServer',
+                # "hypervisor": 'XenServer',
                 # Hypervisor type should be same as
                 # hypervisor type of cluster
                 "privateport": 22,
@@ -333,21 +334,7 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
         try:
                 if not isVmAccessible:
                     self.create_natrule(vm, public_ip, network)
-                # Start httpd service on VM first
-                sshClient = vm.get_ssh_client()
-                sshClient.execute("service httpd start")
-                time.sleep(5)
-                ssh_response = str(sshClient.execute("service httpd status")).lower()
-                self.debug("httpd service status is: %s" % ssh_response)
-                if "httpd: unrecognized service" in ssh_response or "inactive" in ssh_response:
-                    ssh_res = sshClient.execute("yum install httpd -y")
-                    if "Complete!" not in ssh_res:
-                        raise Exception("Failed to install http server")
-                    sshClient.execute("service httpd start")
-                    time.sleep(5)
-                    ssh_response = str(sshClient.execute("service httpd status")).lower()
-                if not "running" in ssh_response:
-                    raise Exception("Failed to start httpd service")
+		self.setup_webserver(vm)
 
                 urllib.urlretrieve("http://%s/test.html" % public_ip.ipaddress.ipaddress,
filename="test.html")
                 if not testnegative:
@@ -360,6 +347,38 @@ class TestVPCNetworkPFRules(cloudstackTestCase):
                 else:
                     self.debug("Failed to wget from VM=%s http server on public_ip=%s: %s"
% (vm.name, public_ip.ipaddress.ipaddress, e))
 
+    def setup_webserver(self, vm):
+        # Start httpd service on VM first
+	sshClient = vm.get_ssh_client()
+	# Test to see if we are on a tiny linux box (using busybox)
+	res = str(sshClient.execute("busybox")).lower()
+        if "hexdump" in res:
+            self.setup_busybox(sshClient)
+        else:
+            self.setup_apache(sshClient)
+
+    def setup_busybox(self, sshClient):
+        """ Create a dummy test.html file and fire up the busybox web server """
+	sshClient.execute('echo test > test.html')
+	sshClient.execute("/usr/sbin/httpd")
+	self.debug("Setup webserver using busybox")
+
+    def setup_apache(self, sshClient):
+	sshClient.execute("service httpd start")
+	time.sleep(5)
+	ssh_response = str(sshClient.execute("service httpd status")).lower()
+	self.debug("httpd service status is: %s" % ssh_response)
+	if "httpd: unrecognized service" in ssh_response or "inactive" in ssh_response:
+	    ssh_res = sshClient.execute("yum install httpd -y")
+	    if "Complete!" not in ssh_res:
+		raise Exception("Failed to install http server")
+	    sshClient.execute("service httpd start")
+	    time.sleep(5)
+	    ssh_response = str(sshClient.execute("service httpd status")).lower()
+	if not "running" in ssh_response:
+	    raise Exception("Failed to start httpd service")
+	self.debug("Setup webserver using apache")
+
     def create_natrule(self, vm, public_ip, network, services=None):
         self.debug("Creating NAT rule in network for vm with public IP")
         if not services:


Mime
View raw message