Fix inspect network show gateway with mask

Signed-off-by: Lei Jitang <leijitang@huawei.com>

api/server/router/network/network_routes.go

@@ -240,7 +240,7 @@ func buildIpamResources(r *types.NetworkResource, nwInfo libnetwork.NetworkInfo)
 		for _, ip4Info := range ipv4Info {
 			iData := network.IPAMConfig{}
 			iData.Subnet = ip4Info.IPAMData.Pool.String()
-			iData.Gateway = ip4Info.IPAMData.Gateway.String()
+			iData.Gateway = ip4Info.IPAMData.Gateway.IP.String()
 			r.IPAM.Config = append(r.IPAM.Config, iData)
 		}
 	}

docs/reference/api/docker_remote_api_v1.24.md

@@ -3115,7 +3115,7 @@ Content-Type: application/json
     "Config": [
       {
         "Subnet": "172.19.0.0/16",
-        "Gateway": "172.19.0.1/16"
+        "Gateway": "172.19.0.1"
       }
     ],
     "Options": {

docs/reference/api/docker_remote_api_v1.25.md

@@ -3115,7 +3115,7 @@ Content-Type: application/json
     "Config": [
       {
         "Subnet": "172.19.0.0/16",
-        "Gateway": "172.19.0.1/16"
+        "Gateway": "172.19.0.1"
       }
     ],
     "Options": {

docs/reference/commandline/network_inspect.md

@@ -102,7 +102,7 @@ $ docker network inspect simple-network
             "Config": [
                 {
                     "Subnet": "172.22.0.0/16",
-                    "Gateway": "172.22.0.1/16"
+                    "Gateway": "172.22.0.1"
                 }
             ]
         },

docs/tutorials/networkingcontainers.md

@@ -183,7 +183,7 @@ If you inspect the network, you'll find that it has nothing in it.
                 "Config": [
                     {
                         "Subnet": "172.18.0.0/16",
-                        "Gateway": "172.18.0.1/16"
+                        "Gateway": "172.18.0.1"
                     }
                 ]
             },

docs/userguide/networking/dockernetworks.md

@@ -333,7 +333,7 @@ $ docker network inspect isolated_nw
             "Config": [
                 {
                     "Subnet": "172.21.0.0/16",
-                    "Gateway": "172.21.0.1/16"
+                    "Gateway": "172.21.0.1"
                 }
             ]
         },

docs/userguide/networking/work-with-networks.md

@@ -57,7 +57,7 @@ $ docker network inspect simple-network
             "Config": [
                 {
                     "Subnet": "172.22.0.0/16",
-                    "Gateway": "172.22.0.1/16"
+                    "Gateway": "172.22.0.1"
                 }
             ]
         },
@@ -153,7 +153,7 @@ $ docker network inspect my-network
             "Config": [
                 {
                     "Subnet": "172.23.0.0/16",
-                    "Gateway": "172.23.0.1/16"
+                    "Gateway": "172.23.0.1"
                 }
             ]
         },
@@ -223,7 +223,7 @@ $ docker network inspect isolated_nw
             "Config": [
                 {
                     "Subnet": "172.25.0.0/16",
-                    "Gateway": "172.25.0.1/16"
+                    "Gateway": "172.25.0.1"
                 }
             ]
         },
@@ -784,7 +784,7 @@ $ docker network inspect isolated_nw
             "Config": [
                 {
                     "Subnet": "172.21.0.0/16",
-                    "Gateway": "172.21.0.1/16"
+                    "Gateway": "172.21.0.1"
                 }
             ]
         },
@@ -895,7 +895,7 @@ docker network inspect isolated_nw
             "Config": [
                 {
                     "Subnet": "172.21.0.0/16",
-                    "Gateway": "172.21.0.1/16"
+                    "Gateway": "172.21.0.1"
                 }
             ]
         },

man/docker-network-inspect.1.md

@@ -91,7 +91,7 @@ $ docker network inspect simple-network
             "Config": [
                 {
                     "Subnet": "172.22.0.0/16",
-                    "Gateway": "172.22.0.1/16"
+                    "Gateway": "172.22.0.1"
                 }
             ]
         },