feat(network): static_routes field to router (#260)

UpCloudLtd · Sep 27, 2023 · 7dd13dd · 7dd13dd
1 parent 9fc8e4d
commit 7dd13dd
Show file tree

Hide file tree

Showing 7 changed files with 170 additions and 80 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,8 +6,8 @@ See updating [Changelog example here](https://keepachangelog.com/en/1.0.0/)
 ## [Unreleased]
 
 ### Added
-
 - network: `dhcp_routes` field to IP network for additional DHCP classless static routes to be delivered if the DHCP is enabled
+- network: `static_routes` field to router for defining static routes
 
 ## [6.6.0]
 

diff --git a/upcloud/network.go b/upcloud/network.go
@@ -293,6 +293,14 @@ type Router struct {
 	Type             string             `json:"type"`
 	UUID             string             `json:"uuid"`
 	Labels           []Label            `json:"labels"`
+	StaticRoutes     []StaticRoute      `json:"static_routes"`
+}
+
+// StaticRoute represents a Static route
+type StaticRoute struct {
+	Name    string `json:"name,omitempty"`
+	Route   string `json:"route"`
+	Nexthop string `json:"nexthop"`
 }
 
 // UnmarshalJSON is a custom unmarshaller that deals with

diff --git a/upcloud/network_test.go b/upcloud/network_test.go
@@ -447,6 +447,13 @@ func TestUnmarshalRouters(t *testing.T) {
 				 ]
 			  },
 			  "name": "Example router",
+			  "static_routes": [
+                {
+			      "route": "0.0.0.0/0",
+			      "nexthop": "10.0.0.100",
+			      "name": "static_route_0"
+			    }
+			  ],
 			  "type": "normal",
 			  "uuid": "04c0df35-2658-4b0c-8ac7-962090f4e92a"
 			}
@@ -473,6 +480,13 @@ func TestUnmarshalRouters(t *testing.T) {
 			},
 			Name: "Example router",
 			Type: "normal",
+			StaticRoutes: []StaticRoute{
+				{
+					Name:    "static_route_0",
+					Route:   "0.0.0.0/0",
+					Nexthop: "10.0.0.100",
+				},
+			},
 			UUID: "04c0df35-2658-4b0c-8ac7-962090f4e92a",
 		},
 	}

diff --git a/upcloud/request/network.go b/upcloud/request/network.go
@@ -279,8 +279,9 @@ func (r *GetRouterDetailsRequest) RequestURL() string {
 
 // CreateRouterRequest represents a request to create a new router.
 type CreateRouterRequest struct {
-	Name   string          `json:"name"`
-	Labels []upcloud.Label `json:"labels,omitempty"`
+	Name         string                `json:"name"`
+	Labels       []upcloud.Label       `json:"labels,omitempty"`
+	StaticRoutes []upcloud.StaticRoute `json:"static_routes,omitempty"`
 }
 
 // RequestURL implements the Request interface.
@@ -302,9 +303,10 @@ func (r CreateRouterRequest) MarshalJSON() ([]byte, error) {
 
 // ModifyRouterRequest represents a request to modify an existing router.
 type ModifyRouterRequest struct {
-	UUID   string           `json:"-"`
-	Name   string           `json:"name"`
-	Labels *[]upcloud.Label `json:"labels,omitempty"`
+	UUID         string                 `json:"-"`
+	Name         string                 `json:"name"`
+	Labels       *[]upcloud.Label       `json:"labels,omitempty"`
+	StaticRoutes *[]upcloud.StaticRoute `json:"static_routes,omitempty"`
 }
 
 // RequestURL implements the Request interface.

diff --git a/upcloud/request/network_test.go b/upcloud/request/network_test.go
@@ -361,12 +361,26 @@ func TestMarshalGetRouterDetailsRequest(t *testing.T) {
 func TestMarshalCreateRouterRequest(t *testing.T) {
 	request := CreateRouterRequest{
 		Name: "Example router",
+		StaticRoutes: []upcloud.StaticRoute{
+			{
+				Name:    "example_static_route",
+				Route:   "0.0.0.0/0",
+				Nexthop: "10.0.0.100",
+			},
+		},
 	}
 
 	expectedJSON := `
 	  {
 		"router": {
-		  "name": "Example router"
+		  "name": "Example router",
+		  "static_routes": [
+            {
+			  "route": "0.0.0.0/0",
+			  "nexthop": "10.0.0.100",
+			  "name": "example_static_route"
+            }
+          ]
 		}
 	  }
 	`
@@ -383,13 +397,27 @@ func TestMarshalCreateRouterRequest(t *testing.T) {
 func TestMarshalModifyRouterRequest(t *testing.T) {
 	request := ModifyRouterRequest{
 		Name: "Modified router",
+		StaticRoutes: &[]upcloud.StaticRoute{
+			{
+				Name:    "example_static_route",
+				Route:   "0.0.0.0/0",
+				Nexthop: "10.0.0.100",
+			},
+		},
 		UUID: "foo",
 	}
 
 	expectedJSON := `
 	  {
 		"router": {
-		  "name": "Modified router"
+		  "name": "Modified router",
+		  "static_routes": [
+            {
+			  "route": "0.0.0.0/0",
+			  "nexthop": "10.0.0.100",
+			  "name": "example_static_route"
+            }
+		  ]
 		}
 	  }
 	`
@@ -403,14 +431,14 @@ func TestMarshalModifyRouterRequest(t *testing.T) {
 
 	request = ModifyRouterRequest{
 		UUID:   "",
-		Name:   "Modified router",
+		Name:   "Modified router name",
 		Labels: &[]upcloud.Label{},
 	}
 
 	expectedJSON = `
 	  {
 		"router": {
-		  "name": "Modified router",
+		  "name": "Modified router name",
 		  "labels": []
 		}
 	  }