Add IPv6 and IDPF support and fix RoCE metal subnetwork logic

Author: LAVEEN

modules/compute/vm-instance/variables.tf

@@ -195,8 +195,8 @@ variable "network_interfaces" {
     subnetwork         (string, required if network is not supplied)
     subnetwork_project (string, optional)
     network_ip         (string, optional)
-    nic_type           (string, optional, choose from ["GVNIC", "VIRTIO_NET", "MRDMA", "IRDMA","IDPF"])
-    stack_type         (string, optional, choose from ["IPV4_ONLY", "IPV4_IPV6" , "IPV6_ONLY"])
+    nic_type           (string, optional, choose from ["GVNIC", "VIRTIO_NET", "MRDMA", "IRDMA", "IDPF"])
+    stack_type         (string, optional, choose from ["IPV4_ONLY", "IPV4_IPV6", "IPV6_ONLY"])
     queue_count        (number, optional)
     access_config      (object, optional)
     ipv6_access_config (object, optional)
@@ -233,13 +233,13 @@ variable "network_interfaces" {
   }
   validation {
     condition = alltrue([
-      for ni in var.network_interfaces : ni.nic_type == "GVNIC" || ni.nic_type == "VIRTIO_NET" || ni.nic_type == "MRDMA" || ni.nic_type == "IRDMA" || ni.nic_type == "IDPF" || ni.nic_type == null
+      for ni in var.network_interfaces : contains(["GVNIC", "VIRTIO_NET", "MRDMA", "IRDMA", "IDPF", null], ni.nic_type)
     ])
     error_message = "In the variable network_interfaces, field \"nic_type\" must be \"GVNIC\", \"VIRTIO_NET\", \"MRDMA\", \"IRDMA\",\"IDPF\"  or null."
   }
   validation {
     condition = alltrue([
-      for ni in var.network_interfaces : ni.stack_type == "IPV4_ONLY" || ni.stack_type == "IPV4_IPV6" || ni.stack_type == "IPV6_ONLY" || ni.stack_type == null
+      for ni in var.network_interfaces : contains(["IPV4_ONLY", "IPV4_IPV6", "IPV6_ONLY", null], ni.stack_type)
     ])
     error_message = "In the variable network_interfaces, field \"stack_type\" must be either \"IPV4_ONLY\", \"IPV4_IPV6\" , \"IPV6_ONLY\" or null."
   }

modules/network/gpu-rdma-vpc/main.tf

@@ -17,10 +17,13 @@
 locals {
   autoname      = replace(var.deployment_name, "_", "-")
   network_name  = var.network_name == null ? "${local.autoname}-net" : var.network_name
-  subnet_prefix = var.subnetworks_template.name_prefix == null ? "${local.autoname}-subnet" : var.subnetworks_template.name_prefix
+  subnet_prefix = try(var.subnetworks_template.name_prefix, null) == null ? "${local.autoname}-subnet" : var.subnetworks_template.name_prefix
   is_roce_metal = var.network_profile != null ? can(regex("vpc-roce-metal", var.network_profile)) : false
 
   new_bits = local.is_roce_metal? 0 :  ceil(log(var.subnetworks_template.count, 2))
+  // RoCE metal profile doesn't allow creating a subnetwork, as the profile 
+  // automatically creates a predefined subnetwork for the MRDMA interfaces.
+  // See: https://cloud.google.com/vpc/docs/network-profiles
   template_subnetworks = local.is_roce_metal? [] : [for i in range(var.subnetworks_template.count) :
     {
       subnet_name   = "${local.subnet_prefix}-${i}"

modules/network/vpc/variables.tf

@@ -83,7 +83,7 @@ variable "mtu" {
 }
 
 variable "enable_ipv6_ula" {
-  description = "Enabled IPv6 ULA, this is a permanent change and cannot be undone!"
+  description = "Enable IPv6 ULA, this is a permanent change and cannot be undone!"
   type        = bool
   default     = false
 }
@@ -94,7 +94,6 @@ variable "internal_ipv6_range" {
   default     = null
 }
 
-
 variable "subnetworks" {
   description = <<-EOT
   List of subnetworks to create within the VPC. If left empty, it will be