From 69b259ff43bf3a5f017f234af4f51f320b73bd38 Mon Sep 17 00:00:00 2001 From: yairra Date: Wed, 5 Jun 2024 14:20:22 +0300 Subject: [PATCH] Azure vWAN | Added premium license support --- azure/templates/vwan-managed-app/README.md | 5 +++++ azure/templates/vwan-managed-app/mainTemplate.json | 7 ++++--- terraform/azure/nva-into-existing-hub/README.md | 2 +- terraform/azure/nva-into-existing-hub/main.tf | 4 ++-- terraform/azure/nva-into-existing-hub/variables.tf | 4 ++-- terraform/azure/nva-into-new-vwan/README.md | 2 +- terraform/azure/nva-into-new-vwan/main.tf | 4 ++-- terraform/azure/nva-into-new-vwan/variables.tf | 4 ++-- 8 files changed, 19 insertions(+), 13 deletions(-) diff --git a/azure/templates/vwan-managed-app/README.md b/azure/templates/vwan-managed-app/README.md index a56fa253..293238e2 100644 --- a/azure/templates/vwan-managed-app/README.md +++ b/azure/templates/vwan-managed-app/README.md @@ -17,6 +17,11 @@ For Full Package (NGTX + S1C) license: https://management.azure.com/subscriptions/{subscription_id}/providers/Microsoft.Network/networkVirtualApplianceSkus/checkpoint-ngtx?api-version=2023-05-01 ``` +For Full Package Premium (NGTX + S1C++) license: +``` +https://management.azure.com/subscriptions/{subscription_id}/providers/Microsoft.Network/networkVirtualApplianceSkus/checkpoint-premium?api-version=2023-05-01 +``` + ## Output example: ``` diff --git a/azure/templates/vwan-managed-app/mainTemplate.json b/azure/templates/vwan-managed-app/mainTemplate.json index 4094f4a6..5b733a83 100644 --- a/azure/templates/vwan-managed-app/mainTemplate.json +++ b/azure/templates/vwan-managed-app/mainTemplate.json @@ -16,7 +16,8 @@ "defaultValue": "Security Enforcement (NGTP)", "allowedValues": [ "Security Enforcement (NGTP)", - "Full Package (NGTX + S1C)" + "Full Package (NGTX + S1C)", + "Full Package Premium (NGTX + S1C++)" ], "type": "String", "metadata": { @@ -24,7 +25,7 @@ } }, "imageVersion": { - "defaultValue": "8120.900631.1522", + "defaultValue": "8120.900631.1594", "type": "String", "metadata": { "description": "The image version that will be used to deploy the solution. To get the image version, make API call to https://management.azure.com/subscriptions/{subscription_id}/providers/Microsoft.Network/networkVirtualApplianceSkus/checkpoint?api-version=2023-05-01" @@ -199,7 +200,7 @@ "name": "vwan-app", "product": "cp-vwan-managed-app", "publisher": "checkpoint", - "version": "1.0.13" + "version": "1.0.14" }, "properties": { "managedResourceGroupId": "[variables('managedResourceGroupId')]", diff --git a/terraform/azure/nva-into-existing-hub/README.md b/terraform/azure/nva-into-existing-hub/README.md index dc01d01e..6b05846d 100755 --- a/terraform/azure/nva-into-existing-hub/README.md +++ b/terraform/azure/nva-into-existing-hub/README.md @@ -87,7 +87,7 @@ please see the [CloudGuard Network for Azure Virtual WAN Deployment Guide](https | | | | | | | **os-version** | The GAIA os version | string | "R8110"
"R8120" | | | | | | | - | **license-type** | The Check Point licence type | string | "Security Enforcement (NGTP)"
"Full Package (NGTX + S1C)" | + | **license-type** | The Check Point licence type | string | "Security Enforcement (NGTP)"
"Full Package (NGTX + S1C)"
"Full Package Premium (NGTX + S1C++)" | | | | | | | | | | | | **scale-unit** | The scale unit determines the size and number of resources deployed. The higher the scale unit, the greater the amount of traffic that can be handled. | string | "2"
"4"
"10"
"20"
"30"
"60"
"80"
| | | | | | | diff --git a/terraform/azure/nva-into-existing-hub/main.tf b/terraform/azure/nva-into-existing-hub/main.tf index 39d67346..40d3c64a 100755 --- a/terraform/azure/nva-into-existing-hub/main.tf +++ b/terraform/azure/nva-into-existing-hub/main.tf @@ -32,7 +32,7 @@ locals { data "http" "image-versions" { method = "GET" - url = "https://management.azure.com/subscriptions/${var.subscription_id}/providers/Microsoft.Network/networkVirtualApplianceSKUs/checkpoint${var.license-type == "Full Package (NGTX + S1C)" ? "-ngtx" : ""}?api-version=2020-05-01" + url = "https://management.azure.com/subscriptions/${var.subscription_id}/providers/Microsoft.Network/networkVirtualApplianceSKUs/checkpoint${var.license-type == "Full Package (NGTX + S1C)" ? "-ngtx" : var.license-type == "Full Package Premium (NGTX + S1C++)" ? "-premium" : ""}?api-version=2020-05-01" request_headers = { Accept = "application/json" "Authorization" = "Bearer ${local.access_token}" @@ -105,7 +105,7 @@ resource "azurerm_managed_application" "nva" { name = "vwan-app" product = "cp-vwan-managed-app" publisher = "checkpoint" - version = "1.0.13" + version = "1.0.14" } parameter_values = jsonencode({ location = { diff --git a/terraform/azure/nva-into-existing-hub/variables.tf b/terraform/azure/nva-into-existing-hub/variables.tf index 090b4bc5..fad0db9e 100755 --- a/terraform/azure/nva-into-existing-hub/variables.tf +++ b/terraform/azure/nva-into-existing-hub/variables.tf @@ -73,8 +73,8 @@ variable "license-type" { type = string default = "Security Enforcement (NGTP)" validation { - condition = contains(["Security Enforcement (NGTP)", "Full Package (NGTX + S1C)"], var.license-type) - error_message = "Allowed values for License Type are 'Security Enforcement (NGTP)','Full Package (NGTX + S1C)'" + condition = contains(["Security Enforcement (NGTP)", "Full Package (NGTX + S1C)", "Full Package Premium (NGTX + S1C++)"], var.license-type) + error_message = "Allowed values for License Type are 'Security Enforcement (NGTP)', 'Full Package (NGTX + S1C)', 'Full Package Premium (NGTX + S1C++)'" } } diff --git a/terraform/azure/nva-into-new-vwan/README.md b/terraform/azure/nva-into-new-vwan/README.md index d63fb424..4e151b9c 100755 --- a/terraform/azure/nva-into-new-vwan/README.md +++ b/terraform/azure/nva-into-new-vwan/README.md @@ -91,7 +91,7 @@ please see the [CloudGuard Network for Azure Virtual WAN Deployment Guide](https | | | | | | | **os-version** | The GAIA os version | string | "R8110"
"R8120" | | | | | | | - | **license-type** | The Check Point licence type | string | "Security Enforcement (NGTP)"
"Full Package (NGTX + S1C)" | + | **license-type** | The Check Point licence type | string | "Security Enforcement (NGTP)"
"Full Package (NGTX + S1C)"
"Full Package Premium (NGTX + S1C++)" | | | | | | | | **scale-unit** | The scale unit determines the size and number of resources deployed. The higher the scale unit, the greater the amount of traffic that can be handled. | string | "2"
"4"
"10"
"20"
"30"
"60"
"80"
| | | | | | | diff --git a/terraform/azure/nva-into-new-vwan/main.tf b/terraform/azure/nva-into-new-vwan/main.tf index 3f75394c..d51f173b 100755 --- a/terraform/azure/nva-into-new-vwan/main.tf +++ b/terraform/azure/nva-into-new-vwan/main.tf @@ -41,7 +41,7 @@ locals { data "http" "image-versions" { method = "GET" - url = "https://management.azure.com/subscriptions/${var.subscription_id}/providers/Microsoft.Network/networkVirtualApplianceSKUs/checkpoint${var.license-type == "Full Package (NGTX + S1C)" ? "-ngtx" : ""}?api-version=2020-05-01" + url = "https://management.azure.com/subscriptions/${var.subscription_id}/providers/Microsoft.Network/networkVirtualApplianceSKUs/checkpoint${var.license-type == "Full Package (NGTX + S1C)" ? "-ngtx" : var.license-type == "Full Package Premium (NGTX + S1C++)" ? "-premium" : ""}?api-version=2020-05-01" request_headers = { Accept = "application/json" "Authorization" = "Bearer ${local.access_token}" @@ -115,7 +115,7 @@ resource "azurerm_managed_application" "nva" { name = "vwan-app" product = "cp-vwan-managed-app" publisher = "checkpoint" - version = "1.0.13" + version = "1.0.14" } parameter_values = jsonencode({ location = { diff --git a/terraform/azure/nva-into-new-vwan/variables.tf b/terraform/azure/nva-into-new-vwan/variables.tf index deb1bc31..f7a2ebec 100755 --- a/terraform/azure/nva-into-new-vwan/variables.tf +++ b/terraform/azure/nva-into-new-vwan/variables.tf @@ -84,8 +84,8 @@ variable "license-type" { type = string default = "Security Enforcement (NGTP)" validation { - condition = contains(["Security Enforcement (NGTP)", "Full Package (NGTX + S1C)"], var.license-type) - error_message = "Allowed values for License Type are 'Security Enforcement (NGTP)','Full Package (NGTX + S1C)'" + condition = contains(["Security Enforcement (NGTP)", "Full Package (NGTX + S1C)", "Full Package Premium (NGTX + S1C++)"], var.license-type) + error_message = "Allowed values for License Type are 'Security Enforcement (NGTP)', 'Full Package (NGTX + S1C)', 'Full Package Premium (NGTX + S1C++)'" } }