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.16'

Browse Source
This commit is contained in:
Rohit Yadav 2021-12-03 15:41:56 +05:30
commit 2e9c9417be
42 changed files with 51 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
api/src/main/java/org/apache/cloudstack/api/BaseUpdateTemplateOrIsoCmd.java
View File

@ -17,7 +17,6 @@
package org.apache.cloudstack.api;
import org.apache.log4j.Logger;
import org.apache.cloudstack.api.command.user.iso.UpdateIsoCmd;
import org.apache.cloudstack.api.response.GuestOSResponse;
import org.apache.cloudstack.api.response.TemplateResponse;
@ -25,7 +24,7 @@ import java.util.Collection;
import java.util.Map;
public abstract class BaseUpdateTemplateOrIsoCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateIsoCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(BaseUpdateTemplateOrIsoCmd.class.getName());
/////////////////////////////////////////////////////
//////////////// API parameters /////////////////////

3
api/src/main/java/org/apache/cloudstack/api/command/admin/address/ReleasePodIpCmdByAdmin.java
View File

@ -24,7 +24,6 @@ import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.command.admin.vlan.ReleasePublicIpRangeCmd;
import org.apache.cloudstack.api.response.AcquireIPAddressResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
@ -32,7 +31,7 @@ import com.cloud.user.Account;
@APICommand(name = "releasePodIpAddress", description = "Releases a Pod IP back to the Pod", responseObject = SuccessResponse.class, requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ReleasePodIpCmdByAdmin extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(ReleasePublicIpRangeCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(ReleasePodIpCmdByAdmin.class.getName());
private static final String s_name = "releasepodipresponse";

3
api/src/main/java/org/apache/cloudstack/api/command/admin/cluster/ListClustersCmd.java
View File

@ -25,7 +25,6 @@ import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd;
import org.apache.cloudstack.api.response.ClusterResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.PodResponse;
@ -37,7 +36,7 @@ import com.cloud.utils.Pair;
@APICommand(name = "listClusters", description = "Lists clusters.", responseObject = ClusterResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListClustersCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListServiceOfferingsCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(ListClustersCmd.class.getName());
private static final String s_name = "listclustersresponse";

3
api/src/main/java/org/apache/cloudstack/api/command/admin/router/ListVirtualRouterElementsCmd.java
View File

@ -28,7 +28,6 @@ import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.command.user.network.ListNetworkOfferingsCmd;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ProviderResponse;
import org.apache.cloudstack.api.response.VirtualRouterProviderResponse;
@ -43,7 +42,7 @@ import com.cloud.network.element.VirtualRouterElementService;
@APICommand(name = "listVirtualRouterElements", description = "Lists all available virtual router elements.", responseObject = VirtualRouterProviderResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListVirtualRouterElementsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListNetworkOfferingsCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(ListVirtualRouterElementsCmd.class.getName());
private static final String s_name = "listvirtualrouterelementsresponse";
// TODO, VirtualRouterElementServer is not singleton in system!

2
api/src/main/java/org/apache/cloudstack/api/command/admin/storage/CreateSecondaryStagingStoreCmd.java
View File

@ -38,7 +38,7 @@ import com.cloud.user.Account;
@APICommand(name = "createSecondaryStagingStore", description = "create secondary staging store.", responseObject = ImageStoreResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class CreateSecondaryStagingStoreCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(AddImageStoreCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(CreateSecondaryStagingStoreCmd.class.getName());
private static final String s_name = "createsecondarystagingstoreresponse";
/////////////////////////////////////////////////////

3
api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/ScaleSystemVMCmd.java
View File

@ -28,7 +28,6 @@ import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd;
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
import org.apache.cloudstack.api.response.SystemVmResponse;
import org.apache.cloudstack.context.CallContext;
@ -47,7 +46,7 @@ import com.cloud.vm.VirtualMachine;
+ "The system vm must be in a \"Stopped\" state for " + "this command to take effect.", entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ScaleSystemVMCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(UpgradeVMCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(ScaleSystemVMCmd.class.getName());
private static final String s_name = "changeserviceforsystemvmresponse";
/////////////////////////////////////////////////////

3
api/src/main/java/org/apache/cloudstack/api/command/admin/systemvm/UpgradeSystemVMCmd.java
View File

@ -28,7 +28,6 @@ import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd;
import org.apache.cloudstack.api.response.ServiceOfferingResponse;
import org.apache.cloudstack.api.response.SystemVmResponse;
import org.apache.cloudstack.context.CallContext;
@ -42,7 +41,7 @@ import com.cloud.vm.VirtualMachine;
+ "The system vm must be in a \"Stopped\" state for " + "this command to take effect.", entityType = {VirtualMachine.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpgradeSystemVMCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpgradeVMCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(UpgradeSystemVMCmd.class.getName());
private static final String s_name = "changeserviceforsystemvmresponse";
/////////////////////////////////////////////////////

3
api/src/main/java/org/apache/cloudstack/api/command/admin/usage/ListTrafficMonitorsCmd.java
View File

@ -25,7 +25,6 @@ import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.TrafficMonitorResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
@ -35,7 +34,7 @@ import com.cloud.host.Host;
@APICommand(name = "listTrafficMonitors", description = "List traffic monitor Hosts.", responseObject = TrafficMonitorResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListTrafficMonitorsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListServiceOfferingsCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(ListTrafficMonitorsCmd.class.getName());
private static final String s_name = "listtrafficmonitorsresponse";
/////////////////////////////////////////////////////

2
api/src/main/java/org/apache/cloudstack/api/command/admin/user/GetUserKeysCmd.java
View File

@ -44,7 +44,7 @@ public class GetUserKeysCmd extends BaseCmd{
@Parameter(name= ApiConstants.ID, type = CommandType.UUID, entityType = UserResponse.class, required = true, description = "ID of the user whose keys are required")
private Long id;
public static final Logger s_logger = Logger.getLogger(RegisterCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(GetUserKeysCmd.class.getName());
public static final String APINAME = "getUserKeys";
public Long getID(){

2
api/src/main/java/org/apache/cloudstack/api/command/admin/user/MoveUserCmd.java
View File

@ -44,7 +44,7 @@ import javax.inject.Inject;
since = "4.11",
authorized = {RoleType.Admin})
public class MoveUserCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpdateUserCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(MoveUserCmd.class.getName());
public static final String APINAME = "moveUser";

2
api/src/main/java/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java
View File

@ -50,7 +50,7 @@ import com.cloud.vm.VirtualMachine;
requestHasSensitiveInfo = false,
responseHasSensitiveInfo = true)
public class MigrateVirtualMachineWithVolumeCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(MigrateVMCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(MigrateVirtualMachineWithVolumeCmd.class.getName());
private static final String s_name = "migratevirtualmachinewithvolumeresponse";

3
api/src/main/java/org/apache/cloudstack/api/command/user/account/DeleteAccountFromProjectCmd.java
View File

@ -26,7 +26,6 @@ import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.command.user.project.DeleteProjectCmd;
import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
@ -38,7 +37,7 @@ import com.cloud.projects.Project;
@APICommand(name = "deleteAccountFromProject", description = "Deletes account from the project", responseObject = SuccessResponse.class, since = "3.0.0",
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteAccountFromProjectCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteProjectCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(DeleteAccountFromProjectCmd.class.getName());
private static final String s_name = "deleteaccountfromprojectresponse";

3
api/src/main/java/org/apache/cloudstack/api/command/user/account/DeleteUserFromProjectCmd.java
View File

@ -27,7 +27,6 @@ import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.command.user.project.DeleteProjectCmd;
import org.apache.cloudstack.api.response.ProjectResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.api.response.UserResponse;
@ -41,7 +40,7 @@ import com.cloud.projects.Project;
@APICommand(name = DeleteUserFromProjectCmd.APINAME, description = "Deletes user from the project", responseObject = SuccessResponse.class, since = "4.15.0",
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, authorized = {RoleType.Admin, RoleType.DomainAdmin, RoleType.ResourceAdmin, RoleType.User})
public class DeleteUserFromProjectCmd extends BaseAsyncCmd {
public static final Logger LOGGER = Logger.getLogger(DeleteProjectCmd.class.getName());
public static final Logger LOGGER = Logger.getLogger(DeleteUserFromProjectCmd.class.getName());
public static final String APINAME = "deleteUserFromProject";
/////////////////////////////////////////////////////

3
api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCategoriesCmd.java
View File

@ -25,7 +25,6 @@ import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.command.user.iso.ListIsosCmd;
import org.apache.cloudstack.api.response.GuestOSCategoryResponse;
import org.apache.cloudstack.api.response.ListResponse;
@ -35,7 +34,7 @@ import com.cloud.utils.Pair;
@APICommand(name = "listOsCategories", description = "Lists all supported OS categories for this cloud.", responseObject = GuestOSCategoryResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListGuestOsCategoriesCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListIsosCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(ListGuestOsCategoriesCmd.class.getName());
private static final String s_name = "listoscategoriesresponse";

3
api/src/main/java/org/apache/cloudstack/api/command/user/guest/ListGuestOsCmd.java
View File

@ -25,7 +25,6 @@ import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.command.user.iso.ListIsosCmd;
import org.apache.cloudstack.api.response.GuestOSCategoryResponse;
import org.apache.cloudstack.api.response.GuestOSResponse;
import org.apache.cloudstack.api.response.ListResponse;
@ -36,7 +35,7 @@ import com.cloud.utils.Pair;
@APICommand(name = "listOsTypes", description = "Lists all supported OS types for this cloud.", responseObject = GuestOSResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListGuestOsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListIsosCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(ListGuestOsCmd.class.getName());
private static final String s_name = "listostypesresponse";

2
api/src/main/java/org/apache/cloudstack/api/command/user/loadbalancer/ListSslCertsCmd.java
View File

@ -39,7 +39,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
@APICommand(name = "listSslCerts", description = "Lists SSL certificates", responseObject = SslCertResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListSslCertsCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteSslCertCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(ListSslCertsCmd.class.getName());
private static final String s_name = "listsslcertsresponse";

3
api/src/main/java/org/apache/cloudstack/api/command/user/nat/DisableStaticNatCmd.java
View File

@ -24,7 +24,6 @@ import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.command.user.firewall.DeletePortForwardingRuleCmd;
import org.apache.cloudstack.api.response.IPAddressResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
@ -38,7 +37,7 @@ import com.cloud.network.IpAddress;
@APICommand(name = "disableStaticNat", description = "Disables static rule for given IP address", responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DisableStaticNatCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeletePortForwardingRuleCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(DisableStaticNatCmd.class.getName());
private static final String s_name = "disablestaticnatresponse";
/////////////////////////////////////////////////////

2
api/src/main/java/org/apache/cloudstack/api/command/user/nat/EnableStaticNatCmd.java
View File

@ -39,7 +39,7 @@ import com.cloud.uservm.UserVm;
@APICommand(name = "enableStaticNat", description = "Enables static NAT for given IP address", responseObject = SuccessResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class EnableStaticNatCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateIpForwardingRuleCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(EnableStaticNatCmd.class.getName());
private static final String s_name = "enablestaticnatresponse";

3
api/src/main/java/org/apache/cloudstack/api/command/user/network/DeleteNetworkCmd.java
View File

@ -27,7 +27,6 @@ import org.apache.cloudstack.api.ApiErrorCode;
import org.apache.cloudstack.api.BaseAsyncCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.ServerApiException;
import org.apache.cloudstack.api.command.admin.network.DeleteNetworkOfferingCmd;
import org.apache.cloudstack.api.response.NetworkResponse;
import org.apache.cloudstack.api.response.SuccessResponse;
import org.apache.cloudstack.context.CallContext;
@ -39,7 +38,7 @@ import com.cloud.network.Network;
@APICommand(name = "deleteNetwork", description = "Deletes a network", responseObject = SuccessResponse.class, entityType = {Network.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteNetworkCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(DeleteNetworkOfferingCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(DeleteNetworkCmd.class.getName());
private static final String s_name = "deletenetworkresponse";
/////////////////////////////////////////////////////

2
api/src/main/java/org/apache/cloudstack/api/command/user/region/ha/gslb/UpdateGlobalLoadBalancerRuleCmd.java
View File

@ -37,7 +37,7 @@ import com.cloud.user.Account;
@APICommand(name = "updateGlobalLoadBalancerRule", description = "update global load balancer rules.", responseObject = GlobalLoadBalancerResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class UpdateGlobalLoadBalancerRuleCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(GlobalLoadBalancerResponse.class.getName());
public static final Logger s_logger = Logger.getLogger(UpdateGlobalLoadBalancerRuleCmd.class.getName());
private static final String s_name = "updategloballoadbalancerruleresponse";

3
api/src/main/java/org/apache/cloudstack/api/command/user/resource/ListHypervisorsCmd.java
View File

@ -25,7 +25,6 @@ import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd;
import org.apache.cloudstack.api.response.HypervisorResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
@ -35,7 +34,7 @@ import com.cloud.user.Account;
@APICommand(name = "listHypervisors", description = "List hypervisors", responseObject = HypervisorResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListHypervisorsCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(UpgradeRouterCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(ListHypervisorsCmd.class.getName());
private static final String s_name = "listhypervisorsresponse";
@Override

2
api/src/main/java/org/apache/cloudstack/api/command/user/securitygroup/AuthorizeSecurityGroupEgressCmd.java
View File

@ -50,7 +50,7 @@ import com.cloud.network.security.SecurityRule;
responseHasSensitiveInfo = false)
@SuppressWarnings("rawtypes")
public class AuthorizeSecurityGroupEgressCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(AuthorizeSecurityGroupIngressCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(AuthorizeSecurityGroupEgressCmd.class.getName());
private static final String s_name = "authorizesecuritygroupegressresponse";

2
api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/ArchiveSnapshotCmd.java
View File

@ -41,7 +41,7 @@ import org.apache.log4j.Logger;
responseObject = SnapshotResponse.class, entityType = {Snapshot.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ArchiveSnapshotCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(CreateSnapshotCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(ArchiveSnapshotCmd.class.getName());
private static final String s_name = "createsnapshotresponse";
@ACL(accessType = SecurityChecker.AccessType.OperateEntry)

2
api/src/main/java/org/apache/cloudstack/api/command/user/ssh/DeleteSSHKeyPairCmd.java
View File

@ -34,7 +34,7 @@ import com.cloud.user.SSHKeyPair;
@APICommand(name = "deleteSSHKeyPair", description = "Deletes a keypair by name", responseObject = SuccessResponse.class, entityType = {SSHKeyPair.class},
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteSSHKeyPairCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(CreateSSHKeyPairCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(DeleteSSHKeyPairCmd.class.getName());
private static final String s_name = "deletesshkeypairresponse";
/////////////////////////////////////////////////////

2
api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVmNicIpCmd.java
View File

@ -49,7 +49,7 @@ import com.cloud.vm.Nic;
@APICommand(name = "updateVmNicIp", description = "Update the default Ip of a VM Nic", responseObject = UserVmResponse.class)
public class UpdateVmNicIpCmd extends BaseAsyncCmd {
public static final Logger s_logger = Logger.getLogger(AddIpToVmNicCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(UpdateVmNicIpCmd.class.getName());
private static final String s_name = "updatevmnicipresponse";
/////////////////////////////////////////////////////

2
engine/schema/src/main/java/com/cloud/usage/dao/UsageNetworkDaoImpl.java
View File

@ -33,7 +33,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
@Component
public class UsageNetworkDaoImpl extends GenericDaoBase<UsageNetworkVO, Long> implements UsageNetworkDao {
private static final Logger s_logger = Logger.getLogger(UsageVMInstanceDaoImpl.class.getName());
private static final Logger s_logger = Logger.getLogger(UsageNetworkDaoImpl.class.getName());
private static final String SELECT_LATEST_STATS =
"SELECT u.account_id, u.zone_id, u.host_id, u.host_type, u.network_id, u.bytes_sent, u.bytes_received, u.agg_bytes_received, u.agg_bytes_sent, u.event_time_millis "
+ "FROM cloud_usage.usage_network u INNER JOIN (SELECT netusage.account_id as acct_id, netusage.zone_id as z_id, max(netusage.event_time_millis) as max_date "

3
plugins/hypervisors/vmware/src/main/java/com/cloud/hypervisor/vmware/manager/VmwareStorageManagerImpl.java
View File

@ -1306,8 +1306,7 @@ public class VmwareStorageManagerImpl implements VmwareStorageManager {
// get volume's chain size for this VM snapshot; exclude current volume vdisk
DataStoreTO store = volumeTO.getDataStore();
ManagedObjectReference morDs = getDatastoreAsManagedObjectReference(baseName, hyperHost, store);
long size = getVMSnapshotChainSize(context, hyperHost, baseName + ".vmdk", morDs, newPath);
size = getVMSnapshotChainSize(context, hyperHost, baseName + "-*.vmdk", morDs, newPath);
long size = getVMSnapshotChainSize(context, hyperHost, baseName + "-*.vmdk", morDs, newPath);
if (volumeTO.getVolumeType() == Volume.Type.ROOT) {
// add memory snapshot size

2
plugins/integrations/kubernetes-service/src/main/java/org/apache/cloudstack/api/command/user/kubernetes/cluster/ScaleKubernetesClusterCmd.java
View File

@ -51,7 +51,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
responseHasSensitiveInfo = true,
authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
public class ScaleKubernetesClusterCmd extends BaseAsyncCmd {
public static final Logger LOGGER = Logger.getLogger(StartKubernetesClusterCmd.class.getName());
public static final Logger LOGGER = Logger.getLogger(ScaleKubernetesClusterCmd.class.getName());
public static final String APINAME = "scaleKubernetesCluster";
@Inject

3
plugins/network-elements/juniper-srx/src/main/java/com/cloud/api/commands/ListExternalFirewallsCmd.java
View File

@ -27,7 +27,6 @@ import org.apache.cloudstack.api.APICommand;
import org.apache.cloudstack.api.ApiConstants;
import org.apache.cloudstack.api.BaseListCmd;
import org.apache.cloudstack.api.Parameter;
import org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd;
import org.apache.cloudstack.api.response.ExternalFirewallResponse;
import org.apache.cloudstack.api.response.ListResponse;
import org.apache.cloudstack.api.response.ZoneResponse;
@ -38,7 +37,7 @@ import com.cloud.network.element.JuniperSRXFirewallElementService;
@APICommand(name = "listExternalFirewalls", description = "List external firewall appliances.", responseObject = ExternalFirewallResponse.class,
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class ListExternalFirewallsCmd extends BaseListCmd {
public static final Logger s_logger = Logger.getLogger(ListServiceOfferingsCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(ListExternalFirewallsCmd.class.getName());
private static final String s_name = "listexternalfirewallsresponse";
/////////////////////////////////////////////////////

2
plugins/network-elements/netscaler/src/main/java/com/cloud/api/commands/DeleteNetscalerControlCenterCmd.java
View File

@ -39,7 +39,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
@APICommand(name = "deleteNetscalerControlCenter", responseObject = SuccessResponse.class, description = "Delete Netscaler Control Center")
public class DeleteNetscalerControlCenterCmd extends BaseCmd {
public static final Logger s_logger = Logger.getLogger(DeleteServicePackageOfferingCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(DeleteNetscalerControlCenterCmd.class.getName());
private static final String s_name = "deleteNetscalerControlCenter";
@Inject
NetscalerLoadBalancerElementService _netsclarLbService;

2
plugins/network-elements/stratosphere-ssp/src/main/java/org/apache/cloudstack/api/commands/DeleteSspCmd.java
View File

@ -38,7 +38,7 @@ import com.cloud.exception.ResourceUnavailableException;
@APICommand(name = "deleteStratosphereSsp", responseObject = SuccessResponse.class, description = "Removes stratosphere ssp server",
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false)
public class DeleteSspCmd extends BaseCmd {
private static final Logger s_logger = Logger.getLogger(AddSspCmd.class.getName());
private static final Logger s_logger = Logger.getLogger(DeleteSspCmd.class.getName());
@Inject
SspService _service;

2
server/src/main/java/com/cloud/api/ApiServlet.java
View File

@ -62,7 +62,7 @@ import com.cloud.utils.net.NetUtils;
@SuppressWarnings("serial")
public class ApiServlet extends HttpServlet {
public static final Logger s_logger = Logger.getLogger(ApiServlet.class.getName());
private static final Logger s_accessLogger = Logger.getLogger("apiserver." + ApiServer.class.getName());
private static final Logger s_accessLogger = Logger.getLogger("apiserver." + ApiServlet.class.getName());
private final static List<String> s_clientAddressHeaders = Collections
.unmodifiableList(Arrays.asList("X-Forwarded-For",
"HTTP_CLIENT_IP", "HTTP_X_FORWARDED_FOR", "Remote_Addr"));

2
server/src/main/java/com/cloud/api/auth/DefaultLogoutAPIAuthenticatorCmd.java
View File

@ -38,7 +38,7 @@ import java.net.InetAddress;
@APICommand(name = "logout", description = "Logs out the user", responseObject = LogoutCmdResponse.class, entityType = {})
public class DefaultLogoutAPIAuthenticatorCmd extends BaseCmd implements APIAuthenticator {
public static final Logger s_logger = Logger.getLogger(DefaultLoginAPIAuthenticatorCmd.class.getName());
public static final Logger s_logger = Logger.getLogger(DefaultLogoutAPIAuthenticatorCmd.class.getName());
private static final String s_name = "logoutresponse";
/////////////////////////////////////////////////////

4
server/src/main/java/com/cloud/network/NetworkServiceImpl.java
View File

@ -1614,8 +1614,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService, C
Long networkOfferingId = cmd.getNetworkOfferingId();
// 1) default is system to false if not specified
// 2) reset parameter to false if it's specified by the regular user
if ((isSystem == null || _accountMgr.isNormalUser(caller.getId())) && id == null) {
// 2) reset parameter to false if it's specified by a non-ROOT user
if (isSystem == null || !_accountMgr.isRootAdmin(caller.getId())) {
isSystem = false;
}

2
server/src/main/java/com/cloud/resource/ResourceManagerImpl.java
View File

@ -1264,7 +1264,7 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager,
// TO DO - Make it more granular and have better conversion into capacity type
if(host.getType() == Type.Routing){
final CapacityState capacityState = nextState == ResourceState.Enabled ? CapacityState.Enabled : CapacityState.Disabled;
final short[] capacityTypes = {Capacity.CAPACITY_TYPE_CPU, Capacity.CAPACITY_TYPE_MEMORY};
final short[] capacityTypes = { Capacity.CAPACITY_TYPE_CPU, Capacity.CAPACITY_TYPE_MEMORY, Capacity.CAPACITY_TYPE_CPU_CORE };
_capacityDao.updateCapacityState(null, null, null, host.getId(), capacityState.toString(), capacityTypes);
final StoragePoolVO storagePool = _storageMgr.findLocalStorageOnHost(host.getId());

2
server/src/main/java/com/cloud/storage/download/DownloadState.java
View File

@ -28,7 +28,7 @@ public abstract class DownloadState {
DOWNLOAD_ANSWER, ABANDON_DOWNLOAD, TIMEOUT_CHECK, DISCONNECT
};
protected static final Logger s_logger = Logger.getLogger(DownloadListener.class.getName());
protected static final Logger s_logger = Logger.getLogger(DownloadState.class.getName());
private DownloadListener dl;

2
server/src/main/java/com/cloud/storage/upload/UploadState.java
View File

@ -29,7 +29,7 @@ public abstract class UploadState {
UPLOAD_ANSWER, ABANDON_UPLOAD, TIMEOUT_CHECK, DISCONNECT
};
protected static final Logger s_logger = Logger.getLogger(UploadListener.class.getName());
protected static final Logger s_logger = Logger.getLogger(UploadState.class.getName());
private UploadListener ul;

2
test/src-not-used/main/java/com/cloud/test/stress/StressTestDirectAttach.java
View File

@ -57,7 +57,7 @@ import com.cloud.utils.exception.CloudRuntimeException;
public class StressTestDirectAttach {
private static long sleepTime = 180000L; // default 0
private static boolean cleanUp = true;
public static final Logger s_logger = Logger.getLogger(TestClientWithAPI.class.getName());
public static final Logger s_logger = Logger.getLogger(StressTestDirectAttach.class.getName());
private static boolean repeat = true;
private static String[] users = null;
private static boolean internet = false;

2
test/src-not-used/main/java/com/cloud/test/utils/SignEC2.java
View File

@ -37,7 +37,7 @@ public class SignEC2 {
public static String port;
public static String command;
public static String accessPoint;
public static final Logger s_logger = Logger.getLogger(SignRequest.class.getName());
public static final Logger s_logger = Logger.getLogger(SignEC2.class.getName());
public static void main(String[] args) {
// Parameters

2
ui/src/config/section/infra/hosts.js
View File

@ -125,7 +125,7 @@ export default {
message: 'message.action.cancel.maintenance.mode',
docHelp: 'adminguide/hosts.html#maintaining-hypervisors-on-hosts',
dataView: true,
show: (record) => { return record.resourcestate === 'Maintenance' || record.resourcestate === 'ErrorInMaintenance' || record.resourcestate === 'PrepareForMaintenance' }
show: (record) => { return record.resourcestate === 'Maintenance' || record.resourcestate === 'ErrorInMaintenance' || record.resourcestate === 'PrepareForMaintenance' || record.resourcestate === 'ErrorInPrepareForMaintenance' }
},
{
api: 'configureOutOfBandManagement',

2
ui/src/views/compute/DeployVM.vue
View File

@ -1651,10 +1651,10 @@ export default {
}
}
}
}
if (this.securitygroupids.length > 0) {
deployVmData.securitygroupids = this.securitygroupids.join(',')
}
}
// step 7: select ssh key pair
deployVmData.keypair = values.keypair
if (values.name) {

11
ui/src/views/compute/InstanceTab.vue
View File

@ -586,10 +586,13 @@ export default {
if (this.loadingNic) return
this.loadingNic = true
this.showUpdateIpModal = false
api('updateVmNicIp', {
nicId: this.editIpAddressNic,
ipaddress: this.editIpAddressValue
}).then(response => {
const params = {
nicId: this.editIpAddressNic
}
if (this.editIpAddressValue) {
params.ipaddress = this.editIpAddressValue
}
api('updateVmNicIp', params).then(response => {
this.$pollJob({
jobId: response.updatevmnicipresponse.jobid,
successMessage: this.$t('message.success.update.ipaddress'),