GCLOUD2-5745: Actualized interfaces field in data source and resource for routes endpoint

Author: shelomentsevd

docs/data-sources/gcore_router.md

@@ -82,6 +82,10 @@ Read-Only:
 
 Read-Only:
 
+- `ip_address` (String)
+- `mac_address` (String)
+- `network_id` (String)
+- `port_id` (String)
 - `subnet_id` (String)
 - `type` (String)
 

docs/resources/gcore_router.md

@@ -106,6 +106,13 @@ Required:
 - `subnet_id` (String) Subnet for router interface must have a gateway IP
 - `type` (String) must be 'subnet'
 
+Read-Only:
+
+- `ip_address` (String)
+- `mac_address` (String)
+- `network_id` (String)
+- `port_id` (String)
+
 
 <a id="nestedblock--routes"></a>
 ### Nested Schema for `routes`

gcore/data_source_gcore_router.go

@@ -90,10 +90,26 @@ func dataSourceRouter() *schema.Resource {
 				Computed: true,
 				Elem: &schema.Resource{
 					Schema: map[string]*schema.Schema{
+						"port_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"network_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"mac_address": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
 						"type": {
 							Type:     schema.TypeString,
 							Computed: true,
 						},
+						"ip_address": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
 						"subnet_id": {
 							Type:     schema.TypeString,
 							Computed: true,
@@ -176,12 +192,18 @@ func dataSourceRouterRead(ctx context.Context, d *schema.ResourceData, m interfa
 		d.Set("external_gateway_info", egilst)
 	}
 
-	ifs := make([]map[string]string, len(router.Interfaces))
-	for i, iface := range router.Interfaces {
-		smap := make(map[string]string, 2)
-		smap["type"] = "subnet"
-		smap["subnet_id"] = iface.IPAssignments[0].SubnetID
-		ifs[i] = smap
+	ifs := make([]map[string]interface{}, 0, len(router.Interfaces))
+	for _, iface := range router.Interfaces {
+		for _, subnet := range iface.IPAssignments {
+			smap := make(map[string]interface{}, 6)
+			smap["port_id"] = iface.PortID
+			smap["network_id"] = iface.NetworkID
+			smap["mac_address"] = iface.MacAddress.String()
+			smap["type"] = "subnet"
+			smap["subnet_id"] = subnet.SubnetID
+			smap["ip_address"] = subnet.IPAddress.String()
+			ifs = append(ifs, smap)
+		}
 	}
 	d.Set("interfaces", ifs)
 

gcore/resource_gcore_router.go

@@ -136,6 +136,22 @@ func resourceRouter() *schema.Resource {
 							Description: "Subnet for router interface must have a gateway IP",
 							Required:    true,
 						},
+						"port_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"network_id": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"mac_address": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
+						"ip_address": {
+							Type:     schema.TypeString,
+							Computed: true,
+						},
 					},
 				},
 			},
@@ -287,12 +303,18 @@ func resourceRouterRead(ctx context.Context, d *schema.ResourceData, m interface
 		d.Set("external_gateway_info", egilst)
 	}
 
-	ifs := make([]interface{}, len(router.Interfaces))
-	for i, iface := range router.Interfaces {
-		smap := make(map[string]interface{}, 2)
-		smap["type"] = "subnet"
-		smap["subnet_id"] = iface.IPAssignments[0].SubnetID
-		ifs[i] = smap
+	ifs := make([]interface{}, 0, len(router.Interfaces))
+	for _, iface := range router.Interfaces {
+		for _, subnet := range iface.IPAssignments {
+			smap := make(map[string]interface{}, 6)
+			smap["port_id"] = iface.PortID
+			smap["network_id"] = iface.NetworkID
+			smap["mac_address"] = iface.MacAddress.String()
+			smap["type"] = "subnet"
+			smap["subnet_id"] = subnet.SubnetID
+			smap["ip_address"] = subnet.IPAddress.String()
+			ifs = append(ifs, smap)
+		}
 	}
 	if err := d.Set("interfaces", schema.NewSet(routerInterfaceUniqueID, ifs)); err != nil {
 		return diag.FromErr(err)