FG single: fixed type and different region for arm64

40net-cloud · Jul 25, 2024 · 3ecfa08 · 3ecfa08
1 parent 835a24a
commit 3ecfa08
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/FortiGate/A-Single-VM/createUiDefinition.json b/FortiGate/A-Single-VM/createUiDefinition.json
@@ -738,7 +738,7 @@
                   "subnets": "Standard deployment is to have an external and internal subnet"
                 },
                 "defaultValue": {
-                  "name": "[if(equals(basics('fortiGateNamePrefix'),''),'FortiGate-VNET',concat(basics('fortiGateNamePrefix'),'-VNET'))]",
+                  "name": "[if(equals(basics('fortiGateNamePrefix'),''),'fortigate-vnet',concat(basics('fortiGateNamePrefix'),'-vnet'))]",
                   "addressPrefixSize": "/22"
                 },
                 "constraints": {

diff --git a/FortiGate/A-Single-VM/test/azuredeploy.tests.ps1 b/FortiGate/A-Single-VM/test/azuredeploy.tests.ps1
@@ -28,7 +28,8 @@ BeforeAll {
   $testsPrefix = "FORTIQA"
   $testsResourceGroupName = "FORTIQA-$testsRandom-$templateName"
   $testsAdminUsername = "azureuser"
-  $testsResourceGroupLocation = "westeurope"
+  $testsResourceGroupLocation_x86 = "westeurope"
+  $testsResourceGroupLocation_arm64 = "northeurope"
 
   # ARM Template Variables
   $config = "config system console `n set output standard `n end `n config system global `n set gui-theme mariner `n end `n config system admin `n edit devops `n set accprofile super_admin `n set ssh-public-key1 `""
@@ -141,7 +142,7 @@ Describe 'FGT Single VM' {
   Context 'Deployment x86' {
 
     It "Test Deployment" {
-      New-AzResourceGroup -Name $testsResourceGroupName -Location "$testsResourceGroupLocation"
+      New-AzResourceGroup -Name $testsResourceGroupName -Location "$testsResourceGroupLocation_x86"
             (Test-AzResourceGroupDeployment -ResourceGroupName "$testsResourceGroupName" -TemplateFile "$templateFileLocation" -TemplateParameterObject $params_x86).Count | Should -Not -BeGreaterThan 0
     }
     It "Deployment" {
@@ -197,7 +198,7 @@ Describe 'FGT Single VM' {
   Context 'Deployment ARM64' {
 
     It "Test Deployment" {
-      New-AzResourceGroup -Name $testsResourceGroupName -Location "$testsResourceGroupLocation"
+      New-AzResourceGroup -Name $testsResourceGroupName -Location "$testsResourceGroupLocation_arm64"
             (Test-AzResourceGroupDeployment -ResourceGroupName "$testsResourceGroupName" -TemplateFile "$templateFileLocation" -TemplateParameterObject $params_arm64).Count | Should -Not -BeGreaterThan 0
     }
     It "Deployment" {