From adb0d3bb744f3c4ed86201a8f811f16a0b9f87de Mon Sep 17 00:00:00 2001 From: David Amorim Faria Date: Wed, 25 Nov 2015 01:41:22 +0100 Subject: [PATCH 1/4] CLOUDSTACK-9065: fix bug when creating packaging with noredist flag --- packaging/package.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packaging/package.sh b/packaging/package.sh index 484b398a1d7..8a876615123 100755 --- a/packaging/package.sh +++ b/packaging/package.sh @@ -102,7 +102,7 @@ function packaging() { echo ". executing rpmbuild" cp "$DISTRO/cloud.spec" "$RPMDIR/SPECS" - (cd "$RPMDIR"; rpmbuild --define "_topdir ${RPMDIR}" "${DEFVER}" "${DEFREL}" ${DEFPRE+"$DEFPRE"} ${DEFOSSNOSS+$DEFOSSNOSS} ${DEFSIM+"$DEFSIM"} -bb SPECS/cloud.spec) + (cd "$RPMDIR"; rpmbuild --define "_topdir ${RPMDIR}" "${DEFVER}" "${DEFREL}" ${DEFPRE+"$DEFPRE"} ${DEFOSSNOSS+"$DEFOSSNOSS"} ${DEFSIM+"$DEFSIM"} -bb SPECS/cloud.spec) if [ $? -ne 0 ]; then echo "RPM Build Failed " exit 3 From 9b0b69d9c8cb6bdc0232c7af0efcb45974f533d2 Mon Sep 17 00:00:00 2001 From: Remi Bergsma Date: Mon, 23 Nov 2015 13:22:02 +0100 Subject: [PATCH 2/4] CLOUDSTACK-9077 Fix injectkeys.sh to work on CentOS7 --- scripts/vm/systemvm/injectkeys.sh | 19 ++++++++++++------- 1 file changed, 12 insertions(+), 7 deletions(-) diff --git a/scripts/vm/systemvm/injectkeys.sh b/scripts/vm/systemvm/injectkeys.sh index f69e33168d7..6f224cdddcf 100755 --- a/scripts/vm/systemvm/injectkeys.sh +++ b/scripts/vm/systemvm/injectkeys.sh @@ -85,14 +85,19 @@ systemvmpath=$3 command -v mkisofs > /dev/null || (echo "$(basename $0): mkisofs not found, please install or ensure PATH is accurate" ; exit 4) -# if running into Docker as unprivileges, skip ssh verification as iso cannot be mounted. -if [ -e /dev/loop0 ]; then +# if running into Docker as unprivileges, skip ssh verification as iso cannot be mounted due to missing loop device. +if [ -f /.dockerinit ]; then + if [ -e /dev/loop0 ]; then + # it's a docker instance with privileges. + inject_into_iso systemvm.iso $newpubkey + [ $? -ne 0 ] && exit 5 + copy_priv_key $newprivkey + else + # this mean it's a docker instance, ssh key cannot be verify. + echo "We run inside Docker, skipping ssh key insertion in systemvm.iso" + fi +else inject_into_iso systemvm.iso $newpubkey [ $? -ne 0 ] && exit 5 copy_priv_key $newprivkey -else - # this mean it's a docker instance, ssh key cannot be verify. - echo "No loop device found, skipping ssh key insertion in systemvm.iso" fi - -exit $? From 001169f08f5d315620cb1860a82e4b08d996d8c9 Mon Sep 17 00:00:00 2001 From: SrikanteswaraRao Talluri Date: Thu, 26 Nov 2015 00:07:43 +0530 Subject: [PATCH 3/4] Change references of people.apache.org to home.apache.org in the test code This closes #1123 Signed-off-by: SrikanteswaraRao Talluri --- .../component/test_project_usage.py | 2 +- .../component/test_reset_ssh_keypair.py | 2 +- test/integration/component/test_tags.py | 2 +- test/integration/component/test_usage.py | 2 +- .../component/test_vm_passwdenabled.py | 2 +- test/integration/component/test_volumes.py | 2 +- .../testpaths/testpath_stopped_vm.py | 4 +-- tools/marvin/marvin/config/test_data.py | 36 +++++++++---------- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py index cb95d89d996..f249b33c00f 100644 --- a/test/integration/component/test_project_usage.py +++ b/test/integration/component/test_project_usage.py @@ -98,7 +98,7 @@ class Services: "iso": { "displaytext": "Test ISO", "name": "Test ISO", - "url": "http://people.apache.org/~tsp/dummy.iso", + "url": "https://home.apache.org/~talluri/dummy.iso", # Source URL where ISO is located "isextractable": True, "isfeatured": True, diff --git a/test/integration/component/test_reset_ssh_keypair.py b/test/integration/component/test_reset_ssh_keypair.py index db7e9b82d98..4fd07fa46eb 100644 --- a/test/integration/component/test_reset_ssh_keypair.py +++ b/test/integration/component/test_reset_ssh_keypair.py @@ -188,7 +188,7 @@ class TestResetSSHKeypair(cloudstackTestCase): # similar steps to get SSH key from web so as to make it ssh enabled cmds = [ - "cd /etc/init.d;wget http://people.apache.org/~tsp/cloud-set-guest-password", + "cd /etc/init.d;wget https://home.apache.org/~talluri/cloud-set-guest-password", "chmod +x /etc/init.d/cloud-set-guest-password", "chkconfig --add cloud-set-guest-password", "cd /etc/init.d;wget http://downloads.sourceforge.net/project/cloudstack/SSH%20Key%20Gen%20Script/" + \ diff --git a/test/integration/component/test_tags.py b/test/integration/component/test_tags.py index 3552064d180..310f305af28 100644 --- a/test/integration/component/test_tags.py +++ b/test/integration/component/test_tags.py @@ -124,7 +124,7 @@ class Services: { "displaytext": "Dummy ISO", "name": "Dummy ISO", - "url": "http://people.apache.org/~tsp/dummy.iso", + "url": "https://home.apache.org/~talluri/dummy.iso", # Source URL where ISO is located "isextractable": True, "isfeatured": True, diff --git a/test/integration/component/test_usage.py b/test/integration/component/test_usage.py index 3bbef399a3f..11f1833c472 100644 --- a/test/integration/component/test_usage.py +++ b/test/integration/component/test_usage.py @@ -93,7 +93,7 @@ class Services: "iso": { "displaytext": "Test ISO", "name": "Test ISO", - "url": "http://people.apache.org/~tsp/dummy.iso", + "url": "https://home.apache.org/~talluri/dummy.iso", # Source URL where ISO is located "isextractable": True, "isfeatured": True, diff --git a/test/integration/component/test_vm_passwdenabled.py b/test/integration/component/test_vm_passwdenabled.py index d340031935c..0b036f724b5 100644 --- a/test/integration/component/test_vm_passwdenabled.py +++ b/test/integration/component/test_vm_passwdenabled.py @@ -167,7 +167,7 @@ class TestVMPasswordEnabled(cloudstackTestCase): # chkconfig --add cloud-set-guest-password cmds = [ - "cd /etc/init.d;wget http://people.apache.org/~tsp/cloud-set-guest-password", + "cd /etc/init.d;wget https://home.apache.org/~talluri/cloud-set-guest-password", "chmod +x /etc/init.d/cloud-set-guest-password", "chkconfig --add cloud-set-guest-password", ] diff --git a/test/integration/component/test_volumes.py b/test/integration/component/test_volumes.py index 12c8f9de347..39f6b52af14 100644 --- a/test/integration/component/test_volumes.py +++ b/test/integration/component/test_volumes.py @@ -88,7 +88,7 @@ class Services: { "displaytext": "Test ISO", "name": "testISO", - "url": "http://people.apache.org/~tsp/dummy.iso", + "url": "https://home.apache.org/~talluri/dummy.iso", # Source URL where ISO is located "ostype": 'CentOS 5.3 (64-bit)', }, diff --git a/test/integration/testpaths/testpath_stopped_vm.py b/test/integration/testpaths/testpath_stopped_vm.py index 927dbd99d9c..190fb1364d6 100644 --- a/test/integration/testpaths/testpath_stopped_vm.py +++ b/test/integration/testpaths/testpath_stopped_vm.py @@ -829,8 +829,8 @@ class TestAdvancedZoneStoppedVM(cloudstackTestCase): # similar steps to get SSH key from web so as to make it ssh enabled cmds = [ - "cd /etc/init.d;wget http://people.apache.org/~tsp/\ - cloud-set-guest-password", + "cd /etc/init.d;wget https://home.apache.org/~talluri/ \ + cloud-set-guest-password", "chmod +x /etc/init.d/cloud-set-guest-password", "chkconfig --add cloud-set-guest-password"] for c in cmds: diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py index 3d4745d0cd4..177fe29b498 100644 --- a/tools/marvin/marvin/config/test_data.py +++ b/tools/marvin/marvin/config/test_data.py @@ -744,7 +744,7 @@ test_data = { "iso": { "displaytext": "Test ISO", "name": "ISO", - "url": "http://people.apache.org/~tsp/dummy.iso", + "url": "https://home.apache.org/~talluri/dummy.iso", "bootable": False, "ispublic": False, "ostype": "Other (64-bit)", @@ -752,7 +752,7 @@ test_data = { "iso1": { "displaytext": "Test ISO 1", "name": "ISO 1", - "url": "http://people.apache.org/~tsp/dummy.iso", + "url": "https://home.apache.org/~talluri/dummy.iso", "isextractable": True, "isfeatured": True, "ispublic": True, @@ -761,7 +761,7 @@ test_data = { "iso2": { "displaytext": "Test ISO 2", "name": "ISO 2", - "url": "http://people.apache.org/~tsp/dummy.iso", + "url": "https://home.apache.org/~talluri/dummy.iso", "isextractable": True, "isfeatured": True, "ispublic": True, @@ -786,7 +786,7 @@ test_data = { "name": "Centos", "passwordenabled": False, "ostype": "CentOS 6.3 (64-bit)", - "url": "http://people.apache.org/~sanjeev/centos63.ova", + "url": "https://home.apache.org/~talluri/centos63.ova", "format": "OVA", "ispublic": "true" }, @@ -804,7 +804,7 @@ test_data = { "displaytext": "Windows 7 (64-bit)", "name": "Windows 7 (64-bit)", "passwordenabled": False, - "url": "http://people.apache.org/~sanjeev/windows7.vhd", + "url": "https://home.apache.org/~talluri/windows7.vhd", "format": "VHD", "ostype": "Windows 7 (64-bit)", "ispublic": "true", @@ -836,7 +836,7 @@ test_data = { "displaytext": "win2012", "name": "win2012", "passwordenabled": False, - "url": "http://people.apache.org/~sanjeev/new-test-win.ova", + "url": "https://home.apache.org/~talluri/new-test-win.ova", "format": "OVA", "ostype": "Windows 8 (64-bit)", }, @@ -844,7 +844,7 @@ test_data = { "displaytext": "Rhel60", "name": "Rhel60", "passwordenabled": False, - "url": "http://people.apache.org/~sanjeev/Rhel6-64bit.ova", + "url": "https://home.apache.org/~talluri/Rhel6-64bit.ova", "format": "OVA", "ostype": "Red Hat Enterprise Linux 6.0 (64-bit)" }, @@ -852,7 +852,7 @@ test_data = { "displaytext": "xs", "name": "xs", "passwordenabled": False, - "url": "http://people.apache.org/~sanjeev/ttylinux_pv.vhd.bz2", + "url": "https://home.apache.org/~talluri/ttylinux_pv.vhd.bz2", "format": "VHD" }, "security_group": {"name": "custom_Sec_Grp"}, @@ -1064,7 +1064,7 @@ test_data = { "displaytext": "RHEL7 (64-bit)", "name": "RHEL 7 Insta1", "passwordenabled": False, - "url": "http://people.apache.org/~sanjeev/RHEL764bitwithtools.vhd", + "url": "https://home.apache.org/~talluri/RHEL764bitwithtools.vhd", "format": "VHD" , "ostype": "RHEL 7 (64-bit)", "ispublic": "true", @@ -1518,7 +1518,7 @@ test_data = { "displaytext": "Windows 8 (64-bit)", "name": "win8withpvxen", "passwordenabled": False, - "url": "http://people.apache.org/~sanjeev/79211594-1d4a-4dee-ae6c-c5c315ded2be.vhd", + "url": "https://home.apache.org/~talluri/79211594-1d4a-4dee-ae6c-c5c315ded2be.vhd", "format": "VHD" , "ostype": "Windows 8 (64-bit)", "ispublic": "true", @@ -1547,17 +1547,17 @@ test_data = { "browser_upload_volume":{ "VHD": { "diskname": "XenUploadVol", - "url": "http://people.apache.org/~sanjeev/rajani-thin-volume.vhd", + "url": "https://home.apache.org/~talluri/rajani-thin-volume.vhd", "checksum": "09b08b6abb1b903fca7711d3ac8d6598", }, "OVA": { "diskname": "VMwareUploadVol", - "url": "http://people.apache.org/~sanjeev/CentOS5.5(64bit)-vmware-autoscale.ova", + "url": "https://home.apache.org/~talluri/CentOS5.5(64bit)-vmware-autoscale.ova", "checksum": "da997b697feaa2f1f6e0d4785b0cece2", }, "QCOW2": { "diskname": "KVMUploadVol", - "url": "http://people.apache.org/~sanjeev/rajani-thin-volume.qcow2", + "url": "https://home.apache.org/~talluri/rajani-thin-volume.qcow2", "checksum": "02de0576dd3a61ab59c03fd795fc86ac", }, 'browser_resized_disk_offering': { @@ -1570,7 +1570,7 @@ test_data = { "VHD": { "templatename": "XenUploadtemplate", "displaytext": "XenUploadtemplate", - "url": "http://people.apache.org/~sanjeev/centos56-x86_64.vhd.bz2", + "url": "https://home.apache.org/~talluri/centos56-x86_64.vhd.bz2", "hypervisor":"XenServer", "checksum": "09b08b6abb1b903fca7711d3ac8d6598", "ostypeid":"74affaea-c658-11e4-ad38-a6d1374244b4" @@ -1578,7 +1578,7 @@ test_data = { "OVA": { "templatename": "VMwareUploadtemplate", "displaytext": "VMwareUploadtemplate", - "url": "http://people.apache.org/~sanjeev/CentOS5.3-x86_64.ova", + "url": "https://home.apache.org/~talluri/CentOS5.3-x86_64.ova", "checksum": "02de0576dd3a61ab59c03fd795fc86ac", "hypervisor":"VMware", "ostypeid":"74affaea-c658-11e4-ad38-a6d1374244b4" @@ -1586,7 +1586,7 @@ test_data = { "QCOW2": { "templatename": "KVMUploadtemplate", "displaytext": "VMwareUploadtemplate", - "url": "http://people.apache.org/~sanjeev/eec2209b-9875-3c8d-92be-c001bd8a0faf.qcow2.bz2", + "url": "https://home.apache.org/~talluri/eec2209b-9875-3c8d-92be-c001bd8a0faf.qcow2.bz2", "checksum": "da997b697feaa2f1f6e0d4785b0cece2", "hypervisor":"KVM", "ostypeid":"2e02e376-cdf3-11e4-beb3-8aa6272b57ef" @@ -1661,7 +1661,7 @@ test_data = { "name": "testISO", "bootable": True, "ispublic": False, - "url": "http://people.apache.org/~sanjeev/CentOS-6.3-x86_64-bin-DVD1.iso", + "url": "https://home.apache.org/~talluri/CentOS-6.3-x86_64-bin-DVD1.iso", "ostype": 'CentOS 6.3 (64-bit)', "mode": 'HTTP_DOWNLOAD' }, @@ -1676,7 +1676,7 @@ test_data = { "isextractable": True, "mode": "HTTP_DOWNLOAD", "templatefilter": "self", - "url": "http://people.apache.org/~sanjeev/systemvm64template-2014-09-30-4.3-vmware.ova", + "url": "https://home.apache.org/~talluri/systemvm64template-2014-09-30-4.3-vmware.ova", "hypervisor": "vmware", "format": "OVA", "nicadapter": "vmxnet3", From ab385c814f5e76a0c7da3ed1ec0c333d2c3139c8 Mon Sep 17 00:00:00 2001 From: Srikanteswararao Talluri Date: Thu, 26 Nov 2015 12:07:49 +0530 Subject: [PATCH 4/4] Revert "Change references of people.apache.org to home.apache.org in the test code" This reverts commit 001169f08f5d315620cb1860a82e4b08d996d8c9. --- .../component/test_project_usage.py | 2 +- .../component/test_reset_ssh_keypair.py | 2 +- test/integration/component/test_tags.py | 2 +- test/integration/component/test_usage.py | 2 +- .../component/test_vm_passwdenabled.py | 2 +- test/integration/component/test_volumes.py | 2 +- .../testpaths/testpath_stopped_vm.py | 4 +-- tools/marvin/marvin/config/test_data.py | 36 +++++++++---------- 8 files changed, 26 insertions(+), 26 deletions(-) diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py index f249b33c00f..cb95d89d996 100644 --- a/test/integration/component/test_project_usage.py +++ b/test/integration/component/test_project_usage.py @@ -98,7 +98,7 @@ class Services: "iso": { "displaytext": "Test ISO", "name": "Test ISO", - "url": "https://home.apache.org/~talluri/dummy.iso", + "url": "http://people.apache.org/~tsp/dummy.iso", # Source URL where ISO is located "isextractable": True, "isfeatured": True, diff --git a/test/integration/component/test_reset_ssh_keypair.py b/test/integration/component/test_reset_ssh_keypair.py index 4fd07fa46eb..db7e9b82d98 100644 --- a/test/integration/component/test_reset_ssh_keypair.py +++ b/test/integration/component/test_reset_ssh_keypair.py @@ -188,7 +188,7 @@ class TestResetSSHKeypair(cloudstackTestCase): # similar steps to get SSH key from web so as to make it ssh enabled cmds = [ - "cd /etc/init.d;wget https://home.apache.org/~talluri/cloud-set-guest-password", + "cd /etc/init.d;wget http://people.apache.org/~tsp/cloud-set-guest-password", "chmod +x /etc/init.d/cloud-set-guest-password", "chkconfig --add cloud-set-guest-password", "cd /etc/init.d;wget http://downloads.sourceforge.net/project/cloudstack/SSH%20Key%20Gen%20Script/" + \ diff --git a/test/integration/component/test_tags.py b/test/integration/component/test_tags.py index 310f305af28..3552064d180 100644 --- a/test/integration/component/test_tags.py +++ b/test/integration/component/test_tags.py @@ -124,7 +124,7 @@ class Services: { "displaytext": "Dummy ISO", "name": "Dummy ISO", - "url": "https://home.apache.org/~talluri/dummy.iso", + "url": "http://people.apache.org/~tsp/dummy.iso", # Source URL where ISO is located "isextractable": True, "isfeatured": True, diff --git a/test/integration/component/test_usage.py b/test/integration/component/test_usage.py index 11f1833c472..3bbef399a3f 100644 --- a/test/integration/component/test_usage.py +++ b/test/integration/component/test_usage.py @@ -93,7 +93,7 @@ class Services: "iso": { "displaytext": "Test ISO", "name": "Test ISO", - "url": "https://home.apache.org/~talluri/dummy.iso", + "url": "http://people.apache.org/~tsp/dummy.iso", # Source URL where ISO is located "isextractable": True, "isfeatured": True, diff --git a/test/integration/component/test_vm_passwdenabled.py b/test/integration/component/test_vm_passwdenabled.py index 0b036f724b5..d340031935c 100644 --- a/test/integration/component/test_vm_passwdenabled.py +++ b/test/integration/component/test_vm_passwdenabled.py @@ -167,7 +167,7 @@ class TestVMPasswordEnabled(cloudstackTestCase): # chkconfig --add cloud-set-guest-password cmds = [ - "cd /etc/init.d;wget https://home.apache.org/~talluri/cloud-set-guest-password", + "cd /etc/init.d;wget http://people.apache.org/~tsp/cloud-set-guest-password", "chmod +x /etc/init.d/cloud-set-guest-password", "chkconfig --add cloud-set-guest-password", ] diff --git a/test/integration/component/test_volumes.py b/test/integration/component/test_volumes.py index 39f6b52af14..12c8f9de347 100644 --- a/test/integration/component/test_volumes.py +++ b/test/integration/component/test_volumes.py @@ -88,7 +88,7 @@ class Services: { "displaytext": "Test ISO", "name": "testISO", - "url": "https://home.apache.org/~talluri/dummy.iso", + "url": "http://people.apache.org/~tsp/dummy.iso", # Source URL where ISO is located "ostype": 'CentOS 5.3 (64-bit)', }, diff --git a/test/integration/testpaths/testpath_stopped_vm.py b/test/integration/testpaths/testpath_stopped_vm.py index 190fb1364d6..927dbd99d9c 100644 --- a/test/integration/testpaths/testpath_stopped_vm.py +++ b/test/integration/testpaths/testpath_stopped_vm.py @@ -829,8 +829,8 @@ class TestAdvancedZoneStoppedVM(cloudstackTestCase): # similar steps to get SSH key from web so as to make it ssh enabled cmds = [ - "cd /etc/init.d;wget https://home.apache.org/~talluri/ \ - cloud-set-guest-password", + "cd /etc/init.d;wget http://people.apache.org/~tsp/\ + cloud-set-guest-password", "chmod +x /etc/init.d/cloud-set-guest-password", "chkconfig --add cloud-set-guest-password"] for c in cmds: diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py index 177fe29b498..3d4745d0cd4 100644 --- a/tools/marvin/marvin/config/test_data.py +++ b/tools/marvin/marvin/config/test_data.py @@ -744,7 +744,7 @@ test_data = { "iso": { "displaytext": "Test ISO", "name": "ISO", - "url": "https://home.apache.org/~talluri/dummy.iso", + "url": "http://people.apache.org/~tsp/dummy.iso", "bootable": False, "ispublic": False, "ostype": "Other (64-bit)", @@ -752,7 +752,7 @@ test_data = { "iso1": { "displaytext": "Test ISO 1", "name": "ISO 1", - "url": "https://home.apache.org/~talluri/dummy.iso", + "url": "http://people.apache.org/~tsp/dummy.iso", "isextractable": True, "isfeatured": True, "ispublic": True, @@ -761,7 +761,7 @@ test_data = { "iso2": { "displaytext": "Test ISO 2", "name": "ISO 2", - "url": "https://home.apache.org/~talluri/dummy.iso", + "url": "http://people.apache.org/~tsp/dummy.iso", "isextractable": True, "isfeatured": True, "ispublic": True, @@ -786,7 +786,7 @@ test_data = { "name": "Centos", "passwordenabled": False, "ostype": "CentOS 6.3 (64-bit)", - "url": "https://home.apache.org/~talluri/centos63.ova", + "url": "http://people.apache.org/~sanjeev/centos63.ova", "format": "OVA", "ispublic": "true" }, @@ -804,7 +804,7 @@ test_data = { "displaytext": "Windows 7 (64-bit)", "name": "Windows 7 (64-bit)", "passwordenabled": False, - "url": "https://home.apache.org/~talluri/windows7.vhd", + "url": "http://people.apache.org/~sanjeev/windows7.vhd", "format": "VHD", "ostype": "Windows 7 (64-bit)", "ispublic": "true", @@ -836,7 +836,7 @@ test_data = { "displaytext": "win2012", "name": "win2012", "passwordenabled": False, - "url": "https://home.apache.org/~talluri/new-test-win.ova", + "url": "http://people.apache.org/~sanjeev/new-test-win.ova", "format": "OVA", "ostype": "Windows 8 (64-bit)", }, @@ -844,7 +844,7 @@ test_data = { "displaytext": "Rhel60", "name": "Rhel60", "passwordenabled": False, - "url": "https://home.apache.org/~talluri/Rhel6-64bit.ova", + "url": "http://people.apache.org/~sanjeev/Rhel6-64bit.ova", "format": "OVA", "ostype": "Red Hat Enterprise Linux 6.0 (64-bit)" }, @@ -852,7 +852,7 @@ test_data = { "displaytext": "xs", "name": "xs", "passwordenabled": False, - "url": "https://home.apache.org/~talluri/ttylinux_pv.vhd.bz2", + "url": "http://people.apache.org/~sanjeev/ttylinux_pv.vhd.bz2", "format": "VHD" }, "security_group": {"name": "custom_Sec_Grp"}, @@ -1064,7 +1064,7 @@ test_data = { "displaytext": "RHEL7 (64-bit)", "name": "RHEL 7 Insta1", "passwordenabled": False, - "url": "https://home.apache.org/~talluri/RHEL764bitwithtools.vhd", + "url": "http://people.apache.org/~sanjeev/RHEL764bitwithtools.vhd", "format": "VHD" , "ostype": "RHEL 7 (64-bit)", "ispublic": "true", @@ -1518,7 +1518,7 @@ test_data = { "displaytext": "Windows 8 (64-bit)", "name": "win8withpvxen", "passwordenabled": False, - "url": "https://home.apache.org/~talluri/79211594-1d4a-4dee-ae6c-c5c315ded2be.vhd", + "url": "http://people.apache.org/~sanjeev/79211594-1d4a-4dee-ae6c-c5c315ded2be.vhd", "format": "VHD" , "ostype": "Windows 8 (64-bit)", "ispublic": "true", @@ -1547,17 +1547,17 @@ test_data = { "browser_upload_volume":{ "VHD": { "diskname": "XenUploadVol", - "url": "https://home.apache.org/~talluri/rajani-thin-volume.vhd", + "url": "http://people.apache.org/~sanjeev/rajani-thin-volume.vhd", "checksum": "09b08b6abb1b903fca7711d3ac8d6598", }, "OVA": { "diskname": "VMwareUploadVol", - "url": "https://home.apache.org/~talluri/CentOS5.5(64bit)-vmware-autoscale.ova", + "url": "http://people.apache.org/~sanjeev/CentOS5.5(64bit)-vmware-autoscale.ova", "checksum": "da997b697feaa2f1f6e0d4785b0cece2", }, "QCOW2": { "diskname": "KVMUploadVol", - "url": "https://home.apache.org/~talluri/rajani-thin-volume.qcow2", + "url": "http://people.apache.org/~sanjeev/rajani-thin-volume.qcow2", "checksum": "02de0576dd3a61ab59c03fd795fc86ac", }, 'browser_resized_disk_offering': { @@ -1570,7 +1570,7 @@ test_data = { "VHD": { "templatename": "XenUploadtemplate", "displaytext": "XenUploadtemplate", - "url": "https://home.apache.org/~talluri/centos56-x86_64.vhd.bz2", + "url": "http://people.apache.org/~sanjeev/centos56-x86_64.vhd.bz2", "hypervisor":"XenServer", "checksum": "09b08b6abb1b903fca7711d3ac8d6598", "ostypeid":"74affaea-c658-11e4-ad38-a6d1374244b4" @@ -1578,7 +1578,7 @@ test_data = { "OVA": { "templatename": "VMwareUploadtemplate", "displaytext": "VMwareUploadtemplate", - "url": "https://home.apache.org/~talluri/CentOS5.3-x86_64.ova", + "url": "http://people.apache.org/~sanjeev/CentOS5.3-x86_64.ova", "checksum": "02de0576dd3a61ab59c03fd795fc86ac", "hypervisor":"VMware", "ostypeid":"74affaea-c658-11e4-ad38-a6d1374244b4" @@ -1586,7 +1586,7 @@ test_data = { "QCOW2": { "templatename": "KVMUploadtemplate", "displaytext": "VMwareUploadtemplate", - "url": "https://home.apache.org/~talluri/eec2209b-9875-3c8d-92be-c001bd8a0faf.qcow2.bz2", + "url": "http://people.apache.org/~sanjeev/eec2209b-9875-3c8d-92be-c001bd8a0faf.qcow2.bz2", "checksum": "da997b697feaa2f1f6e0d4785b0cece2", "hypervisor":"KVM", "ostypeid":"2e02e376-cdf3-11e4-beb3-8aa6272b57ef" @@ -1661,7 +1661,7 @@ test_data = { "name": "testISO", "bootable": True, "ispublic": False, - "url": "https://home.apache.org/~talluri/CentOS-6.3-x86_64-bin-DVD1.iso", + "url": "http://people.apache.org/~sanjeev/CentOS-6.3-x86_64-bin-DVD1.iso", "ostype": 'CentOS 6.3 (64-bit)', "mode": 'HTTP_DOWNLOAD' }, @@ -1676,7 +1676,7 @@ test_data = { "isextractable": True, "mode": "HTTP_DOWNLOAD", "templatefilter": "self", - "url": "https://home.apache.org/~talluri/systemvm64template-2014-09-30-4.3-vmware.ova", + "url": "http://people.apache.org/~sanjeev/systemvm64template-2014-09-30-4.3-vmware.ova", "hypervisor": "vmware", "format": "OVA", "nicadapter": "vmxnet3",