Merge pull request #261 from linkernetworks/sufuf3/update-route

[Task] Update pod route

API.md

@@ -328,12 +328,6 @@ Response Data:
             100,
             200
         ],
-        "routes":[
-           {
-              "dstCIDR":"224.0.0.0/4",
-              "gateway":"0.0.0.0"
-           }
-        ],
         "bridgeName": "",
         "nodes": [
             {
@@ -386,12 +380,6 @@ Response Data:
         100,
         200
     ],
-    "routes":[
-       {
-          "dstCIDR":"224.0.0.0/4",
-          "gateway":"0.0.0.0"
-       }
-    ],
     "bridgeName": "ovsbr0",
     "nodes": [
         {
@@ -632,6 +620,11 @@ For each Pod, we have fileds need to handle.
     - vlanTag: the vlan tag for `ifName` interface.
     - ipADdress: the IPv4 address of the `ifName` interface.
     - netmask: the IPv4 netmask of the `ifName` interface.
+    - routesGw: a array of route with gateway (Optional)
+        - dstCIDR(required): destination network cidr for add IP routing table
+        - gateway(required): the gateway of the interface subnet
+    - routeIntf: a array of route without gateway (Optional)
+        - dstCIDR(required): destination network cidr for add IP routing table
 7. capability: the power of the container, if it's ture, it will get almost all capability and act as a privileged=true.
 8. restartPolicy: the attribute how the pod restart is container, it should be a string and only valid for those following strings.
     - Always,OnFailure,Never
@@ -659,8 +652,19 @@ Request Data:
       "ifName":"eth12",
       "vlanTag":0,
       "ipAddress":"1.2.3.4",
-      "netmask":"255.255.255.0"
-  }],
+      "netmask":"255.255.255.0",
+      "routesGw": [
+         {
+            "dstCIDR":"192.168.2.0/24",
+            "gateway":"192.168.2.254"
+         }
+      ],
+      "routeIntf": [
+         {
+            "dstCIDR":"224.0.0.0/4",
+         }
+      ]
+  },
   "volumes":[
   ],
   "capability":true,

src/entity/pod.go

@@ -25,21 +25,27 @@ type Container struct {
 	Command []string `bson:"command" json:"command" validate:"required,dive,required"`
 }
 
-// PodRoute is the structure for add IP routing table
-type PodRoute struct {
+// PodRouteGw is the structure for add IP routing table with gateway
+type PodRouteGw struct {
+	DstCIDR string `bson:"dstCIDR" json:"dstCIDR" validate:"required,cidrv4"`
+	Gateway string `bson:"gateway" json:"gateway" validate:"required,ipv4"`
+}
+
+// PodRouteIntf is the structure for add IP routing table via interface
+type PodRouteIntf struct {
 	DstCIDR string `bson:"dstCIDR" json:"dstCIDR" validate:"required,cidrv4"`
-	Gateway string `bson:"gateway" json:"gateway" validate:"omitempty,ipv4"`
 }
 
 // PodNetwork is the structure for pod network info
 type PodNetwork struct {
 	Name   string `bson:"name" json:"name" validate:"required"`
 	IfName string `bson:"ifName" json:"ifName" validate:"required"`
 	// can not validate nil
-	VlanTag   *int32     `bson:"vlanTag" json:"vlanTag" validate:"-"`
-	IPAddress string     `bson:"ipAddress" json:"ipAddress" validate:"required,ipv4"`
-	Netmask   string     `bson:"netmask" json:"netmask" validate:"required,ipv4"`
-	Routes    []PodRoute `bson:"routes,omitempty" json:"routes" validate:"required,dive,required"`
+	VlanTag    *int32         `bson:"vlanTag" json:"vlanTag" validate:"-"`
+	IPAddress  string         `bson:"ipAddress" json:"ipAddress" validate:"required,ipv4"`
+	Netmask    string         `bson:"netmask" json:"netmask" validate:"required,ipv4"`
+	RoutesGw   []PodRouteGw   `bson:"routesGw,omitempty" json:"routesGw" validate:"required,dive,required"`
+	RoutesIntf []PodRouteIntf `bson:"routesIntf,omitempty" json:"routesIntf" validate:"required,dive,required"`
 
 	// It's from the entity.Network entity
 	BridgeName string `bson:"bridgeName" json:"bridgeName" validate:"-"`

src/pod/pod.go

@@ -106,12 +106,14 @@ func generateClientCommand(network entity.PodNetwork) (command []string) {
 	if network.VlanTag != nil {
 		command = append(command, "-v="+strconv.Itoa((int)(*network.VlanTag)))
 	}
-	if len(network.Routes) != 0 {
-		// Support one command with one add route in first version
-		if network.Routes[0].Gateway != "" {
-			command = append(command, "--net="+network.Routes[0].DstCIDR, "-g="+network.Routes[0].Gateway)
-		} else {
-			command = append(command, "--net="+network.Routes[0].DstCIDR)
+	if len(network.RoutesGw) != 0 {
+		for _, netroute := range network.RoutesGw {
+			command = append(command, "--route-gw="+netroute.DstCIDR+","+netroute.Gateway)
+		}
+	}
+	if len(network.RoutesIntf) != 0 {
+		for _, netroute := range network.RoutesIntf {
+			command = append(command, "--route-intf="+netroute.DstCIDR)
 		}
 	}
 	return
@@ -123,7 +125,7 @@ func generateInitContainer(networks []entity.PodNetwork) ([]corev1.Container, er
 	for i, v := range networks {
 		containers = append(containers, corev1.Container{
 			Name:    fmt.Sprintf("init-network-client-%d", i),
-			Image:   "sdnvortex/network-controller:v0.4.0",
+			Image:   "sdnvortex/network-controller:v0.4.3",
 			Command: []string{"/go/bin/client"},
 			Args:    generateClientCommand(v),
 			Env: []corev1.EnvVar{

tests/01-multiple-interface/pod.info

@@ -17,22 +17,25 @@
 			"vlanTag":123,
 			"ipAddress":"1.2.3.4",
             "netmask":"255.255.255.0",
-            "routes": []
+            "routesGw": [],
+            "routesIntf": []
 		},
 		{
 			"name":"@NETWORKNAME@",
 			"ifName":"eth13",
 			"vlanTag":124,
 			"ipAddress":"1.2.4.5",
 			"netmask":"255.255.255.0",
-            "routes": []
+            "routesGw": [],
+            "routesIntf": []
 		},
 		{
 			"name":"@NETWORKNAME@",
 			"ifName":"eth15",
 			"ipAddress":"15.2.4.5",
 			"netmask":"255.255.255.0",
-            "routes":[]
+            "routesGw":[],
+            "routesIntf":[]
 		}
 	],
 	"volumes":[],