Add a VPC-reference field to RoutingTable struct (#254)

Signed-off-by: ZIV NEVO <[email protected]>
np-guard · May 30, 2024 · 34fe0bd · 34fe0bd
1 parent f6b0391
commit 34fe0bd
Show file tree

Hide file tree

Showing 6 changed files with 79 additions and 13 deletions.
diff --git a/pkg/ibm/datamodel/data_model.go b/pkg/ibm/datamodel/data_model.go
@@ -254,15 +254,16 @@ func (res *Instance) GetCRN() *string { return res.CRN }
 // RoutingTable configuration object (not taggable)
 type RoutingTable struct {
 	vpcv1.RoutingTable
-	Routes []RouteWrapper `json:"routes"`
+	Routes []RouteWrapper      `json:"routes"`
+	VPC    *vpcv1.VPCReference `json:"vpc"`
 }
 
-func NewRoutingTable(rt *vpcv1.RoutingTable, routes []vpcv1.Route) *RoutingTable {
+func NewRoutingTable(rt *vpcv1.RoutingTable, routes []vpcv1.Route, vpcRef *vpcv1.VPCReference) *RoutingTable {
 	routesWrapper := make([]RouteWrapper, len(routes))
 	for i := range routes {
 		routesWrapper[i] = RouteWrapper(routes[i])
 	}
-	return &RoutingTable{RoutingTable: *rt, Routes: routesWrapper}
+	return &RoutingTable{RoutingTable: *rt, Routes: routesWrapper, VPC: vpcRef}
 }
 
 // RouteWrapper is an alias to vpcv1.Route that allows us to override

diff --git a/pkg/ibm/datamodel/test/data/demo-with-instances-config.json b/pkg/ibm/datamodel/test/data/demo-with-instances-config.json
@@ -3209,7 +3209,14 @@
                     "resource_type": "subnet"
                 }
             ],
-            "routes": []
+            "routes": [],
+            "vpc": {
+                "crn": "crn:1",
+                "href": "href:2",
+                "id": "id:3",
+                "name": "ky-testenv-vpc",
+                "resource_type": "vpc"
+            }
         }
     ],
     "load_balancers": [],

diff --git a/pkg/ibm/datamodel/test/data/experiments_env.json b/pkg/ibm/datamodel/test/data/experiments_env.json
@@ -2312,7 +2312,14 @@
                     "resource_type": "subnet"
                 }
             ],
-            "routes": []
+            "routes": [],
+            "vpc": {
+                "crn": "crn:1",
+                "href": "href:2",
+                "id": "id:3",
+                "name": "test-vpc1-ky",
+                "resource_type": "vpc"
+            }
         },
         {
             "accept_routes_from": [],
@@ -2414,7 +2421,14 @@
                         "name": "us-south-1"
                     }
                 }
-            ]
+            ],
+            "vpc": {
+                "crn": "crn:1",
+                "href": "href:2",
+                "id": "id:3",
+                "name": "test-vpc1-ky",
+                "resource_type": "vpc"
+            }
         },
         {
             "accept_routes_from": [
@@ -2446,7 +2460,14 @@
                     "resource_type": "subnet"
                 }
             ],
-            "routes": []
+            "routes": [],
+            "vpc": {
+                "crn": "crn:17",
+                "href": "href:18",
+                "id": "id:19",
+                "name": "test-vpc2-ky",
+                "resource_type": "vpc"
+            }
         }
     ],
     "load_balancers": [],

diff --git a/pkg/ibm/datamodel/test/data/iks-on-goldeneye-vpc-config.json b/pkg/ibm/datamodel/test/data/iks-on-goldeneye-vpc-config.json
@@ -3263,7 +3263,14 @@
                     "resource_type": "subnet"
                 }
             ],
-            "routes": []
+            "routes": [],
+            "vpc": {
+                "crn": "crn:1",
+                "href": "href:2",
+                "id": "id:3",
+                "name": "ky-test-vpc",
+                "resource_type": "vpc"
+            }
         }
     ],
     "load_balancers": [

diff --git a/pkg/ibm/datamodel/test/data/transit-gateways.json b/pkg/ibm/datamodel/test/data/transit-gateways.json
@@ -1527,7 +1527,14 @@
             "route_transit_gateway_ingress": false,
             "route_vpc_zone_ingress": false,
             "subnets": [],
-            "routes": []
+            "routes": [],
+            "vpc": {
+                "crn": "crn:30",
+                "href": "href:31",
+                "id": "id:32",
+                "name": "ky-vpc2",
+                "resource_type": "vpc"
+            }
         },
         {
             "accept_routes_from": [
@@ -1559,7 +1566,14 @@
                     "resource_type": "subnet"
                 }
             ],
-            "routes": []
+            "routes": [],
+            "vpc": {
+                "crn": "crn:17",
+                "href": "href:18",
+                "id": "id:19",
+                "name": "ky-vpc1",
+                "resource_type": "vpc"
+            }
         },
         {
             "accept_routes_from": [
@@ -1591,7 +1605,14 @@
                     "resource_type": "subnet"
                 }
             ],
-            "routes": []
+            "routes": [],
+            "vpc": {
+                "crn": "crn:30",
+                "href": "href:31",
+                "id": "id:32",
+                "name": "ky-vpc2",
+                "resource_type": "vpc"
+            }
         }
     ],
     "load_balancers": [],

diff --git a/pkg/ibm/vpc_collection.go b/pkg/ibm/vpc_collection.go
@@ -270,8 +270,17 @@ func getRoutingTables(vpcService *vpcv1.VpcV1, vpcList []*datamodel.VPC) ([]*dat
 		return collection.RoutingTables
 	}
 
+	vpcResourceType := vpcv1.VPCReferenceResourceTypeVPCConst
 	for i := range vpcList {
-		vpcID := *vpcList[i].ID
+		vpc := vpcList[i]
+		vpcID := *vpc.ID
+		vpcRef := &vpcv1.VPCReference{
+			CRN:          vpc.CRN,
+			Href:         vpc.Href,
+			ID:           vpc.ID,
+			Name:         vpc.Name,
+			ResourceType: &vpcResourceType,
+		}
 
 		routingTables, err := iteratePagedAPI(routingTableAPIFunc(vpcID), routingTableGetArray)
 		if err != nil {
@@ -282,7 +291,7 @@ func getRoutingTables(vpcService *vpcv1.VpcV1, vpcList []*datamodel.VPC) ([]*dat
 			if err != nil {
 				return nil, err
 			}
-			res = append(res, datamodel.NewRoutingTable(&routingTables[j], routes))
+			res = append(res, datamodel.NewRoutingTable(&routingTables[j], routes, vpcRef))
 		}
 	}