Skip to content

Commit c9e5f2d

Browse files
majguomajguo
committed
address comments from ui content review
Signed-off-by: Jianguo Ma <[email protected]>
1 parent 2937a1a commit c9e5f2d

File tree

2 files changed

+22
-32
lines changed

2 files changed

+22
-32
lines changed

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020

2121
<groupId>com.ibm.websphere.azure</groupId>
2222
<artifactId>azure.websphere-traditional.cluster</artifactId>
23-
<version>1.3.4</version>
23+
<version>1.3.5</version>
2424

2525
<parent>
2626
<groupId>com.microsoft.azure.iaas</groupId>

‎src/main/arm/createUiDefinition.json‎

Lines changed: 21 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,26 @@
99
"type": "Microsoft.Common.InfoBox",
1010
"options": {
1111
"icon": "Info",
12-
"text": "You must provide an entitled IBMid account to provision the WebSphere cluster. Select here for more details.",
13-
"uri": "https://www.ibm.com/ibmid/myibm/help/us/helpdesk.html"
12+
"text": "Provide an entitled IBMid to provision the WebSphere cluster. <a href='https://www.ibm.com/ibmid/myibm/help/us/helpdesk.html' target='_blank'>Learn more</a>"
1413
}
1514
},
1615
{
1716
"name": "ibmUserId",
1817
"type": "Microsoft.Common.TextBox",
19-
"label": "Username for IBMid",
20-
"toolTip": "Username of IBMid account.",
18+
"label": "IBMid",
2119
"constraints": {
2220
"required": true,
2321
"regex": "^(?!\\-)([a-z0-9A-Z@\\-]{1,128})([^\\-])",
24-
"validationMessage": "The value must be valid IBMid username."
22+
"validationMessage": "The value must be valid IBMid."
2523
}
2624
},
2725
{
2826
"name": "ibmUserPwd",
2927
"type": "Microsoft.Common.PasswordBox",
3028
"label": {
31-
"password": "Password for IBMid account",
29+
"password": "Password for IBMid",
3230
"confirmPassword": "Confirm password"
3331
},
34-
"toolTip": "Password of IBMid account.",
3532
"constraints": {
3633
"required": true
3734
}
@@ -41,20 +38,16 @@
4138
"type": "Microsoft.Common.InfoBox",
4239
"options": {
4340
"icon": "Info",
44-
"text": "You must accept the IBM License Agreement to proceed the deployment. Select here for more details.",
45-
"uri": "https://www.ibm.com/software/sla/sladb.nsf/searchlis/?searchview&searchorder=4&searchmax=0&query=%225724-H88%22"
41+
"text": "Accept the IBM License Agreement to proceed with the deployment. <a href='https://www.ibm.com/software/sla/sladb.nsf/searchlis/?searchview&searchorder=4&searchmax=0&query=%225724-H88%22' target='_blank'>Learn more</a>"
4642
}
4743
},
4844
{
4945
"name": "acceptIBMLicenseAgreement",
50-
"label": "Accept IBM License Agreement",
51-
"type": "Microsoft.Common.TextBox",
52-
"toolTip": "A value not equal to Y/y indicates you do not accept the IBM License Agreement. In that case the deployment will not proceed.",
53-
"defaultValue": "Y",
46+
"type": "Microsoft.Common.CheckBox",
47+
"label": "I accept the IBM License Agreement.",
5448
"constraints": {
5549
"required": true,
56-
"regex": "^[Yy]$",
57-
"validationMessage": "The value must be Y/y to proceed with deployment."
50+
"validationMessage": "The deployment will not proceed unless you accept the IBM License Agreement."
5851
}
5952
}
6053
],
@@ -73,7 +66,7 @@
7366
"type": "Microsoft.Common.OptionsGroup",
7467
"label": "Dynamic cluster?",
7568
"defaultValue": "No",
76-
"toolTip": "Select 'Yes' to create a dynamic cluster which enables WebSphere to start/stop nodes on-demand dynamically.",
69+
"toolTip": "Create a dynamic cluster that dynamically starts nodes when workload increases and stops nodes when workload decreases.",
7770
"constraints": {
7871
"allowedValues": [
7972
{
@@ -93,17 +86,17 @@
9386
"type": "Microsoft.Common.TextBox",
9487
"label": "Number of VMs",
9588
"defaultValue": "4",
96-
"toolTip": "The number of VMs to create, with one deployment manager and multiple worker nodes for the remainings.",
89+
"toolTip": "The number of virtual machines to create, with 1 deployment manager and 1 to 4 worker nodes.",
9790
"constraints": {
9891
"required": true,
9992
"regex": "^(2|3|4|5)$",
100-
"validationMessage": "Number of VMs to deploy, limit 5."
93+
"validationMessage": "Number of virtual machines to deploy, limit 5 since this offer is using a single storage account."
10194
}
10295
},
10396
{
10497
"name": "vmSizeSelect",
10598
"type": "Microsoft.Compute.SizeSelector",
106-
"label": "Virtual machine size",
99+
"label": "VM size",
107100
"toolTip": "The size of virtual machine to provision.",
108101
"recommendedSizes": [
109102
"Standard_D2_v3",
@@ -129,7 +122,7 @@
129122
"name": "dmgrVMPrefix",
130123
"type": "Microsoft.Common.TextBox",
131124
"label": "Deployment manager server prefix",
132-
"toolTip": "The string to prepend to the name of the deployment manager server.",
125+
"toolTip": "The string to prepend to the name of the deployment manager server, default is 'dmgr'.",
133126
"defaultValue": "dmgr",
134127
"constraints": {
135128
"required": true,
@@ -141,7 +134,7 @@
141134
"name": "managedVMPrefix",
142135
"type": "Microsoft.Common.TextBox",
143136
"label": "Managed server prefix",
144-
"toolTip": "The string to prepend to the name of the managed server.",
137+
"toolTip": "The string to prepend to the name of the managed server, default is 'managed'.",
145138
"defaultValue": "managed",
146139
"constraints": {
147140
"required": true,
@@ -153,7 +146,7 @@
153146
"name": "dnsLabelPrefix",
154147
"type": "Microsoft.Common.TextBox",
155148
"label": "DNS label prefix",
156-
"toolTip": "The string to prepend to the DNS label.",
149+
"toolTip": "The string to prepend to the DNS label, default is 'wasndcluster'.",
157150
"defaultValue": "wasndcluster",
158151
"constraints": {
159152
"required": true,
@@ -175,7 +168,7 @@
175168
{
176169
"name": "adminUsername",
177170
"type": "Microsoft.Common.TextBox",
178-
"label": "Username for admin account of VMs",
171+
"label": "VM administrator",
179172
"defaultValue": "websphere",
180173
"toolTip": "Use only letters and numbers.",
181174
"constraints": {
@@ -189,14 +182,12 @@
189182
"type": "Microsoft.Compute.CredentialsCombo",
190183
"label": {
191184
"authenticationType": "Authentication type",
192-
"password": "Password",
185+
"password": "Password for VM administrator",
193186
"confirmPassword": "Confirm password",
194-
"sshPublicKey": "SSH public key"
187+
"sshPublicKey": "SSH Public Key for VM administrator"
195188
},
196189
"toolTip": {
197-
"authenticationType": "Use username and password or SSH public key for authentication to the VM.",
198-
"password": "Password for admin account of VMs.",
199-
"sshPublicKey": "SSH key for admin account of VMs."
190+
"authenticationType": "Use user and password or SSH Public Key for authentication to the virtual machine."
200191
},
201192
"constraints": {
202193
"required": true
@@ -210,7 +201,7 @@
210201
{
211202
"name": "wasUsername",
212203
"type": "Microsoft.Common.TextBox",
213-
"label": "Username for WebSphere admin",
204+
"label": "WebSphere administrator",
214205
"defaultValue": "wasadmin",
215206
"toolTip": "Use only allowed characters.",
216207
"constraints": {
@@ -223,10 +214,9 @@
223214
"name": "wasPassword",
224215
"type": "Microsoft.Common.PasswordBox",
225216
"label": {
226-
"password": "Password for WebSphere admin",
217+
"password": "Password for WebSphere administrator",
227218
"confirmPassword": "Confirm password"
228219
},
229-
"toolTip": "Password for WebSphere admin.",
230220
"constraints": {
231221
"required": true
232222
}

0 commit comments

Comments
 (0)