add GW spoke

Author: harshithpatte-g

mmv1/products/networkconnectivity/Hub.yaml

@@ -112,6 +112,7 @@ properties:
     enum_values:
       - 'MESH'
       - 'STAR'
+      - 'HYBRID_INSPECTION'
     default_from_api: true
   - name: 'policyMode'
     type: Enum

mmv1/products/networkconnectivity/Spoke.yaml

@@ -110,6 +110,13 @@ examples:
       network_name: 'net'
       hub_name: 'hub1'
       spoke_name: 'spoke1-ipv6'
+  - name: 'network_connectivity_spoke_gateway'
+    primary_resource_id: 'primary'
+    min_version: beta
+    vars:
+      network_name: 'net-spoke'
+      hub_name: 'hub'
+      spoke_name: 'gateway'
 parameters:
   - name: 'location'
     type: String
@@ -148,6 +155,7 @@ properties:
   - name: 'group'
     type: String
     description: The name of the group that this spoke is associated with.
+    diff_suppress_func: 'tpgresource.CompareSelfLinkOrResourceName'
     immutable: true
     default_from_api: true
   - name: 'linkedVpnTunnels'
@@ -158,6 +166,7 @@ properties:
       - linked_router_appliance_instances
       - linked_vpc_network
       - linked_producer_vpc_network
+      - gateway
     update_mask_fields:
       - 'linkedVpnTunnels.includeImportRanges'
     properties:
@@ -188,6 +197,7 @@ properties:
       - linked_router_appliance_instances
       - linked_vpc_network
       - linked_producer_vpc_network
+      - gateway
     update_mask_fields:
       - 'linkedInterconnectAttachments.includeImportRanges'
     properties:
@@ -218,6 +228,7 @@ properties:
       - linked_vpn_tunnels
       - linked_vpc_network
       - linked_producer_vpc_network
+      - gateway
     update_mask_fields:
       - 'linkedRouterApplianceInstances.instances'
       - 'linkedRouterApplianceInstances.includeImportRanges'
@@ -259,6 +270,7 @@ properties:
       - linked_router_appliance_instances
       - linked_vpn_tunnels
       - linked_producer_vpc_network
+      - gateway
     update_mask_fields:
       - 'linkedVpcNetwork.excludeExportRanges'
       - 'linkedVpcNetwork.includeExportRanges'
@@ -288,6 +300,7 @@ properties:
       - linked_router_appliance_instances
       - linked_vpn_tunnels
       - linked_vpc_network
+      - gateway
     properties:
       - name: network
         type: String
@@ -315,6 +328,39 @@ properties:
         description: IP ranges encompassing the subnets to be excluded from peering.
         item_type:
           type: String
+  - name: gateway
+    type: NestedObject
+    description: Todo
+    immutable: true
+    min_version: beta
+    conflicts:
+      - linked_interconnect_attachments
+      - linked_router_appliance_instances
+      - linked_vpn_tunnels
+      - linked_vpc_network
+      - linkedProducerVpcNetwork
+    properties:
+      - name: ipRangeReservations
+        type: Array
+        description: Todo
+        required: true
+        immutable: false
+        item_type:
+          type: NestedObject
+          properties:
+            - name: ipRange
+              type: String
+              description: Todo
+              required: true
+      - name: capacity
+        type: Enum
+        description: todo
+        immutable: false
+        required: false
+        enum_values:
+          - 'CAPACITY_1_GBPS'
+          - 'CAPACITY_10_GBPS'
+          - 'CAPACITY_100_GBPS'
   - name: 'uniqueId'
     type: String
     description: Output only. The Google-generated UUID for the spoke. This value is unique across all spoke resources. If a spoke is deleted and another with the same name is created, the new spoke is assigned a different unique_id.

mmv1/products/networkconnectivity/product.yaml

@@ -17,5 +17,7 @@ display_name: 'Network Connectivity'
 versions:
   - name: 'ga'
     base_url: 'https://networkconnectivity.googleapis.com/v1/'
+  - name: 'beta'
+    base_url: 'https://networkconnectivity.googleapis.com/v1beta/'
 scopes:
   - 'https://www.googleapis.com/auth/cloud-platform'

mmv1/templates/terraform/examples/network_connectivity_spoke_gateway.tf.tmpl

@@ -0,0 +1,41 @@
+resource "google_compute_network" "network" {
+  provider = google-beta
+  name        = "{{index $.Vars "network_name"}}"
+  auto_create_subnetworks = false
+}
+
+resource "google_compute_subnetwork" "subnetwork" {
+  provider = google-beta
+  name          = "tf-test-subnet%{random_suffix}"
+  ip_cidr_range = "10.0.0.0/28"
+  region        = "us-central1"
+  network       = google_compute_network.network.self_link
+}
+
+resource "google_network_connectivity_hub" "basic_hub" {
+  provider = google-beta
+  name        = "{{index $.Vars "hub_name"}}"
+  description = "A sample hub"
+  labels = {
+    label-two = "value-one"
+  }
+  preset_topology = "HYBRID_INSPECTION"
+}
+
+resource "google_network_connectivity_spoke" "primary" {
+  provider = google-beta
+  name        = "{{index $.Vars "spoke_name"}}"
+  location = "us-central1"
+  description = "A sample spoke with a linked routher appliance instance"
+  labels = {
+    label-one = "value-one"
+  }
+  hub =  google_network_connectivity_hub.basic_hub.id
+  gateway {
+    ip_range_reservations {
+      ip_range = "10.0.0.0/23"
+    }
+    capacity = "CAPACITY_1_GBPS"
+  }
+  group = "gateways"
+}