Skip to content

Commit cc2d5df

Browse files
committed
minor fixups
1 parent 186e771 commit cc2d5df

8 files changed

Lines changed: 20 additions & 16 deletions

File tree

api/src/main/java/org/apache/cloudstack/api/command/user/schedule/CreateResourceScheduleCmd.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,10 @@ public class CreateResourceScheduleCmd extends BaseCmd {
5858
@Parameter(name = ApiConstants.ACTION, type = CommandType.STRING, required = true, description = "Action to take on the resource.")
5959
private String action;
6060

61-
@Parameter(name = ApiConstants.START_DATE, type = CommandType.DATE, required = false, description = "Start date from which the schedule becomes active. Defaults to current date plus 1 minute. Use format \"yyyy-MM-dd hh:mm:ss\")")
61+
@Parameter(name = ApiConstants.START_DATE, type = CommandType.DATE, required = false, description = "Start date from which the schedule becomes active. Defaults to current date plus 1 minute. Use format \"yyyy-MM-dd hh:mm:ss\"")
6262
private Date startDate;
6363

64-
@Parameter(name = ApiConstants.END_DATE, type = CommandType.DATE, required = false, description = "End date after which the schedule becomes inactive. Use format \"yyyy-MM-dd hh:mm:ss\")")
64+
@Parameter(name = ApiConstants.END_DATE, type = CommandType.DATE, required = false, description = "End date after which the schedule becomes inactive. Use format \"yyyy-MM-dd hh:mm:ss\"")
6565
private Date endDate;
6666

6767
@Parameter(name = ApiConstants.ENABLED, type = CommandType.BOOLEAN, required = false, description = "Enable schedule. Defaults to true")

api/src/main/java/org/apache/cloudstack/api/command/user/schedule/DeleteResourceScheduleCmd.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public class DeleteResourceScheduleCmd extends BaseCmd {
4343
@Parameter(name = ApiConstants.RESOURCE_TYPE, type = CommandType.STRING, required = true, description = "Type of the resource")
4444
private String resourceType;
4545

46-
@Parameter(name = ApiConstants.RESOURCE_ID, type = CommandType.STRING, required = true, description = "ID of the resource for which schedule is to be defined")
46+
@Parameter(name = ApiConstants.RESOURCE_ID, type = CommandType.STRING, required = true, description = "ID of the resource for which schedules are to be deleted")
4747
private String resourceId;
4848

4949
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = ResourceScheduleResponse.class, required = false, description = "ID of the schedule to be deleted")

api/src/main/java/org/apache/cloudstack/api/command/user/schedule/ListResourceScheduleCmd.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,22 +39,22 @@ public class ListResourceScheduleCmd extends BaseListCmd {
3939
@Inject
4040
ResourceScheduleManager resourceScheduleManager;
4141

42-
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = ResourceScheduleResponse.class, required = false, description = "ID of the schedule to be updated")
42+
@Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = ResourceScheduleResponse.class, required = false, description = "ID of the schedule")
4343
private Long id;
4444

45-
@Parameter(name = ApiConstants.IDS, type = CommandType.LIST, collectionType = CommandType.UUID, entityType = ResourceScheduleResponse.class, required = false, description = "comma separated list of schedule ids to be deleted")
45+
@Parameter(name = ApiConstants.IDS, type = CommandType.LIST, collectionType = CommandType.UUID, entityType = ResourceScheduleResponse.class, required = false, description = "comma separated list of schedule ids")
4646
private List<Long> ids;
4747

48-
@Parameter(name = ApiConstants.RESOURCE_TYPE, type = CommandType.STRING, required = true, description = "Type of the resource")
48+
@Parameter(name = ApiConstants.RESOURCE_TYPE, type = CommandType.STRING, required = true, description = "Type of the resource.")
4949
private String resourceType;
5050

51-
@Parameter(name = ApiConstants.RESOURCE_ID, type = CommandType.STRING, required = true, description = "ID of the resource for which schedule is to be defined")
51+
@Parameter(name = ApiConstants.RESOURCE_ID, type = CommandType.STRING, required = true, description = "ID of the resource for which schedules are to be listed.")
5252
private String resourceId;
5353

5454
@Parameter(name = ApiConstants.ACTION, type = CommandType.STRING, required = false, description = "Action to take on the resource.")
5555
private String action;
5656

57-
@Parameter(name = ApiConstants.ENABLED, type = CommandType.BOOLEAN, required = false, description = "Enable schedule. Defaults to true")
57+
@Parameter(name = ApiConstants.ENABLED, type = CommandType.BOOLEAN, required = false, description = "Filter by enabled status.")
5858
private Boolean enabled;
5959

6060
public Long getId() {

api/src/main/java/org/apache/cloudstack/api/command/user/vm/CreateVMScheduleCmd.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import javax.inject.Inject;
3535
import java.util.Date;
3636

37+
@Deprecated
3738
@APICommand(name = "createVMSchedule", description = "Create Instance Schedule", responseObject = VMScheduleResponse.class,
3839
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.19.0",
3940
authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
@@ -77,14 +78,14 @@ public class CreateVMScheduleCmd extends BaseCmd {
7778
type = CommandType.DATE,
7879
required = false,
7980
description = "Start date from which the schedule becomes active. Defaults to current date plus 1 minute."
80-
+ "Use format \"yyyy-MM-dd hh:mm:ss\")")
81+
+ "Use format \"yyyy-MM-dd hh:mm:ss\"")
8182
private Date startDate;
8283

8384
@Parameter(name = ApiConstants.END_DATE,
8485
type = CommandType.DATE,
8586
required = false,
8687
description = "End date after which the schedule becomes inactive"
87-
+ "Use format \"yyyy-MM-dd hh:mm:ss\")")
88+
+ "Use format \"yyyy-MM-dd hh:mm:ss\"")
8889
private Date endDate;
8990

9091
@Parameter(name = ApiConstants.ENABLED,

api/src/main/java/org/apache/cloudstack/api/command/user/vm/DeleteVMScheduleCmd.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
import java.util.Collections;
3838
import java.util.List;
3939

40+
@Deprecated
4041
@APICommand(name = "deleteVMSchedule", description = "Delete Instance Schedule.", responseObject = SuccessResponse.class,
4142
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.19.0",
4243
authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})

api/src/main/java/org/apache/cloudstack/api/command/user/vm/ListVMScheduleCmd.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import java.util.ArrayList;
3535
import java.util.List;
3636

37+
@Deprecated
3738
@APICommand(name = "listVMSchedule", description = "List Instance Schedules.", responseObject = VMScheduleResponse.class,
3839
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.19.0",
3940
authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
@@ -64,7 +65,7 @@ public class ListVMScheduleCmd extends BaseListCmd {
6465
@Parameter(name = ApiConstants.ENABLED,
6566
type = CommandType.BOOLEAN,
6667
required = false,
67-
description = "ID of Instance schedule")
68+
description = "Filter by enabled status")
6869
private Boolean enabled;
6970

7071
/// //////////////////////////////////////////////////

api/src/main/java/org/apache/cloudstack/api/command/user/vm/UpdateVMScheduleCmd.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import javax.inject.Inject;
3535
import java.util.Date;
3636

37+
@Deprecated
3738
@APICommand(name = "updateVMSchedule", description = "Update Instance Schedule.", responseObject = VMScheduleResponse.class,
3839
requestHasSensitiveInfo = false, responseHasSensitiveInfo = false, since = "4.19.0",
3940
authorized = {RoleType.Admin, RoleType.ResourceAdmin, RoleType.DomainAdmin, RoleType.User})
@@ -70,14 +71,14 @@ public class UpdateVMScheduleCmd extends BaseCmd {
7071
type = CommandType.DATE,
7172
required = false,
7273
description = "Start date from which the schedule becomes active"
73-
+ "Use format \"yyyy-MM-dd hh:mm:ss\")")
74+
+ "Use format \"yyyy-MM-dd hh:mm:ss\"")
7475
private Date startDate;
7576

7677
@Parameter(name = ApiConstants.END_DATE,
7778
type = CommandType.DATE,
7879
required = false,
7980
description = "End date after which the schedule becomes inactive"
80-
+ "Use format \"yyyy-MM-dd hh:mm:ss\")")
81+
+ "Use format \"yyyy-MM-dd hh:mm:ss\"")
8182
private Date endDate;
8283

8384
@Parameter(name = ApiConstants.ENABLED,

ui/public/locales/te.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2466,7 +2466,7 @@
24662466
"label.vmlimit": "ఉదాహరణ పరిమితులు",
24672467
"label.vmname": "ఉదాహరణ పేరు",
24682468
"label.vms": "సందర్భాలు",
2469-
"label.vmscheduleactions": "చర్యలు",
2469+
"label.scheduleactions": "చర్యలు",
24702470
"label.vmstate": "ఉదాహరణ స్థితి",
24712471
"label.vmtotal": "మొత్తం సందర్భాలు",
24722472
"label.vmware": "VMware",
@@ -3107,7 +3107,7 @@
31073107
"message.error.remove.nic": "లోపం ఏర్పడింది",
31083108
"message.error.remove.secondary.ipaddress": "ద్వితీయ IP చిరునామాను తీసివేయడంలో లోపం ఏర్పడింది",
31093109
"message.error.remove.tungsten.routing.policy": "నెట్‌వర్క్ నుండి టంగ్‌స్టన్-ఫాబ్రిక్ రూటింగ్ విధానాన్ని తీసివేయడం విఫలమైంది",
3110-
"message.error.remove.vm.schedule": "ఉదాహరణ షెడ్యూల్‌ని తీసివేయడం విఫలమైంది",
3110+
"message.error.remove.resource.schedule": "వనరు కోసం షెడ్యూల్‌ను తొలగించడం విఫలమైంది",
31113111
"message.error.required.input": "దయచేసి ఇన్‌పుట్‌ని నమోదు చేయండి",
31123112
"message.error.reset.config": "కాన్ఫిగర్‌ని డిఫాల్ట్ విలువకు రీసెట్ చేయడం సాధ్యపడలేదు",
31133113
"message.error.retrieve.kubeconfig": "Kubernetes క్లస్టర్ కాన్ఫిగరేషన్‌ని తిరిగి పొందడం సాధ్యం కాలేదు",
@@ -3462,7 +3462,7 @@
34623462
"message.success.config.backup.schedule": "ఉదాహరణ బ్యాకప్ షెడ్యూల్ విజయవంతంగా కాన్ఫిగర్ చేయబడింది",
34633463
"message.success.config.health.monitor": "హెల్త్ మానిటర్‌ని విజయవంతంగా కాన్ఫిగర్ చేయండి",
34643464
"message.success.config.sticky.policy": "స్టిక్కీ పాలసీ విజయవంతంగా కాన్ఫిగర్ చేయబడింది",
3465-
"message.success.config.vm.schedule": "ఉదాహరణ షెడ్యూల్ విజయవంతంగా కాన్ఫిగర్ చేయబడింది",
3465+
"message.success.config.resource.schedule": "వనరు కోసం షెడ్యూల్ విజయవంతంగా కాన్ఫిగర్ చేయబడింది",
34663466
"message.success.copy.clipboard": "క్లిప్‌బోర్డ్‌కి విజయవంతంగా కాపీ చేయబడింది",
34673467
"message.success.create.account": "ఖాతా విజయవంతంగా సృష్టించబడింది",
34683468
"message.success.create.asnrange": "AS పరిధి విజయవంతంగా సృష్టించబడింది",

0 commit comments

Comments
 (0)