Adding support changes for NPI

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"])
-    stack_type         (string, optional, choose from ["IPV4_ONLY", "IPV4_IPV6"])
+    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,15 +233,15 @@ 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 == null
+      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
     ])
-    error_message = "In the variable network_interfaces, field \"nic_type\" must be \"GVNIC\", \"VIRTIO_NET\", \"MRDMA\", \"IRDMA\", or null."
+    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 == null
+      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
     ])
-    error_message = "In the variable network_interfaces, field \"stack_type\" must be either \"IPV4_ONLY\", \"IPV4_IPV6\" or null."
+    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

@@ -18,9 +18,10 @@ 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
-
-  new_bits = ceil(log(var.subnetworks_template.count, 2))
-  template_subnetworks = [for i in range(var.subnetworks_template.count) :
+  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))
+  template_subnetworks = local.is_roce_metal? [] : [for i in range(var.subnetworks_template.count) :
     {
       subnet_name   = "${local.subnet_prefix}-${i}"
       subnet_region = try(var.subnetworks_template.region, var.region)

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

@@ -50,7 +50,7 @@ variable "subnetworks_template" {
   ip_range    (string, required, range of IPs for all subnets to share (CIDR format), default is 192.168.0.0/16)
   region      (string, optional, region to deploy subnets to, defaults to vars.region)
   EOT
-  nullable    = false
+  nullable    = true
   type = object({
     count       = number
     name_prefix = string
@@ -65,8 +65,18 @@ variable "subnetworks_template" {
   }
 
   validation {
-    condition     = var.subnetworks_template.count > 0
-    error_message = "Number of subnetworks must be greater than 0"
+    # If it's NOT a RoCE Metal profile, the template cannot be null
+    condition = (
+      can(regex("vpc-roce-metal", var.network_profile)) || 
+      var.subnetworks_template != null
+    )
+    error_message = "subnetworks_template cannot be null unless using a 'vpc-roce-metal' network profile."
+  }
+
+validation {
+    # If template is provided, count must be > 0
+    condition     = var.subnetworks_template == null ? true : var.subnetworks_template.count > 0
+    error_message = "Number of subnetworks must be greater than 0."
   }
 
   validation {

modules/network/vpc/main.tf

@@ -191,6 +191,8 @@ module "vpc" {
   secondary_ranges                       = length(local.secondary_ranges_map) > 0 ? local.secondary_ranges_map : var.secondary_ranges
   routing_mode                           = var.network_routing_mode
   mtu                                    = var.mtu
+  enable_ipv6_ula                        = var.enable_ipv6_ula
+  internal_ipv6_range                    = var.internal_ipv6_range
   description                            = var.network_description
   shared_vpc_host                        = var.shared_vpc_host
   delete_default_internet_gateway_routes = var.delete_default_internet_gateway_routes

modules/network/vpc/variables.tf

@@ -82,6 +82,19 @@ variable "mtu" {
   default     = 8896
 }
 
+variable "enable_ipv6_ula" {
+  description = "Enabled IPv6 ULA, this is a permanent change and cannot be undone!"
+  type        = bool
+  default     = false
+}
+
+variable "internal_ipv6_range" {
+  description = "When enabling IPv6 ULA, optionally specify a /48 from fd20::/20 (default null)"
+  type        = string
+  default     = null
+}
+
+
 variable "subnetworks" {
   description = <<-EOT
   List of subnetworks to create within the VPC. If left empty, it will be