DaanHoogland commented on code in PR #6851: URL: https://github.com/apache/cloudstack/pull/6851#discussion_r1044196915
########## plugins/metrics/src/main/java/org/apache/cloudstack/api/ListVMsMetricsCmdByAdmin.java: ########## @@ -0,0 +1,73 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.cloudstack.api; + +import org.apache.cloudstack.acl.RoleType; +import org.apache.cloudstack.api.command.admin.AdminCmd; +import org.apache.cloudstack.api.response.ClusterResponse; +import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.PodResponse; +import org.apache.cloudstack.api.response.StoragePoolResponse; +import org.apache.cloudstack.response.VmMetricsResponse; + +@APICommand(name = ListVMsMetricsCmd.APINAME, description = "Lists VM metrics", responseObject = VmMetricsResponse.class, + requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, responseView = ResponseObject.ResponseView.Full, + since = "4.9.3", authorized = {RoleType.Admin}) +public class ListVMsMetricsCmdByAdmin extends ListVMsMetricsCmd implements AdminCmd { + + ///////////////////////////////////////////////////// + //////////////// API parameters ///////////////////// + ///////////////////////////////////////////////////// + + @Parameter(name=ApiConstants.HOST_ID, type= BaseCmd.CommandType.UUID, entityType= HostResponse.class, + description="the host ID") + private Long hostId; + + @Parameter(name=ApiConstants.POD_ID, type= BaseCmd.CommandType.UUID, entityType= PodResponse.class, + description="the pod ID") + private Long podId; + + @Parameter(name=ApiConstants.STORAGE_ID, type= BaseCmd.CommandType.UUID, entityType= StoragePoolResponse.class, + description="the storage ID where vm's volumes belong to") + private Long storageId; + + @Parameter(name = ApiConstants.CLUSTER_ID, type = BaseCmd.CommandType.UUID, entityType = ClusterResponse.class, + description = "the cluster ID", since = "4.16.0") Review Comment: ```suggestion description = "the cluster ID") ``` we should not add an antidated parameter. ########## server/src/main/java/com/cloud/api/query/QueryManagerImpl.java: ########## @@ -971,6 +972,15 @@ public ListResponse<UserVmResponse> searchForUserVMs(ListVMsCmd cmd) { return response; } + private Object getObjectPossibleMethodValue(Object obj, String methodName) { + Object result = null; + try { + Method m = obj.getClass().getMethod(methodName); + result = m.invoke(obj); + } catch (NoSuchMethodException | InvocationTargetException | IllegalAccessException ignored) {} Review Comment: not even logged? ########## server/src/main/java/com/cloud/api/query/QueryManagerImpl.java: ########## @@ -1035,16 +1045,14 @@ private Pair<List<UserVmJoinVO>, Integer> searchForUserVMsInternal(ListVMsCmd cm Object backupOfferingId = cmd.getBackupOfferingId(); Object isHaEnabled = cmd.getHaEnabled(); Object pod = null; - Long clusterId = null; + Object clusterId = null; Object hostId = null; Object storageId = null; if (_accountMgr.isRootAdmin(caller.getId())) { - if (cmd instanceof ListVMsCmdByAdmin) { Review Comment: But these use the `if (cmd instaceof <...>ByAdmin) {}` pattern. Or we changing this? It is a good improvement in some ways but would justify its own PR. -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected]
