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/09/11 18:01:35 UTC
[1/3] git commit: updated refs/heads/master to ff1ce07
Repository: cloudstack
Updated Branches:
refs/heads/master 6b9e2ac16 -> ff1ce07ae
CLOUDSTACK-8756:Incorrect guest os mapping in CCP 4.2.1-6 for CentOS 5.9
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/bbdb4785
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/bbdb4785
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/bbdb4785
Branch: refs/heads/master
Commit: bbdb47854df106f6c95b9c8935ffc3717eac3617
Parents: 614ee49
Author: shweta agarwal <sh...@citrix.com>
Authored: Fri Aug 21 17:47:01 2015 +0530
Committer: shweta agarwal <sh...@citrix.com>
Committed: Fri Aug 21 17:47:01 2015 +0530
----------------------------------------------------------------------
.../component/test_escalations_vmware.py | 67 +++++++++++++++++++-
tools/marvin/marvin/config/test_data.py | 9 +++
2 files changed, 75 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bbdb4785/test/integration/component/test_escalations_vmware.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_escalations_vmware.py b/test/integration/component/test_escalations_vmware.py
index fec1f6f..aba4af0 100644
--- a/test/integration/component/test_escalations_vmware.py
+++ b/test/integration/component/test_escalations_vmware.py
@@ -27,12 +27,13 @@ from marvin.lib.base import (Account,
DiskOffering,
Template,
listConfigurations)
-from marvin.lib.common import (get_domain,
+from marvin.lib.common import (get_domain,list_isos,
get_zone,
get_template)
from nose.plugins.attrib import attr
from ast import literal_eval
from marvin.codes import PASS
+from marvin.cloudstackException import CloudstackAPIException
class TestVMware(cloudstackTestCase):
@@ -203,3 +204,67 @@ class TestVMware(cloudstackTestCase):
self.fail("Failed to attach data disk to RHEL vm whose root disk type is IDE")
return
+ @attr(tags=["advanced", "basic"], required_hardware="true")
+ def test2_attach_ISO_in_CentOSVM(self):
+ """
+ @desc:Incorrect guest os mapping in vmware for CentOS 5.9 and above
+ Step1 :Register an CentOS 6.3 template
+ Step2 :Launch a VM
+ Step3: Try to attach VMware Tools ISO
+ Step4: Verify VMware tools ISO attached correctly
+ """
+ self.hypervisor = str(get_hypervisor_type(self.api_client)).lower()
+ if self.hypervisor != "vmware":
+ self.skipTest("This test can be run only on vmware")
+ template = Template.register(
+ self.userapiclient,
+ self.services["CentOS6.3template"],
+ zoneid=self.zone.id,
+ account=self.account.name,
+ domainid=self.account.domainid,
+ hypervisor=self.hypervisor
+ )
+ self.debug(
+ "Registered a template with format {} and id {}".format(
+ self.services["CentOS6.3template"]["format"],template.id)
+ )
+ template.download(self.userapiclient)
+ self.cleanup.append(template)
+ vm = VirtualMachine.create(
+ self.userapiclient,
+ self.services["virtual_machine"],
+ accountid=self.account.name,
+ domainid=self.account.domainid,
+ serviceofferingid=self.service_offering.id,
+ templateid=template.id,
+ zoneid=self.zone.id
+ )
+ self.cleanup.append(vm)
+ response = VirtualMachine.list(self.userapiclient,id=vm.id)
+ status = validateList(response)
+ self.assertEqual(status[0],PASS,"list vm response returned invalid list")
+ list_default_iso_response = list_isos(
+ self.api_client,
+ name="vmware-tools.iso",
+ account="system",
+ isready="true"
+ )
+ status = validateList(list_default_iso_response)
+ self.assertEquals(
+ PASS,
+ status[0],
+ "ISO list is empty")
+ self.debug(
+ "Registered a ISO with name {}".format(list_default_iso_response[0].name))
+ try:
+ vm.attach_iso(self.userapiclient,list_default_iso_response[0])
+ except CloudstackAPIException as e:
+ self.fail("Attached ISO failed : %s" % e)
+ response = VirtualMachine.list(self.userapiclient, id=vm.id)
+ status = validateList(response)
+ self.assertEqual(status[0], PASS,"list vm response returned invalid list")
+ attachedIsoName=response[0].isoname;
+ self.assertEqual(attachedIsoName, "vmware-tools.iso", "vmware-tools.iso not attached")
+ return
+
+
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/bbdb4785/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 06514de..b607b68 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -775,6 +775,15 @@ test_data = {
"ostype": "CentOS 5.6 (64-bit)"
},
+ "CentOS6.3template": {
+ "displaytext": "Centos",
+ "name": "Centos",
+ "passwordenabled": False,
+ "ostype": "CentOS 6.3 (64-bit)",
+ "url": "http://10.147.28.7/templates/centos63.ova",
+ "format": "OVA",
+ "ispublic": "true"
+ },
"template_2": {
"displaytext": "Public Template",
"name": "Public template",
[3/3] git commit: updated refs/heads/master to ff1ce07
Posted by ra...@apache.org.
Merge pull request #728 from shwetaag/attach_iso
CLOUDSTACK-8756:Incorrect guest os mapping in CCP 4.2.1-6 for CentOS 5.9Check the bug 8756 for more details
* pr/728:
CLOUDSTACK-8756:Incorrect guest os mapping in CCP 4.2.1-6 for CentOS 5.9
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/ff1ce07a
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ff1ce07a
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ff1ce07a
Branch: refs/heads/master
Commit: ff1ce07aef95634acd32153db42bba262b0ff9c9
Parents: adfa9c0 bbdb478
Author: Rajani Karuturi <ra...@citrix.com>
Authored: Fri Sep 11 21:20:01 2015 +0530
Committer: Rajani Karuturi <ra...@citrix.com>
Committed: Fri Sep 11 21:20:03 2015 +0530
----------------------------------------------------------------------
.../component/test_escalations_vmware.py | 67 +++++++++++++++++++-
tools/marvin/marvin/config/test_data.py | 9 +++
2 files changed, 75 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
[2/3] git commit: updated refs/heads/master to ff1ce07
Posted by ra...@apache.org.
Revert "CLOUDSTACK-8756:Incorrect guest os mapping in CCP 4.2.1-6 for CentOS 5.9"
This reverts commit ba59a43333b6f31e48e4b6e43e16068e4cacdc45.
Reverting as this is a direct commit to master. Will be followed by a
merge
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/adfa9c0c
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/adfa9c0c
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/adfa9c0c
Branch: refs/heads/master
Commit: adfa9c0ca652f818e07323744e201e086e475c28
Parents: 6b9e2ac
Author: Rajani Karuturi <ra...@citrix.com>
Authored: Fri Sep 11 21:18:25 2015 +0530
Committer: Rajani Karuturi <ra...@citrix.com>
Committed: Fri Sep 11 21:18:25 2015 +0530
----------------------------------------------------------------------
.../component/test_escalations_vmware.py | 67 +-------------------
tools/marvin/marvin/config/test_data.py | 9 ---
2 files changed, 1 insertion(+), 75 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/adfa9c0c/test/integration/component/test_escalations_vmware.py
----------------------------------------------------------------------
diff --git a/test/integration/component/test_escalations_vmware.py b/test/integration/component/test_escalations_vmware.py
index aba4af0..fec1f6f 100644
--- a/test/integration/component/test_escalations_vmware.py
+++ b/test/integration/component/test_escalations_vmware.py
@@ -27,13 +27,12 @@ from marvin.lib.base import (Account,
DiskOffering,
Template,
listConfigurations)
-from marvin.lib.common import (get_domain,list_isos,
+from marvin.lib.common import (get_domain,
get_zone,
get_template)
from nose.plugins.attrib import attr
from ast import literal_eval
from marvin.codes import PASS
-from marvin.cloudstackException import CloudstackAPIException
class TestVMware(cloudstackTestCase):
@@ -204,67 +203,3 @@ class TestVMware(cloudstackTestCase):
self.fail("Failed to attach data disk to RHEL vm whose root disk type is IDE")
return
- @attr(tags=["advanced", "basic"], required_hardware="true")
- def test2_attach_ISO_in_CentOSVM(self):
- """
- @desc:Incorrect guest os mapping in vmware for CentOS 5.9 and above
- Step1 :Register an CentOS 6.3 template
- Step2 :Launch a VM
- Step3: Try to attach VMware Tools ISO
- Step4: Verify VMware tools ISO attached correctly
- """
- self.hypervisor = str(get_hypervisor_type(self.api_client)).lower()
- if self.hypervisor != "vmware":
- self.skipTest("This test can be run only on vmware")
- template = Template.register(
- self.userapiclient,
- self.services["CentOS6.3template"],
- zoneid=self.zone.id,
- account=self.account.name,
- domainid=self.account.domainid,
- hypervisor=self.hypervisor
- )
- self.debug(
- "Registered a template with format {} and id {}".format(
- self.services["CentOS6.3template"]["format"],template.id)
- )
- template.download(self.userapiclient)
- self.cleanup.append(template)
- vm = VirtualMachine.create(
- self.userapiclient,
- self.services["virtual_machine"],
- accountid=self.account.name,
- domainid=self.account.domainid,
- serviceofferingid=self.service_offering.id,
- templateid=template.id,
- zoneid=self.zone.id
- )
- self.cleanup.append(vm)
- response = VirtualMachine.list(self.userapiclient,id=vm.id)
- status = validateList(response)
- self.assertEqual(status[0],PASS,"list vm response returned invalid list")
- list_default_iso_response = list_isos(
- self.api_client,
- name="vmware-tools.iso",
- account="system",
- isready="true"
- )
- status = validateList(list_default_iso_response)
- self.assertEquals(
- PASS,
- status[0],
- "ISO list is empty")
- self.debug(
- "Registered a ISO with name {}".format(list_default_iso_response[0].name))
- try:
- vm.attach_iso(self.userapiclient,list_default_iso_response[0])
- except CloudstackAPIException as e:
- self.fail("Attached ISO failed : %s" % e)
- response = VirtualMachine.list(self.userapiclient, id=vm.id)
- status = validateList(response)
- self.assertEqual(status[0], PASS,"list vm response returned invalid list")
- attachedIsoName=response[0].isoname;
- self.assertEqual(attachedIsoName, "vmware-tools.iso", "vmware-tools.iso not attached")
- return
-
-
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/adfa9c0c/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 b607b68..06514de 100644
--- a/tools/marvin/marvin/config/test_data.py
+++ b/tools/marvin/marvin/config/test_data.py
@@ -775,15 +775,6 @@ test_data = {
"ostype": "CentOS 5.6 (64-bit)"
},
- "CentOS6.3template": {
- "displaytext": "Centos",
- "name": "Centos",
- "passwordenabled": False,
- "ostype": "CentOS 6.3 (64-bit)",
- "url": "http://10.147.28.7/templates/centos63.ova",
- "format": "OVA",
- "ispublic": "true"
- },
"template_2": {
"displaytext": "Public Template",
"name": "Public template",