Skip to content

Commit 00892d2

Browse files
git4rkgit4rk
authored
Merge pull request #14 from majguo/issue-7-ui-content-review
Address comments from UI content review
2 parents 2937a1a + 7cae876 commit 00892d2

File tree

2 files changed

+26
-32
lines changed

2 files changed

+26
-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: 25 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -9,29 +9,28 @@
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",
19+
"toolTip": "Your IBMid.",
2120
"constraints": {
2221
"required": true,
2322
"regex": "^(?!\\-)([a-z0-9A-Z@\\-]{1,128})([^\\-])",
24-
"validationMessage": "The value must be valid IBMid username."
23+
"validationMessage": "The value must be valid IBMid."
2524
}
2625
},
2726
{
2827
"name": "ibmUserPwd",
2928
"type": "Microsoft.Common.PasswordBox",
3029
"label": {
31-
"password": "Password for IBMid account",
30+
"password": "Password for IBMid",
3231
"confirmPassword": "Confirm password"
3332
},
34-
"toolTip": "Password of IBMid account.",
33+
"toolTip": "Password for your IBMid.",
3534
"constraints": {
3635
"required": true
3736
}
@@ -41,20 +40,17 @@
4140
"type": "Microsoft.Common.InfoBox",
4241
"options": {
4342
"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"
43+
"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>"
4644
}
4745
},
4846
{
4947
"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",
48+
"type": "Microsoft.Common.CheckBox",
49+
"label": "I accept the IBM License Agreement.",
50+
"toolTip": "Select to accept the IBM License Agreement.",
5451
"constraints": {
5552
"required": true,
56-
"regex": "^[Yy]$",
57-
"validationMessage": "The value must be Y/y to proceed with deployment."
53+
"validationMessage": "The deployment will not proceed unless you accept the IBM License Agreement."
5854
}
5955
}
6056
],
@@ -73,7 +69,7 @@
7369
"type": "Microsoft.Common.OptionsGroup",
7470
"label": "Dynamic cluster?",
7571
"defaultValue": "No",
76-
"toolTip": "Select 'Yes' to create a dynamic cluster which enables WebSphere to start/stop nodes on-demand dynamically.",
72+
"toolTip": "Create a dynamic cluster that dynamically starts nodes when workload increases and stops nodes when workload decreases.",
7773
"constraints": {
7874
"allowedValues": [
7975
{
@@ -93,17 +89,17 @@
9389
"type": "Microsoft.Common.TextBox",
9490
"label": "Number of VMs",
9591
"defaultValue": "4",
96-
"toolTip": "The number of VMs to create, with one deployment manager and multiple worker nodes for the remainings.",
92+
"toolTip": "The number of virtual machines to create, with 1 deployment manager and 1 to 4 worker nodes.",
9793
"constraints": {
9894
"required": true,
9995
"regex": "^(2|3|4|5)$",
100-
"validationMessage": "Number of VMs to deploy, limit 5."
96+
"validationMessage": "Number of virtual machines to deploy, limit 5 because this offer uses a single storage account."
10197
}
10298
},
10399
{
104100
"name": "vmSizeSelect",
105101
"type": "Microsoft.Compute.SizeSelector",
106-
"label": "Virtual machine size",
102+
"label": "VM size",
107103
"toolTip": "The size of virtual machine to provision.",
108104
"recommendedSizes": [
109105
"Standard_D2_v3",
@@ -129,7 +125,7 @@
129125
"name": "dmgrVMPrefix",
130126
"type": "Microsoft.Common.TextBox",
131127
"label": "Deployment manager server prefix",
132-
"toolTip": "The string to prepend to the name of the deployment manager server.",
128+
"toolTip": "The string to prepend to the name of the deployment manager server, default is 'dmgr'.",
133129
"defaultValue": "dmgr",
134130
"constraints": {
135131
"required": true,
@@ -141,7 +137,7 @@
141137
"name": "managedVMPrefix",
142138
"type": "Microsoft.Common.TextBox",
143139
"label": "Managed server prefix",
144-
"toolTip": "The string to prepend to the name of the managed server.",
140+
"toolTip": "The string to prepend to the name of the managed server, default is 'managed'.",
145141
"defaultValue": "managed",
146142
"constraints": {
147143
"required": true,
@@ -153,7 +149,7 @@
153149
"name": "dnsLabelPrefix",
154150
"type": "Microsoft.Common.TextBox",
155151
"label": "DNS label prefix",
156-
"toolTip": "The string to prepend to the DNS label.",
152+
"toolTip": "The string to prepend to the DNS label, default is 'wasndcluster'.",
157153
"defaultValue": "wasndcluster",
158154
"constraints": {
159155
"required": true,
@@ -175,7 +171,7 @@
175171
{
176172
"name": "adminUsername",
177173
"type": "Microsoft.Common.TextBox",
178-
"label": "Username for admin account of VMs",
174+
"label": "VM administrator",
179175
"defaultValue": "websphere",
180176
"toolTip": "Use only letters and numbers.",
181177
"constraints": {
@@ -189,14 +185,12 @@
189185
"type": "Microsoft.Compute.CredentialsCombo",
190186
"label": {
191187
"authenticationType": "Authentication type",
192-
"password": "Password",
188+
"password": "Password for VM administrator",
193189
"confirmPassword": "Confirm password",
194-
"sshPublicKey": "SSH public key"
190+
"sshPublicKey": "SSH Public Key for VM administrator"
195191
},
196192
"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."
193+
"authenticationType": "Use user and password or SSH Public Key for authentication to the virtual machine."
200194
},
201195
"constraints": {
202196
"required": true
@@ -210,7 +204,7 @@
210204
{
211205
"name": "wasUsername",
212206
"type": "Microsoft.Common.TextBox",
213-
"label": "Username for WebSphere admin",
207+
"label": "WebSphere administrator",
214208
"defaultValue": "wasadmin",
215209
"toolTip": "Use only allowed characters.",
216210
"constraints": {
@@ -223,10 +217,10 @@
223217
"name": "wasPassword",
224218
"type": "Microsoft.Common.PasswordBox",
225219
"label": {
226-
"password": "Password for WebSphere admin",
220+
"password": "Password for WebSphere administrator",
227221
"confirmPassword": "Confirm password"
228222
},
229-
"toolTip": "Password for WebSphere admin.",
223+
"toolTip": "Password for WebSphere administrator.",
230224
"constraints": {
231225
"required": true
232226
}

0 commit comments

Comments
 (0)