Skip to content

Commit d58bb99

Browse files
committed
user data -> User Data in cmd and response
1 parent 05ed3e0 commit d58bb99

File tree

9 files changed

+43
-43
lines changed

9 files changed

+43
-43
lines changed

api/src/main/java/org/apache/cloudstack/api/command/user/userdata/RegisterUserDataCmd.java

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
import com.cloud.user.UserData;
4444

4545
@APICommand(name = "registerUserData",
46-
description = "Register a new user data.",
46+
description = "Register a new User Data.",
4747
since = "4.18",
4848
responseObject = SuccessResponse.class,
4949
requestHasSensitiveInfo = false,
@@ -56,33 +56,33 @@ public class RegisterUserDataCmd extends BaseCmd {
5656
//////////////// API parameters /////////////////////
5757
/////////////////////////////////////////////////////
5858

59-
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "Name of the user data")
59+
@Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "Name of the User Data")
6060
private String name;
6161

6262
//Owner information
63-
@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "an optional account for the user data. Must be used with domainId.")
63+
@Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "an optional account for the User Data. Must be used with domainId.")
6464
private String accountName;
6565

6666
@Parameter(name = ApiConstants.DOMAIN_ID,
6767
type = CommandType.UUID,
6868
entityType = DomainResponse.class,
69-
description = "an optional domainId for the user data. If the account parameter is used, domainId must also be used.")
69+
description = "an optional domainId for the User Data. If the account parameter is used, domainId must also be used.")
7070
private Long domainId;
7171

72-
@Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "an optional project for the user data")
72+
@Parameter(name = ApiConstants.PROJECT_ID, type = CommandType.UUID, entityType = ProjectResponse.class, description = "an optional project for the User Data")
7373
private Long projectId;
7474

7575
@Parameter(name = ApiConstants.USER_DATA,
7676
type = CommandType.STRING,
7777
required = true,
78-
description = "Base64 encoded user data content. " +
78+
description = "Base64 encoded User Data content. " +
7979
"Using HTTP GET (via querystring), you can send up to 4KB of data after base64 encoding. " +
8080
"Using HTTP POST (via POST body), you can send up to 32KB of data after base64 encoding, " +
8181
"which can be increased upto 1MB using the vm.userdata.max.length setting",
8282
length = 1048576)
8383
private String userData;
8484

85-
@Parameter(name = ApiConstants.PARAMS, type = CommandType.STRING, description = "comma separated list of variables declared in the user data content")
85+
@Parameter(name = ApiConstants.PARAMS, type = CommandType.STRING, description = "comma separated list of variables declared in the User Data content")
8686
private String params;
8787

8888

api/src/main/java/org/apache/cloudstack/api/response/UserDataResponse.java

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -27,41 +27,41 @@
2727
public class UserDataResponse extends BaseResponseWithAnnotations implements ControlledEntityResponse {
2828

2929
@SerializedName(ApiConstants.ID)
30-
@Param(description = "ID of the user data")
30+
@Param(description = "ID of the User Data")
3131
private String id;
3232

3333
@SerializedName(ApiConstants.NAME)
34-
@Param(description = "Name of the user data")
34+
@Param(description = "Name of the User Data")
3535
private String name;
3636

37-
@SerializedName(ApiConstants.ACCOUNT_ID) @Param(description="the owner id of the user data")
37+
@SerializedName(ApiConstants.ACCOUNT_ID) @Param(description="the owner id of the User Data")
3838
private String accountId;
3939

40-
@SerializedName(ApiConstants.ACCOUNT) @Param(description="the owner of the user data")
40+
@SerializedName(ApiConstants.ACCOUNT) @Param(description="the owner of the User Data")
4141
private String accountName;
4242

4343
@SerializedName(ApiConstants.PROJECT_ID)
44-
@Param(description = "the project id of the user data", since = "4.19.1")
44+
@Param(description = "the project id of the User Data", since = "4.19.1")
4545
private String projectId;
4646

4747
@SerializedName(ApiConstants.PROJECT)
48-
@Param(description = "the project name of the user data", since = "4.19.1")
48+
@Param(description = "the project name of the User Data", since = "4.19.1")
4949
private String projectName;
5050

51-
@SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the user data owner")
51+
@SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain id of the User Data owner")
5252
private String domainId;
5353

54-
@SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the user data owner")
54+
@SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the User Data owner")
5555
private String domain;
5656

5757
@SerializedName(ApiConstants.DOMAIN_PATH)
58-
@Param(description = "path of the domain to which the user data owner belongs", since = "4.19.2.0")
58+
@Param(description = "path of the domain to which the User Data owner belongs", since = "4.19.2.0")
5959
private String domainPath;
6060

61-
@SerializedName(ApiConstants.USER_DATA) @Param(description="base64 encoded user data content")
61+
@SerializedName(ApiConstants.USER_DATA) @Param(description="base64 encoded User Data content")
6262
private String userData;
6363

64-
@SerializedName(ApiConstants.PARAMS) @Param(description="list of parameters which contains the list of keys or string parameters that are needed to be passed for any variables declared in the user data")
64+
@SerializedName(ApiConstants.PARAMS) @Param(description="list of parameters which contains the list of keys or string parameters that are needed to be passed for any variables declared in the User Data")
6565
private String params;
6666

6767
public UserDataResponse() {

ui/public/locales/ar.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,7 @@
11491149
"label.usehttps": "\u0627\u0633\u062a\u062e\u062f\u0645 HTTPS",
11501150
"label.usenewdiskoffering": "Replace disk offering?",
11511151
"label.user": "User",
1152-
"label.user.data": "User data",
1152+
"label.user.data": "User Data",
11531153
"label.username": "Username",
11541154
"label.users": "Users",
11551155
"label.utilization": "Utilisation",

ui/public/locales/ca.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,7 @@
11491149
"label.usehttps": "Use HTTPS",
11501150
"label.usenewdiskoffering": "Replace disk offering?",
11511151
"label.user": "User",
1152-
"label.user.data": "User data",
1152+
"label.user.data": "User Data",
11531153
"label.username": "Username",
11541154
"label.users": "Users",
11551155
"label.utilization": "Utilisation",

ui/public/locales/en.json

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,7 @@
227227
"label.action.update.offering.access": "Update offering access",
228228
"label.action.update.resource.count": "Update resource count",
229229
"label.action.value": "Action/Value",
230-
"label.action.user.data.reset": "Reset User data",
230+
"label.action.user.data.reset": "Reset User Data",
231231
"label.action.vmsnapshot.create": "Take Instance Snapshot",
232232
"label.action.vmsnapshot.delete": "Delete Instance Snapshot",
233233
"label.action.vmsnapshot.revert": "Revert to Instance Snapshot",
@@ -1861,7 +1861,7 @@
18611861
"label.register.oauth": "Register OAuth",
18621862
"label.register.template": "Register Template",
18631863
"label.register.user.data": "Register User Data",
1864-
"label.register.user.data.details": "Enter the user data in plain text or in Base64 encoding. Up to 32KB of Base64 encoded user data can be sent by default. The setting vm.userdata.max.length can be used to increase the limit to upto 1MB.",
1864+
"label.register.user.data.details": "Enter the User Data in plain text or in Base64 encoding. Up to 32KB of Base64 encoded User Data can be sent by default. The setting vm.userdata.max.length can be used to increase the limit to upto 1MB.",
18651865
"label.reinstall.vm": "Reinstall Instance",
18661866
"label.reject": "Reject",
18671867
"label.related": "Related",
@@ -1923,8 +1923,8 @@
19231923
"label.reset.config.value": "Reset to default value",
19241924
"label.reset.ssh.key.pair": "Reset SSH key pair",
19251925
"label.reset.to.default": "Reset to default",
1926-
"label.reset.user.data.on.autoscale.vm.group": "Reset User data on AutoScale VM Group",
1927-
"label.reset.user.data.on.vm": "Reset User data on Instance",
1926+
"label.reset.user.data.on.autoscale.vm.group": "Reset User Data on AutoScale VM Group",
1927+
"label.reset.user.data.on.vm": "Reset User Data on Instance",
19281928
"label.reset.vpn.connection": "Reset VPN connection",
19291929
"label.resource": "Resource",
19301930
"label.resource.limit.exceeded": "Resource limit exceeded",
@@ -2139,16 +2139,16 @@
21392139
"label.ssh.key.pairs": "SSH Key Pairs",
21402140
"label.uefi.supported": "UEFI supported",
21412141
"label.usediops": "IOPS used",
2142-
"label.user.data.id": "User data ID",
2143-
"label.user.data.name": "User data name",
2144-
"label.user.data.details": "User data details",
2145-
"label.user.data.params": "User data parameters",
2146-
"label.user.data.policy": "User data link policy",
2147-
"label.user.data.text": "Manual User data entry",
2148-
"label.user.data.registered": "Stored User data",
2149-
"label.user.data.do.override": "User data override",
2150-
"label.user.data.do.append": "User data append",
2151-
"label.user.data.policy.tooltip": "User data linked to the Template can be overridden by User data provided during Instance deploy. Select the override policy as required.",
2142+
"label.user.data.id": "User Data ID",
2143+
"label.user.data.name": "User Data name",
2144+
"label.user.data.details": "User Data details",
2145+
"label.user.data.params": "User Data parameters",
2146+
"label.user.data.policy": "User Data link policy",
2147+
"label.user.data.text": "Manual User Data entry",
2148+
"label.user.data.registered": "Stored User Data",
2149+
"label.user.data.do.override": "User Data override",
2150+
"label.user.data.do.append": "User Data append",
2151+
"label.user.data.policy.tooltip": "User Data linked to the Template can be overridden by User Data provided during Instance deploy. Select the override policy as required.",
21522152
"label.user.data": "User Data",
21532153
"label.user.data.library": "User Data Library",
21542154
"label.ssh.port": "SSH port",
@@ -2434,7 +2434,7 @@
24342434
"label.usenewdiskoffering": "Replace disk offering?",
24352435
"label.user": "User",
24362436
"label.user.conflict": "Conflict",
2437-
"label.user.data": "User data",
2437+
"label.user.data": "User Data",
24382438
"label.username": "Username",
24392439
"label.username.tooltip": "The Username for the Host",
24402440
"label.users": "Users",
@@ -3008,7 +3008,7 @@
30083008
"message.desc.primary.storage": "Each cluster must contain one or more primary storage servers. We will add the first one now. Primary storage contains the disk volumes for all the Instances running on hosts in the cluster. Use any standards-compliant protocol that is supported by the underlying hypervisor.",
30093009
"message.desc.reset.ssh.key.pair": "Please specify a ssh key pair that you would like to add to this Instance.",
30103010
"message.desc.secondary.storage": "Each zone must have at least one NFS or secondary storage server. We will add the first one now. Secondary storage stores Instance Templates, ISO images, and Instance disk volume Snapshots. This server must be available to all hosts in the zone.<br/><br/>Provide the IP address and exported path.",
3011-
"message.desc.register.user.data": "Please fill in the following to register new user data.",
3011+
"message.desc.register.user.data": "Please fill in the following to register new User Data.",
30123012
"message.desc.registered.user.data": "Registered a User Data.",
30133013
"message.desc.zone": "A zone is the largest organizational unit in CloudStack, and it typically corresponds to a single datacenter. Zones provide physical isolation and redundancy. A zone consists of one or more pods (each of which contains hosts and primary storage servers) and a secondary storage server which is shared by all pods in the zone.",
30143014
"message.desc.zone.edge": "A zone is the largest organizational unit in CloudStack, and it typically corresponds to a single datacenter. Zones provide physical isolation and redundancy. An edge zone consists of one or more hosts (each of which provides local storage as primary storage servers). Only shared and L2 Networks can be deployed in such zones and functionalities that require secondary storages are not supported.",
@@ -3186,7 +3186,7 @@
31863186
"message.error.upload.template": "Template upload failed.",
31873187
"message.error.upload.template.description": "Only one Template can be uploaded at a time.",
31883188
"message.error.url": "Please enter URL.",
3189-
"message.error.user.data": "Please enter the User data",
3189+
"message.error.user.data": "Please enter the User Data",
31903190
"message.error.username": "Enter your username.",
31913191
"message.error.valid.iops.range": "Please enter a valid IOPS range.",
31923192
"message.error.vcenter.datacenter": "Please enter vCenter datacenter.",
@@ -3348,7 +3348,7 @@
33483348
"message.path": "Path : ",
33493349
"message.path.description": "NFS: exported path from the server. VMFS: /datacenter name/datastore name. SharedMountPoint: path where primary storage is mounted, such as /mnt/primary.",
33503350
"message.please.confirm.remove.ssh.key.pair": "Please confirm that you want to remove this SSH key pair.",
3351-
"message.please.confirm.remove.user.data": "Please confirm that you want to remove this User data",
3351+
"message.please.confirm.remove.user.data": "Please confirm that you want to remove this User Data",
33523352
"message.please.enter.valid.value": "Please enter a valid value.",
33533353
"message.please.enter.value": "Please enter values.",
33543354
"message.please.wait.while.autoscale.vmgroup.is.being.created": "Please wait while your AutoScaling Group is being created; this may take a while...",
@@ -3554,7 +3554,7 @@
35543554
"message.success.register.iso": "Successfully registered ISO",
35553555
"message.success.register.keypair": "Successfully registered SSH key pair",
35563556
"message.success.register.template": "Successfully registered Template",
3557-
"message.success.register.user.data": "Successfully registered User data",
3557+
"message.success.register.user.data": "Successfully registered User Data",
35583558
"message.success.release.ip": "Successfully released IP",
35593559
"message.success.release.dedicated.bgp.peer": "Successfully released dedicated BGP peer",
35603560
"message.success.release.dedicated.ipv4.subnet": "Successfully released dedicated IPv4 subnet",

ui/public/locales/hi.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -410,7 +410,7 @@
410410
"label.usageunit": "Unit",
411411
"label.usehttps": "HTTPS का उपयोग करें",
412412
"label.user": "उपयोगकर्ता",
413-
"label.user.data": "User data",
413+
"label.user.data": "User Data",
414414
"label.username": "उपयोगकर्ता नाम",
415415
"label.users": "उपयोगकर्ता",
416416
"label.uuid": "ID",

ui/public/locales/it_IT.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,7 @@
11491149
"label.usehttps": "Utilizzare HTTPS",
11501150
"label.usenewdiskoffering": "Replace disk offering?",
11511151
"label.user": "User",
1152-
"label.user.data": "User data",
1152+
"label.user.data": "User Data",
11531153
"label.username": "Username",
11541154
"label.users": "Users",
11551155
"label.utilization": "Utilisation",

ui/public/locales/pl.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1149,7 +1149,7 @@
11491149
"label.usehttps": "Use HTTPS",
11501150
"label.usenewdiskoffering": "Replace disk offering?",
11511151
"label.user": "U\u017cytkowni",
1152-
"label.user.data": "User data",
1152+
"label.user.data": "User Data",
11531153
"label.username": "Nazwa u\u017cytkownika",
11541154
"label.users": "U\u017cytkownicy",
11551155
"label.utilization": "Utilisation",

ui/public/locales/ru_RU.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1148,7 +1148,7 @@
11481148
"label.usehttps": "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 HTTPS",
11491149
"label.usenewdiskoffering": "Replace disk offering?",
11501150
"label.user": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c",
1151-
"label.user.data": "User data",
1151+
"label.user.data": "User Data",
11521152
"label.username": "\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f",
11531153
"label.users": "\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438",
11541154
"label.utilization": "Utilisation",

0 commit comments

Comments
 (0)