Merge pull request #1 from haroldwongms/update-ui

Update createUiDefinition.json
haroldwongms · Jun 2, 2022 · 9cbc3c9 · 9cbc3c9
2 parents fa7b773 + caf2fb4
commit 9cbc3c9
Showing 1 changed file with 44 additions and 94 deletions.
diff --git a/createUiDefinition.json b/createUiDefinition.json
@@ -4,28 +4,6 @@
 	"version": "0.1.2-preview",
 	"parameters": {
 		"basics": [{
-			"name": "VirtualNetworkName",
-			"type": "Microsoft.Compute.UserNameTextBox",
-			"label": "Virtual Network Name",
-			"defaultValue": "VNet1",
-			"toolTip": "The name of the Virtual Network for Horizon Cloud.",
-			"constraints": {
-				"required": true
-			},
-			"osPlatform": "Linux"
-		}, {
-			"name": "ManagementSubnet",
-			"type": "Microsoft.Common.TextBox",
-			"label": "Management Subnet",
-			"toolTip": "For the management subnet, a CIDR of /27 or more is required. This subnet is for IP addresses used by the VMs involved in management activities of the pod itself.",
-			"constraints": {
-				"required": true
-			},
-			"options": {
-				"hideConfirmation": false,
-				"hidePassword": true
-			},
-			"osPlatform": "Linux"
 		}],
 		"steps": [{
 			"name": "infrastructureSettings",
@@ -34,83 +12,55 @@
 				"preValidation": "Configure Infrastructure Settings",
 				"postValidation": "Done"
 			},
-			"bladeTitle": "Infrastructure Settings",
+			"bladeTitle": "Horizon Cloud on Azure Prerequisites",
 			"elements": [{
-				"name": "vmTowerName",
-				"type": "Microsoft.Common.TextBox",
-				"label": "Ansible Tower VM Name",
-				"defaultValue": "ansibletowervm",
-				"toolTip": "The name of the Ansible Tower VM. Must be between 1 and 30 characters.",
-				"constraints": {
-					"required": true,
-					"regex": "^[a-z0-9A-Z]{1,30}$",
-					"validationMessage": "Only alphanumeric characters are allowed, and the value must be 1-30 characters long."
-				}
-			}, {
-				"name": "vmSize",
-				"type": "Microsoft.Compute.SizeSelector",
-				"label": "Ansible Tower VM size",
-				"defaultValue": "Standard_DS2_v2",
-				"toolTip": "The size of the Ansible Tower VM to deploy.",
-				"recommendedSizes": [
-					"Standard_DS2_v2",
-					"Standard_DS1_v2",
-					"Standard_DS3_v2"
-				],
-				"constraints": {
-					"allowedSizes": [
-						"Standard_DS1", "Standard_DS2", "Standard_DS3", "Standard_DS4",
-						"Standard_DS11", "Standard_DS12", "Standard_DS13", "Standard_DS14",
-						"Standard_DS1_v2", "Standard_DS2_v2", "Standard_DS3_v2", "Standard_DS4_v2", "Standard_DS5_v2",
-						"Standard_DS11_v2", "Standard_DS12_v2", "Standard_DS13_v2", "Standard_DS14_v2"
-					]
-				},
-				"osPlatform": "Linux"
-			}]
-		}, {
-			"name": "ansibleTowerSettings",
-			"label": "Ansible Tower Settings",
-			"subLabel": {
-				"preValidation": "Configure Ansible Tower Settings",
-				"postValidation": "Done"
-			},
-			"bladeTitle": "Ansible Tower Settings",
-			"elements": [{
-				"name": "ansibleTowerAdminPassword",
-				"type": "Microsoft.Common.PasswordBox",
+				"name": "virtualNetwork",
+				"type": "Microsoft.Network.VirtualNetworkCombo",
 				"label": {
-					"password": "Password for Ansible Tower Console Admin",
-					"confirmPassword": "Confirm Password for  Ansible Tower Console Admin"
-				},
+          "virtualNetwork": "Virtual network",
+          "subnets": "Subnets"
+        },
+				"defaultValue": {
+          "name": "vnet01",
+          "addressPrefixSize": "/16"
+        },
 				"toolTip": {
-					"password": "Password for Ansible Tower Console Admin. Must be between 5 and 30 characters."
-				},
-				"constraints": {
-					"required": true,
-					"regex": "^.{5,30}$",
-					"validationMessage": "Enter a password for Ansible Tower Console Admin. The password must be 5-30 characters long."
-				},
-				"options": {
-					"hideConfirmation": false
-				}
-			}, {
-				"name": "ansibleTowerDatabasePassword",
-				"type": "Microsoft.Common.PasswordBox",
-				"label": {
-					"password": "Password for Ansible Tower Database",
-					"confirmPassword": "Confirm Password for Ansible Tower Database"
-				},
-				"toolTip": {
-					"password": "Password for Ansible Tower Database. Must be between 5 and 30 characters."
-				},
+          "virtualNetwork": "",
+          "subnets": ""
+        },
 				"constraints": {
-					"required": true,
-					"regex": "^.{5,30}$",
-					"validationMessage": "Enter a password for Ansible Tower Database. The password must be 5-30 characters long."
+          "minAddressPrefixSize": "/16"
 				},
-				"options": {
-					"hideConfirmation": false
-				}
+        "options": {
+          "hideExisting": true
+        },
+        "subnets": {
+          "subnet1": {
+            "label": "Management subnet",
+            "defaultValue": {
+              "name": "subnet-1",
+              "addressPrefixSize": "/24"
+            },
+            "constraints": {
+              "minAddressPrefixSize": "/24",
+              "minAddressCount": 12,
+              "requireContiguousAddresses": true
+            }
+          },
+          "subnet2": {
+            "label": "Second subnet",
+            "defaultValue": {
+              "name": "subnet-2",
+              "addressPrefixSize": "/26"
+            },
+            "constraints": {
+              "minAddressPrefixSize": "/26",
+              "minAddressCount": 8,
+              "requireContiguousAddresses": true
+            }
+          }
+        },
+        "visible": true
 			}]
 		}],
 		"outputs": {