Repository: cloudstack Updated Branches: refs/heads/4.6 3f7a86d8e -> 001169f08
Change references of people.apache.org to home.apache.org in the test code This closes #1123 Signed-off-by: SrikanteswaraRao Talluri <tall...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/001169f0 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/001169f0 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/001169f0 Branch: refs/heads/4.6 Commit: 001169f08f5d315620cb1860a82e4b08d996d8c9 Parents: 3f7a86d Author: SrikanteswaraRao Talluri <tall...@apache.org> Authored: Thu Nov 26 00:07:43 2015 +0530 Committer: Srikanteswararao Talluri <tall...@apache.org> Committed: Thu Nov 26 11:41:11 2015 +0530 ---------------------------------------------------------------------- .../integration/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(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/001169f0/test/integration/component/test_project_usage.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py index cb95d89..f249b33 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, http://git-wip-us.apache.org/repos/asf/cloudstack/blob/001169f0/test/integration/component/test_reset_ssh_keypair.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_reset_ssh_keypair.py b/test/integration/component/test_reset_ssh_keypair.py index db7e9b8..4fd07fa 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/"; + \ http://git-wip-us.apache.org/repos/asf/cloudstack/blob/001169f0/test/integration/component/test_tags.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_tags.py b/test/integration/component/test_tags.py index 3552064..310f305 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, http://git-wip-us.apache.org/repos/asf/cloudstack/blob/001169f0/test/integration/component/test_usage.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_usage.py b/test/integration/component/test_usage.py index 3bbef39..11f1833 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, http://git-wip-us.apache.org/repos/asf/cloudstack/blob/001169f0/test/integration/component/test_vm_passwdenabled.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_vm_passwdenabled.py b/test/integration/component/test_vm_passwdenabled.py index d340031..0b036f7 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", ] http://git-wip-us.apache.org/repos/asf/cloudstack/blob/001169f0/test/integration/component/test_volumes.py ---------------------------------------------------------------------- diff --git a/test/integration/component/test_volumes.py b/test/integration/component/test_volumes.py index 12c8f9d..39f6b52 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)', }, http://git-wip-us.apache.org/repos/asf/cloudstack/blob/001169f0/test/integration/testpaths/testpath_stopped_vm.py ---------------------------------------------------------------------- diff --git a/test/integration/testpaths/testpath_stopped_vm.py b/test/integration/testpaths/testpath_stopped_vm.py index 927dbd9..190fb13 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: http://git-wip-us.apache.org/repos/asf/cloudstack/blob/001169f0/tools/marvin/marvin/config/test_data.py ---------------------------------------------------------------------- diff --git a/tools/marvin/marvin/config/test_data.py b/tools/marvin/marvin/config/test_data.py index 3d4745d..177fe29 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",
