apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.17' into main

Browse Source
This commit is contained in:
Rohit Yadav 2022-12-14 05:21:35 +00:00
commit f7f03adddb
2 changed files with 32 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/metrics/src/main/java/org/apache/cloudstack/api/ListVMsMetricsCmd.java
View File

@ -43,7 +43,7 @@ import org.apache.cloudstack.response.VmMetricsResponse;
* </ul> * </ul>
*/ */
@APICommand(name = ListVMsMetricsCmd.APINAME, description = "Lists VM metrics", responseObject = VmMetricsResponse.class, @APICommand(name = ListVMsMetricsCmd.APINAME, description = "Lists VM metrics", responseObject = VmMetricsResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, responseView = ResponseObject.ResponseView.Full, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, responseView = ResponseObject.ResponseView.Restricted,
since = "4.9.3", authorized = {RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User}) since = "4.9.3", authorized = {RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
public class ListVMsMetricsCmd extends ListVMsCmd implements UserCmd { public class ListVMsMetricsCmd extends ListVMsCmd implements UserCmd {
public static final String APINAME = "listVirtualMachinesMetrics"; public static final String APINAME = "listVirtualMachinesMetrics";

43
test/integration/smoke/test_metrics_api.py
View File

@ -58,16 +58,28 @@ class TestMetrics(cloudstackTestCase):
cls.hypervisor cls.hypervisor
) )
cls._cleanup.append(cls.service_offering) cls._cleanup.append(cls.service_offering)
cls.domain = get_domain(cls.apiclient)
cls.account = Account.create(
cls.apiclient,
cls.services["account"],
admin=False,
domainid=cls.domain.id
)
cls._cleanup.append(cls.account)
@classmethod @classmethod
def tearDownClass(cls): def tearDownClass(cls):
super(TestMetrics, cls).tearDownClass() super(TestMetrics, cls).tearDownClass()
def setUp(self): def setUp(self):
self.userapiclient = self.testClient.getUserApiClient(
UserName=self.account.name,
DomainName=self.account.domain
)
self.cleanup = [] self.cleanup = []
def tearDown(self): def tearDown(self):
super(TestMetrics, self).tearDown(); super(TestMetrics, self).tearDown()
@attr(tags = ["advanced", "advancedns", "smoke", "basic"], required_hardware="false") @attr(tags = ["advanced", "advancedns", "smoke", "basic"], required_hardware="false")
def test_list_hosts_metrics(self): def test_list_hosts_metrics(self):
@ -117,23 +129,24 @@ class TestMetrics(cloudstackTestCase):
return return
@attr(tags = ["advanced", "advancedns", "smoke", "basic"], required_hardware="false") def run_list_vm_metrics_test(self, is_user):
def test_list_vms_metrics(self): apiclient = self.apiclient
#deploy VM if is_user:
apiclient = self.userapiclient
self.small_virtual_machine = VirtualMachine.create( self.small_virtual_machine = VirtualMachine.create(
self.apiclient, apiclient,
self.services["virtual_machine"], self.services["virtual_machine"],
serviceofferingid=self.service_offering.id, serviceofferingid=self.service_offering.id,
templateid=self.template.id, templateid=self.template.id,
zoneid=self.zone.id zoneid=self.zone.id
) )
self.cleanup.append(self.small_virtual_machine) self.cleanup.append(self.small_virtual_machine)
cmd = listVirtualMachinesMetrics.listVirtualMachinesMetricsCmd() cmd = listVirtualMachinesMetrics.listVirtualMachinesMetricsCmd()
cmd.id = self.small_virtual_machine.id cmd.id = self.small_virtual_machine.id
lvmm = self.apiclient.listVirtualMachinesMetrics(cmd)[0] lvmm = apiclient.listVirtualMachinesMetrics(cmd)[0]
self.assertEqual(lvmm.id, self.small_virtual_machine.id) self.assertEqual(lvmm.id, self.small_virtual_machine.id)
@ -144,7 +157,13 @@ class TestMetrics(cloudstackTestCase):
self.assertTrue(hasattr(lvmm, 'networkread')) self.assertTrue(hasattr(lvmm, 'networkread'))
self.assertTrue(hasattr(lvmm, 'networkwrite')) self.assertTrue(hasattr(lvmm, 'networkwrite'))
return @attr(tags = ["advanced", "advancedns", "smoke", "basic"], required_hardware="false")
def test_list_vms_metrics_admin(self):
self.run_list_vm_metrics_test(False)
@attr(tags = ["advanced", "advancedns", "smoke", "basic"], required_hardware="false")
def test_list_vms_metrics_user(self):
self.run_list_vm_metrics_test(True)
@attr(tags = ["advanced", "advancedns", "smoke", "basic"], required_hardware="false") @attr(tags = ["advanced", "advancedns", "smoke", "basic"], required_hardware="false")
def test_list_pstorage_metrics(self): def test_list_pstorage_metrics(self):