toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Generate api/types:Port from swagger spec.

Browse Source 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: f06d8d6db991199ea5e5fcf527ff96f0d00c3a45
Component: engine
This commit is contained in:
Daniel Nephin
2016-10-03 14:49:49 -04:00
parent 07a14ff9a8
commit 247fb589b6
6 changed files with 44 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
components/engine/api/common.go
View File

@ -20,7 +20,7 @@ import (
// Common constants for daemon and client.
const (
// Version of Current REST API
// DefaultVersion of Current REST API
DefaultVersion string = "1.25"
// MinVersion represents Minimum REST API version supported
@ -57,8 +57,8 @@ func (r byPortInfo) Less(i, j int) bool {
// it's used by command 'docker ps'
func DisplayablePorts(ports []types.Port) string {
type portGroup struct {
first int
last int
first uint16
last uint16
}
groupMap := make(map[string]*portGroup)
var result []string
@ -99,7 +99,7 @@ func DisplayablePorts(ports []types.Port) string {
return strings.Join(result, ", ")
}
func formGroup(key string, start, last int) string {
func formGroup(key string, start, last uint16) string {
parts := strings.Split(key, "/")
groupType := parts[0]
var ip string
@ -107,7 +107,7 @@ func formGroup(key string, start, last int) string {
ip = parts[0]
groupType = parts[1]
}
group := strconv.Itoa(start)
group := strconv.Itoa(int(start))
if start != last {
group = fmt.Sprintf("%s-%d", group, last)
}