From d1aa45ae83d31f5e85c50cb9f48dd2632d08c930 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Wed, 9 Nov 2011 10:21:17 -0500
Subject: [PATCH 01/16] CC-2870: Create testing infrastructure for testing
 upgrades

-added 1.9.5-RC1 to testing.
---
 dev_tools/fabric/fab_setup.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/dev_tools/fabric/fab_setup.py b/dev_tools/fabric/fab_setup.py
index 45b428f5a..e9f4be9a8 100644
--- a/dev_tools/fabric/fab_setup.py
+++ b/dev_tools/fabric/fab_setup.py
@@ -130,6 +130,11 @@ def airtime_194_tar():
     run('wget http://downloads.sourceforge.net/project/airtime/1.9.4/airtime-1.9.4.tar.gz')
     run('tar xfz airtime-1.9.4.tar.gz')
     sudo('cd ~/airtime-1.9.4/install_full/ubuntu && ./airtime-full-install')
+    
+def airtime_195_RC1_tar():
+    run('wget http://downloads.sourceforge.net/project/airtime/1.9.5-RC1/airtime-1.9.5-RC1.tar.gz')
+    run('tar xfz airtime-1.9.5-RC1.tar.gz')
+    sudo('cd ~/airtime-1.9.5-RC1/install_full/ubuntu && ./airtime-full-install')
 
 def airtime_latest_deb():
     append('/etc/apt/sources.list', "deb http://apt.sourcefabric.org/ lucid main", use_sudo=True)

From 8f75bf18705daeb66db4232a4477c6151629c09b Mon Sep 17 00:00:00 2001
From: Yuchen Wang <yuchen@naomi-DX4840.(none)>
Date: Wed, 9 Nov 2011 15:35:14 -0500
Subject: [PATCH 02/16] CC-2966:	Remove minimum and maximum logo sizes - make
 them recommended instead

Fixed by:
1. change wording
2. attach custom filter to the logo upload form, the filter scales down the image
if it's larger than 600x600
---
 .../application/forms/RegisterAirtime.php     | 10 ++---
 .../application/forms/SupportSettings.php     | 10 ++---
 .../forms/customfilters/ImageSize.php         | 42 +++++++++++++++++++
 .../views/scripts/form/register-dialog.phtml  |  2 +-
 .../views/scripts/form/support-setting.phtml  |  2 +-
 5 files changed, 52 insertions(+), 14 deletions(-)
 create mode 100644 airtime_mvc/application/forms/customfilters/ImageSize.php

diff --git a/airtime_mvc/application/forms/RegisterAirtime.php b/airtime_mvc/application/forms/RegisterAirtime.php
index 694224b9d..4ca52e27c 100644
--- a/airtime_mvc/application/forms/RegisterAirtime.php
+++ b/airtime_mvc/application/forms/RegisterAirtime.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once 'customfilters/ImageSize.php';
+
 class Application_Form_RegisterAirtime extends Zend_Form
 {
 
@@ -102,12 +104,8 @@ class Application_Form_RegisterAirtime extends Zend_Form
 				->setRequired(false)
 				->setDecorators(array('File'))
 				->addValidator('Count', false, 1)
-				->addValidator('Extension', false, 'jpg,png,gif')
-				->addValidator('ImageSize', false, array(
-					'minwidth'	=> 200,
-					'minheight'	=> 200,
-					'maxwidth'	=> 600,
-					'maxheight'	=>	600));
+				->addValidator('Extension', false, 'jpg,jpeg,png,gif')
+				->addFilter('ImageSize');
 		$this->addElement($upload);
 		
         //enable support feedback
diff --git a/airtime_mvc/application/forms/SupportSettings.php b/airtime_mvc/application/forms/SupportSettings.php
index 605e85878..f0956cdf7 100644
--- a/airtime_mvc/application/forms/SupportSettings.php
+++ b/airtime_mvc/application/forms/SupportSettings.php
@@ -1,5 +1,7 @@
 <?php
 
+require_once 'customfilters/ImageSize.php';
+
 class Application_Form_SupportSettings extends Zend_Form
 {
 
@@ -99,12 +101,8 @@ class Application_Form_SupportSettings extends Zend_Form
 				->setRequired(false)
 				->setDecorators(array('File'))
 				->addValidator('Count', false, 1)
-				->addValidator('Extension', false, 'jpg,png,gif')
-				->addValidator('ImageSize', false, array(
-					'minwidth'	=> 200,
-					'minheight'	=> 200,
-					'maxwidth'	=> 600,
-					'maxheight'	=>	600));
+				->addValidator('Extension', false, 'jpg,jpeg,png,gif')
+				->addFilter('ImageSize');
 		$upload->setAttrib('accept', 'image/jpeg,image/gif,image/png,image/jpg');
 		$this->addElement($upload);
 		
diff --git a/airtime_mvc/application/forms/customfilters/ImageSize.php b/airtime_mvc/application/forms/customfilters/ImageSize.php
new file mode 100644
index 000000000..9dcfffffe
--- /dev/null
+++ b/airtime_mvc/application/forms/customfilters/ImageSize.php
@@ -0,0 +1,42 @@
+<?php
+
+class Zend_Filter_ImageSize implements Zend_Filter_Interface {
+    
+	public function filter($value) {
+        if(!file_exists($value)) {
+            throw new Zend_Filter_Exception('Image does not exist: ' . $value);
+        }
+        
+        $image = imageCreateFromString(file_get_contents($value));
+		if(false === $image) {
+            throw new Zend_Filter_Exception('Can\'t load image: ' . $value);
+        }
+        
+        // find ratio to scale down to
+        // TODO: pass 600 as parameter in the future
+        $origWidth = imagesx($image);
+        $origHeight = imagesy($image);
+        $ratio = max($origWidth, $origHeight) / 600;
+        if($ratio < 1) {
+        	return;
+        }
+        
+        // create a scaled down image
+        $newWidth = round($origWidth / $ratio);
+        $newHeight = round($origHeight / $ratio);
+        $resized = imagecreatetruecolor($newWidth, $newHeight);
+        imagecopyresampled($resized, $image, 0, 0, 0, 0, $newWidth, $newHeight, $origWidth, $origHeight);
+        
+        // determine type and store to disk
+        $explodeResult = explode(".", $value);
+        $type = $explodeResult[count($explodeResult) - 1];
+        $writeFunc = 'image' . $type;
+        if($type == 'jpeg' || $type == 'jpg') {
+            imagejpeg($resized, $value, 100);
+        } else {
+        	$writeFunc($resized, $value);
+        }
+	}
+}
+
+?>
diff --git a/airtime_mvc/application/views/scripts/form/register-dialog.phtml b/airtime_mvc/application/views/scripts/form/register-dialog.phtml
index acb461be5..8faeb5913 100644
--- a/airtime_mvc/application/views/scripts/form/register-dialog.phtml
+++ b/airtime_mvc/application/views/scripts/form/register-dialog.phtml
@@ -144,7 +144,7 @@
 		        	<?php }?>
                     
 		            <?php echo $this->element->getElement('Logo') ?>
-		            <p class="info-text">Min. size: 200x200 Max. size: 600x600</p>
+		            <p class="info-text">Note: Anything larger than 600x600 will be resized.</p>
 		            <?php if($this->element->getElement('Logo')->hasErrors()) : ?>
 		                <ul class='errors'>
 		                    <?php foreach($this->element->getElement('Logo')->getMessages() as $error): ?>
diff --git a/airtime_mvc/application/views/scripts/form/support-setting.phtml b/airtime_mvc/application/views/scripts/form/support-setting.phtml
index 9794f8159..e4b1621c4 100644
--- a/airtime_mvc/application/views/scripts/form/support-setting.phtml
+++ b/airtime_mvc/application/views/scripts/form/support-setting.phtml
@@ -138,7 +138,7 @@
             <?php }?>
             
             <?php echo $this->element->getElement('Logo') ?>
-            <div class="info-text"><p>Min. size: 200x200 Max. size: 600x600</p></div>
+            <div class="info-text"><p>Note: Anything larger than 600x600 will be resized.</p></div>
             <?php if($this->element->getElement('Logo')->hasErrors()) : ?>
                 <ul class='errors'>
                     <?php foreach($this->element->getElement('Logo')->getMessages() as $error): ?>

From 5d741d84ee115b0a90c1817a61ec1bb7954a7430 Mon Sep 17 00:00:00 2001
From: Yuchen Wang <yuchen@naomi-DX4840.(none)>
Date: Wed, 9 Nov 2011 16:03:32 -0500
Subject: [PATCH 03/16] CC-3001: Preferences->"Submit" button renamed to
 "Save", and should be at the top and the bottom of the screen

Changed all other buttons that says "Submit" to "Save.
Also added some CSS stuff so that the "Save" button at the top of Preference page
have some space between itself and the form below.
---
 airtime_mvc/application/forms/AddUser.php          | 2 +-
 airtime_mvc/application/forms/AdvancedSearch.php   | 2 +-
 airtime_mvc/application/forms/EditAudioMD.php      | 2 +-
 airtime_mvc/application/forms/PlaylistMetadata.php | 2 +-
 airtime_mvc/application/forms/SupportSettings.php  | 2 +-
 airtime_mvc/public/css/styles.css                  | 4 ++++
 6 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/airtime_mvc/application/forms/AddUser.php b/airtime_mvc/application/forms/AddUser.php
index 43b76495c..1f00f7865 100644
--- a/airtime_mvc/application/forms/AddUser.php
+++ b/airtime_mvc/application/forms/AddUser.php
@@ -81,7 +81,7 @@ class Application_Form_AddUser extends Zend_Form
         $submit = new Zend_Form_Element_Submit('submit');
         $submit->setAttrib('class', 'ui-button ui-state-default right-floated');
         $submit->setIgnore(true);
-        $submit->setLabel('Submit');
+        $submit->setLabel('Save');
         $this->addElement($submit);
     }
     
diff --git a/airtime_mvc/application/forms/AdvancedSearch.php b/airtime_mvc/application/forms/AdvancedSearch.php
index ff074718b..4c15795b7 100644
--- a/airtime_mvc/application/forms/AdvancedSearch.php
+++ b/airtime_mvc/application/forms/AdvancedSearch.php
@@ -16,7 +16,7 @@ class Application_Form_AdvancedSearch extends Zend_Form
 		// Add the submit button
         $this->addElement('button', 'search_submit', array(
             'ignore'   => true,
-            'label'    => 'Submit',
+            'label'    => 'Save',
 			'order'    => '-1'
         ));
 		$this->getElement('search_submit')->removeDecorator('DtDdWrapper');
diff --git a/airtime_mvc/application/forms/EditAudioMD.php b/airtime_mvc/application/forms/EditAudioMD.php
index 423ef1025..a4968644f 100644
--- a/airtime_mvc/application/forms/EditAudioMD.php
+++ b/airtime_mvc/application/forms/EditAudioMD.php
@@ -134,7 +134,7 @@ class Application_Form_EditAudioMD extends Zend_Form
         $this->addElement('submit', 'submit', array(
             'ignore'   => true,
             'class'    => 'ui-button ui-state-default',
-            'label'    => 'Submit',
+            'label'    => 'Save',
             'decorators' => array(
                 'ViewHelper'
             )
diff --git a/airtime_mvc/application/forms/PlaylistMetadata.php b/airtime_mvc/application/forms/PlaylistMetadata.php
index 15de97699..d53a4ddab 100644
--- a/airtime_mvc/application/forms/PlaylistMetadata.php
+++ b/airtime_mvc/application/forms/PlaylistMetadata.php
@@ -24,7 +24,7 @@ class Application_Form_PlaylistMetadata extends Zend_Form{
 
          // Add the comment element
         $this->addElement('button', 'new_playlist_submit', array(
-            'label'      => 'Submit',
+            'label'      => 'Save',
             'ignore'   => true
 		));
     }
diff --git a/airtime_mvc/application/forms/SupportSettings.php b/airtime_mvc/application/forms/SupportSettings.php
index f0956cdf7..ab97000e7 100644
--- a/airtime_mvc/application/forms/SupportSettings.php
+++ b/airtime_mvc/application/forms/SupportSettings.php
@@ -151,7 +151,7 @@ class Application_Form_SupportSettings extends Zend_Form
         $submit = new Zend_Form_Element_Submit("submit");
         $submit->class = 'ui-button ui-state-default right-floated';
         $submit->setIgnore(true)
-                ->setLabel("Submit")
+                ->setLabel("Save")
                 ->setDecorators(array('ViewHelper'));
         $this->addElement($submit);
     }
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 297cc30f3..9671cf476 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -1618,6 +1618,10 @@ div.success{
     width: 500px;
 }
 
+.preferences .padded {
+    margin-top: 5px; /* Firefox needs this */
+}
+
 dt.block-display, dd.block-display {
     display: block;
     float: none;

From 5ba1bf28f9e1b9f901d2a04efff881c008eb560e Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Wed, 9 Nov 2011 16:26:23 -0500
Subject: [PATCH 04/16] -improvements to upgrade infrastructure testing -run
 shell script for fab_setup.py

---
 dev_tools/fabric/fab_setup.py | 74 +++++++++++++++++++++++++++--------
 dev_tools/fabric/run.sh       | 21 ++++++++++
 2 files changed, 79 insertions(+), 16 deletions(-)
 create mode 100755 dev_tools/fabric/run.sh

diff --git a/dev_tools/fabric/fab_setup.py b/dev_tools/fabric/fab_setup.py
index e9f4be9a8..b6bc73d51 100644
--- a/dev_tools/fabric/fab_setup.py
+++ b/dev_tools/fabric/fab_setup.py
@@ -1,8 +1,20 @@
+#Airtime install/upgrade infrastructure
+#author martin.konecny@sourcefabric.org
+
+#Documentation for this page:
+#http://wiki.sourcefabric.org/x/OwCD
+
+
 import os
 import time
+import sys
 from fabric.api import *
 from fabric.contrib.files import comment, sed, append
 
+from xml.dom.minidom import parse
+from xml.dom.minidom import Node
+from xml.dom.minidom import Element
+
 
 env.user = 'martin'
 env.password = 'test'
@@ -26,11 +38,9 @@ def download_if_needed(vdi_dir, xml_dir, vm_name, vm_vdi_file, vm_xml_file):
     
     if os.path.exists(os.path.join(vdi_dir, vm_vdi_file)):
         print "File %s already exists. No need to re-download" % os.path.join(vdi_dir, vm_vdi_file)
-        downloaded = False
     else:
         print "File %s not found. Downloading" % vm_vdi_file
         local("wget %s/%s/%s -O %s"%(env.vm_download_url, vm_name, vm_vdi_file, os.path.join(vdi_dir, vm_vdi_file)))
-        downloaded = True
            
     if os.path.exists(os.path.join(xml_dir, vm_xml_file)):
         print "File %s already exists. No need to re-download" % os.path.join(xml_dir, vm_xml_file)
@@ -38,7 +48,6 @@ def download_if_needed(vdi_dir, xml_dir, vm_name, vm_vdi_file, vm_xml_file):
         print "File %s not found. Downloading" % vm_xml_file
         local("wget %s/%s/%s -O %s"%(env.vm_download_url, vm_name, vm_xml_file, os.path.join(xml_dir, vm_xml_file)))
        
-    return downloaded
 
 def create_fresh_os(os_version, os_arch):
     
@@ -48,19 +57,41 @@ def create_fresh_os(os_version, os_arch):
     vdi_dir = os.path.expanduser('~/tmp/vms/%s'%vm_name)
     vdi_snapshot_dir = os.path.expanduser('~/tmp/vms/%s/Snapshots'%vm_name)
     xml_dir = os.path.expanduser('~/.VirtualBox')
+    vm_xml_path = os.path.join(xml_dir, vm_xml_file)
     
-    downloaded = download_if_needed(vdi_dir, xml_dir, vm_name, vm_vdi_file, vm_xml_file)
 
-    if downloaded:
+    if not os.path.exists("%s/vm_registered"%vdi_dir) and os.path.exists(vm_xml_path):
+        #vm_xml file exists, but it wasn't registered. Did something go wrong on a previous attempt?
+        #Let's attempt to correct this by completely removing the virtual machine.
+        
+        dom = parse(vm_xml_path)
+        root = dom.childNodes[0]
+        rootChildren = root.childNodes
+        
+        #manually remove all snapshots before removing virtual machine
+        for rc in rootChildren:
+            if rc.nodeType == Node.ELEMENT_NODE and rc.localName == "Machine":
+                snapshotNodes = rc.getElementsByTagName("Snapshot")
+                for sn in snapshotNodes:
+                    local("VBoxManage snapshot %s delete %s"% (vm_name, sn.getAttribute("uuid")[1:-1]))
+    
+        os.remove(vm_xml_path)
+        local("VBoxManage unregistervm %s --delete"% vm_name)
+        
+    download_if_needed(vdi_dir, xml_dir, vm_name, vm_vdi_file, vm_xml_file)
+        
+    if not os.path.exists("%s/vm_registered"%vdi_dir):
         local("VBoxManage registervm %s"%os.path.join(xml_dir, vm_xml_file), capture=True)
         local('VBoxManage storagectl "%s" --name "SATA Controller" --add sata'%vm_name)
-        local('VBoxManage storageattach "%s" --storagectl "SATA Controller" --port 0 --type hdd --medium %s'%(vm_name, os.path.join(vdi_dir, vm_vdi_file)))
-        local("VBoxManage snapshot %s take fresh_install"%vm_name)
+        local('VBoxManage storageattach "%s" --storagectl "SATA Controller" --port 0 --device 0 --type hdd --medium %s'%(vm_name, os.path.join(vdi_dir, vm_vdi_file)))
         local("VBoxManage modifyvm %s --snapshotfolder %s"%(vm_name, vdi_snapshot_dir))
-    #else:
-    #    local('VBoxManage snapshot %s restore fresh_install'%vm_name)
-        
+        local("VBoxManage snapshot %s take fresh_install"%vm_name)
+        local("touch %s/vm_registered"%vdi_dir)
+
+
+    local('VBoxManage snapshot %s restore fresh_install'%vm_name)
     local('VBoxManage startvm %s'%vm_name)
+    print "Please wait while attempting to acquire IP address"
         
     time.sleep(30)
     
@@ -71,6 +102,16 @@ def create_fresh_os(os_version, os_arch):
     print "Address found %s"%ip_addr
     env.hosts.append(ip_addr)
     env.host_string = ip_addr
+    
+    if os_version == "10.04":
+        print "Lucid detected - updating python virtualenv"
+        sudo('apt-get update')
+        sudo('apt-get install -y python-setuptools')
+        sudo('wget http://apt.sourcefabric.org/pool/main/p/python-virtualenv/python-virtualenv_1.4.9-3_all.deb')
+        #sudo('echo "Y" | gdebi python-virtualenv_1.4.9-3_all.deb')
+        
+        #for some weird reason have to run dpkg after gdebi for the package to be configured :/
+        sudo('dpkg -i python-virtualenv_1.4.9-3_all.deb')
 
 def ubuntu_lucid_32(fresh_os=True):
     if (fresh_os):
@@ -123,6 +164,7 @@ def airtime_182_tar():
     run('tar xfz airtime-1.8.2.tar.gz')
     sudo('cd ~/airtime-1.8.2/install && php airtime-install.php')
 
+    #need to reboot because of daemon-tools.
     reboot(45)
     sudo('airtime-check-system')
     
@@ -131,10 +173,10 @@ def airtime_194_tar():
     run('tar xfz airtime-1.9.4.tar.gz')
     sudo('cd ~/airtime-1.9.4/install_full/ubuntu && ./airtime-full-install')
     
-def airtime_195_RC1_tar():
-    run('wget http://downloads.sourceforge.net/project/airtime/1.9.5-RC1/airtime-1.9.5-RC1.tar.gz')
-    run('tar xfz airtime-1.9.5-RC1.tar.gz')
-    sudo('cd ~/airtime-1.9.5-RC1/install_full/ubuntu && ./airtime-full-install')
+def airtime_195_tar():
+    run('wget http://downloads.sourceforge.net/project/airtime/1.9.5-RC3/airtime-1.9.5-RC3.tar.gz')
+    run('tar xfz airtime-1.9.5-RC3.tar.gz')
+    sudo('cd ~/airtime-1.9.5/install_full/ubuntu && ./airtime-full-install')
 
 def airtime_latest_deb():
     append('/etc/apt/sources.list', "deb http://apt.sourcefabric.org/ lucid main", use_sudo=True)
@@ -146,11 +188,11 @@ def airtime_latest_deb():
     sudo('apt-get purge -y pulseaudio')
     sudo('apt-get install -y --force-yes airtime')
     
-def airtime_devel():
+def airtime_git_branch(branch="devel"):
     sudo('apt-get update')
     sudo('apt-get install -y git-core')
     run('git clone https://github.com/sourcefabric/Airtime.git ~/airtime')
-    sudo('cd ~/airtime && git checkout devel && install_full/ubuntu/airtime-full-install || true')
+    sudo('cd ~/airtime && git checkout %s && install_full/ubuntu/airtime-full-install || true' % branch)
 
 
 def airtime_200():
diff --git a/dev_tools/fabric/run.sh b/dev_tools/fabric/run.sh
new file mode 100755
index 000000000..920f36bf7
--- /dev/null
+++ b/dev_tools/fabric/run.sh
@@ -0,0 +1,21 @@
+#!/bin/bash
+
+exec 2>&1
+
+target="airtime_195_tar"
+airtime_versions=(""  "airtime_182_tar" "airtime_194_tar")
+ubuntu_versions=("ubuntu_lucid_32" "ubuntu_natty_32")
+
+
+num1=${#ubuntu_versions[@]}
+num2=${#airtime_versions[@]}
+
+
+for i in $(seq 0 $(($num1 -1)));
+do
+    for j in $(seq 0 $(($num2 -1)));
+    do
+        echo fab -f fab_setup.py ${ubuntu_versions[$i]} ${airtime_versions[$j]} $target 2>&1 | tee $LOG
+        fab -f fab_setup.py ${ubuntu_versions[$i]} ${airtime_versions[$j]} $target 2>&1 | tee $LOG
+    done
+done

From 8a737d58f5865afdd5a61ae30576ace0ab1854b7 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Wed, 9 Nov 2011 17:31:59 -0500
Subject: [PATCH 05/16] CC-2870: Create testing infrastructure for testing
 upgrades

-improvements the run.sh script.
	-System is now shutdown after completion
	-Logs to various files
---
 dev_tools/fabric/fab_setup.py | 8 ++++++--
 dev_tools/fabric/run.sh       | 4 ++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/dev_tools/fabric/fab_setup.py b/dev_tools/fabric/fab_setup.py
index b6bc73d51..c1060631e 100644
--- a/dev_tools/fabric/fab_setup.py
+++ b/dev_tools/fabric/fab_setup.py
@@ -26,6 +26,10 @@ env.vm_download_url = "http://host.sourcefabric.org/vms/VirtualBox"
 #fab -f fab_setup.py ubuntu_lucid_64 airtime_182_tar airtime_190_tar 
 
 
+def shutdown():
+    sudo("shutdown -hP now")
+    time.sleep(30)
+
 def test():
     x = sudo('airtime-check-system')
     print x.failed
@@ -174,8 +178,8 @@ def airtime_194_tar():
     sudo('cd ~/airtime-1.9.4/install_full/ubuntu && ./airtime-full-install')
     
 def airtime_195_tar():
-    run('wget http://downloads.sourceforge.net/project/airtime/1.9.5-RC3/airtime-1.9.5-RC3.tar.gz')
-    run('tar xfz airtime-1.9.5-RC3.tar.gz')
+    run('wget http://downloads.sourceforge.net/project/airtime/1.9.5-RC4/airtime-1.9.5-RC4.tar.gz')
+    run('tar xfz airtime-1.9.5-RC4.tar.gz')
     sudo('cd ~/airtime-1.9.5/install_full/ubuntu && ./airtime-full-install')
 
 def airtime_latest_deb():
diff --git a/dev_tools/fabric/run.sh b/dev_tools/fabric/run.sh
index 920f36bf7..e52494aee 100755
--- a/dev_tools/fabric/run.sh
+++ b/dev_tools/fabric/run.sh
@@ -15,7 +15,7 @@ for i in $(seq 0 $(($num1 -1)));
 do
     for j in $(seq 0 $(($num2 -1)));
     do
-        echo fab -f fab_setup.py ${ubuntu_versions[$i]} ${airtime_versions[$j]} $target 2>&1 | tee $LOG
-        fab -f fab_setup.py ${ubuntu_versions[$i]} ${airtime_versions[$j]} $target 2>&1 | tee $LOG
+        echo fab -f fab_setup.py ${ubuntu_versions[$i]} ${airtime_versions[$j]} $target shutdown
+        fab -f fab_setup.py ${ubuntu_versions[$i]} ${airtime_versions[$j]} $target shutdown 2>&1 | tee "${ubuntu_versions[$i]}_${airtime_versions[$j]}_$target.log"
     done
 done

From cec90ddf7064d30776b020c2d291f1acf24d41e0 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Wed, 9 Nov 2011 17:50:51 -0500
Subject: [PATCH 06/16] CC-2870: Create testing infrastructure for testing
 upgrades

-try multiple times until ip address acquired.
---
 dev_tools/fabric/fab_setup.py | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/dev_tools/fabric/fab_setup.py b/dev_tools/fabric/fab_setup.py
index c1060631e..1f1a013e7 100644
--- a/dev_tools/fabric/fab_setup.py
+++ b/dev_tools/fabric/fab_setup.py
@@ -98,12 +98,16 @@ def create_fresh_os(os_version, os_arch):
     print "Please wait while attempting to acquire IP address"
         
     time.sleep(30)
-    
-    ret = local('VBoxManage --nologo guestproperty get "%s" /VirtualBox/GuestInfo/Net/0/V4/IP'%vm_name, capture=True)
-    
-    triple = ret.partition(':')
-    ip_addr = triple[2].strip(' \r\n')
-    print "Address found %s"%ip_addr
+
+    try_again = True
+    while try_again:
+        ret = local('VBoxManage --nologo guestproperty get "%s" /VirtualBox/GuestInfo/Net/0/V4/IP'%vm_name, capture=True)
+        triple = ret.partition(':')
+        ip_addr = triple[2].strip(' \r\n')
+        print "Address found %s"%ip_addr
+        
+        try_again = (len(ip_addr) == 0)
+        
     env.hosts.append(ip_addr)
     env.host_string = ip_addr
     

From 31942fa433811fba8c86916aa1be965126a11238 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Wed, 9 Nov 2011 18:08:00 -0500
Subject: [PATCH 07/16] CC-2870: Create testing infrastructure for testing
 upgrades

-1.9.4 needs apt-get update to be run before installing.
---
 dev_tools/fabric/fab_setup.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/dev_tools/fabric/fab_setup.py b/dev_tools/fabric/fab_setup.py
index 1f1a013e7..1f4316124 100644
--- a/dev_tools/fabric/fab_setup.py
+++ b/dev_tools/fabric/fab_setup.py
@@ -177,6 +177,10 @@ def airtime_182_tar():
     sudo('airtime-check-system')
     
 def airtime_194_tar():
+    #1.9.4 doesn't do apt-get update during install, and therefore the package index
+    #files are not resynchronized. Need to do this here.
+    sudo('apt-get update')
+    
     run('wget http://downloads.sourceforge.net/project/airtime/1.9.4/airtime-1.9.4.tar.gz')
     run('tar xfz airtime-1.9.4.tar.gz')
     sudo('cd ~/airtime-1.9.4/install_full/ubuntu && ./airtime-full-install')

From 99d610a4d3b12227336e339f698e89cbfde4f30d Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Wed, 9 Nov 2011 18:21:44 -0500
Subject: [PATCH 08/16] CC-2870: Create testing infrastructure for testing
 upgrades

-Some changes in preparation of a Debian testing VM
---
 dev_tools/fabric/fab_setup.py | 32 ++++++++++++++++++--------------
 1 file changed, 18 insertions(+), 14 deletions(-)

diff --git a/dev_tools/fabric/fab_setup.py b/dev_tools/fabric/fab_setup.py
index 1f4316124..2c636f0f3 100644
--- a/dev_tools/fabric/fab_setup.py
+++ b/dev_tools/fabric/fab_setup.py
@@ -15,7 +15,6 @@ from xml.dom.minidom import parse
 from xml.dom.minidom import Node
 from xml.dom.minidom import Element
 
-
 env.user = 'martin'
 env.password = 'test'
 env.hosts = []
@@ -53,11 +52,10 @@ def download_if_needed(vdi_dir, xml_dir, vm_name, vm_vdi_file, vm_xml_file):
         local("wget %s/%s/%s -O %s"%(env.vm_download_url, vm_name, vm_xml_file, os.path.join(xml_dir, vm_xml_file)))
        
 
-def create_fresh_os(os_version, os_arch):
+def create_fresh_os(vm_name, update_virtualenv=False):
     
-    vm_name = 'Ubuntu_%s_%s'%(os_version, os_arch)
-    vm_vdi_file = 'Ubuntu_%s_%s.vdi'%(os_version, os_arch)
-    vm_xml_file = 'Ubuntu_%s_%s.xml'%(os_version, os_arch)
+    vm_vdi_file = '%s.vdi'%vm_name
+    vm_xml_file = '%s.xml'%vm_name
     vdi_dir = os.path.expanduser('~/tmp/vms/%s'%vm_name)
     vdi_snapshot_dir = os.path.expanduser('~/tmp/vms/%s/Snapshots'%vm_name)
     xml_dir = os.path.expanduser('~/.VirtualBox')
@@ -111,32 +109,38 @@ def create_fresh_os(os_version, os_arch):
     env.hosts.append(ip_addr)
     env.host_string = ip_addr
     
-    if os_version == "10.04":
+    if update_virtualenv:
         print "Lucid detected - updating python virtualenv"
         sudo('apt-get update')
         sudo('apt-get install -y python-setuptools')
         sudo('wget http://apt.sourcefabric.org/pool/main/p/python-virtualenv/python-virtualenv_1.4.9-3_all.deb')
-        #sudo('echo "Y" | gdebi python-virtualenv_1.4.9-3_all.deb')
-        
-        #for some weird reason have to run dpkg after gdebi for the package to be configured :/
+
         sudo('dpkg -i python-virtualenv_1.4.9-3_all.deb')
 
 def ubuntu_lucid_32(fresh_os=True):
     if (fresh_os):
-        create_fresh_os('10.04', '32')
+        create_fresh_os('Ubuntu_10.04_32', update_virtualenv=True)
 
 def ubuntu_lucid_64(fresh_os=True):
     if (fresh_os):
-        create_fresh_os('10.04', '64')
+        create_fresh_os('Ubuntu_10.04_64', update_virtualenv=True)
 
 def ubuntu_natty_32(fresh_os=True):
     if (fresh_os):
-        create_fresh_os('11.04', '32')
+        create_fresh_os('Ubuntu_11.04_32')
     
 def ubuntu_natty_64(fresh_os=True):
     if (fresh_os):
-        create_fresh_os('11.04', '64')
-
+        create_fresh_os('Ubuntu_11.04_64')
+        
+def debian_squeeze_32(fresh_os=True):
+    if (fresh_os):
+        create_fresh_os('Debian_Squeeze_32')
+        
+def debian_squeeze_64(fresh_os=True):
+    if (fresh_os):
+        create_fresh_os('Debian_Squeeze_64')
+        
 def airtime_182_tar():
     sudo('apt-get update')
     sudo('apt-get install -y tar gzip unzip apache2 php5-pgsql libapache2-mod-php5 ' + \

From 1a585e3680607e5fd36598b1d87460c52e969bf8 Mon Sep 17 00:00:00 2001
From: lukabazuka <vladimir.stefanovic@sourcefabric.org>
Date: Thu, 10 Nov 2011 00:57:24 +0100
Subject: [PATCH 09/16] CC-2959 Status box design for each stream

Signed-off-by: lukabazuka <vladimir.stefanovic@sourcefabric.org>
---
 .../public/css/images/stream_status.png       | Bin 0 -> 1091 bytes
 airtime_mvc/public/css/styles.css             |  42 +++++++++++++++++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 airtime_mvc/public/css/images/stream_status.png

diff --git a/airtime_mvc/public/css/images/stream_status.png b/airtime_mvc/public/css/images/stream_status.png
new file mode 100644
index 0000000000000000000000000000000000000000..99c2ca38ca4a3b32e5dfada0438e6abc03be065c
GIT binary patch
literal 1091
zcmeAS@N?(olHy`uVBq!ia0vp^{6IX7gBeJgB`SReQj#UE5hcO-X(i=}MX3yqDfvmM
z3ZA)%>8U}fi7AzZCsS=07#JG@d_r8GGBQ5?ck&erOVm-OpO%)tK7S59$nfgxxynmg
zFRvVWs;j%~cIBO)hZ4>({L|J>zs&xIoBQILHTPfaylr6-v72$-?at%Nmpu7*Ds&ga
zkN5B2NJs>3Wr*Fw?X`np+2P*LX=!hTgdTc%bsS6Fcy7k)`nnHnZ10kiDo&cbF*Exl
zAdt0LD|9<U<Ozm#4;qg+I=1eJzN)SLQ%b6Eo!v8D-s3Z8zJGHi?gT@?E{2#h3_r`t
zo=%<mQeOU)jm_0BySCh)l(a|XTU=bw9)^X7+Fthb?8wb+UY$^WTCZfEN#Q2z%%kF|
zhlP$MBs>xm`~Uy{qup!vKAwAP@`PK?&aa<beEj9ezhA%BT<gp{D06+!j*_eL-!5PN
zaQyhrs|z<j=)2S1aeL$1C(9N+_;c*_-4na+%)dXeFJY(1%InSFB_$_b4xf5CVbZPO
zmk-Xpcysc_#Qs}f4&3~)@5Jj>_e)DR+;98w<NNFQ_y_N<Kl$+Br<mC9e?M{$>NOn;
zxS*^1WBKw`S0=nFEQr|0@c949<fy%=zzAz73GxdDI&vTZg9WR1Ixt<F^>lFzskrs#
zLU{C}00FiKCl%Ecm>8KjSrj=q6dRa=M5Mo!z1ds7ae>~t+UcLK`+le_%m2&xbKSGK
ztMl176p!=&zBa4$|HFvcjRD{1z0Pevys`G}&gCZM5oe!nI-90F{p>Y9rYjpPL$73b
z8)|+wV0AVP4)lMuwp;UBTS8`+;nW#Q#-Dl~pSdDbkv8+d{O^9fnZm}e8@qRA$(Zk|
zdt9>h=A7LPy}lc(S`GcC&+;uSX7*d|y6^L=ui>6gDhq#!ys~8so%(3eiSDcg%lVvA
z+NOtiUY+*G$K}GWzNhCxJttlHd}qeJ>5G&m?@Te8IlCud7pLH>>VpXd>-Dz0yX^cj
z)A#;A`NM6z(q=g~KKSo_R<!flzn^6v^?sRGZLhe!DM3<x>Dw}ETdO=llld+$bHa+h
zwf4;uNMO%cYFm@JpJ%)F7Y6QW>PPqA<~V++H+KK0l*Yv@>fe*^FXsQQ9rK9eoYou}
z?zNA<2KYSFN-ucuJmpE=;oLlx;(yE$>lC&;Iz0cz_NIVTNxr)i?jKa-csSQ)2miw~
zJO0i*hYNEX{`}$HaL$qCzGJhWn8!l>%?t7`I4xVh;Jdzsx{>@|`I(&Qjv054ugk04
kdv9&%H}?NOg%TK!Gu+&5=y>KFFp)8My85}Sb4q9e0AdMjegFUf

literal 0
HcmV?d00001

diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 9671cf476..20d9bc78e 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -2304,4 +2304,44 @@ tfoot tr th	{
 	-webkit-box-shadow: rgba(0, 0, 0, 0.4) 0 2px 2px inset;
 }
 #stream_url {font-size:12px; line-height: 170%;}
-.stream-setting-content fieldset {border-width:0 1px 1px 1px;}
\ No newline at end of file
+.stream-setting-content fieldset {border-width:0 1px 1px 1px;}
+
+/*---////////////////////    STREAM SETTINGS STATUS    ////////////////////---*/
+.stream-status {
+	border: 1px solid;
+	padding:2px 10px 4px 22px;
+	margin:2px 1px 10px 0px;
+	width: auto;
+}
+.stream-status h3 {
+	font-size: 12px;
+	font-weight: bold;
+	line-height: 12px;
+	padding:0;
+	margin:5px 4px 2px 4px;
+}
+.stream-status p {
+	padding:0;
+	margin:2px 3px 1px 4px;
+	color:#4F4F4F;
+	font-size: 11px;
+}
+.stream-config dd.stream-status	{
+	padding:2px 10px 4px 22px;
+	margin:4px 0 10px 14px;
+	width: 65%;
+}
+.status-good {
+	background:#e3ffc9 url(images/stream_status.png) no-repeat 5px 5px;
+	border-color:#54b300;
+}
+.status-good h3 {
+	color:#54b300;
+}
+.status-error {
+	background:#ffeded url(images/stream_status.png) no-repeat 5px -128px;
+	border-color:#f90000;
+}
+.status-error h3 {
+	color:#DA0101;
+}
\ No newline at end of file

From d174b39d5b8a7a5d07c7e6356ec8e90b3d21aea8 Mon Sep 17 00:00:00 2001
From: lukabazuka <vladimir.stefanovic@sourcefabric.org>
Date: Thu, 10 Nov 2011 02:03:02 +0100
Subject: [PATCH 10/16] CC-2836

Signed-off-by: lukabazuka <vladimir.stefanovic@sourcefabric.org>
---
 airtime_mvc/public/css/styles.css | 25 +++++++++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 20d9bc78e..a1945933e 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -1212,7 +1212,8 @@ button, input {
 
 .button-bar-top .input_text {
 	height:25px;
-	margin-right:6px
+	margin-right:6px;
+	padding: 0 3px;
 }
 .button-bar-top .input_text.hasDatepicker, .input_text.hasDatepicker {
 	background-image:url(images/input_with_calendar_bg.png);
@@ -1948,7 +1949,16 @@ dd .info-text-small {
     /*width:98.5%;*/
 	min-width:152px;
 }
-
+.stream-config .display_field dd input[type="text"], .stream-config .display_field dd textarea {
+	min-width:99%;
+	padding: 4px 3px;
+}
+.stream-config .display_field dd textarea {
+	min-height:60px;
+}
+.simple-formblock .display_field dd {
+	min-width:68%;
+}
 .stream-config dd input[id$=port] {
     width:152px;
 }
@@ -2306,6 +2316,17 @@ tfoot tr th	{
 #stream_url {font-size:12px; line-height: 170%;}
 .stream-setting-content fieldset {border-width:0 1px 1px 1px;}
 
+.stream-setting-content fieldset {
+    border-width: 0 1px 1px;
+}
+.stream-setting-content fieldset.display_field {
+    border: 1px solid #8F8F8F;
+    padding: 10px;
+}
+.stream-setting-content fieldset.display_field.closed {
+    border-width: 1px 0 0;
+}
+
 /*---////////////////////    STREAM SETTINGS STATUS    ////////////////////---*/
 .stream-status {
 	border: 1px solid;

From 18f21e480a4484ab7e13f45ad2730322dc142ab9 Mon Sep 17 00:00:00 2001
From: lukabazuka <vladimir.stefanovic@sourcefabric.org>
Date: Thu, 10 Nov 2011 02:17:58 +0100
Subject: [PATCH 11/16] CC-2438

Signed-off-by: lukabazuka <vladimir.stefanovic@sourcefabric.org>
---
 airtime_mvc/public/css/styles.css | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index a1945933e..c695fdb7d 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -241,7 +241,7 @@ select {
 	color:#a5a5a5;
 }
 
-.listen-control-block a {
+.listen-control-block a, .listen-control-button {
 	font-size:11px;
 	text-transform:uppercase;
 	padding:0;
@@ -251,9 +251,13 @@ select {
 	font-weight:bold;
 	margin-top:34px;
 	display:block;
+	text-align:center;
 	
 }
-.listen-control-block a span {
+.listen-control-button {
+	margin-top:6px;
+}
+.listen-control-block a span, .listen-control-button span {
 	background-color: #6e6e6e;
     background: -moz-linear-gradient(top, #868686 0, #6e6e6e 100%);
     background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #868686), color-stop(100%, #6e6e6e));
@@ -265,10 +269,13 @@ select {
 	text-shadow: #555555 0px -1px;
 	display:block;
 }
-.listen-control-block a:hover {
+.listen-control-button span {
+	padding:2px 10px;
+}
+.listen-control-block a:hover, .listen-control-button:hover {
 	border:1px solid #000;
 }
-.listen-control-block a:hover span {
+.listen-control-block a:hover span, .listen-control-button:hover span {
 	background-color: #292929;
     background: -moz-linear-gradient(top, #3b3b3b 0, #292929 100%);
     background: -webkit-gradient(linear, left top, left bottom, color-stop(0, #3b3b3b), color-stop(100%, #292929));

From cbe5b3e7f0d1c958da6f841b0477a21ea7d7d60f Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Thu, 10 Nov 2011 12:28:38 -0500
Subject: [PATCH 12/16] CC-2870: Create testing infrastructure for testing
 upgrades

-wait 1 second before reacquiring IP address
-use absolute instead of relative paths (fix for debian squeeze and sudo)
---
 dev_tools/fabric/fab_setup.py | 21 ++++++++++-----------
 1 file changed, 10 insertions(+), 11 deletions(-)

diff --git a/dev_tools/fabric/fab_setup.py b/dev_tools/fabric/fab_setup.py
index 2c636f0f3..32da51d71 100644
--- a/dev_tools/fabric/fab_setup.py
+++ b/dev_tools/fabric/fab_setup.py
@@ -45,12 +45,9 @@ def download_if_needed(vdi_dir, xml_dir, vm_name, vm_vdi_file, vm_xml_file):
         print "File %s not found. Downloading" % vm_vdi_file
         local("wget %s/%s/%s -O %s"%(env.vm_download_url, vm_name, vm_vdi_file, os.path.join(vdi_dir, vm_vdi_file)))
            
-    if os.path.exists(os.path.join(xml_dir, vm_xml_file)):
-        print "File %s already exists. No need to re-download" % os.path.join(xml_dir, vm_xml_file)
-    else:
-        print "File %s not found. Downloading" % vm_xml_file
-        local("wget %s/%s/%s -O %s"%(env.vm_download_url, vm_name, vm_xml_file, os.path.join(xml_dir, vm_xml_file)))
-       
+    local("rm -f %s"%os.path.join(xml_dir, vm_xml_file))
+    local("wget %s/%s/%s -O %s"%(env.vm_download_url, vm_name, vm_xml_file, os.path.join(xml_dir, vm_xml_file)))
+   
 
 def create_fresh_os(vm_name, update_virtualenv=False):
     
@@ -61,7 +58,7 @@ def create_fresh_os(vm_name, update_virtualenv=False):
     xml_dir = os.path.expanduser('~/.VirtualBox')
     vm_xml_path = os.path.join(xml_dir, vm_xml_file)
     
-
+    """
     if not os.path.exists("%s/vm_registered"%vdi_dir) and os.path.exists(vm_xml_path):
         #vm_xml file exists, but it wasn't registered. Did something go wrong on a previous attempt?
         #Let's attempt to correct this by completely removing the virtual machine.
@@ -79,6 +76,7 @@ def create_fresh_os(vm_name, update_virtualenv=False):
     
         os.remove(vm_xml_path)
         local("VBoxManage unregistervm %s --delete"% vm_name)
+    """
         
     download_if_needed(vdi_dir, xml_dir, vm_name, vm_vdi_file, vm_xml_file)
         
@@ -95,7 +93,7 @@ def create_fresh_os(vm_name, update_virtualenv=False):
     local('VBoxManage startvm %s'%vm_name)
     print "Please wait while attempting to acquire IP address"
         
-    time.sleep(30)
+    time.sleep(15)
 
     try_again = True
     while try_again:
@@ -105,6 +103,7 @@ def create_fresh_os(vm_name, update_virtualenv=False):
         print "Address found %s"%ip_addr
         
         try_again = (len(ip_addr) == 0)
+        time.sleep(1)
         
     env.hosts.append(ip_addr)
     env.host_string = ip_addr
@@ -187,12 +186,12 @@ def airtime_194_tar():
     
     run('wget http://downloads.sourceforge.net/project/airtime/1.9.4/airtime-1.9.4.tar.gz')
     run('tar xfz airtime-1.9.4.tar.gz')
-    sudo('cd ~/airtime-1.9.4/install_full/ubuntu && ./airtime-full-install')
+    sudo('cd /home/martin/airtime-1.9.4/install_full/ubuntu && ./airtime-full-install')
     
 def airtime_195_tar():
     run('wget http://downloads.sourceforge.net/project/airtime/1.9.5-RC4/airtime-1.9.5-RC4.tar.gz')
     run('tar xfz airtime-1.9.5-RC4.tar.gz')
-    sudo('cd ~/airtime-1.9.5/install_full/ubuntu && ./airtime-full-install')
+    sudo('cd /home/martin/airtime-1.9.5/install_full/ubuntu && ./airtime-full-install')
 
 def airtime_latest_deb():
     append('/etc/apt/sources.list', "deb http://apt.sourcefabric.org/ lucid main", use_sudo=True)
@@ -208,7 +207,7 @@ def airtime_git_branch(branch="devel"):
     sudo('apt-get update')
     sudo('apt-get install -y git-core')
     run('git clone https://github.com/sourcefabric/Airtime.git ~/airtime')
-    sudo('cd ~/airtime && git checkout %s && install_full/ubuntu/airtime-full-install || true' % branch)
+    sudo('cd /home/martin/airtime && git checkout %s && install_full/ubuntu/airtime-full-install || true' % branch)
 
 
 def airtime_200():

From de8ebc209aca42edcd0e27d66bac2ec42367d9e0 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Thu, 10 Nov 2011 12:45:04 -0500
Subject: [PATCH 13/16] CC-2870: Create testing infrastructure for testing
 upgrades

-debian needs debian-multimedia repository
---
 dev_tools/fabric/fab_setup.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/dev_tools/fabric/fab_setup.py b/dev_tools/fabric/fab_setup.py
index 32da51d71..566a71f6f 100644
--- a/dev_tools/fabric/fab_setup.py
+++ b/dev_tools/fabric/fab_setup.py
@@ -49,7 +49,7 @@ def download_if_needed(vdi_dir, xml_dir, vm_name, vm_vdi_file, vm_xml_file):
     local("wget %s/%s/%s -O %s"%(env.vm_download_url, vm_name, vm_xml_file, os.path.join(xml_dir, vm_xml_file)))
    
 
-def create_fresh_os(vm_name, update_virtualenv=False):
+def create_fresh_os(vm_name, update_virtualenv=False, debian=False):
     
     vm_vdi_file = '%s.vdi'%vm_name
     vm_xml_file = '%s.xml'%vm_name
@@ -115,6 +115,9 @@ def create_fresh_os(vm_name, update_virtualenv=False):
         sudo('wget http://apt.sourcefabric.org/pool/main/p/python-virtualenv/python-virtualenv_1.4.9-3_all.deb')
 
         sudo('dpkg -i python-virtualenv_1.4.9-3_all.deb')
+        
+    if debian:
+        append('/etc/apt/sources.list', "deb http://www.debian-multimedia.org squeeze main non-free", use_sudo=True)
 
 def ubuntu_lucid_32(fresh_os=True):
     if (fresh_os):
@@ -134,11 +137,11 @@ def ubuntu_natty_64(fresh_os=True):
         
 def debian_squeeze_32(fresh_os=True):
     if (fresh_os):
-        create_fresh_os('Debian_Squeeze_32')
+        create_fresh_os('Debian_Squeeze_32', debian=True)
         
 def debian_squeeze_64(fresh_os=True):
     if (fresh_os):
-        create_fresh_os('Debian_Squeeze_64')
+        create_fresh_os('Debian_Squeeze_64', debian=True)
         
 def airtime_182_tar():
     sudo('apt-get update')

From d4582d768ae6edc1323d5a2d2daacca998b46be3 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Thu, 10 Nov 2011 13:31:08 -0500
Subject: [PATCH 14/16] CC-2870: Create testing infrastructure for testing
 upgrades

-download file to temp file and the rename after to final name
---
 dev_tools/fabric/fab_setup.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/dev_tools/fabric/fab_setup.py b/dev_tools/fabric/fab_setup.py
index 566a71f6f..5b583027f 100644
--- a/dev_tools/fabric/fab_setup.py
+++ b/dev_tools/fabric/fab_setup.py
@@ -43,7 +43,9 @@ def download_if_needed(vdi_dir, xml_dir, vm_name, vm_vdi_file, vm_xml_file):
         print "File %s already exists. No need to re-download" % os.path.join(vdi_dir, vm_vdi_file)
     else:
         print "File %s not found. Downloading" % vm_vdi_file
-        local("wget %s/%s/%s -O %s"%(env.vm_download_url, vm_name, vm_vdi_file, os.path.join(vdi_dir, vm_vdi_file)))
+        tmpPath = local("mktemp", capture=True)
+        local("wget %s/%s/%s -O %s"%(env.vm_download_url, vm_name, vm_vdi_file, tmpPath))
+        os.rename(tmpPath, os.path.join(vdi_dir, vm_vdi_file))
            
     local("rm -f %s"%os.path.join(xml_dir, vm_xml_file))
     local("wget %s/%s/%s -O %s"%(env.vm_download_url, vm_name, vm_xml_file, os.path.join(xml_dir, vm_xml_file)))
@@ -192,8 +194,8 @@ def airtime_194_tar():
     sudo('cd /home/martin/airtime-1.9.4/install_full/ubuntu && ./airtime-full-install')
     
 def airtime_195_tar():
-    run('wget http://downloads.sourceforge.net/project/airtime/1.9.5-RC4/airtime-1.9.5-RC4.tar.gz')
-    run('tar xfz airtime-1.9.5-RC4.tar.gz')
+    run('wget http://downloads.sourceforge.net/project/airtime/1.9.5-RC5/airtime-1.9.5-RC5.tar.gz')
+    run('tar xfz airtime-1.9.5-RC5.tar.gz')
     sudo('cd /home/martin/airtime-1.9.5/install_full/ubuntu && ./airtime-full-install')
 
 def airtime_latest_deb():

From 605c69c975fd0060f51ad9b110ea4b20c2786e01 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Thu, 10 Nov 2011 14:27:49 -0500
Subject: [PATCH 15/16] CC-2978: Install fails on Ubuntu 11.10

-initial commit
---
 install_minimal/airtime-install | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install
index 7aa9c963e..f62daa600 100755
--- a/install_minimal/airtime-install
+++ b/install_minimal/airtime-install
@@ -47,8 +47,17 @@ $SCRIPTPATH/include/airtime-initialize.sh $@
 
 #Hack to parse rabbitmq pid and place it into the correct directory. This is also
 #done in our rabbitmq init.d script, but placing it here so that monit recognizes 
-# it faster (in time for the airtime-check-system)
-sed "s/.*,\(.*\)\}.*/\1/" /var/lib/rabbitmq/pids > /var/run/rabbitmq.pid
+# it faster (in time for the upcoming airtime-check-system)
+codename=`lsb_release -cs`
+if [ "$codename" == "oneiric" ];
+then
+    rabbitmqstatus=`/etc/init.d/rabbitmq-server status | grep "\[{pid"`
+    rabbitmqpid=`echo $rabbitmqstatus | sed "s/.*,\(.*\)\}.*/\1/"`
+else
+    rabbitmqpid=`sed "s/.*,\(.*\)\}.*/\1/" /var/lib/rabbitmq/pids`
+fi
+echo "RabbitMQ PID: $rabbitmqpid"
+echo "$rabbitmqpid" > /var/run/rabbitmq.pid
 
 echo -e "\n*** Verifying your system environment, running airtime-check-system ***"
 sleep 10

From c2eae518c4bca86508fa2463bb240d3336d849f4 Mon Sep 17 00:00:00 2001
From: Martin Konecny <martin@localhost.localdomain>
Date: Thu, 10 Nov 2011 14:42:46 -0500
Subject: [PATCH 16/16] CC-2978: Install fails on Ubuntu 11.10

-fixed for oneiric version of rabbitmq
---
 install_minimal/airtime-install             | 14 +-------------
 python_apps/monit/monit-airtime-generic.cfg |  2 +-
 utils/rabbitmq-update-pid.sh                | 15 +++++++++++++++
 3 files changed, 17 insertions(+), 14 deletions(-)
 create mode 100755 utils/rabbitmq-update-pid.sh

diff --git a/install_minimal/airtime-install b/install_minimal/airtime-install
index f62daa600..7859e1c23 100755
--- a/install_minimal/airtime-install
+++ b/install_minimal/airtime-install
@@ -45,19 +45,7 @@ python $AIRTIMEROOT/python_apps/create-pypo-user.py
 $SCRIPTPATH/include/airtime-copy-files.sh
 $SCRIPTPATH/include/airtime-initialize.sh $@
 
-#Hack to parse rabbitmq pid and place it into the correct directory. This is also
-#done in our rabbitmq init.d script, but placing it here so that monit recognizes 
-# it faster (in time for the upcoming airtime-check-system)
-codename=`lsb_release -cs`
-if [ "$codename" == "oneiric" ];
-then
-    rabbitmqstatus=`/etc/init.d/rabbitmq-server status | grep "\[{pid"`
-    rabbitmqpid=`echo $rabbitmqstatus | sed "s/.*,\(.*\)\}.*/\1/"`
-else
-    rabbitmqpid=`sed "s/.*,\(.*\)\}.*/\1/" /var/lib/rabbitmq/pids`
-fi
-echo "RabbitMQ PID: $rabbitmqpid"
-echo "$rabbitmqpid" > /var/run/rabbitmq.pid
+/usr/lib/airtime/utils/rabbitmq-update-pid.sh
 
 echo -e "\n*** Verifying your system environment, running airtime-check-system ***"
 sleep 10
diff --git a/python_apps/monit/monit-airtime-generic.cfg b/python_apps/monit/monit-airtime-generic.cfg
index 03f0d0173..791a401e3 100644
--- a/python_apps/monit/monit-airtime-generic.cfg
+++ b/python_apps/monit/monit-airtime-generic.cfg
@@ -6,5 +6,5 @@
 
  check process rabbitmq-server
     with pidfile "/var/run/rabbitmq.pid"
-    start program = "/bin/bash -c '/etc/init.d/rabbitmq-server start; sed "s/.*,\(.*\)\}.*/\1/" /var/lib/rabbitmq/pids > /var/run/rabbitmq.pid'"
+    start program = "/bin/bash -c '/etc/init.d/rabbitmq-server start; /usr/lib/airtime/utils/rabbitmq-update-pid.sh'"
     stop program = "/etc/init.d/rabbitmq-server stop"
diff --git a/utils/rabbitmq-update-pid.sh b/utils/rabbitmq-update-pid.sh
new file mode 100755
index 000000000..79a8204b3
--- /dev/null
+++ b/utils/rabbitmq-update-pid.sh
@@ -0,0 +1,15 @@
+#!/bin/bash
+
+#Hack to parse rabbitmq pid and place it into the correct directory. This is also
+#done in our rabbitmq init.d script, but placing it here so that monit recognizes 
+# it faster (in time for the upcoming airtime-check-system)
+codename=`lsb_release -cs`
+if [ "$codename" == "oneiric" ];
+then
+    rabbitmqstatus=`/etc/init.d/rabbitmq-server status | grep "\[{pid"`
+    rabbitmqpid=`echo $rabbitmqstatus | sed "s/.*,\(.*\)\}.*/\1/"`
+else
+    rabbitmqpid=`sed "s/.*,\(.*\)\}.*/\1/" /var/lib/rabbitmq/pids`
+fi
+echo "RabbitMQ PID: $rabbitmqpid"
+echo "$rabbitmqpid" > /var/run/rabbitmq.pid