Merge pull request #372 from squeed/fix-build

win-bridge, win-overlay: remove extra import

.travis.yml

@@ -3,14 +3,15 @@ sudo: required
 dist: trusty
 
 go:
-  - 1.10.x
   - 1.11.x
+  - 1.12.x
 
 env:
   global:
   - PATH=$GOROOT/bin:$GOPATH/bin:$PATH
   - CGO_ENABLED=0
   matrix:
+  - TARGET=386
   - TARGET=amd64
   - TARGET=arm
   - TARGET=arm64
@@ -22,10 +23,10 @@ matrix:
   include:
     - os: windows
       env: TARGET=amd64
-      go: 1.10.x
+      go: 1.11.x
     - os: windows
       env: TARGET=amd64
-      go: 1.11.x
+      go: 1.12.x
 
 install:
   - go get github.com/onsi/ginkgo/ginkgo

Godeps/Godeps.json

@@ -1,367 +0,0 @@
-{
-	"ImportPath": "github.com/containernetworking/plugins",
-	"GoVersion": "go1.7",
-	"GodepVersion": "v80",
-	"Packages": [
-		"./..."
-	],
-	"Deps": [
-		{
-			"ImportPath": "github.com/Microsoft/go-winio",
-			"Comment": "v0.4.11",
-			"Rev": "97e4973ce50b2ff5f09635a57e2b88a037aae829"
-		},
-		{
-			"ImportPath": "github.com/Microsoft/hcsshim",
-			"Comment": "v0.7.6",
-			"Rev": "e44e499d29527b244d6858772f1b9090eeaddc4e"
-		},
-		{
-			"ImportPath": "github.com/Microsoft/hcsshim/internal/guid",
-			"Comment": "v0.7.4",
-			"Rev": "e44e499d29527b244d6858772f1b9090eeaddc4e"
-		},
-		{
-			"ImportPath": "github.com/Microsoft/hcsshim/internal/hcs",
-			"Comment": "v0.7.4",
-			"Rev": "e44e499d29527b244d6858772f1b9090eeaddc4e"
-		},
-		{
-			"ImportPath": "github.com/Microsoft/hcsshim/internal/hcserror",
-			"Comment": "v0.7.4",
-			"Rev": "e44e499d29527b244d6858772f1b9090eeaddc4e"
-		},
-		{
-			"ImportPath": "github.com/Microsoft/hcsshim/internal/hns",
-			"Comment": "v0.7.4",
-			"Rev": "e44e499d29527b244d6858772f1b9090eeaddc4e"
-		},
-		{
-			"ImportPath": "github.com/Microsoft/hcsshim/internal/interop",
-			"Comment": "v0.7.4",
-			"Rev": "e44e499d29527b244d6858772f1b9090eeaddc4e"
-		},
-		{
-			"ImportPath": "github.com/Microsoft/hcsshim/internal/longpath",
-			"Comment": "v0.7.4",
-			"Rev": "e44e499d29527b244d6858772f1b9090eeaddc4e"
-		},
-		{
-			"ImportPath": "github.com/Microsoft/hcsshim/internal/mergemaps",
-			"Comment": "v0.7.4",
-			"Rev": "e44e499d29527b244d6858772f1b9090eeaddc4e"
-		},
-		{
-			"ImportPath": "github.com/Microsoft/hcsshim/internal/safefile",
-			"Comment": "v0.7.4",
-			"Rev": "e44e499d29527b244d6858772f1b9090eeaddc4e"
-		},
-		{
-			"ImportPath": "github.com/Microsoft/hcsshim/internal/schema1",
-			"Comment": "v0.7.4",
-			"Rev": "e44e499d29527b244d6858772f1b9090eeaddc4e"
-		},
-		{
-			"ImportPath": "github.com/Microsoft/hcsshim/internal/timeout",
-			"Comment": "v0.7.4",
-			"Rev": "e44e499d29527b244d6858772f1b9090eeaddc4e"
-		},
-		{
-			"ImportPath": "github.com/Microsoft/hcsshim/internal/wclayer",
-			"Comment": "v0.7.4",
-			"Rev": "e44e499d29527b244d6858772f1b9090eeaddc4e"
-		},
-		{
-			"ImportPath": "github.com/alexflint/go-filemutex",
-			"Rev": "72bdc8eae2aef913234599b837f5dda445ca9bd9"
-		},
-		{
-			"ImportPath": "github.com/buger/jsonparser",
-			"Rev": "f4dd9f5a6b441265aefc1d44872a6f8c10f42b37"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/libcni",
-			"Comment": "v0.7.0",
-			"Rev": "7d76556571b6cf1ab90d7026a73092ac8d5e0c23"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/pkg/invoke",
-			"Comment": "v0.7.0",
-			"Rev": "7d76556571b6cf1ab90d7026a73092ac8d5e0c23"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/pkg/skel",
-			"Comment": "v0.7.0",
-			"Rev": "7d76556571b6cf1ab90d7026a73092ac8d5e0c23"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/pkg/types",
-			"Comment": "v0.7.0",
-			"Rev": "7d76556571b6cf1ab90d7026a73092ac8d5e0c23"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/pkg/types/020",
-			"Comment": "v0.7.0",
-			"Rev": "7d76556571b6cf1ab90d7026a73092ac8d5e0c23"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/pkg/types/current",
-			"Comment": "v0.7.0",
-			"Rev": "7d76556571b6cf1ab90d7026a73092ac8d5e0c23"
-		},
-		{
-			"ImportPath": "github.com/containernetworking/cni/pkg/version",
-			"Comment": "v0.7.0",
-			"Rev": "7d76556571b6cf1ab90d7026a73092ac8d5e0c23"
-		},
-		{
-			"ImportPath": "github.com/coreos/go-iptables/iptables",
-			"Comment": "v0.4.1",
-			"Rev": "78b5fff24e6df8886ef8eca9411f683a884349a5"
-		},
-		{
-			"ImportPath": "github.com/coreos/go-systemd/activation",
-			"Comment": "v17",
-			"Rev": "39ca1b05acc7ad1220e09f133283b8859a8b71ab"
-		},
-		{
-			"ImportPath": "github.com/d2g/dhcp4",
-			"Rev": "f0e4d29ff0231dce36e250b2ed9ff08412584bca"
-		},
-		{
-			"ImportPath": "github.com/d2g/dhcp4client",
-			"Rev": "bed07e1bc5b85f69c6f0fd73393aa35ec68ed892"
-		},
-		{
-			"ImportPath": "github.com/d2g/dhcp4server",
-			"Rev": "477b11cea4dcc56af002849238d4f9c1e093c744"
-		},
-		{
-			"ImportPath": "github.com/d2g/dhcp4server/leasepool",
-			"Rev": "477b11cea4dcc56af002849238d4f9c1e093c744"
-		},
-		{
-			"ImportPath": "github.com/d2g/dhcp4server/leasepool/memorypool",
-			"Rev": "477b11cea4dcc56af002849238d4f9c1e093c744"
-		},
-		{
-			"ImportPath": "github.com/godbus/dbus",
-			"Comment": "v4.1.0-6-g885f9cc",
-			"Rev": "885f9cc04c9c1a6a61a2008e211d36c5737be3f5"
-		},
-		{
-			"ImportPath": "github.com/j-keck/arping",
-			"Rev": "2cf9dc699c5640a7e2c81403a44127bf28033600"
-		},
-		{
-			"ImportPath": "github.com/juju/errors",
-			"Rev": "22422dad46e14561a0854ad42497a75af9b61909"
-		},
-		{
-			"ImportPath": "github.com/mattn/go-shellwords",
-			"Comment": "v1.0.3",
-			"Rev": "02e3cf038dcea8290e44424da473dd12be796a8a"
-		},
-		{
-			"ImportPath": "github.com/onsi/ginkgo",
-			"Comment": "v1.2.0-29-g7f8ab55",
-			"Rev": "7f8ab55aaf3b86885aa55b762e803744d1674700"
-		},
-		{
-			"ImportPath": "github.com/onsi/ginkgo/config",
-			"Comment": "v1.2.0-29-g7f8ab55",
-			"Rev": "7f8ab55aaf3b86885aa55b762e803744d1674700"
-		},
-		{
-			"ImportPath": "github.com/onsi/ginkgo/extensions/table",
-			"Comment": "v1.2.0-29-g7f8ab55",
-			"Rev": "7f8ab55aaf3b86885aa55b762e803744d1674700"
-		},
-		{
-			"ImportPath": "github.com/onsi/ginkgo/internal/codelocation",
-			"Comment": "v1.2.0-29-g7f8ab55",
-			"Rev": "7f8ab55aaf3b86885aa55b762e803744d1674700"
-		},
-		{
-			"ImportPath": "github.com/onsi/ginkgo/internal/containernode",
-			"Comment": "v1.2.0-29-g7f8ab55",
-			"Rev": "7f8ab55aaf3b86885aa55b762e803744d1674700"
-		},
-		{
-			"ImportPath": "github.com/onsi/ginkgo/internal/failer",
-			"Comment": "v1.2.0-29-g7f8ab55",
-			"Rev": "7f8ab55aaf3b86885aa55b762e803744d1674700"
-		},
-		{
-			"ImportPath": "github.com/onsi/ginkgo/internal/leafnodes",
-			"Comment": "v1.2.0-29-g7f8ab55",
-			"Rev": "7f8ab55aaf3b86885aa55b762e803744d1674700"
-		},
-		{
-			"ImportPath": "github.com/onsi/ginkgo/internal/remote",
-			"Comment": "v1.2.0-29-g7f8ab55",
-			"Rev": "7f8ab55aaf3b86885aa55b762e803744d1674700"
-		},
-		{
-			"ImportPath": "github.com/onsi/ginkgo/internal/spec",
-			"Comment": "v1.2.0-29-g7f8ab55",
-			"Rev": "7f8ab55aaf3b86885aa55b762e803744d1674700"
-		},
-		{
-			"ImportPath": "github.com/onsi/ginkgo/internal/specrunner",
-			"Comment": "v1.2.0-29-g7f8ab55",
-			"Rev": "7f8ab55aaf3b86885aa55b762e803744d1674700"
-		},
-		{
-			"ImportPath": "github.com/onsi/ginkgo/internal/suite",
-			"Comment": "v1.2.0-29-g7f8ab55",
-			"Rev": "7f8ab55aaf3b86885aa55b762e803744d1674700"
-		},
-		{
-			"ImportPath": "github.com/onsi/ginkgo/internal/testingtproxy",
-			"Comment": "v1.2.0-29-g7f8ab55",
-			"Rev": "7f8ab55aaf3b86885aa55b762e803744d1674700"
-		},
-		{
-			"ImportPath": "github.com/onsi/ginkgo/internal/writer",
-			"Comment": "v1.2.0-29-g7f8ab55",
-			"Rev": "7f8ab55aaf3b86885aa55b762e803744d1674700"
-		},
-		{
-			"ImportPath": "github.com/onsi/ginkgo/reporters",
-			"Comment": "v1.2.0-29-g7f8ab55",
-			"Rev": "7f8ab55aaf3b86885aa55b762e803744d1674700"
-		},
-		{
-			"ImportPath": "github.com/onsi/ginkgo/reporters/stenographer",
-			"Comment": "v1.2.0-29-g7f8ab55",
-			"Rev": "7f8ab55aaf3b86885aa55b762e803744d1674700"
-		},
-		{
-			"ImportPath": "github.com/onsi/ginkgo/types",
-			"Comment": "v1.2.0-29-g7f8ab55",
-			"Rev": "7f8ab55aaf3b86885aa55b762e803744d1674700"
-		},
-		{
-			"ImportPath": "github.com/onsi/gomega",
-			"Comment": "v1.0-71-g2152b45",
-			"Rev": "2152b45fa28a361beba9aab0885972323a444e28"
-		},
-		{
-			"ImportPath": "github.com/onsi/gomega/format",
-			"Comment": "v1.0-71-g2152b45",
-			"Rev": "2152b45fa28a361beba9aab0885972323a444e28"
-		},
-		{
-			"ImportPath": "github.com/onsi/gomega/gbytes",
-			"Comment": "v1.0-71-g2152b45",
-			"Rev": "2152b45fa28a361beba9aab0885972323a444e28"
-		},
-		{
-			"ImportPath": "github.com/onsi/gomega/gexec",
-			"Comment": "v1.0-71-g2152b45",
-			"Rev": "2152b45fa28a361beba9aab0885972323a444e28"
-		},
-		{
-			"ImportPath": "github.com/onsi/gomega/internal/assertion",
-			"Comment": "v1.0-71-g2152b45",
-			"Rev": "2152b45fa28a361beba9aab0885972323a444e28"
-		},
-		{
-			"ImportPath": "github.com/onsi/gomega/internal/asyncassertion",
-			"Comment": "v1.0-71-g2152b45",
-			"Rev": "2152b45fa28a361beba9aab0885972323a444e28"
-		},
-		{
-			"ImportPath": "github.com/onsi/gomega/internal/oraclematcher",
-			"Comment": "v1.0-71-g2152b45",
-			"Rev": "2152b45fa28a361beba9aab0885972323a444e28"
-		},
-		{
-			"ImportPath": "github.com/onsi/gomega/internal/testingtsupport",
-			"Comment": "v1.0-71-g2152b45",
-			"Rev": "2152b45fa28a361beba9aab0885972323a444e28"
-		},
-		{
-			"ImportPath": "github.com/onsi/gomega/matchers",
-			"Comment": "v1.0-71-g2152b45",
-			"Rev": "2152b45fa28a361beba9aab0885972323a444e28"
-		},
-		{
-			"ImportPath": "github.com/onsi/gomega/matchers/support/goraph/bipartitegraph",
-			"Comment": "v1.0-71-g2152b45",
-			"Rev": "2152b45fa28a361beba9aab0885972323a444e28"
-		},
-		{
-			"ImportPath": "github.com/onsi/gomega/matchers/support/goraph/edge",
-			"Comment": "v1.0-71-g2152b45",
-			"Rev": "2152b45fa28a361beba9aab0885972323a444e28"
-		},
-		{
-			"ImportPath": "github.com/onsi/gomega/matchers/support/goraph/node",
-			"Comment": "v1.0-71-g2152b45",
-			"Rev": "2152b45fa28a361beba9aab0885972323a444e28"
-		},
-		{
-			"ImportPath": "github.com/onsi/gomega/matchers/support/goraph/util",
-			"Comment": "v1.0-71-g2152b45",
-			"Rev": "2152b45fa28a361beba9aab0885972323a444e28"
-		},
-		{
-			"ImportPath": "github.com/onsi/gomega/types",
-			"Comment": "v1.0-71-g2152b45",
-			"Rev": "2152b45fa28a361beba9aab0885972323a444e28"
-		},
-		{
-			"ImportPath": "github.com/safchain/ethtool",
-			"Rev": "7ff1ba29eca231991280817541cb3903f6be15d1"
-		},
-		{
-			"ImportPath": "github.com/sirupsen/logrus",
-			"Comment": "v1.0.6",
-			"Rev": "3e01752db0189b9157070a0e1668a620f9a85da2"
-		},
-		{
-			"ImportPath": "github.com/vishvananda/netlink",
-			"Comment": "v1.0.0-40-g023a6da",
-			"Rev": "023a6dafdcdfa7068ac83b260ab7f03cd4131aca"
-		},
-		{
-			"ImportPath": "github.com/vishvananda/netlink/nl",
-			"Comment": "v1.0.0-40-g023a6da",
-			"Rev": "023a6dafdcdfa7068ac83b260ab7f03cd4131aca"
-		},
-		{
-			"ImportPath": "github.com/vishvananda/netns",
-			"Rev": "13995c7128ccc8e51e9a6bd2b551020a27180abd"
-		},
-		{
-			"ImportPath": "golang.org/x/crypto/ssh/terminal",
-			"Rev": "7c1a557ab941a71c619514f229f0b27ccb0c27cf"
-		},
-		{
-			"ImportPath": "golang.org/x/net/bpf",
-			"Rev": "49bb7cea24b1df9410e1712aa6433dae904ff66a"
-		},
-		{
-			"ImportPath": "golang.org/x/net/internal/iana",
-			"Rev": "49bb7cea24b1df9410e1712aa6433dae904ff66a"
-		},
-		{
-			"ImportPath": "golang.org/x/net/ipv4",
-			"Rev": "49bb7cea24b1df9410e1712aa6433dae904ff66a"
-		},
-		{
-			"ImportPath": "golang.org/x/sys/unix",
-			"Rev": "66b7b1311ac80bbafcd2daeef9a5e6e2cd1e2399"
-		},
-		{
-			"ImportPath": "golang.org/x/sys/windows",
-			"Rev": "66b7b1311ac80bbafcd2daeef9a5e6e2cd1e2399"
-		},
-		{
-			"ImportPath": "golang.org/x/net/internal/socket",
-			"Rev": "49bb7cea24b1df9410e1712aa6433dae904ff66a"
-		}
-	]
-}

Godeps/Readme

@@ -1,5 +0,0 @@
-This directory tree is generated automatically by godep.
-
-Please do not edit.
-
-See https://github.com/tools/godep for more information.

Vagrantfile

@@ -10,9 +10,9 @@ Vagrant.configure(2) do |config|
     set -e -x -u
     apt-get update -y || (sleep 40 && apt-get update -y)
     apt-get install -y git gcc-multilib gcc-mingw-w64
-    wget -qO- https://storage.googleapis.com/golang/go1.11.1.linux-amd64.tar.gz | tar -C /usr/local -xz
+    wget -qO- https://storage.googleapis.com/golang/go1.12.7.linux-amd64.tar.gz | tar -C /usr/local -xz
     echo 'export GOPATH=/go' >> /root/.bashrc
     echo 'export PATH=$PATH:/usr/local/go/bin:$GOPATH/bin' >> /root/.bashrc
     cd /go/src/github.com/containernetworking/plugins
   SHELL
-end
+end

build_linux.sh

@@ -16,6 +16,7 @@ fi
 
 export GOPATH=${PWD}/gopath
 export GO="${GO:-go}"
+export GOFLAGS="${GOFLAGS} -mod=vendor"
 
 mkdir -p "${PWD}/bin"
 

build_windows.sh

@@ -12,6 +12,8 @@ ln -s ${PWD} ${GOPATH}/src/${REPO_PATH} || exit 255
 
 export GO="${GO:-go}"
 export GOOS=windows
+export GOFLAGS="${GOFLAGS} -mod=vendor"
+echo $GOFLAGS
 
 PLUGINS=$(cat plugins/windows_only.txt)
 for d in $PLUGINS; do

go.mod

@@ -0,0 +1,40 @@
+module github.com/containernetworking/plugins
+
+go 1.12
+
+require (
+	github.com/Microsoft/go-winio v0.4.11 // indirect
+	github.com/Microsoft/hcsshim v0.8.6
+	github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae
+	github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44
+	github.com/containernetworking/cni v0.7.0
+	github.com/coreos/go-iptables v0.4.2
+	github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7
+	github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c
+	github.com/d2g/dhcp4client v1.0.0
+	github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5
+	github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4 // indirect
+	github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c
+	github.com/golang/protobuf v1.3.1 // indirect
+	github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56
+	github.com/juju/errors v0.0.0-20180806074554-22422dad46e1
+	github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8 // indirect
+	github.com/juju/testing v0.0.0-20190613124551-e81189438503 // indirect
+	github.com/kr/pretty v0.1.0 // indirect
+	github.com/mattn/go-shellwords v1.0.3
+	github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b
+	github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a
+	github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8
+	github.com/sirupsen/logrus v1.0.6 // indirect
+	github.com/stretchr/testify v1.3.0 // indirect
+	github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf
+	github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc // indirect
+	golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941 // indirect
+	golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1 // indirect
+	golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f
+	gopkg.in/airbrake/gobrake.v2 v2.0.9 // indirect
+	gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 // indirect
+	gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 // indirect
+	gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce // indirect
+	gopkg.in/yaml.v2 v2.2.2 // indirect
+)

go.sum

@@ -0,0 +1,77 @@
+github.com/Microsoft/go-winio v0.4.11 h1:zoIOcVf0xPN1tnMVbTtEdI+P8OofVk3NObnwOQ6nK2Q=
+github.com/Microsoft/go-winio v0.4.11/go.mod h1:VhR8bwka0BXejwEJY73c50VrPtXAaKcyvVC4A4RozmA=
+github.com/Microsoft/hcsshim v0.8.6 h1:ZfF0+zZeYdzMIVMZHKtDKJvLHj76XCuVae/jNkjj0IA=
+github.com/Microsoft/hcsshim v0.8.6/go.mod h1:Op3hHsoHPAvb6lceZHDtd9OkTew38wNoXnJs8iY7rUg=
+github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae h1:AMzIhMUqU3jMrZiTuW0zkYeKlKDAFD+DG20IoO421/Y=
+github.com/alexflint/go-filemutex v0.0.0-20171022225611-72bdc8eae2ae/go.mod h1:CgnQgUtFrFz9mxFNtED3jI5tLDjKlOM+oUF/sTk6ps0=
+github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44 h1:y853v6rXx+zefEcjET3JuKAqvhj+FKflQijjeaSv2iA=
+github.com/buger/jsonparser v0.0.0-20180808090653-f4dd9f5a6b44/go.mod h1:bbYlZJ7hK1yFx9hf58LP0zeX7UjIGs20ufpu3evjr+s=
+github.com/containernetworking/cni v0.7.0 h1:1Qy7EwdC08mx5wUB0DpjCuBrk6e/uXg9yI9TvAvgox8=
+github.com/containernetworking/cni v0.7.0/go.mod h1:LGwApLUm2FpoOfxTDEeq8T9ipbpZ61X79hmU3w8FmsY=
+github.com/coreos/go-iptables v0.4.2 h1:KH0EwId05JwWIfb96gWvkiT2cbuOu8ygqUaB+yPAwIg=
+github.com/coreos/go-iptables v0.4.2/go.mod h1:/mVI274lEDI2ns62jHCDnCyBF9Iwsmekav8Dbxlm1MU=
+github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7 h1:u9SHYsPQNyt5tgDm3YN7+9dYrpK96E5wFilTFWIDZOM=
+github.com/coreos/go-systemd v0.0.0-20180511133405-39ca1b05acc7/go.mod h1:F5haX7vjVVG0kc13fIWeqUViNPyEJxv/OmvnBo0Yme4=
+github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c h1:Xo2rK1pzOm0jO6abTPIQwbAmqBIOj132otexc1mmzFc=
+github.com/d2g/dhcp4 v0.0.0-20170904100407-a1d1b6c41b1c/go.mod h1:Ct2BUK8SB0YC1SMSibvLzxjeJLnrYEVLULFNiHY9YfQ=
+github.com/d2g/dhcp4client v1.0.0 h1:suYBsYZIkSlUMEz4TAYCczKf62IA2UWC+O8+KtdOhCo=
+github.com/d2g/dhcp4client v1.0.0/go.mod h1:j0hNfjhrt2SxUOw55nL0ATM/z4Yt3t2Kd1mW34z5W5s=
+github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5 h1:+CpLbZIeUn94m02LdEKPcgErLJ347NUwxPKs5u8ieiY=
+github.com/d2g/dhcp4server v0.0.0-20181031114812-7d4a0a7f59a5/go.mod h1:Eo87+Kg/IX2hfWJfwxMzLyuSZyxSoAug2nGa1G2QAi8=
+github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4 h1:itqmmf1PFpC4n5JW+j4BU7X4MTfVurhYRTjODoPb2Y8=
+github.com/d2g/hardwareaddr v0.0.0-20190221164911-e7d9fbe030e4/go.mod h1:bMl4RjIciD2oAxI7DmWRx6gbeqrkoLqv3MV0vzNad+I=
+github.com/davecgh/go-spew v1.1.0 h1:ZDRjVQ15GmhC3fiQ8ni8+OwkZQO4DARzQgrnXU1Liz8=
+github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
+github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c h1:RBUpb2b14UnmRHNd2uHz20ZHLDK+SW5Us/vWF5IHRaY=
+github.com/godbus/dbus v0.0.0-20180201030542-885f9cc04c9c/go.mod h1:/YcGZj5zSblfDWMMoOzV4fas9FZnQYTkDnsGvmh2Grw=
+github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg=
+github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
+github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56 h1:742eGXur0715JMq73aD95/FU0XpVKXqNuTnEfXsLOYQ=
+github.com/j-keck/arping v0.0.0-20160618110441-2cf9dc699c56/go.mod h1:ymszkNOg6tORTn+6F6j+Jc8TOr5osrynvN6ivFWZ2GA=
+github.com/juju/errors v0.0.0-20180806074554-22422dad46e1 h1:wnhMXidtb70kDZCeLt/EfsVtkXS5c8zLnE9y/6DIRAU=
+github.com/juju/errors v0.0.0-20180806074554-22422dad46e1/go.mod h1:W54LbzXuIE0boCoNJfwqpmkKJ1O4TCTZMetAt6jGk7Q=
+github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8 h1:UUHMLvzt/31azWTN/ifGWef4WUqvXk0iRqdhdy/2uzI=
+github.com/juju/loggo v0.0.0-20190526231331-6e530bcce5d8/go.mod h1:vgyd7OREkbtVEN/8IXZe5Ooef3LQePvuBm9UWj6ZL8U=
+github.com/juju/testing v0.0.0-20190613124551-e81189438503 h1:ZUgTbk8oHgP0jpMieifGC9Lv47mHn8Pb3mFX3/Ew4iY=
+github.com/juju/testing v0.0.0-20190613124551-e81189438503/go.mod h1:63prj8cnj0tU0S9OHjGJn+b1h0ZghCndfnbQolrYTwA=
+github.com/kr/pretty v0.1.0 h1:L/CwN0zerZDmRFUapSPitk6f+Q3+0za1rQkzVuMiMFI=
+github.com/kr/pretty v0.1.0/go.mod h1:dAy3ld7l9f0ibDNOQOHHMYYIIbhfbHSm3C4ZsoJORNo=
+github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
+github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
+github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
+github.com/mattn/go-shellwords v1.0.3 h1:K/VxK7SZ+cvuPgFSLKi5QPI9Vr/ipOf4C1gN+ntueUk=
+github.com/mattn/go-shellwords v1.0.3/go.mod h1:3xCvwCdWdlDJUrvuMn7Wuy9eWs4pE8vqg+NOMyg4B2o=
+github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b h1:Ey6yH0acn50T/v6CB75bGP4EMJqnv9WvnjN7oZaj+xE=
+github.com/onsi/ginkgo v0.0.0-20151202141238-7f8ab55aaf3b/go.mod h1:lLunBs/Ym6LB5Z9jYTR76FiuTmxDTDusOGeTQH+WWjE=
+github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a h1:KfNOeFvoAssuZLT7IntKZElKwi/5LRuxY71k+t6rfaM=
+github.com/onsi/gomega v0.0.0-20151007035656-2152b45fa28a/go.mod h1:C1qb7wdrVGGVU+Z6iS04AVkA3Q65CEZX59MT0QO5uiA=
+github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
+github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8 h1:2c1EFnZHIPCW8qKWgHMH/fX2PkSabFc5mrVzfUNdg5U=
+github.com/safchain/ethtool v0.0.0-20190326074333-42ed695e3de8/go.mod h1:Z0q5wiBQGYcxhMZ6gUqHn6pYNLypFAvaL3UvgZLR0U4=
+github.com/sirupsen/logrus v1.0.6 h1:hcP1GmhGigz/O7h1WVUM5KklBp1JoNS9FggWKdj/j3s=
+github.com/sirupsen/logrus v1.0.6/go.mod h1:pMByvHTf9Beacp5x1UXfOR9xyW/9antXMhjMPG0dEzc=
+github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
+github.com/stretchr/testify v1.3.0 h1:TivCn/peBQ7UY8ooIcPgZFpTNSz0Q2U6UrFlUfqbe0Q=
+github.com/stretchr/testify v1.3.0/go.mod h1:M5WIy9Dh21IEIfnGCwXGc5bZfKNJtfHm1UVUgZn+9EI=
+github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf h1:3J37+NPjNyGW/dbfXtj3yWuF9OEepIdGOXRaJGbORV8=
+github.com/vishvananda/netlink v0.0.0-20181108222139-023a6dafdcdf/go.mod h1:+SR5DhBJrl6ZM7CoCKvpw5BKroDKQ+PJqOg65H/2ktk=
+github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc h1:R83G5ikgLMxrBvLh22JhdfI8K6YXEPHx5P03Uu3DRs4=
+github.com/vishvananda/netns v0.0.0-20180720170159-13995c7128cc/go.mod h1:ZjcWmFBXmLKZu9Nxj3WKYEafiSqer2rnvPr0en9UNpI=
+golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941 h1:qBTHLajHecfu+xzRI9PqVDcqx7SdHj9d4B+EzSn3tAc=
+golang.org/x/crypto v0.0.0-20181009213950-7c1a557ab941/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4=
+golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1 h1:Y/KGZSOdz/2r0WJ9Mkmz6NJBusp0kiNx1Cn82lzJQ6w=
+golang.org/x/net v0.0.0-20181011144130-49bb7cea24b1/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
+golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f h1:25KHgbfyiSm6vwQLbM3zZIe1v9p/3ea4Rz+nnM5K/i4=
+golang.org/x/sys v0.0.0-20190616124812-15dcb6c0061f/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
+gopkg.in/airbrake/gobrake.v2 v2.0.9 h1:7z2uVWwn7oVeeugY1DtlPAy5H+KYgB1KeKTnqjNatLo=
+gopkg.in/airbrake/gobrake.v2 v2.0.9/go.mod h1:/h5ZAUhDkGaJfjzjKLSjv6zCL6O0LLBxU4K+aSYdM/U=
+gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY=
+gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
+gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2 h1:OAj3g0cR6Dx/R07QgQe8wkA9RNjB2u4i700xBkIT4e0=
+gopkg.in/gemnasium/logrus-airbrake-hook.v2 v2.1.2/go.mod h1:Xk6kEKp8OKb+X14hQBKWaSkCsqBpgog8nAV2xsGOxlo=
+gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce h1:xcEWjVhvbDy+nHP67nPDDpbYrY+ILlfndk4bRioVHaU=
+gopkg.in/mgo.v2 v2.0.0-20180705113604-9856a29383ce/go.mod h1:yeKp02qBN3iKW1OzL3MGk2IdtZzaj7SFntXj72NppTA=
+gopkg.in/yaml.v2 v2.2.2 h1:ZCJp+EgiOT7lHqUV2J862kp8Qj64Jo6az82+3Td9dZw=
+gopkg.in/yaml.v2 v2.2.2/go.mod h1:hI93XBmqTisBFMUTm0b8Fm+jr3Dg1NNxqwp+5A1VGuI=

pkg/hns/endpoint_windows.go

@@ -77,6 +77,9 @@ func GenerateHnsEndpoint(epInfo *EndpointInfo, n *NetConf) (*hcsshim.HNSEndpoint
 		}
 	}
 
+	if n.LoopbackDSR {
+		n.ApplyLoopbackDSR(&epInfo.IpAddress)
+	}
 	if hnsEndpoint == nil {
 		hnsEndpoint = &hcsshim.HNSEndpoint{
 			Name:           epInfo.EndpointName,
@@ -117,14 +120,8 @@ func GenerateHcnEndpoint(epInfo *EndpointInfo, n *NetConf) (*hcn.HostComputeEndp
 	if hcnEndpoint == nil {
 		routes := []hcn.Route{
 			{
-				NextHop: GetIpString(&epInfo.Gateway),
-				DestinationPrefix: func() string {
-					destinationPrefix := "0.0.0.0/0"
-					if ipv6 := epInfo.Gateway.To4(); ipv6 == nil {
-						destinationPrefix = "::/0"
-					}
-					return destinationPrefix
-				}(),
+				NextHop:           GetIpString(&epInfo.Gateway),
+				DestinationPrefix: GetDefaultDestinationPrefix(&epInfo.Gateway),
 			},
 		}
 
@@ -138,6 +135,9 @@ func GenerateHcnEndpoint(epInfo *EndpointInfo, n *NetConf) (*hcn.HostComputeEndp
 		}
 		ipConfigs := []hcn.IpConfig{hcnIpConfig}
 
+		if n.LoopbackDSR {
+			n.ApplyLoopbackDSR(&epInfo.IpAddress)
+		}
 		hcnEndpoint = &hcn.HostComputeEndpoint{
 			SchemaVersion:      hcn.Version{Major: 2},
 			Name:               epInfo.EndpointName,

pkg/hns/netconf_windows.go

@@ -17,6 +17,9 @@ package hns
 import (
 	"bytes"
 	"encoding/json"
+	"fmt"
+	"net"
+
 	"github.com/Microsoft/hcsshim/hcn"
 	"github.com/buger/jsonparser"
 	"github.com/containernetworking/cni/pkg/types"
@@ -26,9 +29,16 @@ import (
 // NetConf is the CNI spec
 type NetConf struct {
 	types.NetConf
+	// ApiVersion is either 1 or 2, which specifies which hns APIs to call
+	ApiVersion int `json:"ApiVersion"`
+	// V2 Api Policies
 	HcnPolicyArgs []hcn.EndpointPolicy `json:"HcnPolicyArgs,omitempty"`
-	Policies      []policy             `json:"policies,omitempty"`
-	RuntimeConfig RuntimeConfig        `json:"runtimeConfig"`
+	// V1 Api Policies
+	Policies []policy `json:"policies,omitempty"`
+	// Options to be passed in by the runtime
+	RuntimeConfig RuntimeConfig `json:"runtimeConfig"`
+	// If true, adds a policy to endpoints to support loopback direct server return
+	LoopbackDSR bool `json:"loopbackDSR"`
 }
 
 type RuntimeDNS struct {
@@ -45,6 +55,31 @@ type policy struct {
 	Value json.RawMessage `json:"value"`
 }
 
+func GetDefaultDestinationPrefix(ip *net.IP) string {
+	destinationPrefix := "0.0.0.0/0"
+	if ipv6 := ip.To4(); ipv6 == nil {
+		destinationPrefix = "::/0"
+	}
+	return destinationPrefix
+}
+
+func (n *NetConf) ApplyLoopbackDSR(ip *net.IP) {
+	value := fmt.Sprintf(`"Destinations" : ["%s"]`, ip.String())
+	if n.ApiVersion == 2 {
+		hcnLoopbackRoute := hcn.EndpointPolicy{
+			Type:     "OutBoundNAT",
+			Settings: []byte(fmt.Sprintf("{%s}", value)),
+		}
+		n.HcnPolicyArgs = append(n.HcnPolicyArgs, hcnLoopbackRoute)
+	} else {
+		hnsLoopbackRoute := policy{
+			Name:  "EndpointPolicy",
+			Value: []byte(fmt.Sprintf(`{"Type": "OutBoundNAT", %s}`, value)),
+		}
+		n.Policies = append(n.Policies, hnsLoopbackRoute)
+	}
+}
+
 // If runtime dns values are there use that else use cni conf supplied dns
 func (n *NetConf) GetDNS() types.DNS {
 	dnsResult := n.DNS

pkg/ip/link_linux.go

@@ -60,11 +60,15 @@ func peerExists(name string) bool {
 	return true
 }
 
-func makeVeth(name string, mtu int) (peerName string, veth netlink.Link, err error) {
+func makeVeth(name, vethPeerName string, mtu int) (peerName string, veth netlink.Link, err error) {
 	for i := 0; i < 10; i++ {
-		peerName, err = RandomVethName()
-		if err != nil {
-			return
+		if vethPeerName != "" {
+			peerName = vethPeerName
+		} else {
+			peerName, err = RandomVethName()
+			if err != nil {
+				return
+			}
 		}
 
 		veth, err = makeVethPair(name, peerName, mtu)
@@ -73,7 +77,7 @@ func makeVeth(name string, mtu int) (peerName string, veth netlink.Link, err err
 			return
 
 		case os.IsExist(err):
-			if peerExists(peerName) {
+			if peerExists(peerName) && vethPeerName == "" {
 				continue
 			}
 			err = fmt.Errorf("container veth name provided (%v) already exists", name)
@@ -121,12 +125,13 @@ func ifaceFromNetlinkLink(l netlink.Link) net.Interface {
 	}
 }
 
-// SetupVeth sets up a pair of virtual ethernet devices.
-// Call SetupVeth from inside the container netns.  It will create both veth
+// SetupVethWithName sets up a pair of virtual ethernet devices.
+// Call SetupVethWithName from inside the container netns.  It will create both veth
 // devices and move the host-side veth into the provided hostNS namespace.
-// On success, SetupVeth returns (hostVeth, containerVeth, nil)
-func SetupVeth(contVethName string, mtu int, hostNS ns.NetNS) (net.Interface, net.Interface, error) {
-	hostVethName, contVeth, err := makeVeth(contVethName, mtu)
+// hostVethName: If hostVethName is not specified, the host-side veth name will use a random string.
+// On success, SetupVethWithName returns (hostVeth, containerVeth, nil)
+func SetupVethWithName(contVethName, hostVethName string, mtu int, hostNS ns.NetNS) (net.Interface, net.Interface, error) {
+	hostVethName, contVeth, err := makeVeth(contVethName, hostVethName, mtu)
 	if err != nil {
 		return net.Interface{}, net.Interface{}, err
 	}
@@ -161,6 +166,14 @@ func SetupVeth(contVethName string, mtu int, hostNS ns.NetNS) (net.Interface, ne
 	return ifaceFromNetlinkLink(hostVeth), ifaceFromNetlinkLink(contVeth), nil
 }
 
+// SetupVeth sets up a pair of virtual ethernet devices.
+// Call SetupVeth from inside the container netns.  It will create both veth
+// devices and move the host-side veth into the provided hostNS namespace.
+// On success, SetupVeth returns (hostVeth, containerVeth, nil)
+func SetupVeth(contVethName string, mtu int, hostNS ns.NetNS) (net.Interface, net.Interface, error) {
+	return SetupVethWithName(contVethName, "", mtu, hostNS)
+}
+
 // DelLinkByName removes an interface link.
 func DelLinkByName(ifName string) error {
 	iface, err := netlink.LinkByName(ifName)

pkg/ip/link_linux_test.go

@@ -189,9 +189,8 @@ var _ = Describe("Link", func() {
 		It("returns useful error", func() {
 			_ = containerNetNS.Do(func(ns.NetNS) error {
 				defer GinkgoRecover()
-
 				_, _, err := ip.SetupVeth(containerVethName, mtu, hostNetNS)
-				Expect(err.Error()).To(Equal("failed to move veth to host netns: file exists"))
+				Expect(err.Error()).To(HavePrefix("failed to move veth to host netns: "))
 
 				return nil
 			})

pkg/ipam/ipam.go

@@ -16,10 +16,8 @@ package ipam
 
 import (
 	"context"
-	"fmt"
 	"github.com/containernetworking/cni/pkg/invoke"
 	"github.com/containernetworking/cni/pkg/types"
-	"os"
 )
 
 func ExecAdd(plugin string, netconf []byte) (types.Result, error) {
@@ -31,13 +29,5 @@ func ExecCheck(plugin string, netconf []byte) error {
 }
 
 func ExecDel(plugin string, netconf []byte) error {
-	cmd := os.Getenv("CNI_COMMAND")
-	if cmd == "" {
-		return fmt.Errorf("environment variable CNI_COMMAND must be specified.")
-	}
-	// Set CNI_COMMAND to DEL explicity.  We might be deleting due to an ADD gone wrong.
-	// restore CNI_COMMAND to original value upon return.
-	os.Setenv("CNI_COMMAND", "DEL")
-	defer os.Setenv("CNI_COMMAND", cmd)
 	return invoke.DelegateDel(context.TODO(), plugin, netconf, nil)
 }

pkg/utils/utils.go

@@ -22,16 +22,22 @@ import (
 const (
 	maxChainLength = 28
 	chainPrefix    = "CNI-"
-	prefixLength   = len(chainPrefix)
 )
 
-// Generates a chain name to be used with iptables.
-// Ensures that the generated chain name is exactly
-// maxChainLength chars in length
+// FormatChainName generates a chain name to be used
+// with iptables. Ensures that the generated chain
+// name is exactly maxChainLength chars in length.
 func FormatChainName(name string, id string) string {
-	chainBytes := sha512.Sum512([]byte(name + id))
-	chain := fmt.Sprintf("%s%x", chainPrefix, chainBytes)
-	return chain[:maxChainLength]
+	return MustFormatChainNameWithPrefix(name, id, "")
+}
+
+// MustFormatChainNameWithPrefix generates a chain name similar
+// to FormatChainName, but adds a custom prefix between
+// chainPrefix and unique identifier. Ensures that the
+// generated chain name is exactly maxChainLength chars in length.
+// Panics if the given prefix is too long.
+func MustFormatChainNameWithPrefix(name string, id string, prefix string) string {
+	return MustFormatHashWithPrefix(maxChainLength, chainPrefix+prefix, name+id)
 }
 
 // FormatComment returns a comment used for easier
@@ -39,3 +45,16 @@ func FormatChainName(name string, id string) string {
 func FormatComment(name string, id string) string {
 	return fmt.Sprintf("name: %q id: %q", name, id)
 }
+
+const MaxHashLen = sha512.Size * 2
+
+// MustFormatHashWithPrefix returns a string of given length that begins with the
+// given prefix. It is filled with entropy based on the given string toHash.
+func MustFormatHashWithPrefix(length int, prefix string, toHash string) string {
+	if len(prefix) >= length || length > MaxHashLen {
+		panic("invalid length")
+	}
+
+	output := sha512.Sum512([]byte(toHash))
+	return fmt.Sprintf("%s%x", prefix, output)[:length]
+}

pkg/utils/utils_test.go

@@ -15,37 +15,151 @@
 package utils
 
 import (
+	"fmt"
+	"strings"
+
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 )
 
 var _ = Describe("Utils", func() {
-	It("must format a short name", func() {
-		chain := FormatChainName("test", "1234")
-		Expect(len(chain)).To(Equal(maxChainLength))
-		Expect(chain).To(Equal("CNI-2bbe0c48b91a7d1b8a6753a8"))
+	Describe("FormatChainName", func() {
+		It("must format a short name", func() {
+			chain := FormatChainName("test", "1234")
+			Expect(len(chain)).To(Equal(maxChainLength))
+			Expect(chain).To(Equal("CNI-2bbe0c48b91a7d1b8a6753a8"))
+		})
+
+		It("must truncate a long name", func() {
+			chain := FormatChainName("testalongnamethatdoesnotmakesense", "1234")
+			Expect(len(chain)).To(Equal(maxChainLength))
+			Expect(chain).To(Equal("CNI-374f33fe84ab0ed84dcdebe3"))
+		})
+
+		It("must be predictable", func() {
+			chain1 := FormatChainName("testalongnamethatdoesnotmakesense", "1234")
+			chain2 := FormatChainName("testalongnamethatdoesnotmakesense", "1234")
+			Expect(len(chain1)).To(Equal(maxChainLength))
+			Expect(len(chain2)).To(Equal(maxChainLength))
+			Expect(chain1).To(Equal(chain2))
+		})
+
+		It("must change when a character changes", func() {
+			chain1 := FormatChainName("testalongnamethatdoesnotmakesense", "1234")
+			chain2 := FormatChainName("testalongnamethatdoesnotmakesense", "1235")
+			Expect(len(chain1)).To(Equal(maxChainLength))
+			Expect(len(chain2)).To(Equal(maxChainLength))
+			Expect(chain1).To(Equal("CNI-374f33fe84ab0ed84dcdebe3"))
+			Expect(chain1).NotTo(Equal(chain2))
+		})
 	})
 
-	It("must truncate a long name", func() {
-		chain := FormatChainName("testalongnamethatdoesnotmakesense", "1234")
-		Expect(len(chain)).To(Equal(maxChainLength))
-		Expect(chain).To(Equal("CNI-374f33fe84ab0ed84dcdebe3"))
+	Describe("MustFormatChainNameWithPrefix", func() {
+		It("generates a chain name with a prefix", func() {
+			chain := MustFormatChainNameWithPrefix("test", "1234", "PREFIX-")
+			Expect(len(chain)).To(Equal(maxChainLength))
+			Expect(chain).To(Equal("CNI-PREFIX-2bbe0c48b91a7d1b8"))
+		})
+
+		It("must format a short name", func() {
+			chain := MustFormatChainNameWithPrefix("test", "1234", "PREFIX-")
+			Expect(len(chain)).To(Equal(maxChainLength))
+			Expect(chain).To(Equal("CNI-PREFIX-2bbe0c48b91a7d1b8"))
+		})
+
+		It("must truncate a long name", func() {
+			chain := MustFormatChainNameWithPrefix("testalongnamethatdoesnotmakesense", "1234", "PREFIX-")
+			Expect(len(chain)).To(Equal(maxChainLength))
+			Expect(chain).To(Equal("CNI-PREFIX-374f33fe84ab0ed84"))
+		})
+
+		It("must be predictable", func() {
+			chain1 := MustFormatChainNameWithPrefix("testalongnamethatdoesnotmakesense", "1234", "PREFIX-")
+			chain2 := MustFormatChainNameWithPrefix("testalongnamethatdoesnotmakesense", "1234", "PREFIX-")
+			Expect(len(chain1)).To(Equal(maxChainLength))
+			Expect(len(chain2)).To(Equal(maxChainLength))
+			Expect(chain1).To(Equal(chain2))
+		})
+
+		It("must change when a character changes", func() {
+			chain1 := MustFormatChainNameWithPrefix("testalongnamethatdoesnotmakesense", "1234", "PREFIX-")
+			chain2 := MustFormatChainNameWithPrefix("testalongnamethatdoesnotmakesense", "1235", "PREFIX-")
+			Expect(len(chain1)).To(Equal(maxChainLength))
+			Expect(len(chain2)).To(Equal(maxChainLength))
+			Expect(chain1).To(Equal("CNI-PREFIX-374f33fe84ab0ed84"))
+			Expect(chain1).NotTo(Equal(chain2))
+		})
+
+		It("panics when prefix is too large", func() {
+			longPrefix := strings.Repeat("PREFIX-", 4)
+			Expect(func() {
+				MustFormatChainNameWithPrefix("test", "1234", longPrefix)
+			}).To(Panic())
+		})
 	})
 
-	It("must be predictable", func() {
-		chain1 := FormatChainName("testalongnamethatdoesnotmakesense", "1234")
-		chain2 := FormatChainName("testalongnamethatdoesnotmakesense", "1234")
-		Expect(len(chain1)).To(Equal(maxChainLength))
-		Expect(len(chain2)).To(Equal(maxChainLength))
-		Expect(chain1).To(Equal(chain2))
+	Describe("MustFormatHashWithPrefix", func() {
+		It("always returns a string with the given prefix", func() {
+			Expect(MustFormatHashWithPrefix(10, "AAA", "some string")).To(HavePrefix("AAA"))
+			Expect(MustFormatHashWithPrefix(10, "foo", "some string")).To(HavePrefix("foo"))
+			Expect(MustFormatHashWithPrefix(10, "bar", "some string")).To(HavePrefix("bar"))
+		})
+
+		It("always returns a string of the given length", func() {
+			Expect(MustFormatHashWithPrefix(10, "AAA", "some string")).To(HaveLen(10))
+			Expect(MustFormatHashWithPrefix(15, "AAA", "some string")).To(HaveLen(15))
+			Expect(MustFormatHashWithPrefix(5, "AAA", "some string")).To(HaveLen(5))
+		})
+
+		It("is deterministic", func() {
+			val1 := MustFormatHashWithPrefix(10, "AAA", "some string")
+			val2 := MustFormatHashWithPrefix(10, "AAA", "some string")
+			val3 := MustFormatHashWithPrefix(10, "AAA", "some string")
+			Expect(val1).To(Equal(val2))
+			Expect(val1).To(Equal(val3))
+		})
+
+		It("is (nearly) perfect (injective function)", func() {
+			hashes := map[string]int{}
+
+			for i := 0; i < 1000; i++ {
+				name := fmt.Sprintf("string %d", i)
+				hashes[MustFormatHashWithPrefix(8, "", name)]++
+			}
+
+			for key, count := range hashes {
+				Expect(count).To(Equal(1), "for key "+key+" got non-unique correspondence")
+			}
+		})
+
+		assertPanicWith := func(f func(), expectedErrorMessage string) {
+			defer func() {
+				Expect(recover()).To(Equal(expectedErrorMessage))
+			}()
+			f()
+			Fail("function should have panicked but did not")
+		}
+
+		It("panics when prefix is longer than the length", func() {
+			assertPanicWith(
+				func() { MustFormatHashWithPrefix(3, "AAA", "some string") },
+				"invalid length",
+			)
+		})
+
+		It("panics when length is not positive", func() {
+			assertPanicWith(
+				func() { MustFormatHashWithPrefix(0, "", "some string") },
+				"invalid length",
+			)
+		})
+
+		It("panics when length is larger than MaxLen", func() {
+			assertPanicWith(
+				func() { MustFormatHashWithPrefix(MaxHashLen+1, "", "some string") },
+				"invalid length",
+			)
+		})
 	})
 
-	It("must change when a character changes", func() {
-		chain1 := FormatChainName("testalongnamethatdoesnotmakesense", "1234")
-		chain2 := FormatChainName("testalongnamethatdoesnotmakesense", "1235")
-		Expect(len(chain1)).To(Equal(maxChainLength))
-		Expect(len(chain2)).To(Equal(maxChainLength))
-		Expect(chain1).To(Equal("CNI-374f33fe84ab0ed84dcdebe3"))
-		Expect(chain1).NotTo(Equal(chain2))
-	})
 })

plugins/ipam/host-local/backend/allocator/allocator.go

@@ -40,7 +40,7 @@ func NewIPAllocator(s *RangeSet, store backend.Store, id int) *IPAllocator {
 	}
 }
 
-// Get alocates an IP
+// Get allocates an IP
 func (a *IPAllocator) Get(id string, ifname string, requestedIP net.IP) (*current.IPConfig, error) {
 	a.store.Lock()
 	defer a.store.Unlock()
@@ -73,6 +73,17 @@ func (a *IPAllocator) Get(id string, ifname string, requestedIP net.IP) (*curren
 		gw = r.Gateway
 
 	} else {
+		// try to get allocated IPs for this given id, if exists, just return error
+		// because duplicate allocation is not allowed in SPEC
+		// https://github.com/containernetworking/cni/blob/master/SPEC.md
+		allocatedIPs := a.store.GetByID(id, ifname)
+		for _, allocatedIP := range allocatedIPs {
+			// check whether the existing IP belong to this range set
+			if _, err := a.rangeset.RangeFor(allocatedIP); err == nil {
+				return nil, fmt.Errorf("%s has been allocated to %s, duplicate allocation is not allowed", allocatedIP.String(), id)
+			}
+		}
+
 		iter, err := a.GetIter()
 		if err != nil {
 			return nil, err

plugins/ipam/host-local/backend/allocator/allocator_test.go

@@ -221,14 +221,14 @@ var _ = Describe("host-local ip allocator", func() {
 		It("should not allocate the broadcast address", func() {
 			alloc := mkalloc()
 			for i := 2; i < 7; i++ {
-				res, err := alloc.Get("ID", "eth0", nil)
+				res, err := alloc.Get(fmt.Sprintf("ID%d", i), "eth0", nil)
 				Expect(err).ToNot(HaveOccurred())
 				s := fmt.Sprintf("192.168.1.%d/29", i)
 				Expect(s).To(Equal(res.Address.String()))
 				fmt.Fprintln(GinkgoWriter, "got ip", res.Address.String())
 			}
 
-			x, err := alloc.Get("ID", "eth0", nil)
+			x, err := alloc.Get("ID8", "eth0", nil)
 			fmt.Fprintln(GinkgoWriter, "got ip", x)
 			Expect(err).To(HaveOccurred())
 		})

plugins/ipam/host-local/backend/disk/backend.go

@@ -19,10 +19,10 @@ import (
 	"net"
 	"os"
 	"path/filepath"
+	"runtime"
 	"strings"
 
 	"github.com/containernetworking/plugins/plugins/ipam/host-local/backend"
-	"runtime"
 )
 
 const lastIPFilePrefix = "last_reserved_ip."
@@ -172,6 +172,35 @@ func (s *Store) ReleaseByID(id string, ifname string) error {
 	return err
 }
 
+// GetByID returns the IPs which have been allocated to the specific ID
+func (s *Store) GetByID(id string, ifname string) []net.IP {
+	var ips []net.IP
+
+	match := strings.TrimSpace(id) + LineBreak + ifname
+	// matchOld for backwards compatibility
+	matchOld := strings.TrimSpace(id)
+
+	// walk through all ips in this network to get the ones which belong to a specific ID
+	_ = filepath.Walk(s.dataDir, func(path string, info os.FileInfo, err error) error {
+		if err != nil || info.IsDir() {
+			return nil
+		}
+		data, err := ioutil.ReadFile(path)
+		if err != nil {
+			return nil
+		}
+		if strings.TrimSpace(string(data)) == match || strings.TrimSpace(string(data)) == matchOld {
+			_, ipString := filepath.Split(path)
+			if ip := net.ParseIP(ipString); ip != nil {
+				ips = append(ips, ip)
+			}
+		}
+		return nil
+	})
+
+	return ips
+}
+
 func GetEscapedPath(dataDir string, fname string) string {
 	if runtime.GOOS == "windows" {
 		fname = strings.Replace(fname, ":", "_", -1)

plugins/ipam/host-local/backend/store.go

@@ -24,4 +24,5 @@ type Store interface {
 	LastReservedIP(rangeID string) (net.IP, error)
 	Release(ip net.IP) error
 	ReleaseByID(id string, ifname string) error
+	GetByID(id string, ifname string) []net.IP
 }

plugins/ipam/host-local/backend/testing/fake_store.go

@@ -81,6 +81,16 @@ func (s *FakeStore) ReleaseByID(id string, ifname string) error {
 	return nil
 }
 
+func (s *FakeStore) GetByID(id string, ifname string) []net.IP {
+	var ips []net.IP
+	for k, v := range s.ipMap {
+		if v == id {
+			ips = append(ips, net.ParseIP(k))
+		}
+	}
+	return ips
+}
+
 func (s *FakeStore) SetIPMap(m map[string]string) {
 	s.ipMap = m
 }

plugins/ipam/host-local/host_local_test.go

@@ -250,6 +250,94 @@ var _ = Describe("host-local Operations", func() {
 		Expect(err).To(HaveOccurred())
 	})
 
+	It("repeat allocating addresses on specific interface for same container ID with ADD", func() {
+		const ifname string = "eth0"
+		const nspath string = "/some/where"
+
+		tmpDir, err := getTmpDir()
+		Expect(err).NotTo(HaveOccurred())
+		defer os.RemoveAll(tmpDir)
+
+		conf := fmt.Sprintf(`{
+		"cniVersion": "0.3.1",
+		"name": "mynet0",
+		"type": "ipvlan",
+		"master": "foo0",
+			"ipam": {
+				"type": "host-local",
+				"dataDir": "%s",
+				"ranges": [
+					[{ "subnet": "10.1.2.0/24" }]
+				]
+			}
+		}`, tmpDir)
+
+		args := &skel.CmdArgs{
+			ContainerID: "dummy",
+			Netns:       nspath,
+			IfName:      ifname,
+			StdinData:   []byte(conf),
+		}
+
+		args1 := &skel.CmdArgs{
+			ContainerID: "dummy1",
+			Netns:       nspath,
+			IfName:      ifname,
+			StdinData:   []byte(conf),
+		}
+
+		// Allocate the IP
+		r0, raw, err := testutils.CmdAddWithArgs(args, func() error {
+			return cmdAdd(args)
+		})
+		Expect(err).NotTo(HaveOccurred())
+		Expect(strings.Index(string(raw), "\"version\":")).Should(BeNumerically(">", 0))
+
+		result0, err := current.GetResult(r0)
+		Expect(err).NotTo(HaveOccurred())
+		Expect(len(result0.IPs)).Should(Equal(1))
+		Expect(result0.IPs[0].Address.String()).Should(Equal("10.1.2.2/24"))
+
+		// Allocate the IP with the same container ID
+		_, _, err = testutils.CmdAddWithArgs(args, func() error {
+			return cmdAdd(args)
+		})
+		Expect(err).To(HaveOccurred())
+
+		// Allocate the IP with the another container ID
+		r1, raw, err := testutils.CmdAddWithArgs(args1, func() error {
+			return cmdAdd(args1)
+		})
+		Expect(err).NotTo(HaveOccurred())
+		Expect(strings.Index(string(raw), "\"version\":")).Should(BeNumerically(">", 0))
+
+		result1, err := current.GetResult(r1)
+		Expect(err).NotTo(HaveOccurred())
+		Expect(len(result1.IPs)).Should(Equal(1))
+		Expect(result1.IPs[0].Address.String()).Should(Equal("10.1.2.3/24"))
+
+		// Allocate the IP with the same container ID again
+		_, _, err = testutils.CmdAddWithArgs(args, func() error {
+			return cmdAdd(args)
+		})
+		Expect(err).To(HaveOccurred())
+
+		ipFilePath := filepath.Join(tmpDir, "mynet0", "10.1.2.2")
+
+		// Release the IPs
+		err = testutils.CmdDelWithArgs(args, func() error {
+			return cmdDel(args)
+		})
+		Expect(err).NotTo(HaveOccurred())
+		_, err = os.Stat(ipFilePath)
+		Expect(err).To(HaveOccurred())
+
+		err = testutils.CmdDelWithArgs(args1, func() error {
+			return cmdDel(args1)
+		})
+		Expect(err).NotTo(HaveOccurred())
+	})
+
 	It("Verify DEL works on backwards compatible allocate", func() {
 		const nspath string = "/some/where"
 		const ifname string = "eth0"

plugins/ipam/static/README.md

@@ -52,3 +52,11 @@ The following [CNI_ARGS](https://github.com/containernetworking/cni/blob/master/
 * `GATEWAY`: request a specific gateway address
 
     (example: CNI_ARGS="IP=10.10.0.1/24;GATEWAY=10.10.0.254")
+
+The plugin also support following [capability argument](https://github.com/containernetworking/cni/blob/master/CONVENTIONS.md).
+
+* `ips`: Pass IP addresses for CNI interface
+
+The following [args conventions](https://github.com/containernetworking/cni/blob/master/CONVENTIONS.md#args-in-network-config) are supported:
+
+* `ips` (array of strings): A list of custom IPs to attempt to allocate, with prefix (e.g. '10.10.0.1/24')

plugins/ipam/static/main.go

@@ -34,6 +34,13 @@ type Net struct {
 	Name       string      `json:"name"`
 	CNIVersion string      `json:"cniVersion"`
 	IPAM       *IPAMConfig `json:"ipam"`
+
+	RuntimeConfig struct {
+		IPs []string `json:"ips,omitempty"`
+	} `json:"runtimeConfig,omitempty"`
+	Args *struct {
+		A *IPAMArgs `json:"cni"`
+	} `json:"args"`
 }
 
 type IPAMConfig struct {
@@ -50,6 +57,10 @@ type IPAMEnvArgs struct {
 	GATEWAY types.UnmarshallableString `json:"gateway,omitempty"`
 }
 
+type IPAMArgs struct {
+	IPs []string `json:"ips"`
+}
+
 type Address struct {
 	AddressStr string `json:"address"`
 	Gateway    net.IP `json:"gateway,omitempty"`
@@ -134,6 +145,23 @@ func LoadIPAMConfig(bytes []byte, envArgs string) (*IPAMConfig, string, error) {
 		return nil, "", err
 	}
 
+	if len(n.RuntimeConfig.IPs) != 0 {
+		// args IP overwrites IP, so clear IPAM Config
+		n.IPAM.Addresses = make([]Address, 0, len(n.RuntimeConfig.IPs))
+		for _, addr := range n.RuntimeConfig.IPs {
+			n.IPAM.Addresses = append(n.IPAM.Addresses, Address{AddressStr: addr})
+		}
+	}
+
+	// import address from args
+	if n.Args != nil && n.Args.A != nil && len(n.Args.A.IPs) != 0 {
+		// args IP overwrites IP, so clear IPAM Config
+		n.IPAM.Addresses = make([]Address, 0, len(n.Args.A.IPs))
+		for _, addr := range n.Args.A.IPs {
+			n.IPAM.Addresses = append(n.IPAM.Addresses, Address{AddressStr: addr})
+		}
+	}
+
 	if n.IPAM == nil {
 		return nil, "", fmt.Errorf("IPAM config missing 'ipam' key")
 	}

plugins/ipam/static/static_test.go

@@ -265,6 +265,145 @@ var _ = Describe("static Operations", func() {
 		})
 		Expect(err).NotTo(HaveOccurred())
 	})
+
+	It("allocates and releases multiple addresses with ADD/DEL, from RuntimeConfig", func() {
+		const ifname string = "eth0"
+		const nspath string = "/some/where"
+
+		conf := `{
+			"cniVersion": "0.3.1",
+			"name": "mynet",
+			"type": "ipvlan",
+			"master": "foo0",
+			"capabilities": {"ips": true},
+			"ipam": {
+				"type": "static",
+				"routes": [
+				{ "dst": "0.0.0.0/0", "gw": "10.10.0.254" },
+				{ "dst": "3ffe:ffff:0:01ff::1/64",
+                                  "gw": "3ffe:ffff:0::1" } ],
+				  "dns": {
+					"nameservers" : ["8.8.8.8"],
+					"domain": "example.com",
+					"search": [ "example.com" ]
+			        }
+			},
+			"RuntimeConfig": {
+				"ips" : ["10.10.0.1/24", "3ffe:ffff:0:01ff::1/64"]
+			}
+		}`
+
+		args := &skel.CmdArgs{
+			ContainerID: "dummy",
+			Netns:       nspath,
+			IfName:      ifname,
+			StdinData:   []byte(conf),
+		}
+
+		// Allocate the IP
+		r, raw, err := testutils.CmdAddWithArgs(args, func() error {
+			return cmdAdd(args)
+		})
+		Expect(err).NotTo(HaveOccurred())
+		Expect(strings.Index(string(raw), "\"version\":")).Should(BeNumerically(">", 0))
+
+		result, err := current.GetResult(r)
+		Expect(err).NotTo(HaveOccurred())
+
+		// Gomega is cranky about slices with different caps
+		Expect(*result.IPs[0]).To(Equal(
+			current.IPConfig{
+				Version: "4",
+				Address: mustCIDR("10.10.0.1/24"),
+			}))
+		Expect(*result.IPs[1]).To(Equal(
+			current.IPConfig{
+				Version: "6",
+				Address: mustCIDR("3ffe:ffff:0:01ff::1/64"),
+			},
+		))
+		Expect(len(result.IPs)).To(Equal(2))
+		Expect(result.Routes).To(Equal([]*types.Route{
+			{Dst: mustCIDR("0.0.0.0/0"), GW: net.ParseIP("10.10.0.254")},
+			{Dst: mustCIDR("3ffe:ffff:0:01ff::1/64"), GW: net.ParseIP("3ffe:ffff:0::1")},
+		}))
+
+		// Release the IP
+		err = testutils.CmdDelWithArgs(args, func() error {
+			return cmdDel(args)
+		})
+		Expect(err).NotTo(HaveOccurred())
+	})
+
+	It("allocates and releases multiple addresses with ADD/DEL, from args", func() {
+		const ifname string = "eth0"
+		const nspath string = "/some/where"
+
+		conf := `{
+			"cniVersion": "0.3.1",
+			"name": "mynet",
+			"type": "ipvlan",
+			"master": "foo0",
+			"ipam": {
+				"type": "static",
+				"routes": [
+				{ "dst": "0.0.0.0/0", "gw": "10.10.0.254" },
+				{ "dst": "3ffe:ffff:0:01ff::1/64",
+                                  "gw": "3ffe:ffff:0::1" } ],
+				  "dns": {
+					"nameservers" : ["8.8.8.8"],
+					"domain": "example.com",
+					"search": [ "example.com" ]
+			        }
+			},
+			"args": {
+				"cni": {
+					"ips" : ["10.10.0.1/24", "3ffe:ffff:0:01ff::1/64"]
+			        }
+			}
+		}`
+
+		args := &skel.CmdArgs{
+			ContainerID: "dummy",
+			Netns:       nspath,
+			IfName:      ifname,
+			StdinData:   []byte(conf),
+		}
+
+		// Allocate the IP
+		r, raw, err := testutils.CmdAddWithArgs(args, func() error {
+			return cmdAdd(args)
+		})
+		Expect(err).NotTo(HaveOccurred())
+		Expect(strings.Index(string(raw), "\"version\":")).Should(BeNumerically(">", 0))
+
+		result, err := current.GetResult(r)
+		Expect(err).NotTo(HaveOccurred())
+
+		// Gomega is cranky about slices with different caps
+		Expect(*result.IPs[0]).To(Equal(
+			current.IPConfig{
+				Version: "4",
+				Address: mustCIDR("10.10.0.1/24"),
+			}))
+		Expect(*result.IPs[1]).To(Equal(
+			current.IPConfig{
+				Version: "6",
+				Address: mustCIDR("3ffe:ffff:0:01ff::1/64"),
+			},
+		))
+		Expect(len(result.IPs)).To(Equal(2))
+		Expect(result.Routes).To(Equal([]*types.Route{
+			{Dst: mustCIDR("0.0.0.0/0"), GW: net.ParseIP("10.10.0.254")},
+			{Dst: mustCIDR("3ffe:ffff:0:01ff::1/64"), GW: net.ParseIP("3ffe:ffff:0::1")},
+		}))
+
+		// Release the IP
+		err = testutils.CmdDelWithArgs(args, func() error {
+			return cmdDel(args)
+		})
+		Expect(err).NotTo(HaveOccurred())
+	})
 })
 
 func mustCIDR(s string) net.IPNet {

plugins/main/bridge/bridge.go

@@ -175,7 +175,7 @@ func ensureAddr(br netlink.Link, family int, ipn *net.IPNet, forceAddress bool)
 	}
 
 	addr := &netlink.Addr{IPNet: ipn, Label: ""}
-	if err := netlink.AddrAdd(br, addr); err != nil {
+	if err := netlink.AddrAdd(br, addr); err != nil && err != syscall.EEXIST {
 		return fmt.Errorf("could not add IP address to %q: %v", br.Attrs().Name, err)
 	}
 
@@ -517,7 +517,7 @@ func cmdAdd(args *skel.CmdArgs) error {
 			chain := utils.FormatChainName(n.Name, args.ContainerID)
 			comment := utils.FormatComment(n.Name, args.ContainerID)
 			for _, ipc := range result.IPs {
-				if err = ip.SetupIPMasq(ip.Network(&ipc.Address), chain, comment); err != nil {
+				if err = ip.SetupIPMasq(&ipc.Address, chain, comment); err != nil {
 					return err
 				}
 			}

plugins/main/bridge/bridge_test.go

@@ -17,12 +17,14 @@ package main
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/vishvananda/netlink/nl"
 	"io/ioutil"
 	"net"
 	"os"
 	"strings"
 
+	"github.com/coreos/go-iptables/iptables"
+	"github.com/vishvananda/netlink/nl"
+
 	"github.com/containernetworking/cni/pkg/skel"
 	"github.com/containernetworking/cni/pkg/types"
 	"github.com/containernetworking/cni/pkg/types/020"
@@ -70,6 +72,7 @@ type testCase struct {
 	isLayer2   bool
 	expGWCIDRs []string // Expected gateway addresses in CIDR form
 	vlan       int
+	ipMasq     bool
 }
 
 // Range definition for each entry in the ranges list
@@ -105,8 +108,7 @@ const (
 	"vlan": %d`
 
 	netDefault = `,
-	"isDefaultGateway": true,
-	"ipMasq": false`
+	"isDefaultGateway": true`
 
 	ipamStartStr = `,
     "ipam": {
@@ -115,6 +117,9 @@ const (
 	ipamDataDirStr = `,
         "dataDir": "%s"`
 
+	ipMasqConfStr = `,
+	"ipMasq": %t`
+
 	// Single subnet configuration (legacy)
 	subnetConfStr = `,
         "subnet":  "%s"`
@@ -147,6 +152,9 @@ func (tc testCase) netConfJSON(dataDir string) string {
 	if tc.vlan != 0 {
 		conf += fmt.Sprintf(vlan, tc.vlan)
 	}
+	if tc.ipMasq {
+		conf += tc.ipMasqConfig()
+	}
 
 	if !tc.isLayer2 {
 		conf += netDefault
@@ -178,6 +186,11 @@ func (tc testCase) subnetConfig() string {
 	return conf
 }
 
+func (tc testCase) ipMasqConfig() string {
+	conf := fmt.Sprintf(ipMasqConfStr, tc.ipMasq)
+	return conf
+}
+
 func (tc testCase) rangesConfig() string {
 	conf := rangesStartStr
 	for i, tcRange := range tc.ranges {
@@ -1595,4 +1608,40 @@ var _ = Describe("bridge Operations", func() {
 			cmdAddDelCheckTest(originalNS, tc, dataDir)
 		}
 	})
+
+	It("configures a bridge and ipMasq rules for 0.4.0 config", func() {
+		err := originalNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+			tc := testCase{
+				ranges: []rangeInfo{{
+					subnet: "10.1.2.0/24",
+				}},
+				ipMasq:     true,
+				cniVersion: "0.4.0",
+			}
+
+			args := tc.createCmdArgs(originalNS, dataDir)
+			r, _, err := testutils.CmdAddWithArgs(args, func() error {
+				return cmdAdd(args)
+			})
+			Expect(err).NotTo(HaveOccurred())
+			result, err := current.GetResult(r)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(result.IPs).Should(HaveLen(1))
+
+			ipt, err := iptables.NewWithProtocol(iptables.ProtocolIPv4)
+			Expect(err).NotTo(HaveOccurred())
+
+			rules, err := ipt.List("nat", "POSTROUTING")
+			Expect(err).NotTo(HaveOccurred())
+			Expect(rules).Should(ContainElement(ContainSubstring(result.IPs[0].Address.IP.String())))
+
+			err = testutils.CmdDelWithArgs(args, func() error {
+				return cmdDel(args)
+			})
+			Expect(err).NotTo(HaveOccurred())
+			return nil
+		})
+		Expect(err).NotTo(HaveOccurred())
+	})
 })

plugins/main/host-device/README.md

@@ -1,17 +1,25 @@
 # host-device
+
 Move an already-existing device into a container.
 
-This simple plugin will move the requested device from the host's network namespace
-to the container's. Nothing else will be done - no IPAM, no addresses.
+## Overview
 
-The device can be specified with any one of three properties:
+This simple plugin will move the requested device from the host's network namespace
+to the container's. IPAM configuration can be used for this plugin.
+
+## Network configuration reference
+
+The device can be specified with any one of four properties:
 * `device`: The device name, e.g. `eth0`, `can0`
 * `hwaddr`: A MAC address
 * `kernelpath`: The kernel device kobj, e.g. `/sys/devices/pci0000:00/0000:00:1f.6`
+* `pciBusID`: A PCI address of network device, e.g `0000:00:1f.6`
 
 For this plugin, `CNI_IFNAME` will be ignored. Upon DEL, the device will be moved back.
 
-A sample configuration might look like:
+## Example configuration
+
+A sample configuration with `device` property looks like:
 
 ```json
 {
@@ -20,3 +28,13 @@ A sample configuration might look like:
 	"device": "enp0s1"
 }
 ```
+
+A sample configuration with `pciBusID` property looks like:
+
+```json
+{
+	"cniVersion": "0.3.1",
+	"type": "host-device",
+	"pciBusID": "0000:3d:00.1"
+}
+```

plugins/main/host-device/host-device.go

@@ -21,6 +21,7 @@ import (
 	"fmt"
 	"io/ioutil"
 	"net"
+	"os"
 	"path/filepath"
 	"runtime"
 	"strings"
@@ -38,12 +39,17 @@ import (
 	bv "github.com/containernetworking/plugins/pkg/utils/buildversion"
 )
 
+const (
+	sysBusPCI = "/sys/bus/pci/devices"
+)
+
 //NetConf for host-device config, look the README to learn how to use those parameters
 type NetConf struct {
 	types.NetConf
 	Device     string `json:"device"`     // Device-Name, something like eth0 or can0 etc.
 	HWAddr     string `json:"hwaddr"`     // MAC Address of target network interface
 	KernelPath string `json:"kernelpath"` // Kernelpath of the device
+	PCIAddr    string `json:"pciBusID"`   // PCI Address of target network device
 }
 
 func init() {
@@ -58,8 +64,8 @@ func loadConf(bytes []byte) (*NetConf, error) {
 	if err := json.Unmarshal(bytes, n); err != nil {
 		return nil, fmt.Errorf("failed to load netconf: %v", err)
 	}
-	if n.Device == "" && n.HWAddr == "" && n.KernelPath == "" {
-		return nil, fmt.Errorf(`specify either "device", "hwaddr" or "kernelpath"`)
+	if n.Device == "" && n.HWAddr == "" && n.KernelPath == "" && n.PCIAddr == "" {
+		return nil, fmt.Errorf(`specify either "device", "hwaddr", "kernelpath" or "pciBusID"`)
 	}
 	return n, nil
 }
@@ -75,7 +81,7 @@ func cmdAdd(args *skel.CmdArgs) error {
 	}
 	defer containerNs.Close()
 
-	hostDev, err := getLink(cfg.Device, cfg.HWAddr, cfg.KernelPath)
+	hostDev, err := getLink(cfg.Device, cfg.HWAddr, cfg.KernelPath, cfg.PCIAddr)
 	if err != nil {
 		return fmt.Errorf("failed to find host device: %v", err)
 	}
@@ -212,14 +218,23 @@ func moveLinkOut(containerNs ns.NetNS, ifName string) error {
 		}
 
 		// Devices can be renamed only when down
-		if err := netlink.LinkSetDown(dev); err != nil {
+		if err = netlink.LinkSetDown(dev); err != nil {
 			return fmt.Errorf("failed to set %q down: %v", ifName, err)
 		}
+
 		// Rename device to it's original name
-		if err := netlink.LinkSetName(dev, dev.Attrs().Alias); err != nil {
+		if err = netlink.LinkSetName(dev, dev.Attrs().Alias); err != nil {
 			return fmt.Errorf("failed to restore %q to original name %q: %v", ifName, dev.Attrs().Alias, err)
 		}
-		if err := netlink.LinkSetNsFd(dev, int(defaultNs.Fd())); err != nil {
+		defer func() {
+			if err != nil {
+				// if moving device to host namespace fails, we should revert device name
+				// to ifName to make sure that device can be found in retries
+				_ = netlink.LinkSetName(dev, ifName)
+			}
+		}()
+
+		if err = netlink.LinkSetNsFd(dev, int(defaultNs.Fd())); err != nil {
 			return fmt.Errorf("failed to move %q to host netns: %v", dev.Attrs().Alias, err)
 		}
 		return nil
@@ -240,7 +255,7 @@ func printLink(dev netlink.Link, cniVersion string, containerNs ns.NetNS) error
 	return types.PrintResult(&result, cniVersion)
 }
 
-func getLink(devname, hwaddr, kernelpath string) (netlink.Link, error) {
+func getLink(devname, hwaddr, kernelpath, pciaddr string) (netlink.Link, error) {
 	links, err := netlink.LinkList()
 	if err != nil {
 		return nil, fmt.Errorf("failed to list node links: %v", err)
@@ -278,6 +293,19 @@ func getLink(devname, hwaddr, kernelpath string) (netlink.Link, error) {
 				}
 			}
 		}
+	} else if len(pciaddr) > 0 {
+		netDir := filepath.Join(sysBusPCI, pciaddr, "net")
+		if _, err := os.Lstat(netDir); err != nil {
+			return nil, fmt.Errorf("no net directory under pci device %s: %q", pciaddr, err)
+		}
+		fInfo, err := ioutil.ReadDir(netDir)
+		if err != nil {
+			return nil, fmt.Errorf("failed to read net directory %s: %q", netDir, err)
+		}
+		if len(fInfo) > 0 {
+			return netlink.LinkByName(fInfo[0].Name())
+		}
+		return nil, fmt.Errorf("failed to find device name for pci address %s", pciaddr)
 	}
 
 	return nil, fmt.Errorf("failed to find physical interface")

plugins/main/host-device/host-device_test.go

@@ -40,6 +40,7 @@ type Net struct {
 	Device        string                 `json:"device"`     // Device-Name, something like eth0 or can0 etc.
 	HWAddr        string                 `json:"hwaddr"`     // MAC Address of target network interface
 	KernelPath    string                 `json:"kernelpath"` // Kernelpath of the device
+	PCIAddr       string                 `json:"pciBusID"`   // PCI Address of target network device
 	IPAM          *IPAMConfig            `json:"ipam,omitempty"`
 	DNS           types.DNS              `json:"dns"`
 	RawPrevResult map[string]interface{} `json:"prevResult,omitempty"`
@@ -239,7 +240,7 @@ var _ = Describe("base functionality", func() {
 		var origLink netlink.Link
 
 		// prepare ifname in original namespace
-		err := originalNS.Do(func(ns.NetNS) error {
+		_ = originalNS.Do(func(ns.NetNS) error {
 			defer GinkgoRecover()
 			err := netlink.LinkAdd(&netlink.Dummy{
 				LinkAttrs: netlink.LinkAttrs{
@@ -253,7 +254,6 @@ var _ = Describe("base functionality", func() {
 			Expect(err).NotTo(HaveOccurred())
 			return nil
 		})
-		Expect(err).NotTo(HaveOccurred())
 
 		// call CmdAdd
 		targetNS, err := testutils.NewNS()
@@ -293,26 +293,24 @@ var _ = Describe("base functionality", func() {
 		}))
 
 		// assert that dummy0 is now in the target namespace
-		err = targetNS.Do(func(ns.NetNS) error {
+		_ = targetNS.Do(func(ns.NetNS) error {
 			defer GinkgoRecover()
 			link, err := netlink.LinkByName(cniName)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(link.Attrs().HardwareAddr).To(Equal(origLink.Attrs().HardwareAddr))
 			return nil
 		})
-		Expect(err).NotTo(HaveOccurred())
 
 		// assert that dummy0 is now NOT in the original namespace anymore
-		err = originalNS.Do(func(ns.NetNS) error {
+		_ = originalNS.Do(func(ns.NetNS) error {
 			defer GinkgoRecover()
 			_, err := netlink.LinkByName(ifname)
 			Expect(err).To(HaveOccurred())
 			return nil
 		})
-		Expect(err).NotTo(HaveOccurred())
 
 		// Check that deleting the device moves it back and restores the name
-		err = originalNS.Do(func(ns.NetNS) error {
+		_ = originalNS.Do(func(ns.NetNS) error {
 			defer GinkgoRecover()
 			err = testutils.CmdDelWithArgs(args, func() error {
 				return cmdDel(args)
@@ -323,15 +321,16 @@ var _ = Describe("base functionality", func() {
 			Expect(err).NotTo(HaveOccurred())
 			return nil
 		})
-		Expect(err).NotTo(HaveOccurred())
-
 	})
 
-	It("Works with a valid config with IPAM", func() {
-		var origLink netlink.Link
+	It("Test idempotence of CmdDel", func() {
+		var (
+			origLink     netlink.Link
+			conflictLink netlink.Link
+		)
 
-		// prepare ifname in original namespace
-		err := originalNS.Do(func(ns.NetNS) error {
+		// prepare host device in original namespace
+		_ = originalNS.Do(func(ns.NetNS) error {
 			defer GinkgoRecover()
 			err := netlink.LinkAdd(&netlink.Dummy{
 				LinkAttrs: netlink.LinkAttrs{
@@ -345,8 +344,142 @@ var _ = Describe("base functionality", func() {
 			Expect(err).NotTo(HaveOccurred())
 			return nil
 		})
+
+		// call CmdAdd
+		targetNS, err := testutils.NewNS()
 		Expect(err).NotTo(HaveOccurred())
 
+		cniName := "eth0"
+		conf := fmt.Sprintf(`{
+			"cniVersion": "0.3.0",
+			"name": "cni-plugin-host-device-test",
+			"type": "host-device",
+			"device": %q
+		}`, ifname)
+		args := &skel.CmdArgs{
+			ContainerID: "dummy",
+			Netns:       targetNS.Path(),
+			IfName:      cniName,
+			StdinData:   []byte(conf),
+		}
+		var resI types.Result
+		err = originalNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+			var err error
+			resI, _, err = testutils.CmdAddWithArgs(args, func() error { return cmdAdd(args) })
+			return err
+		})
+		Expect(err).NotTo(HaveOccurred())
+
+		// check that the result is sane
+		res, err := current.NewResultFromResult(resI)
+		Expect(err).NotTo(HaveOccurred())
+		Expect(res.Interfaces).To(Equal([]*current.Interface{
+			{
+				Name:    cniName,
+				Mac:     origLink.Attrs().HardwareAddr.String(),
+				Sandbox: targetNS.Path(),
+			},
+		}))
+
+		// assert that dummy0 is now in the target namespace
+		_ = targetNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+			link, err := netlink.LinkByName(cniName)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(link.Attrs().HardwareAddr).To(Equal(origLink.Attrs().HardwareAddr))
+			return nil
+		})
+
+		// assert that dummy0 is now NOT in the original namespace anymore
+		_ = originalNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+			_, err := netlink.LinkByName(ifname)
+			Expect(err).To(HaveOccurred())
+			return nil
+		})
+
+		// create another conflict host device with same name "dummy0"
+		_ = originalNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+			err := netlink.LinkAdd(&netlink.Dummy{
+				LinkAttrs: netlink.LinkAttrs{
+					Name: ifname,
+				},
+			})
+			Expect(err).NotTo(HaveOccurred())
+			conflictLink, err = netlink.LinkByName(ifname)
+			Expect(err).NotTo(HaveOccurred())
+			err = netlink.LinkSetUp(conflictLink)
+			Expect(err).NotTo(HaveOccurred())
+			return nil
+		})
+
+		// try to call CmdDel and fails
+		_ = originalNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+			err = testutils.CmdDelWithArgs(args, func() error {
+				return cmdDel(args)
+			})
+			Expect(err).To(HaveOccurred())
+			return nil
+		})
+
+		// assert container interface "eth0" still exists in target namespace
+		_ = targetNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+			link, err := netlink.LinkByName(cniName)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(link.Attrs().HardwareAddr).To(Equal(origLink.Attrs().HardwareAddr))
+			return nil
+		})
+
+		// remove the conflict host device
+		_ = originalNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+			err = netlink.LinkDel(conflictLink)
+			Expect(err).NotTo(HaveOccurred())
+			return nil
+		})
+
+		// try to call CmdDel and succeed
+		_ = originalNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+			err = testutils.CmdDelWithArgs(args, func() error {
+				return cmdDel(args)
+			})
+			Expect(err).NotTo(HaveOccurred())
+			return nil
+		})
+
+		// assert that dummy0 is now back in the original namespace
+		_ = originalNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+			_, err := netlink.LinkByName(ifname)
+			Expect(err).NotTo(HaveOccurred())
+			return nil
+		})
+	})
+
+	It("Works with a valid config with IPAM", func() {
+		var origLink netlink.Link
+
+		// prepare ifname in original namespace
+		_ = originalNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+			err := netlink.LinkAdd(&netlink.Dummy{
+				LinkAttrs: netlink.LinkAttrs{
+					Name: ifname,
+				},
+			})
+			Expect(err).NotTo(HaveOccurred())
+			origLink, err = netlink.LinkByName(ifname)
+			Expect(err).NotTo(HaveOccurred())
+			err = netlink.LinkSetUp(origLink)
+			Expect(err).NotTo(HaveOccurred())
+			return nil
+		})
+
 		// call CmdAdd
 		targetNS, err := testutils.NewNS()
 		Expect(err).NotTo(HaveOccurred())
@@ -393,7 +526,7 @@ var _ = Describe("base functionality", func() {
 		}))
 
 		// assert that dummy0 is now in the target namespace
-		err = targetNS.Do(func(ns.NetNS) error {
+		_ = targetNS.Do(func(ns.NetNS) error {
 			defer GinkgoRecover()
 			link, err := netlink.LinkByName(cniName)
 			Expect(err).NotTo(HaveOccurred())
@@ -408,19 +541,17 @@ var _ = Describe("base functionality", func() {
 
 			return nil
 		})
-		Expect(err).NotTo(HaveOccurred())
 
 		// assert that dummy0 is now NOT in the original namespace anymore
-		err = originalNS.Do(func(ns.NetNS) error {
+		_ = originalNS.Do(func(ns.NetNS) error {
 			defer GinkgoRecover()
 			_, err := netlink.LinkByName(ifname)
 			Expect(err).To(HaveOccurred())
 			return nil
 		})
-		Expect(err).NotTo(HaveOccurred())
 
 		// Check that deleting the device moves it back and restores the name
-		err = originalNS.Do(func(ns.NetNS) error {
+		_ = originalNS.Do(func(ns.NetNS) error {
 			defer GinkgoRecover()
 			err = testutils.CmdDelWithArgs(args, func() error {
 				return cmdDel(args)
@@ -431,8 +562,6 @@ var _ = Describe("base functionality", func() {
 			Expect(err).NotTo(HaveOccurred())
 			return nil
 		})
-		Expect(err).NotTo(HaveOccurred())
-
 	})
 
 	It("fails an invalid config", func() {
@@ -449,7 +578,7 @@ var _ = Describe("base functionality", func() {
 			StdinData:   []byte(conf),
 		}
 		_, _, err := testutils.CmdAddWithArgs(args, func() error { return cmdAdd(args) })
-		Expect(err).To(MatchError(`specify either "device", "hwaddr" or "kernelpath"`))
+		Expect(err).To(MatchError(`specify either "device", "hwaddr", "kernelpath" or "pciBusID"`))
 
 	})
 
@@ -457,7 +586,7 @@ var _ = Describe("base functionality", func() {
 		var origLink netlink.Link
 
 		// prepare ifname in original namespace
-		err := originalNS.Do(func(ns.NetNS) error {
+		_ = originalNS.Do(func(ns.NetNS) error {
 			defer GinkgoRecover()
 			err := netlink.LinkAdd(&netlink.Dummy{
 				LinkAttrs: netlink.LinkAttrs{
@@ -471,7 +600,6 @@ var _ = Describe("base functionality", func() {
 			Expect(err).NotTo(HaveOccurred())
 			return nil
 		})
-		Expect(err).NotTo(HaveOccurred())
 
 		// call CmdAdd
 		targetNS, err := testutils.NewNS()
@@ -511,23 +639,21 @@ var _ = Describe("base functionality", func() {
 		}))
 
 		// assert that dummy0 is now in the target namespace
-		err = targetNS.Do(func(ns.NetNS) error {
+		_ = targetNS.Do(func(ns.NetNS) error {
 			defer GinkgoRecover()
 			link, err := netlink.LinkByName(cniName)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(link.Attrs().HardwareAddr).To(Equal(origLink.Attrs().HardwareAddr))
 			return nil
 		})
-		Expect(err).NotTo(HaveOccurred())
 
 		// assert that dummy0 is now NOT in the original namespace anymore
-		err = originalNS.Do(func(ns.NetNS) error {
+		_ = originalNS.Do(func(ns.NetNS) error {
 			defer GinkgoRecover()
 			_, err := netlink.LinkByName(ifname)
 			Expect(err).To(HaveOccurred())
 			return nil
 		})
-		Expect(err).NotTo(HaveOccurred())
 
 		// call CmdCheck
 		n := &Net{}
@@ -554,7 +680,7 @@ var _ = Describe("base functionality", func() {
 		Expect(err).NotTo(HaveOccurred())
 
 		// Check that deleting the device moves it back and restores the name
-		err = originalNS.Do(func(ns.NetNS) error {
+		_ = originalNS.Do(func(ns.NetNS) error {
 			defer GinkgoRecover()
 			err = testutils.CmdDelWithArgs(args, func() error {
 				return cmdDel(args)
@@ -565,15 +691,13 @@ var _ = Describe("base functionality", func() {
 			Expect(err).NotTo(HaveOccurred())
 			return nil
 		})
-		Expect(err).NotTo(HaveOccurred())
-
 	})
 
 	It("Works with a valid 0.4.0 config with IPAM", func() {
 		var origLink netlink.Link
 
 		// prepare ifname in original namespace
-		err := originalNS.Do(func(ns.NetNS) error {
+		_ = originalNS.Do(func(ns.NetNS) error {
 			defer GinkgoRecover()
 			err := netlink.LinkAdd(&netlink.Dummy{
 				LinkAttrs: netlink.LinkAttrs{
@@ -587,7 +711,6 @@ var _ = Describe("base functionality", func() {
 			Expect(err).NotTo(HaveOccurred())
 			return nil
 		})
-		Expect(err).NotTo(HaveOccurred())
 
 		// call CmdAdd
 		targetNS, err := testutils.NewNS()
@@ -635,7 +758,7 @@ var _ = Describe("base functionality", func() {
 		}))
 
 		// assert that dummy0 is now in the target namespace
-		err = targetNS.Do(func(ns.NetNS) error {
+		_ = targetNS.Do(func(ns.NetNS) error {
 			defer GinkgoRecover()
 			link, err := netlink.LinkByName(cniName)
 			Expect(err).NotTo(HaveOccurred())
@@ -650,16 +773,14 @@ var _ = Describe("base functionality", func() {
 
 			return nil
 		})
-		Expect(err).NotTo(HaveOccurred())
 
 		// assert that dummy0 is now NOT in the original namespace anymore
-		err = originalNS.Do(func(ns.NetNS) error {
+		_ = originalNS.Do(func(ns.NetNS) error {
 			defer GinkgoRecover()
 			_, err := netlink.LinkByName(ifname)
 			Expect(err).To(HaveOccurred())
 			return nil
 		})
-		Expect(err).NotTo(HaveOccurred())
 
 		// call CmdCheck
 		n := &Net{}
@@ -689,7 +810,7 @@ var _ = Describe("base functionality", func() {
 		Expect(err).NotTo(HaveOccurred())
 
 		// Check that deleting the device moves it back and restores the name
-		err = originalNS.Do(func(ns.NetNS) error {
+		_ = originalNS.Do(func(ns.NetNS) error {
 			defer GinkgoRecover()
 			err = testutils.CmdDelWithArgs(args, func() error {
 				return cmdDel(args)
@@ -700,8 +821,144 @@ var _ = Describe("base functionality", func() {
 			Expect(err).NotTo(HaveOccurred())
 			return nil
 		})
-		Expect(err).NotTo(HaveOccurred())
-
 	})
 
+	It("Test idempotence of CmdDel with 0.4.0 config", func() {
+		var (
+			origLink     netlink.Link
+			conflictLink netlink.Link
+		)
+
+		// prepare host device in original namespace
+		_ = originalNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+			err := netlink.LinkAdd(&netlink.Dummy{
+				LinkAttrs: netlink.LinkAttrs{
+					Name: ifname,
+				},
+			})
+			Expect(err).NotTo(HaveOccurred())
+			origLink, err = netlink.LinkByName(ifname)
+			Expect(err).NotTo(HaveOccurred())
+			err = netlink.LinkSetUp(origLink)
+			Expect(err).NotTo(HaveOccurred())
+			return nil
+		})
+
+		// call CmdAdd
+		targetNS, err := testutils.NewNS()
+		Expect(err).NotTo(HaveOccurred())
+
+		cniName := "eth0"
+		conf := fmt.Sprintf(`{
+			"cniVersion": "0.4.0",
+			"name": "cni-plugin-host-device-test",
+			"type": "host-device",
+			"device": %q
+		}`, ifname)
+		args := &skel.CmdArgs{
+			ContainerID: "dummy",
+			Netns:       targetNS.Path(),
+			IfName:      cniName,
+			StdinData:   []byte(conf),
+		}
+		var resI types.Result
+		err = originalNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+			var err error
+			resI, _, err = testutils.CmdAddWithArgs(args, func() error { return cmdAdd(args) })
+			return err
+		})
+		Expect(err).NotTo(HaveOccurred())
+
+		// check that the result is sane
+		res, err := current.NewResultFromResult(resI)
+		Expect(err).NotTo(HaveOccurred())
+		Expect(res.Interfaces).To(Equal([]*current.Interface{
+			{
+				Name:    cniName,
+				Mac:     origLink.Attrs().HardwareAddr.String(),
+				Sandbox: targetNS.Path(),
+			},
+		}))
+
+		// assert that dummy0 is now in the target namespace
+		_ = targetNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+			link, err := netlink.LinkByName(cniName)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(link.Attrs().HardwareAddr).To(Equal(origLink.Attrs().HardwareAddr))
+			return nil
+		})
+
+		// assert that dummy0 is now NOT in the original namespace anymore
+		_ = originalNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+			_, err := netlink.LinkByName(ifname)
+			Expect(err).To(HaveOccurred())
+			return nil
+		})
+
+		// create another conflict host device with same name "dummy0"
+		_ = originalNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+			err := netlink.LinkAdd(&netlink.Dummy{
+				LinkAttrs: netlink.LinkAttrs{
+					Name: ifname,
+				},
+			})
+			Expect(err).NotTo(HaveOccurred())
+			conflictLink, err = netlink.LinkByName(ifname)
+			Expect(err).NotTo(HaveOccurred())
+			err = netlink.LinkSetUp(conflictLink)
+			Expect(err).NotTo(HaveOccurred())
+			return nil
+		})
+
+		// try to call CmdDel and fails
+		_ = originalNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+			err = testutils.CmdDelWithArgs(args, func() error {
+				return cmdDel(args)
+			})
+			Expect(err).To(HaveOccurred())
+			return nil
+		})
+
+		// assert container interface "eth0" still exists in target namespace
+		err = targetNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+			link, err := netlink.LinkByName(cniName)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(link.Attrs().HardwareAddr).To(Equal(origLink.Attrs().HardwareAddr))
+			return nil
+		})
+		Expect(err).NotTo(HaveOccurred())
+
+		// remove the conflict host device
+		_ = originalNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+			err = netlink.LinkDel(conflictLink)
+			Expect(err).NotTo(HaveOccurred())
+			return nil
+		})
+
+		// try to call CmdDel and succeed
+		_ = originalNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+			err = testutils.CmdDelWithArgs(args, func() error {
+				return cmdDel(args)
+			})
+			Expect(err).NotTo(HaveOccurred())
+			return nil
+		})
+
+		// assert that dummy0 is now back in the original namespace
+		_ = originalNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+			_, err := netlink.LinkByName(ifname)
+			Expect(err).NotTo(HaveOccurred())
+			return nil
+		})
+	})
 })

plugins/main/windows/win-bridge/README.md

@@ -32,7 +32,8 @@ With win-bridge plugin, all containers (on the same host) are plugged into an L2
                 "NeedEncap": true
             }
         }
-    ].          
+    ],
+    "loopbackDSR": true,
     "capabilities": {
         "dns": true
     }
@@ -51,5 +52,6 @@ With win-bridge plugin, all containers (on the same host) are plugged into an L2
 * `ipam` (dictionary, optional): IPAM configuration to be used for this network.
 * `Policies` (list, optional): List of hns policies to be used (only used when ApiVersion is < 2).
 * `HcnPolicyArgs` (list, optional): List of hcn policies to be used (only used when ApiVersion is 2).
-* `capabilities` (dictionary, optional): runtime capabilities to enable.
- * `dns` (boolean, optional): if true will take the dns config supplied by the runtime and override other settings.
+* `loopbackDSR` (bool, optional): If true, will add a policy to allow the interface to support loopback direct server return.
+* `capabilities` (dictionary, optional): Runtime capabilities to enable.
+ * `dns` (boolean, optional): If true, will take the dns config supplied by the runtime and override other settings.

plugins/main/windows/win-bridge/sample.conf

@@ -39,6 +39,7 @@
                     "NeedEncap":true
                 }
             }
-        ]
+        ],
+        "loopbackDSR": true
     }
 }

plugins/main/windows/win-bridge/win-bridge_windows.go

@@ -19,7 +19,6 @@ import (
 	"fmt"
 	"runtime"
 	"strings"
-	"os"
 
 	"github.com/Microsoft/hcsshim"
 	"github.com/Microsoft/hcsshim/hcn"
@@ -39,7 +38,6 @@ type NetConf struct {
 	hns.NetConf
 
 	IPMasqNetwork string `json:"ipMasqNetwork,omitempty"`
-	ApiVersion    int    `json:"ApiVersion"`
 }
 
 func init() {
@@ -104,7 +102,7 @@ func cmdHnsAdd(args *skel.CmdArgs, n *NetConf) (*current.Result, error) {
 		return nil, fmt.Errorf("network %v not found", networkName)
 	}
 
-	if !strings.EqualFold(hnsNetwork.Type, "L2Bridge") {
+	if !strings.EqualFold(hnsNetwork.Type, "L2Bridge") && !strings.EqualFold(hnsNetwork.Type, "L2Tunnel") {
 		return nil, fmt.Errorf("network %v is of an unexpected type: %v", networkName, hnsNetwork.Type)
 	}
 
@@ -146,7 +144,7 @@ func cmdHcnAdd(args *skel.CmdArgs, n *NetConf) (*current.Result, error) {
 		return nil, fmt.Errorf("network %v not found", networkName)
 	}
 
-	if  hcnNetwork.Type != hcn.L2Bridge {
+	if hcnNetwork.Type != hcn.L2Bridge && hcnNetwork.Type != hcn.L2Tunnel {
 		return nil, fmt.Errorf("network %v is of unexpected type: %v", networkName, hcnNetwork.Type)
 	}
 
@@ -191,13 +189,11 @@ func cmdAdd(args *skel.CmdArgs) error {
 	}
 
 	if err != nil {
-		os.Setenv("CNI_COMMAND", "DEL")
 		ipam.ExecDel(n.IPAM.Type, args.StdinData)
-		os.Setenv("CNI_COMMAND", "ADD")
 		return errors.Annotate(err, "error while executing ADD command")
 	}
 
-	if (result == nil) {
+	if result == nil {
 		return errors.New("result for ADD not populated correctly")
 	}
 	return types.PrintResult(result, cniVersion)

plugins/main/windows/win-overlay/README.md

@@ -14,11 +14,11 @@ With win-overlay plugin, all containers (on the same host) are plugged into an O
 	"ipam": {
 		"type": "host-local",
 		"subnet": "10.10.0.0/16"
-	}
+	},
+    "loopbackDSR": true,
     "capabilites": {
         "dns": true
     }
-
 }
 ```
 
@@ -33,5 +33,6 @@ With win-overlay plugin, all containers (on the same host) are plugged into an O
 * `endpointMacPrefix` (string, optional): set to the MAC prefix configured for Flannel.
 * `Policies` (list, optional): List of hns policies to be used.
 * `ipam` (dictionary, required): IPAM configuration to be used for this network.
+* `loopbackDSR` (bool, optional): If true, will add a policy to allow the interface to support loopback direct server return.
 * `capabilities` (dictionary, optional): runtime capabilities to be parsed and injected by runtime.
- * `dns` (boolean, optional): if true will take the dns config supplied by the runtime and override other settings.
+ * `dns` (boolean, optional): If true, will take the dns config supplied by the runtime and override other settings.

plugins/main/windows/win-overlay/win-overlay_windows.go

@@ -19,7 +19,6 @@ import (
 	"fmt"
 	"runtime"
 	"strings"
-	"os"
 
 	"github.com/Microsoft/hcsshim"
 	"github.com/juju/errors"
@@ -119,7 +118,9 @@ func cmdAdd(args *skel.CmdArgs) error {
 		}
 
 		result.DNS = n.GetDNS()
-
+		if n.LoopbackDSR {
+			n.ApplyLoopbackDSR(&ipAddr)
+		}
 		hnsEndpoint := &hcsshim.HNSEndpoint{
 			Name:           epName,
 			VirtualNetwork: hnsNetwork.Id,
@@ -135,9 +136,7 @@ func cmdAdd(args *skel.CmdArgs) error {
 	})
 	defer func() {
 		if !success {
-			os.Setenv("CNI_COMMAND", "DEL")
 			ipam.ExecDel(n.IPAM.Type, args.StdinData)
-			os.Setenv("CNI_COMMAND", "ADD")
 		}
 	}()
 	if err != nil {

plugins/meta/bandwidth/bandwidth_linux_test.go

@@ -105,7 +105,7 @@ var _ = Describe("bandwidth test", func() {
 		hostIP = net.IP{169, 254, 0, 1}
 		containerIP = net.IP{10, 254, 0, 1}
 		hostIfaceMTU = 1024
-		ifbDeviceName = "5b6c"
+		ifbDeviceName = "bwpa8eda89404b7"
 
 		createVeth(hostNs.Path(), hostIfname, containerNs.Path(), containerIfname, hostIP, containerIP, hostIfaceMTU)
 	})
@@ -621,6 +621,257 @@ var _ = Describe("bandwidth test", func() {
 		})
 	})
 
+	Describe("Getting the host interface which plugin should work on from veth peer of container interface", func() {
+		It("Should work with multiple host veth interfaces", func() {
+			conf := `{
+	"cniVersion": "0.4.0",
+	"name": "cni-plugin-bandwidth-test",
+	"type": "bandwidth",
+	"ingressRate": 8,
+	"ingressBurst": 8,
+	"egressRate": 16,
+	"egressBurst": 8,
+	"prevResult": {
+		"interfaces": [
+			{
+				"name": "%s",
+				"sandbox": ""
+			},
+			{
+				"name": "%s",
+				"sandbox": ""
+			},
+			{
+				"name": "%s",
+				"sandbox": ""
+			},
+			{
+				"name": "%s",
+				"sandbox": "%s"
+			}
+		],
+		"ips": [
+			{
+				"version": "4",
+				"address": "%s/24",
+				"gateway": "10.0.0.1",
+				"interface": 1
+			}
+		],
+		"routes": []
+	}
+}`
+
+			// create veth peer in host ns
+			vethName, peerName := "host-veth-peer1", "host-veth-peer2"
+			createVethInOneNs(hostNs.Path(), vethName, peerName)
+
+			conf = fmt.Sprintf(conf, vethName, peerName, hostIfname, containerIfname, containerNs.Path(), containerIP.String())
+			args := &skel.CmdArgs{
+				ContainerID: "dummy",
+				Netns:       containerNs.Path(),
+				IfName:      containerIfname,
+				StdinData:   []byte(conf),
+			}
+
+			Expect(hostNs.Do(func(netNS ns.NetNS) error {
+				defer GinkgoRecover()
+				r, out, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
+				Expect(err).NotTo(HaveOccurred(), string(out))
+				result, err := current.GetResult(r)
+				Expect(err).NotTo(HaveOccurred())
+
+				Expect(result.Interfaces).To(HaveLen(5))
+				Expect(result.Interfaces[4].Name).To(Equal(ifbDeviceName))
+				Expect(result.Interfaces[4].Sandbox).To(Equal(""))
+
+				ifbLink, err := netlink.LinkByName(ifbDeviceName)
+				Expect(err).NotTo(HaveOccurred())
+				Expect(ifbLink.Attrs().MTU).To(Equal(hostIfaceMTU))
+
+				qdiscs, err := netlink.QdiscList(ifbLink)
+				Expect(err).NotTo(HaveOccurred())
+
+				Expect(qdiscs).To(HaveLen(1))
+				Expect(qdiscs[0].Attrs().LinkIndex).To(Equal(ifbLink.Attrs().Index))
+
+				Expect(qdiscs[0]).To(BeAssignableToTypeOf(&netlink.Tbf{}))
+				Expect(qdiscs[0].(*netlink.Tbf).Rate).To(Equal(uint64(2)))
+				Expect(qdiscs[0].(*netlink.Tbf).Limit).To(Equal(uint32(1)))
+
+				hostVethLink, err := netlink.LinkByName(hostIfname)
+				Expect(err).NotTo(HaveOccurred())
+
+				qdiscFilters, err := netlink.FilterList(hostVethLink, netlink.MakeHandle(0xffff, 0))
+				Expect(err).NotTo(HaveOccurred())
+
+				Expect(qdiscFilters).To(HaveLen(1))
+				Expect(qdiscFilters[0].(*netlink.U32).Actions[0].(*netlink.MirredAction).Ifindex).To(Equal(ifbLink.Attrs().Index))
+
+				return nil
+			})).To(Succeed())
+
+			Expect(hostNs.Do(func(n ns.NetNS) error {
+				defer GinkgoRecover()
+
+				ifbLink, err := netlink.LinkByName(hostIfname)
+				Expect(err).NotTo(HaveOccurred())
+
+				qdiscs, err := netlink.QdiscList(ifbLink)
+				Expect(err).NotTo(HaveOccurred())
+
+				Expect(qdiscs).To(HaveLen(2))
+				Expect(qdiscs[0].Attrs().LinkIndex).To(Equal(ifbLink.Attrs().Index))
+
+				Expect(qdiscs[0]).To(BeAssignableToTypeOf(&netlink.Tbf{}))
+				Expect(qdiscs[0].(*netlink.Tbf).Rate).To(Equal(uint64(1)))
+				Expect(qdiscs[0].(*netlink.Tbf).Limit).To(Equal(uint32(1)))
+				return nil
+			})).To(Succeed())
+
+		})
+
+		It("Should fail when container interface has no veth peer", func() {
+			conf := `{
+	"cniVersion": "0.4.0",
+	"name": "cni-plugin-bandwidth-test",
+	"type": "bandwidth",
+	"ingressRate": 8,
+	"ingressBurst": 8,
+	"egressRate": 16,
+	"egressBurst": 8,
+	"prevResult": {
+		"interfaces": [
+			{
+				"name": "%s",
+				"sandbox": ""
+			},
+			{
+				"name": "%s",
+				"sandbox": "%s"
+			}
+		],
+		"ips": [
+			{
+				"version": "4",
+				"address": "%s/24",
+				"gateway": "10.0.0.1",
+				"interface": 1
+			}
+		],
+		"routes": []
+	}
+}`
+
+			// create a macvlan device to be container interface
+			macvlanContainerIfname := "container-macv"
+			createMacvlan(containerNs.Path(), containerIfname, macvlanContainerIfname)
+
+			conf = fmt.Sprintf(conf, hostIfname, macvlanContainerIfname, containerNs.Path(), containerIP.String())
+			args := &skel.CmdArgs{
+				ContainerID: "dummy",
+				Netns:       containerNs.Path(),
+				IfName:      macvlanContainerIfname,
+				StdinData:   []byte(conf),
+			}
+
+			Expect(hostNs.Do(func(netNS ns.NetNS) error {
+				defer GinkgoRecover()
+
+				_, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
+				Expect(err).To(HaveOccurred())
+
+				return nil
+			})).To(Succeed())
+		})
+
+		It("Should fail when preResult has no interfaces", func() {
+			conf := `{
+	"cniVersion": "0.4.0",
+	"name": "cni-plugin-bandwidth-test",
+	"type": "bandwidth",
+	"ingressRate": 8,
+	"ingressBurst": 8,
+	"egressRate": 16,
+	"egressBurst": 8,
+	"prevResult": {
+		"interfaces": [],
+		"ips": [],
+		"routes": []
+	}
+}`
+
+			args := &skel.CmdArgs{
+				ContainerID: "dummy",
+				Netns:       containerNs.Path(),
+				IfName:      "eth0",
+				StdinData:   []byte(conf),
+			}
+
+			Expect(hostNs.Do(func(netNS ns.NetNS) error {
+				defer GinkgoRecover()
+
+				_, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
+				Expect(err).To(HaveOccurred())
+
+				return nil
+			})).To(Succeed())
+		})
+
+		It("Should fail when veth peer of container interface does not match any of host interfaces in preResult", func() {
+			conf := `{
+	"cniVersion": "0.4.0",
+	"name": "cni-plugin-bandwidth-test",
+	"type": "bandwidth",
+	"ingressRate": 8,
+	"ingressBurst": 8,
+	"egressRate": 16,
+	"egressBurst": 8,
+	"prevResult": {
+		"interfaces": [
+			{
+				"name": "%s",
+				"sandbox": ""
+			},
+			{
+				"name": "%s",
+				"sandbox": "%s"
+			}
+		],
+		"ips": [
+			{
+				"version": "4",
+				"address": "%s/24",
+				"gateway": "10.0.0.1",
+				"interface": 1
+			}
+		],
+		"routes": []
+	}
+}`
+
+			// fake a non-exist host interface name
+			fakeHostIfname := fmt.Sprintf("%s-fake", hostIfname)
+
+			conf = fmt.Sprintf(conf, fakeHostIfname, containerIfname, containerNs.Path(), containerIP.String())
+			args := &skel.CmdArgs{
+				ContainerID: "dummy",
+				Netns:       containerNs.Path(),
+				IfName:      containerIfname,
+				StdinData:   []byte(conf),
+			}
+
+			Expect(hostNs.Do(func(netNS ns.NetNS) error {
+				defer GinkgoRecover()
+
+				_, _, err := testutils.CmdAdd(containerNs.Path(), args.ContainerID, "", []byte(conf), func() error { return cmdAdd(args) })
+				Expect(err).To(HaveOccurred())
+
+				return nil
+			})).To(Succeed())
+		})
+	})
+
 	Context("when chaining bandwidth plugin with PTP using 0.3.0 config", func() {
 		var ptpConf string
 		var rateInBits int

plugins/meta/bandwidth/bandwidth_suite_test.go

@@ -199,3 +199,61 @@ func createVeth(hostNamespace string, hostVethIfName string, containerNamespace
 
 	Expect(err).NotTo(HaveOccurred())
 }
+
+func createVethInOneNs(namespace, vethName, peerName string) {
+	vethDeviceRequest := &netlink.Veth{
+		LinkAttrs: netlink.LinkAttrs{
+			Name:  vethName,
+			Flags: net.FlagUp,
+		},
+		PeerName: peerName,
+	}
+
+	netNS, err := ns.GetNS(namespace)
+	Expect(err).NotTo(HaveOccurred())
+
+	err = netNS.Do(func(_ ns.NetNS) error {
+		if err := netlink.LinkAdd(vethDeviceRequest); err != nil {
+			return fmt.Errorf("failed to create veth pair: %v", err)
+		}
+
+		_, err := netlink.LinkByName(peerName)
+		if err != nil {
+			return fmt.Errorf("failed to find newly-created veth device %q: %v", peerName, err)
+		}
+		return nil
+	})
+	Expect(err).NotTo(HaveOccurred())
+}
+
+func createMacvlan(namespace, master, macvlanName string) {
+	netNS, err := ns.GetNS(namespace)
+	Expect(err).NotTo(HaveOccurred())
+
+	err = netNS.Do(func(_ ns.NetNS) error {
+		m, err := netlink.LinkByName(master)
+		if err != nil {
+			return fmt.Errorf("failed to lookup master %q: %v", master, err)
+		}
+
+		macvlanDeviceRequest := &netlink.Macvlan{
+			LinkAttrs: netlink.LinkAttrs{
+				MTU:         m.Attrs().MTU,
+				Name:        macvlanName,
+				ParentIndex: m.Attrs().Index,
+			},
+			Mode: netlink.MACVLAN_MODE_BRIDGE,
+		}
+
+		if err = netlink.LinkAdd(macvlanDeviceRequest); err != nil {
+			return fmt.Errorf("failed to create macvlan device: %s", err)
+		}
+
+		_, err = netlink.LinkByName(macvlanName)
+		if err != nil {
+			return fmt.Errorf("failed to find newly-created macvlan device %q: %v", macvlanName, err)
+		}
+		return nil
+	})
+	Expect(err).NotTo(HaveOccurred())
+}

plugins/meta/bandwidth/main.go

@@ -15,9 +15,7 @@
 package main
 
 import (
-	"crypto/sha1"
 	"encoding/json"
-	"errors"
 	"fmt"
 
 	"github.com/vishvananda/netlink"
@@ -28,9 +26,14 @@ import (
 	"github.com/containernetworking/cni/pkg/version"
 
 	"github.com/containernetworking/plugins/pkg/ip"
+	"github.com/containernetworking/plugins/pkg/ns"
+	"github.com/containernetworking/plugins/pkg/utils"
 	bv "github.com/containernetworking/plugins/pkg/utils/buildversion"
 )
 
+const maxIfbDeviceLength = 15
+const ifbDevicePrefix = "bwp"
+
 // BandwidthEntry corresponds to a single entry in the bandwidth argument,
 // see CONVENTIONS.md
 type BandwidthEntry struct {
@@ -111,14 +114,8 @@ func validateRateAndBurst(rate int, burst int) error {
 	return nil
 }
 
-func getIfbDeviceName(networkName string, containerId string) (string, error) {
-	hash := sha1.New()
-	_, err := hash.Write([]byte(networkName + containerId))
-	if err != nil {
-		return "", err
-	}
-
-	return fmt.Sprintf("%x", hash.Sum(nil))[:4], nil
+func getIfbDeviceName(networkName string, containerId string) string {
+	return utils.MustFormatHashWithPrefix(maxIfbDeviceLength, ifbDevicePrefix, networkName+containerId)
 }
 
 func getMTU(deviceName string) (int, error) {
@@ -130,21 +127,35 @@ func getMTU(deviceName string) (int, error) {
 	return link.Attrs().MTU, nil
 }
 
-func getHostInterface(interfaces []*current.Interface) (*current.Interface, error) {
+// get the veth peer of container interface in host namespace
+func getHostInterface(interfaces []*current.Interface, containerIfName string, netns ns.NetNS) (*current.Interface, error) {
 	if len(interfaces) == 0 {
-		return nil, errors.New("no interfaces provided")
+		return nil, fmt.Errorf("no interfaces provided")
 	}
 
+	// get veth peer index of container interface
+	var peerIndex int
 	var err error
+	_ = netns.Do(func(_ ns.NetNS) error {
+		_, peerIndex, err = ip.GetVethPeerIfindex(containerIfName)
+		return nil
+	})
+	if peerIndex <= 0 {
+		return nil, fmt.Errorf("container interface %s has no veth peer: %v", containerIfName, err)
+	}
+
+	// find host interface by index
+	link, err := netlink.LinkByIndex(peerIndex)
+	if err != nil {
+		return nil, fmt.Errorf("veth peer with index %d is not in host ns", peerIndex)
+	}
 	for _, iface := range interfaces {
-		if iface.Sandbox == "" { // host interface
-			_, _, err = ip.GetVethPeerIfindex(iface.Name)
-			if err == nil {
-				return iface, err
-			}
+		if iface.Sandbox == "" && iface.Name == link.Attrs().Name {
+			return iface, nil
 		}
 	}
-	return nil, errors.New(fmt.Sprintf("no host interface found. last error: %s", err))
+
+	return nil, fmt.Errorf("no veth peer of container interface found in host ns")
 }
 
 func cmdAdd(args *skel.CmdArgs) error {
@@ -166,7 +177,14 @@ func cmdAdd(args *skel.CmdArgs) error {
 	if err != nil {
 		return fmt.Errorf("could not convert result to current version: %v", err)
 	}
-	hostInterface, err := getHostInterface(result.Interfaces)
+
+	netns, err := ns.GetNS(args.Netns)
+	if err != nil {
+		return fmt.Errorf("failed to open netns %q: %v", netns, err)
+	}
+	defer netns.Close()
+
+	hostInterface, err := getHostInterface(result.Interfaces, args.IfName, netns)
 	if err != nil {
 		return err
 	}
@@ -184,10 +202,7 @@ func cmdAdd(args *skel.CmdArgs) error {
 			return err
 		}
 
-		ifbDeviceName, err := getIfbDeviceName(conf.Name, args.ContainerID)
-		if err != nil {
-			return err
-		}
+		ifbDeviceName := getIfbDeviceName(conf.Name, args.ContainerID)
 
 		err = CreateIfb(ifbDeviceName, mtu)
 		if err != nil {
@@ -218,10 +233,7 @@ func cmdDel(args *skel.CmdArgs) error {
 		return err
 	}
 
-	ifbDeviceName, err := getIfbDeviceName(conf.Name, args.ContainerID)
-	if err != nil {
-		return err
-	}
+	ifbDeviceName := getIfbDeviceName(conf.Name, args.ContainerID)
 
 	if err := TeardownIfb(ifbDeviceName); err != nil {
 		return err
@@ -266,7 +278,13 @@ func cmdCheck(args *skel.CmdArgs) error {
 		return fmt.Errorf("could not convert result to current version: %v", err)
 	}
 
-	hostInterface, err := getHostInterface(result.Interfaces)
+	netns, err := ns.GetNS(args.Netns)
+	if err != nil {
+		return fmt.Errorf("failed to open netns %q: %v", netns, err)
+	}
+	defer netns.Close()
+
+	hostInterface, err := getHostInterface(result.Interfaces, args.IfName, netns)
 	if err != nil {
 		return err
 	}
@@ -316,10 +334,7 @@ func cmdCheck(args *skel.CmdArgs) error {
 		latency := latencyInUsec(latencyInMillis)
 		limitInBytes := limit(uint64(rateInBytes), latency, uint32(burstInBytes))
 
-		ifbDeviceName, err := getIfbDeviceName(bwConf.Name, args.ContainerID)
-		if err != nil {
-			return err
-		}
+		ifbDeviceName := getIfbDeviceName(bwConf.Name, args.ContainerID)
 
 		ifbDevice, err := netlink.LinkByName(ifbDeviceName)
 		if err != nil {

plugins/meta/portmap/portmap.go

@@ -20,6 +20,7 @@ import (
 	"sort"
 	"strconv"
 
+	"github.com/containernetworking/plugins/pkg/utils"
 	"github.com/containernetworking/plugins/pkg/utils/sysctl"
 	"github.com/coreos/go-iptables/iptables"
 )
@@ -172,7 +173,7 @@ func genToplevelDnatChain() chain {
 func genDnatChain(netName, containerID string) chain {
 	return chain{
 		table:       "nat",
-		name:        formatChainName("DN-", netName, containerID),
+		name:        utils.MustFormatChainNameWithPrefix(netName, containerID, "DN-"),
 		entryChains: []string{TopLevelDNATChainName},
 	}
 }
@@ -323,11 +324,9 @@ func enableLocalnetRouting(ifName string) error {
 // genOldSnatChain is no longer used, but used to be created. We'll try and
 // tear it down in case the plugin version changed between ADD and DEL
 func genOldSnatChain(netName, containerID string) chain {
-	name := formatChainName("SN-", netName, containerID)
-
 	return chain{
 		table:       "nat",
-		name:        name,
+		name:        utils.MustFormatChainNameWithPrefix(netName, containerID, "SN-"),
 		entryChains: []string{OldTopLevelSNATChainName},
 	}
 }

plugins/meta/portmap/utils.go

@@ -15,7 +15,6 @@
 package main
 
 import (
-	"crypto/sha512"
 	"fmt"
 	"net"
 	"strconv"
@@ -24,8 +23,6 @@ import (
 	"github.com/vishvananda/netlink"
 )
 
-const maxChainNameLength = 28
-
 // fmtIpPort correctly formats ip:port literals for iptables and ip6tables -
 // need to wrap v6 literals in a []
 func fmtIpPort(ip net.IP, port int) string {
@@ -62,12 +59,6 @@ func getRoutableHostIF(containerIP net.IP) string {
 	return ""
 }
 
-func formatChainName(prefix, name, id string) string {
-	chainBytes := sha512.Sum512([]byte(name + id))
-	chain := fmt.Sprintf("CNI-%s%x", prefix, chainBytes)
-	return chain[:maxChainNameLength]
-}
-
 // groupByProto groups port numbers by protocol
 func groupByProto(entries []PortMapEntry) map[string][]int {
 	if len(entries) == 0 {

plugins/meta/tuning/README.md

@@ -61,3 +61,13 @@ The following [CNI_ARGS](https://github.com/containernetworking/cni/blob/master/
 
 Note: You may add `IgnoreUnknown=true` to allow loose CNI argument verification (see CNI's issue[#560](https://github.com/containernetworking/cni/issues/560)).
 
+The plugin also support following [capability argument](https://github.com/containernetworking/cni/blob/master/CONVENTIONS.md).
+
+* `mac`: Pass MAC addresses for CNI interface
+
+The following [args conventions](https://github.com/containernetworking/cni/blob/master/CONVENTIONS.md#args-in-network-config) are supported:
+
+* `mac` (string, optional): MAC address (i.e. hardware address) of interface
+* `mtu` (integer, optional): MTU of interface
+* `promisc` (bool, optional): Change the promiscuous mode of interface
+* `sysctl` (object, optional): Change system controls

plugins/meta/tuning/tuning.go

@@ -43,9 +43,24 @@ type TuningConf struct {
 	Mac     string            `json:"mac,omitempty"`
 	Promisc bool              `json:"promisc,omitempty"`
 	Mtu     int               `json:"mtu,omitempty"`
+
+	RuntimeConfig struct {
+		Mac string `json:"mac,omitempty"`
+	} `json:"runtimeConfig,omitempty"`
+	Args *struct {
+		A *IPAMArgs `json:"cni"`
+	} `json:"args"`
 }
 
-type MACEnvArgs struct {
+type IPAMArgs struct {
+	SysCtl  *map[string]string `json:"sysctl"`
+	Mac     *string            `json:"mac,omitempty"`
+	Promisc *bool              `json:"promisc,omitempty"`
+	Mtu     *int               `json:"mtu,omitempty"`
+}
+
+// MacEnvArgs represents CNI_ARG
+type MacEnvArgs struct {
 	types.CommonArgs
 	MAC types.UnmarshallableString `json:"mac,omitempty"`
 }
@@ -56,9 +71,9 @@ func parseConf(data []byte, envArgs string) (*TuningConf, error) {
 		return nil, fmt.Errorf("failed to load netconf: %v", err)
 	}
 
-	// Parse custom MAC from both env args
+	// Parse custom Mac from both env args
 	if envArgs != "" {
-		e := MACEnvArgs{}
+		e := MacEnvArgs{}
 		err := types.LoadArgs(envArgs, &e)
 		if err != nil {
 			return nil, err
@@ -69,6 +84,33 @@ func parseConf(data []byte, envArgs string) (*TuningConf, error) {
 		}
 	}
 
+	// Parse custom Mac from RuntimeConfig
+	if conf.RuntimeConfig.Mac != "" {
+		conf.Mac = conf.RuntimeConfig.Mac
+	}
+
+	// Get args
+	if conf.Args != nil && conf.Args.A != nil {
+		if conf.Args.A.SysCtl != nil {
+			for k, v := range *conf.Args.A.SysCtl {
+				conf.SysCtl[k] = v
+			}
+		}
+
+		if conf.Args.A.Mac != nil {
+			conf.Mac = *conf.Args.A.Mac
+		}
+
+		if conf.Args.A.Promisc != nil {
+			conf.Promisc = *conf.Args.A.Promisc
+		}
+
+		if conf.Args.A.Mtu != nil {
+			conf.Mtu = *conf.Args.A.Mtu
+		}
+
+	}
+
 	return &conf, nil
 }
 
@@ -83,15 +125,7 @@ func changeMacAddr(ifName string, newMacAddr string) error {
 		return fmt.Errorf("failed to get %q: %v", ifName, err)
 	}
 
-	err = netlink.LinkSetDown(link)
-	if err != nil {
-		return fmt.Errorf("failed to set %q down: %v", ifName, err)
-	}
-	err = netlink.LinkSetHardwareAddr(link, addr)
-	if err != nil {
-		return fmt.Errorf("failed to set %q address to %q: %v", ifName, newMacAddr, err)
-	}
-	return netlink.LinkSetUp(link)
+	return netlink.LinkSetHardwareAddr(link, addr)
 }
 
 func updateResultsMacAddr(config TuningConf, ifName string, newMacAddr string) {
@@ -230,7 +264,7 @@ func cmdCheck(args *skel.CmdArgs) error {
 
 	err = ns.WithNetNSPath(args.Netns, func(_ ns.NetNS) error {
 		// Check each configured value vs what's currently in the container
-		for key, conf_value := range tuningConf.SysCtl {
+		for key, confValue := range tuningConf.SysCtl {
 			fileName := filepath.Join("/proc/sys", strings.Replace(key, ".", "/", -1))
 			fileName = filepath.Clean(fileName)
 
@@ -238,9 +272,9 @@ func cmdCheck(args *skel.CmdArgs) error {
 			if err != nil {
 				return err
 			}
-			cur_value := strings.TrimSuffix(string(contents), "\n")
-			if conf_value != cur_value {
-				return fmt.Errorf("Error: Tuning configured value of %s is %s, current value is %s", fileName, conf_value, cur_value)
+			curValue := strings.TrimSuffix(string(contents), "\n")
+			if confValue != curValue {
+				return fmt.Errorf("Error: Tuning configured value of %s is %s, current value is %s", fileName, confValue, curValue)
 			}
 		}
 

plugins/meta/tuning/tuning_test.go

@@ -215,6 +215,67 @@ var _ = Describe("tuning plugin", func() {
 		Expect(err).NotTo(HaveOccurred())
 	})
 
+	It("configures and deconfigures promiscuous mode from args with ADD/DEL", func() {
+		conf := []byte(`{
+	"name": "test",
+	"type": "iplink",
+	"cniVersion": "0.3.1",
+        "args": {
+            "cni": {
+	        "promisc": true
+            }
+        },
+	"prevResult": {
+		"interfaces": [
+			{"name": "dummy0", "sandbox":"netns"}
+		],
+		"ips": [
+			{
+				"version": "4",
+				"address": "10.0.0.2/24",
+				"gateway": "10.0.0.1",
+				"interface": 0
+			}
+		]
+	}
+}`)
+
+		args := &skel.CmdArgs{
+			ContainerID: "dummy",
+			Netns:       originalNS.Path(),
+			IfName:      IFNAME,
+			StdinData:   conf,
+		}
+
+		err := originalNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+
+			r, _, err := testutils.CmdAddWithArgs(args, func() error {
+				return cmdAdd(args)
+			})
+			Expect(err).NotTo(HaveOccurred())
+
+			result, err := current.GetResult(r)
+			Expect(err).NotTo(HaveOccurred())
+
+			Expect(len(result.Interfaces)).To(Equal(1))
+			Expect(result.Interfaces[0].Name).To(Equal(IFNAME))
+			Expect(len(result.IPs)).To(Equal(1))
+			Expect(result.IPs[0].Address.String()).To(Equal("10.0.0.2/24"))
+
+			link, err := netlink.LinkByName(IFNAME)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(link.Attrs().Promisc).To(Equal(1))
+
+			err = testutils.CmdDel(originalNS.Path(),
+				args.ContainerID, "", func() error { return cmdDel(args) })
+			Expect(err).NotTo(HaveOccurred())
+
+			return nil
+		})
+		Expect(err).NotTo(HaveOccurred())
+	})
+
 	It("configures and deconfigures mtu with ADD/DEL", func() {
 		conf := []byte(`{
 	"name": "test",
@@ -272,6 +333,67 @@ var _ = Describe("tuning plugin", func() {
 		Expect(err).NotTo(HaveOccurred())
 	})
 
+	It("configures and deconfigures mtu from args with ADD/DEL", func() {
+		conf := []byte(`{
+	"name": "test",
+	"type": "iplink",
+	"cniVersion": "0.3.1",
+        "args": {
+            "cni": {
+                "mtu": 1454
+            }
+        },
+	"prevResult": {
+		"interfaces": [
+			{"name": "dummy0", "sandbox":"netns"}
+		],
+		"ips": [
+			{
+				"version": "4",
+				"address": "10.0.0.2/24",
+				"gateway": "10.0.0.1",
+				"interface": 0
+			}
+		]
+	}
+}`)
+
+		args := &skel.CmdArgs{
+			ContainerID: "dummy",
+			Netns:       originalNS.Path(),
+			IfName:      IFNAME,
+			StdinData:   conf,
+		}
+
+		err := originalNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+
+			r, _, err := testutils.CmdAddWithArgs(args, func() error {
+				return cmdAdd(args)
+			})
+			Expect(err).NotTo(HaveOccurred())
+
+			result, err := current.GetResult(r)
+			Expect(err).NotTo(HaveOccurred())
+
+			Expect(len(result.Interfaces)).To(Equal(1))
+			Expect(result.Interfaces[0].Name).To(Equal(IFNAME))
+			Expect(len(result.IPs)).To(Equal(1))
+			Expect(result.IPs[0].Address.String()).To(Equal("10.0.0.2/24"))
+
+			link, err := netlink.LinkByName(IFNAME)
+			Expect(err).NotTo(HaveOccurred())
+			Expect(link.Attrs().MTU).To(Equal(1454))
+
+			err = testutils.CmdDel(originalNS.Path(),
+				args.ContainerID, "", func() error { return cmdDel(args) })
+			Expect(err).NotTo(HaveOccurred())
+
+			return nil
+		})
+		Expect(err).NotTo(HaveOccurred())
+	})
+
 	It("configures and deconfigures mac address (from conf file) with ADD/DEL", func() {
 		conf := []byte(`{
 	"name": "test",
@@ -331,6 +453,69 @@ var _ = Describe("tuning plugin", func() {
 		Expect(err).NotTo(HaveOccurred())
 	})
 
+	It("configures and deconfigures mac address (from args) with ADD/DEL", func() {
+		conf := []byte(`{
+	"name": "test",
+	"type": "iplink",
+	"cniVersion": "0.3.1",
+        "args": {
+            "cni": {
+                "mac": "c2:11:22:33:44:55"
+            }
+        },
+	"prevResult": {
+		"interfaces": [
+			{"name": "dummy0", "sandbox":"netns"}
+		],
+		"ips": [
+			{
+				"version": "4",
+				"address": "10.0.0.2/24",
+				"gateway": "10.0.0.1",
+				"interface": 0
+			}
+		]
+	}
+}`)
+
+		args := &skel.CmdArgs{
+			ContainerID: "dummy",
+			Netns:       originalNS.Path(),
+			IfName:      IFNAME,
+			StdinData:   conf,
+		}
+
+		err := originalNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+
+			r, _, err := testutils.CmdAddWithArgs(args, func() error {
+				return cmdAdd(args)
+			})
+			Expect(err).NotTo(HaveOccurred())
+
+			result, err := current.GetResult(r)
+			Expect(err).NotTo(HaveOccurred())
+
+			Expect(len(result.Interfaces)).To(Equal(1))
+			Expect(result.Interfaces[0].Name).To(Equal(IFNAME))
+			Expect(len(result.IPs)).To(Equal(1))
+			Expect(result.IPs[0].Address.String()).To(Equal("10.0.0.2/24"))
+
+			link, err := netlink.LinkByName(IFNAME)
+			Expect(err).NotTo(HaveOccurred())
+			hw, err := net.ParseMAC("c2:11:22:33:44:55")
+			Expect(err).NotTo(HaveOccurred())
+			Expect(link.Attrs().HardwareAddr).To(Equal(hw))
+
+			err = testutils.CmdDel(originalNS.Path(),
+				args.ContainerID, "", func() error { return cmdDel(args) })
+			Expect(err).NotTo(HaveOccurred())
+
+			return nil
+		})
+		Expect(err).NotTo(HaveOccurred())
+	})
+
 	It("configures and deconfigures mac address (from CNI_ARGS) with ADD/DEL", func() {
 		conf := []byte(`{
 	"name": "test",
@@ -379,6 +564,7 @@ var _ = Describe("tuning plugin", func() {
 			Expect(err).NotTo(HaveOccurred())
 			hw, err := net.ParseMAC("c2:11:22:33:44:66")
 			Expect(err).NotTo(HaveOccurred())
+			fmt.Printf("%v, %v\n", link.Attrs().HardwareAddr, hw)
 			Expect(link.Attrs().HardwareAddr).To(Equal(hw))
 
 			err = testutils.CmdDel(originalNS.Path(),
@@ -681,4 +867,67 @@ var _ = Describe("tuning plugin", func() {
 		})
 		Expect(err).NotTo(HaveOccurred())
 	})
+
+	It("configures and deconfigures mac address (from RuntimeConfig) with ADD/DEL", func() {
+		conf := []byte(`{
+	"name": "test",
+	"type": "iplink",
+	"cniVersion": "0.3.1",
+        "capabilities": {"mac": true},
+        "RuntimeConfig": {
+            "mac": "c2:11:22:33:44:55"
+        },
+	"prevResult": {
+		"interfaces": [
+			{"name": "dummy0", "sandbox":"netns"}
+		],
+		"ips": [
+			{
+				"version": "4",
+				"address": "10.0.0.2/24",
+				"gateway": "10.0.0.1",
+				"interface": 0
+			}
+		]
+	}
+}`)
+
+		args := &skel.CmdArgs{
+			ContainerID: "dummy",
+			Netns:       originalNS.Path(),
+			IfName:      IFNAME,
+			StdinData:   conf,
+		}
+
+		err := originalNS.Do(func(ns.NetNS) error {
+			defer GinkgoRecover()
+
+			r, _, err := testutils.CmdAddWithArgs(args, func() error {
+				return cmdAdd(args)
+			})
+			Expect(err).NotTo(HaveOccurred())
+
+			result, err := current.GetResult(r)
+			Expect(err).NotTo(HaveOccurred())
+
+			Expect(len(result.Interfaces)).To(Equal(1))
+			Expect(result.Interfaces[0].Name).To(Equal(IFNAME))
+			Expect(len(result.IPs)).To(Equal(1))
+			Expect(result.IPs[0].Address.String()).To(Equal("10.0.0.2/24"))
+
+			link, err := netlink.LinkByName(IFNAME)
+			Expect(err).NotTo(HaveOccurred())
+			hw, err := net.ParseMAC("c2:11:22:33:44:55")
+			Expect(err).NotTo(HaveOccurred())
+			Expect(link.Attrs().HardwareAddr).To(Equal(hw))
+
+			err = testutils.CmdDel(originalNS.Path(),
+				args.ContainerID, "", func() error { return cmdDel(args) })
+			Expect(err).NotTo(HaveOccurred())
+
+			return nil
+		})
+		Expect(err).NotTo(HaveOccurred())
+	})
+
 })

scripts/release.sh

@@ -16,7 +16,7 @@ rm -Rf ${SRC_DIR}/${RELEASE_DIR}
 mkdir -p ${SRC_DIR}/${RELEASE_DIR}
 mkdir -p ${OUTPUT_DIR}
 
-$DOCKER run -v ${SRC_DIR}:/go/src/github.com/containernetworking/plugins --rm golang:1.10-alpine \
+$DOCKER run -ti -v ${SRC_DIR}:/go/src/github.com/containernetworking/plugins --rm golang:1.12-alpine \
 /bin/sh -xe -c "\
     apk --no-cache add bash tar;
     cd /go/src/github.com/containernetworking/plugins; umask 0022;

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/LICENSE

@@ -1,191 +0,0 @@
-
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   Copyright 2014 Docker, Inc.
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/NOTICE

@@ -1,22 +0,0 @@
-runhcs is a fork of runc.
-
-The following is runc's legal notice.
-
----
-
-runc
-
-Copyright 2012-2015 Docker, Inc.
-
-This product includes software developed at Docker, Inc. (http://www.docker.com).
-
-The following is courtesy of our legal counsel:
-
-Use and transfer of Docker may be subject to certain restrictions by the
-United States and other governments.
-It is your responsibility to ensure that your use and/or transfer does not
-violate applicable laws.
-
-For more information, please see http://www.bis.doc.gov
-
-See also http://www.apache.org/dev/crypto.html and/or seek legal counsel.

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/container.go

@@ -1,848 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"errors"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strconv"
-	"strings"
-	"time"
-
-	winio "github.com/Microsoft/go-winio"
-	"github.com/Microsoft/hcsshim/internal/cni"
-	"github.com/Microsoft/hcsshim/internal/guid"
-	"github.com/Microsoft/hcsshim/internal/hcs"
-	"github.com/Microsoft/hcsshim/internal/hcsoci"
-	"github.com/Microsoft/hcsshim/internal/logfields"
-	"github.com/Microsoft/hcsshim/internal/regstate"
-	"github.com/Microsoft/hcsshim/internal/runhcs"
-	"github.com/Microsoft/hcsshim/internal/uvm"
-	"github.com/Microsoft/hcsshim/osversion"
-	specs "github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/sirupsen/logrus"
-	"golang.org/x/sys/windows"
-)
-
-var errContainerStopped = errors.New("container is stopped")
-
-type persistedState struct {
-	// ID is the id of this container/UVM.
-	ID string `json:",omitempty"`
-	// Owner is the owner value passed into the runhcs command and may be `""`.
-	Owner string `json:",omitempty"`
-	// SandboxID is the sandbox identifer passed in via OCI specifications. This
-	// can either be the sandbox itself or the sandbox this container should run
-	// in. See `parseSandboxAnnotations`.
-	SandboxID string `json:",omitempty"`
-	// HostID will be VM ID hosting this container. If a sandbox is used it will
-	// match the `SandboxID`.
-	HostID string `json:",omitempty"`
-	// Bundle is the folder path on disk where the container state and spec files
-	// reside.
-	Bundle  string    `json:",omitempty"`
-	Created time.Time `json:",omitempty"`
-	Rootfs  string    `json:",omitempty"`
-	// Spec is the in memory deserialized values found on `Bundle\config.json`.
-	Spec           *specs.Spec `json:",omitempty"`
-	RequestedNetNS string      `json:",omitempty"`
-	// IsHost is `true` when this is a VM isolated config.
-	IsHost bool `json:",omitempty"`
-	// UniqueID is a unique ID generated per container config.
-	UniqueID guid.GUID `json:",omitempty"`
-	// HostUniqueID is the unique ID of the hosting VM if this container is
-	// hosted.
-	HostUniqueID guid.GUID `json:",omitempty"`
-}
-
-type containerStatus string
-
-const (
-	containerRunning containerStatus = "running"
-	containerStopped containerStatus = "stopped"
-	containerCreated containerStatus = "created"
-	containerPaused  containerStatus = "paused"
-	containerUnknown containerStatus = "unknown"
-
-	keyState     = "state"
-	keyResources = "resources"
-	keyShimPid   = "shim"
-	keyInitPid   = "pid"
-	keyNetNS     = "netns"
-	// keyPidMapFmt is the format to use when mapping a host OS pid to a guest
-	// pid.
-	keyPidMapFmt = "pid-%d"
-)
-
-type container struct {
-	persistedState
-	ShimPid   int
-	hc        *hcs.System
-	resources *hcsoci.Resources
-}
-
-func startProcessShim(id, pidFile, logFile string, spec *specs.Process) (_ *os.Process, err error) {
-	// Ensure the stdio handles inherit to the child process. This isn't undone
-	// after the StartProcess call because the caller never launches another
-	// process before exiting.
-	for _, f := range []*os.File{os.Stdin, os.Stdout, os.Stderr} {
-		err = windows.SetHandleInformation(windows.Handle(f.Fd()), windows.HANDLE_FLAG_INHERIT, windows.HANDLE_FLAG_INHERIT)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	args := []string{
-		"--stdin", strconv.Itoa(int(os.Stdin.Fd())),
-		"--stdout", strconv.Itoa(int(os.Stdout.Fd())),
-		"--stderr", strconv.Itoa(int(os.Stderr.Fd())),
-	}
-	if spec != nil {
-		args = append(args, "--exec")
-	}
-	if strings.HasPrefix(logFile, runhcs.SafePipePrefix) {
-		args = append(args, "--log-pipe", logFile)
-	}
-	args = append(args, id)
-	return launchShim("shim", pidFile, logFile, args, spec)
-}
-
-func launchShim(cmd, pidFile, logFile string, args []string, data interface{}) (_ *os.Process, err error) {
-	executable, err := os.Executable()
-	if err != nil {
-		return nil, err
-	}
-
-	// Create a pipe to use as stderr for the shim process. This is used to
-	// retrieve early error information, up to the point that the shim is ready
-	// to launch a process in the container.
-	rp, wp, err := os.Pipe()
-	if err != nil {
-		return nil, err
-	}
-	defer rp.Close()
-	defer wp.Close()
-
-	// Create a pipe to send the data, if one is provided.
-	var rdatap, wdatap *os.File
-	if data != nil {
-		rdatap, wdatap, err = os.Pipe()
-		if err != nil {
-			return nil, err
-		}
-		defer rdatap.Close()
-		defer wdatap.Close()
-	}
-
-	var log *os.File
-	fullargs := []string{os.Args[0]}
-	if logFile != "" {
-		if !strings.HasPrefix(logFile, runhcs.SafePipePrefix) {
-			log, err = os.OpenFile(logFile, os.O_CREATE|os.O_WRONLY|os.O_APPEND|os.O_SYNC, 0666)
-			if err != nil {
-				return nil, err
-			}
-			defer log.Close()
-		}
-
-		fullargs = append(fullargs, "--log-format", logFormat)
-		if logrus.GetLevel() == logrus.DebugLevel {
-			fullargs = append(fullargs, "--debug")
-		}
-	}
-	fullargs = append(fullargs, cmd)
-	fullargs = append(fullargs, args...)
-	attr := &os.ProcAttr{
-		Files: []*os.File{rdatap, wp, log},
-	}
-	p, err := os.StartProcess(executable, fullargs, attr)
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		if err != nil {
-			p.Kill()
-		}
-	}()
-
-	wp.Close()
-
-	// Write the data if provided.
-	if data != nil {
-		rdatap.Close()
-		dataj, err := json.Marshal(data)
-		if err != nil {
-			return nil, err
-		}
-		_, err = wdatap.Write(dataj)
-		if err != nil {
-			return nil, err
-		}
-		wdatap.Close()
-	}
-
-	err = runhcs.GetErrorFromPipe(rp, p)
-	if err != nil {
-		return nil, err
-	}
-
-	if pidFile != "" {
-		if err = createPidFile(pidFile, p.Pid); err != nil {
-			return nil, err
-		}
-	}
-
-	return p, nil
-}
-
-// parseSandboxAnnotations searches `a` for various annotations used by
-// different runtimes to represent a sandbox ID, and sandbox type.
-//
-// If found returns the tuple `(sandboxID, isSandbox)` where `isSandbox == true`
-// indicates the identifer is the sandbox itself; `isSandbox == false` indicates
-// the identifer is the sandbox in which to place this container. Otherwise
-// returns `("", false)`.
-func parseSandboxAnnotations(a map[string]string) (string, bool) {
-	var t, id string
-	if t = a["io.kubernetes.cri.container-type"]; t != "" {
-		id = a["io.kubernetes.cri.sandbox-id"]
-	} else if t = a["io.kubernetes.cri-o.ContainerType"]; t != "" {
-		id = a["io.kubernetes.cri-o.SandboxID"]
-	} else if t = a["io.kubernetes.docker.type"]; t != "" {
-		id = a["io.kubernetes.sandbox.id"]
-		if t == "podsandbox" {
-			t = "sandbox"
-		}
-	}
-	if t == "container" {
-		return id, false
-	}
-	if t == "sandbox" {
-		return id, true
-	}
-	return "", false
-}
-
-// parseAnnotationsBool searches `a` for `key` and if found verifies that the
-// value is `true` or `false` in any case. If `key` is not found returns `def`.
-func parseAnnotationsBool(a map[string]string, key string, def bool) bool {
-	if v, ok := a[key]; ok {
-		switch strings.ToLower(v) {
-		case "true":
-			return true
-		case "false":
-			return false
-		default:
-			logrus.WithFields(logrus.Fields{
-				logfields.OCIAnnotation: key,
-				logfields.Value:         v,
-				logfields.ExpectedType:  logfields.Bool,
-			}).Warning("annotation could not be parsed")
-		}
-	}
-	return def
-}
-
-// parseAnnotationsCPU searches `s.Annotations` for the CPU annotation. If
-// not found searches `s` for the Windows CPU section. If neither are found
-// returns `def`.
-func parseAnnotationsCPU(s *specs.Spec, annotation string, def int32) int32 {
-	if m := parseAnnotationsUint64(s.Annotations, annotation, 0); m != 0 {
-		return int32(m)
-	}
-	if s.Windows != nil &&
-		s.Windows.Resources != nil &&
-		s.Windows.Resources.CPU != nil &&
-		s.Windows.Resources.CPU.Count != nil &&
-		*s.Windows.Resources.CPU.Count > 0 {
-		return int32(*s.Windows.Resources.CPU.Count)
-	}
-	return def
-}
-
-// parseAnnotationsMemory searches `s.Annotations` for the memory annotation. If
-// not found searches `s` for the Windows memory section. If neither are found
-// returns `def`.
-func parseAnnotationsMemory(s *specs.Spec, annotation string, def int32) int32 {
-	if m := parseAnnotationsUint64(s.Annotations, annotation, 0); m != 0 {
-		return int32(m)
-	}
-	if s.Windows != nil &&
-		s.Windows.Resources != nil &&
-		s.Windows.Resources.Memory != nil &&
-		s.Windows.Resources.Memory.Limit != nil &&
-		*s.Windows.Resources.Memory.Limit > 0 {
-		return int32(*s.Windows.Resources.Memory.Limit)
-	}
-	return def
-}
-
-// parseAnnotationsPreferredRootFSType searches `a` for `key` and verifies that the
-// value is in the set of allowed values. If `key` is not found returns `def`.
-func parseAnnotationsPreferredRootFSType(a map[string]string, key string, def uvm.PreferredRootFSType) uvm.PreferredRootFSType {
-	if v, ok := a[key]; ok {
-		switch v {
-		case "initrd":
-			return uvm.PreferredRootFSTypeInitRd
-		case "vhd":
-			return uvm.PreferredRootFSTypeVHD
-		default:
-			logrus.Warningf("annotation: '%s', with value: '%s' must be 'initrd' or 'vhd'", key, v)
-		}
-	}
-	return def
-}
-
-// parseAnnotationsUint32 searches `a` for `key` and if found verifies that the
-// value is a 32 bit unsigned integer. If `key` is not found returns `def`.
-func parseAnnotationsUint32(a map[string]string, key string, def uint32) uint32 {
-	if v, ok := a[key]; ok {
-		countu, err := strconv.ParseUint(v, 10, 32)
-		if err == nil {
-			v := uint32(countu)
-			return v
-		}
-		logrus.WithFields(logrus.Fields{
-			logfields.OCIAnnotation: key,
-			logfields.Value:         v,
-			logfields.ExpectedType:  logfields.Uint32,
-			logrus.ErrorKey:         err,
-		}).Warning("annotation could not be parsed")
-	}
-	return def
-}
-
-// parseAnnotationsUint64 searches `a` for `key` and if found verifies that the
-// value is a 64 bit unsigned integer. If `key` is not found returns `def`.
-func parseAnnotationsUint64(a map[string]string, key string, def uint64) uint64 {
-	if v, ok := a[key]; ok {
-		countu, err := strconv.ParseUint(v, 10, 64)
-		if err == nil {
-			return countu
-		}
-		logrus.WithFields(logrus.Fields{
-			logfields.OCIAnnotation: key,
-			logfields.Value:         v,
-			logfields.ExpectedType:  logfields.Uint64,
-			logrus.ErrorKey:         err,
-		}).Warning("annotation could not be parsed")
-	}
-	return def
-}
-
-// startVMShim starts a vm-shim command with the specified `opts`. `opts` can be `uvm.OptionsWCOW` or `uvm.OptionsLCOW`
-func (c *container) startVMShim(logFile string, opts interface{}) (*os.Process, error) {
-	var os string
-	if _, ok := opts.(*uvm.OptionsLCOW); ok {
-		os = "linux"
-	} else {
-		os = "windows"
-	}
-	args := []string{"--os", os}
-	if strings.HasPrefix(logFile, runhcs.SafePipePrefix) {
-		args = append(args, "--log-pipe", logFile)
-	}
-	args = append(args, c.VMPipePath())
-	return launchShim("vmshim", "", logFile, args, opts)
-}
-
-type containerConfig struct {
-	ID                     string
-	Owner                  string
-	HostID                 string
-	PidFile                string
-	ShimLogFile, VMLogFile string
-	Spec                   *specs.Spec
-	VMConsolePipe          string
-}
-
-func createContainer(cfg *containerConfig) (_ *container, err error) {
-	// Store the container information in a volatile registry key.
-	cwd, err := os.Getwd()
-	if err != nil {
-		return nil, err
-	}
-
-	vmisolated := cfg.Spec.Linux != nil || (cfg.Spec.Windows != nil && cfg.Spec.Windows.HyperV != nil)
-
-	sandboxID, isSandbox := parseSandboxAnnotations(cfg.Spec.Annotations)
-	hostID := cfg.HostID
-	if isSandbox {
-		if sandboxID != cfg.ID {
-			return nil, errors.New("sandbox ID must match ID")
-		}
-	} else if sandboxID != "" {
-		// Validate that the sandbox container exists.
-		sandbox, err := getContainer(sandboxID, false)
-		if err != nil {
-			return nil, err
-		}
-		defer sandbox.Close()
-		if sandbox.SandboxID != sandboxID {
-			return nil, fmt.Errorf("container %s is not a sandbox", sandboxID)
-		}
-		if hostID == "" {
-			// Use the sandbox's host.
-			hostID = sandbox.HostID
-		} else if sandbox.HostID == "" {
-			return nil, fmt.Errorf("sandbox container %s is not running in a VM host, but host %s was specified", sandboxID, hostID)
-		} else if hostID != sandbox.HostID {
-			return nil, fmt.Errorf("sandbox container %s has a different host %s from the requested host %s", sandboxID, sandbox.HostID, hostID)
-		}
-		if vmisolated && hostID == "" {
-			return nil, fmt.Errorf("container %s is not a VM isolated sandbox", sandboxID)
-		}
-	}
-
-	uniqueID := guid.New()
-
-	newvm := false
-	var hostUniqueID guid.GUID
-	if hostID != "" {
-		host, err := getContainer(hostID, false)
-		if err != nil {
-			return nil, err
-		}
-		defer host.Close()
-		if !host.IsHost {
-			return nil, fmt.Errorf("host container %s is not a VM host", hostID)
-		}
-		hostUniqueID = host.UniqueID
-	} else if vmisolated && (isSandbox || cfg.Spec.Linux != nil || osversion.Get().Build >= osversion.RS5) {
-		// This handles all LCOW, Pod Sandbox, and (Windows Xenon V2 for RS5+)
-		hostID = cfg.ID
-		newvm = true
-		hostUniqueID = uniqueID
-	}
-
-	// Make absolute the paths in Root.Path and Windows.LayerFolders.
-	rootfs := ""
-	if cfg.Spec.Root != nil {
-		rootfs = cfg.Spec.Root.Path
-		if rootfs != "" && !filepath.IsAbs(rootfs) && !strings.HasPrefix(rootfs, `\\?\`) {
-			rootfs = filepath.Join(cwd, rootfs)
-			cfg.Spec.Root.Path = rootfs
-		}
-	}
-
-	netNS := ""
-	if cfg.Spec.Windows != nil {
-		for i, f := range cfg.Spec.Windows.LayerFolders {
-			if !filepath.IsAbs(f) && !strings.HasPrefix(rootfs, `\\?\`) {
-				cfg.Spec.Windows.LayerFolders[i] = filepath.Join(cwd, f)
-			}
-		}
-
-		// Determine the network namespace to use.
-		if cfg.Spec.Windows.Network != nil {
-			if cfg.Spec.Windows.Network.NetworkSharedContainerName != "" {
-				// RS4 case
-				err = stateKey.Get(cfg.Spec.Windows.Network.NetworkSharedContainerName, keyNetNS, &netNS)
-				if err != nil {
-					if _, ok := err.(*regstate.NoStateError); !ok {
-						return nil, err
-					}
-				}
-			} else if cfg.Spec.Windows.Network.NetworkNamespace != "" {
-				// RS5 case
-				netNS = cfg.Spec.Windows.Network.NetworkNamespace
-			}
-		}
-	}
-
-	// Store the initial container state in the registry so that the delete
-	// command can clean everything up if something goes wrong.
-	c := &container{
-		persistedState: persistedState{
-			ID:             cfg.ID,
-			Owner:          cfg.Owner,
-			Bundle:         cwd,
-			Rootfs:         rootfs,
-			Created:        time.Now(),
-			Spec:           cfg.Spec,
-			SandboxID:      sandboxID,
-			HostID:         hostID,
-			IsHost:         newvm,
-			RequestedNetNS: netNS,
-			UniqueID:       uniqueID,
-			HostUniqueID:   hostUniqueID,
-		},
-	}
-	err = stateKey.Create(cfg.ID, keyState, &c.persistedState)
-	if err != nil {
-		return nil, err
-	}
-	defer func() {
-		if err != nil {
-			c.Remove()
-		}
-	}()
-	if isSandbox && vmisolated {
-		cnicfg := cni.NewPersistedNamespaceConfig(netNS, cfg.ID, hostUniqueID)
-		err = cnicfg.Store()
-		if err != nil {
-			return nil, err
-		}
-		defer func() {
-			if err != nil {
-				cnicfg.Remove()
-			}
-		}()
-	}
-
-	// Start a VM if necessary.
-	if newvm {
-		var opts interface{}
-
-		const (
-			annotationAllowOvercommit      = "io.microsoft.virtualmachine.computetopology.memory.allowovercommit"
-			annotationEnableDeferredCommit = "io.microsoft.virtualmachine.computetopology.memory.enabledeferredcommit"
-			annotationMemorySizeInMB       = "io.microsoft.virtualmachine.computetopology.memory.sizeinmb"
-			annotationProcessorCount       = "io.microsoft.virtualmachine.computetopology.processor.count"
-			annotationVPMemCount           = "io.microsoft.virtualmachine.devices.virtualpmem.maximumcount"
-			annotationVPMemSize            = "io.microsoft.virtualmachine.devices.virtualpmem.maximumsizebytes"
-			annotationPreferredRootFSType  = "io.microsoft.virtualmachine.lcow.preferredrootfstype"
-		)
-
-		if cfg.Spec.Linux != nil {
-			lopts := uvm.NewDefaultOptionsLCOW(vmID(c.ID), cfg.Owner)
-			lopts.MemorySizeInMB = parseAnnotationsMemory(cfg.Spec, annotationMemorySizeInMB, lopts.MemorySizeInMB)
-			lopts.AllowOvercommit = parseAnnotationsBool(cfg.Spec.Annotations, annotationAllowOvercommit, lopts.AllowOvercommit)
-			lopts.EnableDeferredCommit = parseAnnotationsBool(cfg.Spec.Annotations, annotationEnableDeferredCommit, lopts.EnableDeferredCommit)
-			lopts.ProcessorCount = parseAnnotationsCPU(cfg.Spec, annotationProcessorCount, lopts.ProcessorCount)
-			lopts.ConsolePipe = cfg.VMConsolePipe
-			lopts.VPMemDeviceCount = parseAnnotationsUint32(cfg.Spec.Annotations, annotationVPMemCount, lopts.VPMemDeviceCount)
-			lopts.VPMemSizeBytes = parseAnnotationsUint64(cfg.Spec.Annotations, annotationVPMemSize, lopts.VPMemSizeBytes)
-			lopts.PreferredRootFSType = parseAnnotationsPreferredRootFSType(cfg.Spec.Annotations, annotationPreferredRootFSType, lopts.PreferredRootFSType)
-			switch lopts.PreferredRootFSType {
-			case uvm.PreferredRootFSTypeInitRd:
-				lopts.RootFSFile = uvm.InitrdFile
-			case uvm.PreferredRootFSTypeVHD:
-				lopts.RootFSFile = uvm.VhdFile
-			}
-			opts = lopts
-		} else {
-			wopts := uvm.NewDefaultOptionsWCOW(vmID(c.ID), cfg.Owner)
-			wopts.MemorySizeInMB = parseAnnotationsMemory(cfg.Spec, annotationMemorySizeInMB, wopts.MemorySizeInMB)
-			wopts.AllowOvercommit = parseAnnotationsBool(cfg.Spec.Annotations, annotationAllowOvercommit, wopts.AllowOvercommit)
-			wopts.EnableDeferredCommit = parseAnnotationsBool(cfg.Spec.Annotations, annotationEnableDeferredCommit, wopts.EnableDeferredCommit)
-			wopts.ProcessorCount = parseAnnotationsCPU(cfg.Spec, annotationProcessorCount, wopts.ProcessorCount)
-
-			// In order for the UVM sandbox.vhdx not to collide with the actual
-			// nested Argon sandbox.vhdx we append the \vm folder to the last entry
-			// in the list.
-			layersLen := len(cfg.Spec.Windows.LayerFolders)
-			layers := make([]string, layersLen)
-			copy(layers, cfg.Spec.Windows.LayerFolders)
-
-			vmPath := filepath.Join(layers[layersLen-1], "vm")
-			err := os.MkdirAll(vmPath, 0)
-			if err != nil {
-				return nil, err
-			}
-			layers[layersLen-1] = vmPath
-
-			wopts.LayerFolders = layers
-			opts = wopts
-		}
-
-		shim, err := c.startVMShim(cfg.VMLogFile, opts)
-		if err != nil {
-			return nil, err
-		}
-		shim.Release()
-	}
-
-	if c.HostID != "" {
-		// Call to the VM shim process to create the container. This is done so
-		// that the VM process can keep track of the VM's virtual hardware
-		// resource use.
-		err = c.issueVMRequest(runhcs.OpCreateContainer)
-		if err != nil {
-			return nil, err
-		}
-		c.hc, err = hcs.OpenComputeSystem(cfg.ID)
-		if err != nil {
-			return nil, err
-		}
-	} else {
-		// Create the container directly from this process.
-		err = createContainerInHost(c, nil)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	// Create the shim process for the container.
-	err = startContainerShim(c, cfg.PidFile, cfg.ShimLogFile)
-	if err != nil {
-		if e := c.Kill(); e == nil {
-			c.Remove()
-		}
-		return nil, err
-	}
-
-	return c, nil
-}
-
-func (c *container) ShimPipePath() string {
-	return runhcs.SafePipePath("runhcs-shim-" + c.UniqueID.String())
-}
-
-func (c *container) VMPipePath() string {
-	return runhcs.VMPipePath(c.HostUniqueID)
-}
-
-func (c *container) VMIsolated() bool {
-	return c.HostID != ""
-}
-
-func (c *container) unmountInHost(vm *uvm.UtilityVM, all bool) error {
-	resources := &hcsoci.Resources{}
-	err := stateKey.Get(c.ID, keyResources, resources)
-	if _, ok := err.(*regstate.NoStateError); ok {
-		return nil
-	}
-	if err != nil {
-		return err
-	}
-	err = hcsoci.ReleaseResources(resources, vm, all)
-	if err != nil {
-		stateKey.Set(c.ID, keyResources, resources)
-		return err
-	}
-
-	err = stateKey.Clear(c.ID, keyResources)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
-func (c *container) Unmount(all bool) error {
-	if c.VMIsolated() {
-		op := runhcs.OpUnmountContainerDiskOnly
-		if all {
-			op = runhcs.OpUnmountContainer
-		}
-		err := c.issueVMRequest(op)
-		if err != nil {
-			if _, ok := err.(*noVMError); ok {
-				logrus.WithFields(logrus.Fields{
-					logfields.ContainerID: c.ID,
-					logfields.UVMID:       c.HostID,
-					logrus.ErrorKey:       errors.New("failed to unmount container resources"),
-				}).Warning("VM shim could not be contacted")
-			} else {
-				return err
-			}
-		}
-	} else {
-		c.unmountInHost(nil, false)
-	}
-	return nil
-}
-
-func createContainerInHost(c *container, vm *uvm.UtilityVM) (err error) {
-	if c.hc != nil {
-		return errors.New("container already created")
-	}
-
-	// Create the container without starting it.
-	opts := &hcsoci.CreateOptions{
-		ID:               c.ID,
-		Owner:            c.Owner,
-		Spec:             c.Spec,
-		HostingSystem:    vm,
-		NetworkNamespace: c.RequestedNetNS,
-	}
-	vmid := ""
-	if vm != nil {
-		vmid = vm.ID()
-	}
-	logrus.WithFields(logrus.Fields{
-		logfields.ContainerID: c.ID,
-		logfields.UVMID:       vmid,
-	}).Info("creating container in UVM")
-	hc, resources, err := hcsoci.CreateContainer(opts)
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if err != nil {
-			hc.Terminate()
-			hc.Wait()
-			hcsoci.ReleaseResources(resources, vm, true)
-		}
-	}()
-
-	// Record the network namespace to support namespace sharing by container ID.
-	if resources.NetNS() != "" {
-		err = stateKey.Set(c.ID, keyNetNS, resources.NetNS())
-		if err != nil {
-			return err
-		}
-	}
-
-	err = stateKey.Set(c.ID, keyResources, resources)
-	if err != nil {
-		return err
-	}
-	c.hc = hc
-	return nil
-}
-
-func startContainerShim(c *container, pidFile, logFile string) error {
-	// Launch a shim process to later execute a process in the container.
-	shim, err := startProcessShim(c.ID, pidFile, logFile, nil)
-	if err != nil {
-		return err
-	}
-	defer shim.Release()
-	defer func() {
-		if err != nil {
-			shim.Kill()
-		}
-	}()
-
-	c.ShimPid = shim.Pid
-	err = stateKey.Set(c.ID, keyShimPid, shim.Pid)
-	if err != nil {
-		return err
-	}
-
-	if pidFile != "" {
-		if err = createPidFile(pidFile, shim.Pid); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-func (c *container) Close() error {
-	if c.hc == nil {
-		return nil
-	}
-	return c.hc.Close()
-}
-
-func (c *container) Exec() error {
-	err := c.hc.Start()
-	if err != nil {
-		return err
-	}
-
-	if c.Spec.Process == nil {
-		return nil
-	}
-
-	// Alert the shim that the container is ready.
-	pipe, err := winio.DialPipe(c.ShimPipePath(), nil)
-	if err != nil {
-		return err
-	}
-	defer pipe.Close()
-
-	shim, err := os.FindProcess(c.ShimPid)
-	if err != nil {
-		return err
-	}
-	defer shim.Release()
-
-	err = runhcs.GetErrorFromPipe(pipe, shim)
-	if err != nil {
-		return err
-	}
-
-	return nil
-}
-
-func getContainer(id string, notStopped bool) (*container, error) {
-	var c container
-	err := stateKey.Get(id, keyState, &c.persistedState)
-	if err != nil {
-		return nil, err
-	}
-	err = stateKey.Get(id, keyShimPid, &c.ShimPid)
-	if err != nil {
-		if _, ok := err.(*regstate.NoStateError); !ok {
-			return nil, err
-		}
-		c.ShimPid = -1
-	}
-	if notStopped && c.ShimPid == 0 {
-		return nil, errContainerStopped
-	}
-
-	hc, err := hcs.OpenComputeSystem(c.ID)
-	if err == nil {
-		c.hc = hc
-	} else if !hcs.IsNotExist(err) {
-		return nil, err
-	} else if notStopped {
-		return nil, errContainerStopped
-	}
-
-	return &c, nil
-}
-
-func (c *container) Remove() error {
-	// Unmount any layers or mapped volumes.
-	err := c.Unmount(!c.IsHost)
-	if err != nil {
-		return err
-	}
-
-	// Follow kata's example and delay tearing down the VM until the owning
-	// container is removed.
-	if c.IsHost {
-		vm, err := hcs.OpenComputeSystem(vmID(c.ID))
-		if err == nil {
-			if err := vm.Terminate(); hcs.IsPending(err) {
-				vm.Wait()
-			}
-		}
-	}
-	return stateKey.Remove(c.ID)
-}
-
-func (c *container) Kill() error {
-	if c.hc == nil {
-		return nil
-	}
-	err := c.hc.Terminate()
-	if hcs.IsPending(err) {
-		err = c.hc.Wait()
-	}
-	if hcs.IsAlreadyStopped(err) {
-		err = nil
-	}
-	return err
-}
-
-func (c *container) Status() (containerStatus, error) {
-	if c.hc == nil || c.ShimPid == 0 {
-		return containerStopped, nil
-	}
-	props, err := c.hc.Properties()
-	if err != nil {
-		if !strings.Contains(err.Error(), "operation is not valid in the current state") {
-			return "", err
-		}
-		return containerUnknown, nil
-	}
-	state := containerUnknown
-	switch props.State {
-	case "", "Created":
-		state = containerCreated
-	case "Running":
-		state = containerRunning
-	case "Paused":
-		state = containerPaused
-	case "Stopped":
-		state = containerStopped
-	}
-	return state, nil
-}

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/create-scratch.go

@@ -1,71 +0,0 @@
-package main
-
-import (
-	"os"
-	"path/filepath"
-
-	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/Microsoft/hcsshim/internal/lcow"
-	"github.com/Microsoft/hcsshim/internal/uvm"
-	"github.com/Microsoft/hcsshim/osversion"
-	gcsclient "github.com/Microsoft/opengcs/client"
-	"github.com/pkg/errors"
-	"github.com/urfave/cli"
-)
-
-var createScratchCommand = cli.Command{
-	Name:        "create-scratch",
-	Usage:       "creates a scratch vhdx at 'destpath' that is ext4 formatted",
-	Description: "Creates a scratch vhdx at 'destpath' that is ext4 formatted",
-	Flags: []cli.Flag{
-		cli.StringFlag{
-			Name:  "destpath",
-			Usage: "Required: describes the destination vhd path",
-		},
-	},
-	Before: appargs.Validate(),
-	Action: func(context *cli.Context) error {
-		dest := context.String("destpath")
-		if dest == "" {
-			return errors.New("'destpath' is required")
-		}
-
-		// If we only have v1 lcow support do it the old way.
-		if osversion.Get().Build < osversion.RS5 {
-			cfg := gcsclient.Config{
-				Options: gcsclient.Options{
-					KirdPath:   filepath.Join(os.Getenv("ProgramFiles"), "Linux Containers"),
-					KernelFile: "kernel",
-					InitrdFile: uvm.InitrdFile,
-				},
-				Name:              "createscratch-uvm",
-				UvmTimeoutSeconds: 5 * 60, // 5 Min
-			}
-
-			if err := cfg.StartUtilityVM(); err != nil {
-				return errors.Wrapf(err, "failed to start '%s'", cfg.Name)
-			}
-			defer cfg.Uvm.Terminate()
-
-			if err := cfg.CreateExt4Vhdx(dest, lcow.DefaultScratchSizeGB, ""); err != nil {
-				return errors.Wrapf(err, "failed to create ext4vhdx for '%s'", cfg.Name)
-			}
-		} else {
-			opts := uvm.NewDefaultOptionsLCOW("createscratch-uvm", context.GlobalString("owner"))
-			convertUVM, err := uvm.CreateLCOW(opts)
-			if err != nil {
-				return errors.Wrapf(err, "failed to create '%s'", opts.ID)
-			}
-			defer convertUVM.Close()
-			if err := convertUVM.Start(); err != nil {
-				return errors.Wrapf(err, "failed to start '%s'", opts.ID)
-			}
-
-			if err := lcow.CreateScratch(convertUVM, dest, lcow.DefaultScratchSizeGB, "", ""); err != nil {
-				return errors.Wrapf(err, "failed to create ext4vhdx for '%s'", opts.ID)
-			}
-		}
-
-		return nil
-	},
-}

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/create.go

@@ -1,100 +0,0 @@
-package main
-
-import (
-	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/urfave/cli"
-)
-
-var createRunFlags = []cli.Flag{
-	cli.StringFlag{
-		Name:  "bundle, b",
-		Value: "",
-		Usage: `path to the root of the bundle directory, defaults to the current directory`,
-	},
-	cli.StringFlag{
-		Name:  "pid-file",
-		Value: "",
-		Usage: "specify the file to write the process id to",
-	},
-	cli.StringFlag{
-		Name:  "shim-log",
-		Value: "",
-		Usage: `path to the log file or named pipe (e.g. \\.\pipe\ProtectedPrefix\Administrators\runhcs-<container-id>-shim-log) for the launched shim process`,
-	},
-	cli.StringFlag{
-		Name:  "vm-log",
-		Value: "",
-		Usage: `path to the log file or named pipe (e.g. \\.\pipe\ProtectedPrefix\Administrators\runhcs-<container-id>-vm-log) for the launched VM shim process`,
-	},
-	cli.StringFlag{
-		Name:  "vm-console",
-		Value: "",
-		Usage: `path to the pipe for the VM's console (e.g. \\.\pipe\debugpipe)`,
-	},
-	cli.StringFlag{
-		Name:  "host",
-		Value: "",
-		Usage: "host container whose VM this container should run in",
-	},
-}
-
-var createCommand = cli.Command{
-	Name:  "create",
-	Usage: "create a container",
-	ArgsUsage: `<container-id>
-
-Where "<container-id>" is your name for the instance of the container that you
-are starting. The name you provide for the container instance must be unique on
-your host.`,
-	Description: `The create command creates an instance of a container for a bundle. The bundle
-is a directory with a specification file named "` + specConfig + `" and a root
-filesystem.
-
-The specification file includes an args parameter. The args parameter is used
-to specify command(s) that get run when the container is started. To change the
-command(s) that get executed on start, edit the args parameter of the spec. See
-"runc spec --help" for more explanation.`,
-	Flags:  append(createRunFlags),
-	Before: appargs.Validate(argID),
-	Action: func(context *cli.Context) error {
-		cfg, err := containerConfigFromContext(context)
-		if err != nil {
-			return err
-		}
-		_, err = createContainer(cfg)
-		if err != nil {
-			return err
-		}
-		return nil
-	},
-}
-
-func containerConfigFromContext(context *cli.Context) (*containerConfig, error) {
-	id := context.Args().First()
-	pidFile, err := absPathOrEmpty(context.String("pid-file"))
-	if err != nil {
-		return nil, err
-	}
-	shimLog, err := absPathOrEmpty(context.String("shim-log"))
-	if err != nil {
-		return nil, err
-	}
-	vmLog, err := absPathOrEmpty(context.String("vm-log"))
-	if err != nil {
-		return nil, err
-	}
-	spec, err := setupSpec(context)
-	if err != nil {
-		return nil, err
-	}
-	return &containerConfig{
-		ID:            id,
-		Owner:         context.GlobalString("owner"),
-		PidFile:       pidFile,
-		ShimLogFile:   shimLog,
-		VMLogFile:     vmLog,
-		VMConsolePipe: context.String("vm-console"),
-		Spec:          spec,
-		HostID:        context.String("host"),
-	}, nil
-}

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/delete.go

@@ -1,73 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-
-	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/Microsoft/hcsshim/internal/regstate"
-	"github.com/urfave/cli"
-)
-
-var deleteCommand = cli.Command{
-	Name:  "delete",
-	Usage: "delete any resources held by the container often used with detached container",
-	ArgsUsage: `<container-id>
-
-Where "<container-id>" is the name for the instance of the container.
-
-EXAMPLE:
-For example, if the container id is "ubuntu01" and runhcs list currently shows the
-status of "ubuntu01" as "stopped" the following will delete resources held for
-"ubuntu01" removing "ubuntu01" from the runhcs list of containers:
-
-       # runhcs delete ubuntu01`,
-	Flags: []cli.Flag{
-		cli.BoolFlag{
-			Name:  "force, f",
-			Usage: "Forcibly deletes the container if it is still running (uses SIGKILL)",
-		},
-	},
-	Before: appargs.Validate(argID),
-	Action: func(context *cli.Context) error {
-		id := context.Args().First()
-		force := context.Bool("force")
-		container, err := getContainer(id, false)
-		if err != nil {
-			if _, ok := err.(*regstate.NoStateError); ok {
-				if e := stateKey.Remove(id); e != nil {
-					fmt.Fprintf(os.Stderr, "remove %s: %v\n", id, e)
-				}
-				if force {
-					return nil
-				}
-			}
-			return err
-		}
-		defer container.Close()
-		s, err := container.Status()
-		if err != nil {
-			return err
-		}
-
-		kill := false
-		switch s {
-		case containerStopped:
-		case containerCreated:
-			kill = true
-		default:
-			if !force {
-				return fmt.Errorf("cannot delete container %s that is not stopped: %s\n", id, s)
-			}
-			kill = true
-		}
-
-		if kill {
-			err = container.Kill()
-			if err != nil {
-				return err
-			}
-		}
-		return container.Remove()
-	},
-}

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/exec.go

@@ -1,160 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-	"path/filepath"
-	"strings"
-	"syscall"
-
-	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/urfave/cli"
-)
-
-var execCommand = cli.Command{
-	Name:  "exec",
-	Usage: "execute new process inside the container",
-	ArgsUsage: `<container-id> <command> [command options]  || -p process.json <container-id>
-
-Where "<container-id>" is the name for the instance of the container and
-"<command>" is the command to be executed in the container.
-"<command>" can't be empty unless a "-p" flag provided.
-
-EXAMPLE:
-For example, if the container is configured to run the linux ps command the
-following will output a list of processes running in the container:
-
-    	# runhcs exec <container-id> ps`,
-	Flags: []cli.Flag{
-		cli.StringFlag{
-			Name:  "cwd",
-			Usage: "current working directory in the container",
-		},
-		cli.StringSliceFlag{
-			Name:  "env, e",
-			Usage: "set environment variables",
-		},
-		cli.BoolFlag{
-			Name:  "tty, t",
-			Usage: "allocate a pseudo-TTY",
-		},
-		cli.StringFlag{
-			Name: "user, u",
-		},
-		cli.StringFlag{
-			Name:  "process, p",
-			Usage: "path to the process.json",
-		},
-		cli.BoolFlag{
-			Name:  "detach,d",
-			Usage: "detach from the container's process",
-		},
-		cli.StringFlag{
-			Name:  "pid-file",
-			Value: "",
-			Usage: "specify the file to write the process id to",
-		},
-		cli.StringFlag{
-			Name:  "shim-log",
-			Value: "",
-			Usage: `path to the log file or named pipe (e.g. \\.\pipe\ProtectedPrefix\Administrators\runhcs-<container-id>-<exec-id>-log) for the launched shim process`,
-		},
-	},
-	Before: appargs.Validate(argID, appargs.Rest(appargs.String)),
-	Action: func(context *cli.Context) error {
-		id := context.Args().First()
-		pidFile, err := absPathOrEmpty(context.String("pid-file"))
-		if err != nil {
-			return err
-		}
-		shimLog, err := absPathOrEmpty(context.String("shim-log"))
-		if err != nil {
-			return err
-		}
-		c, err := getContainer(id, false)
-		if err != nil {
-			return err
-		}
-		defer c.Close()
-		status, err := c.Status()
-		if err != nil {
-			return err
-		}
-		if status != containerRunning {
-			return errContainerStopped
-		}
-		spec, err := getProcessSpec(context, c)
-		if err != nil {
-			return err
-		}
-		p, err := startProcessShim(id, pidFile, shimLog, spec)
-		if err != nil {
-			return err
-		}
-		if !context.Bool("detach") {
-			state, err := p.Wait()
-			if err != nil {
-				return err
-			}
-			os.Exit(int(state.Sys().(syscall.WaitStatus).ExitCode))
-		}
-		return nil
-	},
-	SkipArgReorder: true,
-}
-
-func getProcessSpec(context *cli.Context, c *container) (*specs.Process, error) {
-	if path := context.String("process"); path != "" {
-		f, err := os.Open(path)
-		if err != nil {
-			return nil, err
-		}
-		defer f.Close()
-		var p specs.Process
-		if err := json.NewDecoder(f).Decode(&p); err != nil {
-			return nil, err
-		}
-		return &p, validateProcessSpec(&p)
-	}
-
-	// process via cli flags
-	p := c.Spec.Process
-
-	if len(context.Args()) == 1 {
-		return nil, fmt.Errorf("process args cannot be empty")
-	}
-	p.Args = context.Args()[1:]
-	// override the cwd, if passed
-	if context.String("cwd") != "" {
-		p.Cwd = context.String("cwd")
-	}
-	// append the passed env variables
-	p.Env = append(p.Env, context.StringSlice("env")...)
-
-	// set the tty
-	if context.IsSet("tty") {
-		p.Terminal = context.Bool("tty")
-	}
-	// override the user, if passed
-	if context.String("user") != "" {
-		p.User.Username = context.String("user")
-	}
-	return p, nil
-}
-
-func validateProcessSpec(spec *specs.Process) error {
-	if spec.Cwd == "" {
-		return fmt.Errorf("Cwd property must not be empty")
-	}
-	// IsAbs doesnt recognize Unix paths on Windows builds so handle that case
-	// here.
-	if !filepath.IsAbs(spec.Cwd) && !strings.HasPrefix(spec.Cwd, "/") {
-		return fmt.Errorf("Cwd must be an absolute path")
-	}
-	if len(spec.Args) == 0 {
-		return fmt.Errorf("args must not be empty")
-	}
-	return nil
-}

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/kill.go

@@ -1,178 +0,0 @@
-package main
-
-import (
-	"strconv"
-	"strings"
-
-	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/Microsoft/hcsshim/internal/guestrequest"
-	"github.com/Microsoft/hcsshim/internal/hcs"
-	"github.com/Microsoft/hcsshim/internal/schema1"
-	"github.com/Microsoft/hcsshim/osversion"
-	"github.com/pkg/errors"
-	"github.com/urfave/cli"
-)
-
-var killCommand = cli.Command{
-	Name:  "kill",
-	Usage: "kill sends the specified signal (default: SIGTERM) to the container's init process",
-	ArgsUsage: `<container-id> [signal]
-
-Where "<container-id>" is the name for the instance of the container and
-"[signal]" is the signal to be sent to the init process.
-
-EXAMPLE:
-For example, if the container id is "ubuntu01" the following will send a "KILL"
-signal to the init process of the "ubuntu01" container:
-
-       # runhcs kill ubuntu01 KILL`,
-	Flags:  []cli.Flag{},
-	Before: appargs.Validate(argID, appargs.Optional(appargs.String)),
-	Action: func(context *cli.Context) error {
-		id := context.Args().First()
-		c, err := getContainer(id, true)
-		if err != nil {
-			return err
-		}
-		defer c.Close()
-		status, err := c.Status()
-		if err != nil {
-			return err
-		}
-		if status != containerRunning {
-			return errContainerStopped
-		}
-
-		signalsSupported := false
-
-		// The Signal feature was added in RS5
-		if osversion.Get().Build >= osversion.RS5 {
-			if c.IsHost || c.HostID != "" {
-				var hostID string
-				if c.IsHost {
-					// This is the LCOW, Pod Sandbox, or Windows Xenon V2 for RS5+
-					hostID = vmID(c.ID)
-				} else {
-					// This is the Nth container in a Pod
-					hostID = c.HostID
-				}
-				uvm, err := hcs.OpenComputeSystem(hostID)
-				if err != nil {
-					return err
-				}
-				defer uvm.Close()
-				if props, err := uvm.Properties(schema1.PropertyTypeGuestConnection); err == nil &&
-					props.GuestConnectionInfo.GuestDefinedCapabilities.SignalProcessSupported {
-					signalsSupported = true
-				}
-			} else if c.Spec.Linux == nil && c.Spec.Windows.HyperV == nil {
-				// RS5+ Windows Argon
-				signalsSupported = true
-			}
-		}
-
-		signal := 0
-		if signalsSupported {
-			signal, err = validateSigstr(context.Args().Get(1), signalsSupported, c.Spec.Linux != nil)
-			if err != nil {
-				return err
-			}
-		}
-
-		var pid int
-		if err := stateKey.Get(id, keyInitPid, &pid); err != nil {
-			return err
-		}
-
-		p, err := c.hc.OpenProcess(pid)
-		if err != nil {
-			return err
-		}
-		defer p.Close()
-
-		if signalsSupported && (c.Spec.Linux != nil || !c.Spec.Process.Terminal) {
-			opts := guestrequest.SignalProcessOptions{
-				Signal: signal,
-			}
-			return p.Signal(opts)
-		}
-
-		// Legacy signal issue a kill
-		return p.Kill()
-	},
-}
-
-func validateSigstr(sigstr string, signalsSupported bool, isLcow bool) (int, error) {
-	errInvalidSignal := errors.Errorf("invalid signal '%s'", sigstr)
-
-	// All flavors including legacy default to SIGTERM on LCOW CtrlC on Windows
-	if sigstr == "" {
-		if isLcow {
-			return 0xf, nil
-		}
-		return 0, nil
-	}
-
-	sigstr = strings.ToUpper(sigstr)
-
-	if !signalsSupported {
-		// If signals arent supported we just validate that its a known signal.
-		// We already return 0 since we only supported a platform Kill() at that
-		// time.
-		if isLcow {
-			switch sigstr {
-			case "15":
-				fallthrough
-			case "TERM":
-				fallthrough
-			case "SIGTERM":
-				return 0, nil
-			default:
-				return 0, errInvalidSignal
-			}
-		}
-		switch sigstr {
-		// Docker sends a UNIX term in the supported Windows Signal map.
-		case "15":
-			fallthrough
-		case "TERM":
-			fallthrough
-		case "0":
-			fallthrough
-		case "CTRLC":
-			return 0, nil
-		case "9":
-			fallthrough
-		case "KILL":
-			return 0, nil
-		default:
-			return 0, errInvalidSignal
-		}
-	}
-
-	var sigmap map[string]int
-	if isLcow {
-		sigmap = signalMapLcow
-	} else {
-		sigmap = signalMapWindows
-	}
-
-	signal, err := strconv.Atoi(sigstr)
-	if err != nil {
-		// Signal might still match the string value
-		for k, v := range sigmap {
-			if k == sigstr {
-				return v, nil
-			}
-		}
-		return 0, errInvalidSignal
-	}
-
-	// Match signal by value
-	for _, v := range sigmap {
-		if signal == v {
-			return signal, nil
-		}
-	}
-	return 0, errInvalidSignal
-}

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/kill_test.go

@@ -1,95 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"strconv"
-	"strings"
-	"testing"
-)
-
-func runValidateSigstrTest(sigstr string, signalsSupported, isLcow bool,
-	expectedSignal int, expectedError bool, t *testing.T) {
-	signal, err := validateSigstr(sigstr, signalsSupported, isLcow)
-	if expectedError {
-		if err == nil {
-			t.Fatalf("Expected err: %v, got: nil", expectedError)
-		} else if err.Error() != fmt.Sprintf("invalid signal '%s'", sigstr) {
-			t.Fatalf("Expected err: %v, got: %v", expectedError, err)
-		}
-	}
-	if signal != expectedSignal {
-		t.Fatalf("Test - Signal: %s, Support: %v, LCOW: %v\nExpected signal: %v, got: %v",
-			sigstr, signalsSupported, isLcow,
-			expectedSignal, signal)
-	}
-}
-
-func TestValidateSigstrEmpty(t *testing.T) {
-	runValidateSigstrTest("", false, false, 0, false, t)
-	runValidateSigstrTest("", false, true, 0xf, false, t)
-	runValidateSigstrTest("", true, false, 0, false, t)
-	runValidateSigstrTest("", true, true, 0xf, false, t)
-}
-
-func TestValidateSigstrDefaultLCOW(t *testing.T) {
-	runValidateSigstrTest("15", false, true, 0, false, t)
-	runValidateSigstrTest("TERM", false, true, 0, false, t)
-	runValidateSigstrTest("SIGTERM", false, true, 0, false, t)
-}
-
-func TestValidateSigstrDefaultLCOWInvalid(t *testing.T) {
-	runValidateSigstrTest("2", false, true, 0, true, t)
-	runValidateSigstrTest("test", false, true, 0, true, t)
-}
-
-func TestValidateSigstrDefaultWCOW(t *testing.T) {
-	runValidateSigstrTest("15", false, false, 0, false, t)
-	runValidateSigstrTest("TERM", false, false, 0, false, t)
-	runValidateSigstrTest("0", false, false, 0, false, t)
-	runValidateSigstrTest("CTRLC", false, false, 0, false, t)
-	runValidateSigstrTest("9", false, false, 0, false, t)
-	runValidateSigstrTest("KILL", false, false, 0, false, t)
-}
-
-func TestValidateSigstrDefaultWCOWInvalid(t *testing.T) {
-	runValidateSigstrTest("2", false, false, 0, true, t)
-	runValidateSigstrTest("test", false, false, 0, true, t)
-}
-
-func TestValidateSignalStringLCOW(t *testing.T) {
-	for k, v := range signalMapLcow {
-		runValidateSigstrTest(k, true, true, v, false, t)
-		// run it again with a case not in the map
-		lc := strings.ToLower(k)
-		if k == lc {
-			t.Fatalf("Expected lower casing - map: %v, got: %v", k, lc)
-		}
-		runValidateSigstrTest(lc, true, true, v, false, t)
-	}
-}
-
-func TestValidateSignalStringWCOW(t *testing.T) {
-	for k, v := range signalMapWindows {
-		runValidateSigstrTest(k, true, false, v, false, t)
-		// run it again with a case not in the map
-		lc := strings.ToLower(k)
-		if k == lc {
-			t.Fatalf("Expected lower casing - map: %v, got: %v", k, lc)
-		}
-		runValidateSigstrTest(lc, true, false, v, false, t)
-	}
-}
-
-func TestValidateSignalValueLCOW(t *testing.T) {
-	for _, v := range signalMapLcow {
-		str := strconv.Itoa(v)
-		runValidateSigstrTest(str, true, true, v, false, t)
-	}
-}
-
-func TestValidateSignalValueWCOW(t *testing.T) {
-	for _, v := range signalMapWindows {
-		str := strconv.Itoa(v)
-		runValidateSigstrTest(str, true, false, v, false, t)
-	}
-}

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/list.go

@@ -1,116 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"os"
-	"text/tabwriter"
-	"time"
-
-	"encoding/json"
-
-	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/Microsoft/hcsshim/internal/runhcs"
-	"github.com/urfave/cli"
-)
-
-const formatOptions = `table or json`
-
-var listCommand = cli.Command{
-	Name:  "list",
-	Usage: "lists containers started by runhcs with the given root",
-	ArgsUsage: `
-
-Where the given root is specified via the global option "--root"
-(default: "/run/runhcs").
-
-EXAMPLE 1:
-To list containers created via the default "--root":
-       # runhcs list
-
-EXAMPLE 2:
-To list containers created using a non-default value for "--root":
-       # runhcs --root value list`,
-	Flags: []cli.Flag{
-		cli.StringFlag{
-			Name:  "format, f",
-			Value: "table",
-			Usage: `select one of: ` + formatOptions,
-		},
-		cli.BoolFlag{
-			Name:  "quiet, q",
-			Usage: "display only container IDs",
-		},
-	},
-	Before: appargs.Validate(),
-	Action: func(context *cli.Context) error {
-		s, err := getContainers(context)
-		if err != nil {
-			return err
-		}
-
-		if context.Bool("quiet") {
-			for _, item := range s {
-				fmt.Println(item.ID)
-			}
-			return nil
-		}
-
-		switch context.String("format") {
-		case "table":
-			w := tabwriter.NewWriter(os.Stdout, 12, 1, 3, ' ', 0)
-			fmt.Fprint(w, "ID\tPID\tSTATUS\tBUNDLE\tCREATED\tOWNER\n")
-			for _, item := range s {
-				fmt.Fprintf(w, "%s\t%d\t%s\t%s\t%s\t%s\n",
-					item.ID,
-					item.InitProcessPid,
-					item.Status,
-					item.Bundle,
-					item.Created.Format(time.RFC3339Nano),
-					item.Owner)
-			}
-			if err := w.Flush(); err != nil {
-				return err
-			}
-		case "json":
-			if err := json.NewEncoder(os.Stdout).Encode(s); err != nil {
-				return err
-			}
-		default:
-			return fmt.Errorf("invalid format option")
-		}
-		return nil
-	},
-}
-
-func getContainers(context *cli.Context) ([]runhcs.ContainerState, error) {
-	ids, err := stateKey.Enumerate()
-	if err != nil {
-		return nil, err
-	}
-
-	var s []runhcs.ContainerState
-	for _, id := range ids {
-		c, err := getContainer(id, false)
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "reading state for %s: %v\n", id, err)
-			continue
-		}
-		status, err := c.Status()
-		if err != nil {
-			fmt.Fprintf(os.Stderr, "reading status for %s: %v\n", id, err)
-		}
-
-		s = append(s, runhcs.ContainerState{
-			ID:             id,
-			Version:        c.Spec.Version,
-			InitProcessPid: c.ShimPid,
-			Status:         string(status),
-			Bundle:         c.Bundle,
-			Rootfs:         c.Rootfs,
-			Created:        c.Created,
-			Annotations:    c.Spec.Annotations,
-		})
-		c.Close()
-	}
-	return s, nil
-}

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/main.go

@@ -1,174 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"io"
-	"os"
-	"strings"
-
-	"github.com/Microsoft/go-winio"
-	"github.com/Microsoft/go-winio/pkg/etwlogrus"
-	"github.com/Microsoft/hcsshim/internal/regstate"
-	"github.com/Microsoft/hcsshim/internal/runhcs"
-	"github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli"
-)
-
-// Add a manifest to get proper Windows version detection.
-//
-// goversioninfo can be installed with "go get github.com/josephspurrier/goversioninfo/cmd/goversioninfo"
-
-//go:generate goversioninfo -platform-specific
-
-// version will be populated by the Makefile, read from
-// VERSION file of the source code.
-var version = ""
-
-// gitCommit will be the hash that the binary was built from
-// and will be populated by the Makefile
-var gitCommit = ""
-
-var stateKey *regstate.Key
-
-var logFormat string
-
-const (
-	specConfig = "config.json"
-	usage      = `Open Container Initiative runtime for Windows
-
-runhcs is a fork of runc, modified to run containers on Windows with or without Hyper-V isolation.  Like runc, it is a command line client for running applications packaged according to the Open Container Initiative (OCI) format.
-
-runhcs integrates with existing process supervisors to provide a production container runtime environment for applications. It can be used with your existing process monitoring tools and the container will be spawned as a direct child of the process supervisor.
-
-Containers are configured using bundles. A bundle for a container is a directory that includes a specification file named "` + specConfig + `".  Bundle contents will depend on the container type.
-
-To start a new instance of a container:
-
-    # runhcs run [ -b bundle ] <container-id>
-
-Where "<container-id>" is your name for the instance of the container that you are starting. The name you provide for the container instance must be unique on your host. Providing the bundle directory using "-b" is optional. The default value for "bundle" is the current directory.`
-)
-
-func main() {
-	// Provider ID: 0b52781f-b24d-5685-ddf6-69830ed40ec3
-	// Hook isn't closed explicitly, as it will exist until process exit.
-	if hook, err := etwlogrus.NewHook("Microsoft.Virtualization.RunHCS"); err == nil {
-		logrus.AddHook(hook)
-	} else {
-		logrus.Error(err)
-	}
-
-	app := cli.NewApp()
-	app.Name = "runhcs"
-	app.Usage = usage
-
-	var v []string
-	if version != "" {
-		v = append(v, version)
-	}
-	if gitCommit != "" {
-		v = append(v, fmt.Sprintf("commit: %s", gitCommit))
-	}
-	v = append(v, fmt.Sprintf("spec: %s", specs.Version))
-	app.Version = strings.Join(v, "\n")
-
-	app.Flags = []cli.Flag{
-		cli.BoolFlag{
-			Name:  "debug",
-			Usage: "enable debug output for logging",
-		},
-		cli.StringFlag{
-			Name:  "log",
-			Value: "nul",
-			Usage: `set the log file path or named pipe (e.g. \\.\pipe\ProtectedPrefix\Administrators\runhcs-log) where internal debug information is written`,
-		},
-		cli.StringFlag{
-			Name:  "log-format",
-			Value: "text",
-			Usage: "set the format used by logs ('text' (default), or 'json')",
-		},
-		cli.StringFlag{
-			Name:  "owner",
-			Value: "runhcs",
-			Usage: "compute system owner",
-		},
-		cli.StringFlag{
-			Name:  "root",
-			Value: "default",
-			Usage: "registry key for storage of container state",
-		},
-	}
-	app.Commands = []cli.Command{
-		createCommand,
-		createScratchCommand,
-		deleteCommand,
-		// eventsCommand,
-		execCommand,
-		killCommand,
-		listCommand,
-		pauseCommand,
-		psCommand,
-		resizeTtyCommand,
-		resumeCommand,
-		runCommand,
-		shimCommand,
-		startCommand,
-		stateCommand,
-		// updateCommand,
-		vmshimCommand,
-	}
-	app.Before = func(context *cli.Context) error {
-		if context.GlobalBool("debug") {
-			logrus.SetLevel(logrus.DebugLevel)
-		}
-		if path := context.GlobalString("log"); path != "" {
-			var f io.Writer
-			var err error
-			if strings.HasPrefix(path, runhcs.SafePipePrefix) {
-				f, err = winio.DialPipe(path, nil)
-			} else {
-				f, err = os.OpenFile(path, os.O_CREATE|os.O_WRONLY|os.O_APPEND|os.O_SYNC, 0666)
-			}
-			if err != nil {
-				return err
-			}
-			logrus.SetOutput(f)
-		}
-		switch logFormat = context.GlobalString("log-format"); logFormat {
-		case "text":
-			// retain logrus's default.
-		case "json":
-			logrus.SetFormatter(new(logrus.JSONFormatter))
-		default:
-			return fmt.Errorf("unknown log-format %q", logFormat)
-		}
-
-		var err error
-		stateKey, err = regstate.Open(context.GlobalString("root"), false)
-		if err != nil {
-			return err
-		}
-		return nil
-	}
-	// If the command returns an error, cli takes upon itself to print
-	// the error on cli.ErrWriter and exit.
-	// Use our own writer here to ensure the log gets sent to the right location.
-	fatalWriter.Writer = cli.ErrWriter
-	cli.ErrWriter = &fatalWriter
-	if err := app.Run(os.Args); err != nil {
-		fmt.Fprintln(cli.ErrWriter, err)
-		os.Exit(1)
-	}
-}
-
-type logErrorWriter struct {
-	Writer io.Writer
-}
-
-var fatalWriter logErrorWriter
-
-func (f *logErrorWriter) Write(p []byte) (n int, err error) {
-	logrus.Error(string(p))
-	return f.Writer.Write(p)
-}

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/pause.go

@@ -1,58 +0,0 @@
-package main
-
-import (
-	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/urfave/cli"
-)
-
-var pauseCommand = cli.Command{
-	Name:  "pause",
-	Usage: "pause suspends all processes inside the container",
-	ArgsUsage: `<container-id>
-
-Where "<container-id>" is the name for the instance of the container to be
-paused. `,
-	Description: `The pause command suspends all processes in the instance of the container.
-
-Use runhcs list to identify instances of containers and their current status.`,
-	Before: appargs.Validate(argID),
-	Action: func(context *cli.Context) error {
-		id := context.Args().First()
-		container, err := getContainer(id, true)
-		if err != nil {
-			return err
-		}
-		defer container.Close()
-		if err := container.hc.Pause(); err != nil {
-			return err
-		}
-
-		return nil
-	},
-}
-
-var resumeCommand = cli.Command{
-	Name:  "resume",
-	Usage: "resumes all processes that have been previously paused",
-	ArgsUsage: `<container-id>
-
-Where "<container-id>" is the name for the instance of the container to be
-resumed.`,
-	Description: `The resume command resumes all processes in the instance of the container.
-
-Use runhcs list to identify instances of containers and their current status.`,
-	Before: appargs.Validate(argID),
-	Action: func(context *cli.Context) error {
-		id := context.Args().First()
-		container, err := getContainer(id, true)
-		if err != nil {
-			return err
-		}
-		defer container.Close()
-		if err := container.hc.Resume(); err != nil {
-			return err
-		}
-
-		return nil
-	},
-}

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/ps.go

@@ -1,51 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-
-	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/Microsoft/hcsshim/internal/schema1"
-	"github.com/urfave/cli"
-)
-
-var psCommand = cli.Command{
-	Name:      "ps",
-	Usage:     "ps displays the processes running inside a container",
-	ArgsUsage: `<container-id> [ps options]`,
-	Flags: []cli.Flag{
-		cli.StringFlag{
-			Name:  "format, f",
-			Value: "json",
-			Usage: `select one of: ` + formatOptions,
-		},
-	},
-	Before: appargs.Validate(argID),
-	Action: func(context *cli.Context) error {
-		id := context.Args().First()
-		container, err := getContainer(id, true)
-		if err != nil {
-			return err
-		}
-		defer container.Close()
-
-		props, err := container.hc.Properties(schema1.PropertyTypeProcessList)
-		if err != nil {
-			return err
-		}
-
-		var pids []int
-		for _, p := range props.ProcessList {
-			pids = append(pids, int(p.ProcessId))
-		}
-
-		switch context.String("format") {
-		case "json":
-			return json.NewEncoder(os.Stdout).Encode(pids)
-		default:
-			return fmt.Errorf("invalid format option")
-		}
-	},
-	SkipArgReorder: true,
-}

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/run.go

@@ -1,64 +0,0 @@
-package main
-
-import (
-	"os"
-	"syscall"
-
-	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/urfave/cli"
-)
-
-// default action is to start a container
-var runCommand = cli.Command{
-	Name:  "run",
-	Usage: "create and run a container",
-	ArgsUsage: `<container-id>
-
-Where "<container-id>" is your name for the instance of the container that you
-are starting. The name you provide for the container instance must be unique on
-your host.`,
-	Description: `The run command creates an instance of a container for a bundle. The bundle
-is a directory with a specification file named "` + specConfig + `" and a root
-filesystem.
-
-The specification file includes an args parameter. The args parameter is used
-to specify command(s) that get run when the container is started. To change the
-command(s) that get executed on start, edit the args parameter of the spec.`,
-	Flags: append(createRunFlags,
-		cli.BoolFlag{
-			Name:  "detach, d",
-			Usage: "detach from the container's process",
-		},
-	),
-	Before: appargs.Validate(argID),
-	Action: func(context *cli.Context) error {
-		cfg, err := containerConfigFromContext(context)
-		if err != nil {
-			return err
-		}
-		c, err := createContainer(cfg)
-		if err != nil {
-			return err
-		}
-		if err != nil {
-			return err
-		}
-		p, err := os.FindProcess(c.ShimPid)
-		if err != nil {
-			return err
-		}
-		err = c.Exec()
-		if err != nil {
-			return err
-		}
-		if !context.Bool("detach") {
-			state, err := p.Wait()
-			if err != nil {
-				return err
-			}
-			c.Remove()
-			os.Exit(int(state.Sys().(syscall.WaitStatus).ExitCode))
-		}
-		return nil
-	},
-}

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/runhcs.exe.manifest

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-    <description>runhcs</description>
-    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-        <application>
-            <!-- Windows 10 -->
-            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-        </application>
-    </compatibility>
-</assembly>

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/shim.go

@@ -1,323 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"net"
-	"os"
-	"strings"
-	"sync"
-	"time"
-
-	winio "github.com/Microsoft/go-winio"
-	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/Microsoft/hcsshim/internal/hcs"
-	"github.com/Microsoft/hcsshim/internal/lcow"
-	"github.com/Microsoft/hcsshim/internal/runhcs"
-	"github.com/Microsoft/hcsshim/internal/schema2"
-	specs "github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli"
-	"golang.org/x/sys/windows"
-)
-
-func containerPipePath(id string) string {
-	return runhcs.SafePipePath("runhcs-shim-" + id)
-}
-
-func newFile(context *cli.Context, param string) *os.File {
-	fd := uintptr(context.Int(param))
-	if fd == 0 {
-		return nil
-	}
-	return os.NewFile(fd, "")
-}
-
-var shimCommand = cli.Command{
-	Name:   "shim",
-	Usage:  `launch the process and proxy stdio (do not call it outside of runhcs)`,
-	Hidden: true,
-	Flags: []cli.Flag{
-		&cli.IntFlag{Name: "stdin", Hidden: true},
-		&cli.IntFlag{Name: "stdout", Hidden: true},
-		&cli.IntFlag{Name: "stderr", Hidden: true},
-		&cli.BoolFlag{Name: "exec", Hidden: true},
-		cli.StringFlag{Name: "log-pipe", Hidden: true},
-	},
-	Before: appargs.Validate(argID),
-	Action: func(context *cli.Context) error {
-		logPipe := context.String("log-pipe")
-		if logPipe != "" {
-			lpc, err := winio.DialPipe(logPipe, nil)
-			if err != nil {
-				return err
-			}
-			defer lpc.Close()
-			logrus.SetOutput(lpc)
-		} else {
-			logrus.SetOutput(os.Stderr)
-		}
-		fatalWriter.Writer = os.Stdout
-
-		id := context.Args().First()
-		c, err := getContainer(id, true)
-		if err != nil {
-			return err
-		}
-		defer c.Close()
-
-		// Asynchronously wait for the container to exit.
-		containerExitCh := make(chan error)
-		go func() {
-			containerExitCh <- c.hc.Wait()
-		}()
-
-		// Get File objects for the open stdio files passed in as arguments.
-		stdin := newFile(context, "stdin")
-		stdout := newFile(context, "stdout")
-		stderr := newFile(context, "stderr")
-
-		exec := context.Bool("exec")
-		terminateOnFailure := false
-
-		errorOut := io.WriteCloser(os.Stdout)
-
-		var spec *specs.Process
-
-		if exec {
-			// Read the process spec from stdin.
-			specj, err := ioutil.ReadAll(os.Stdin)
-			if err != nil {
-				return err
-			}
-			os.Stdin.Close()
-
-			spec = new(specs.Process)
-			err = json.Unmarshal(specj, spec)
-			if err != nil {
-				return err
-			}
-
-		} else {
-			// Stdin is not used.
-			os.Stdin.Close()
-
-			// Listen on the named pipe associated with this container.
-			l, err := winio.ListenPipe(c.ShimPipePath(), nil)
-			if err != nil {
-				return err
-			}
-
-			// Alert the parent process that initialization has completed
-			// successfully.
-			errorOut.Write(runhcs.ShimSuccess)
-			errorOut.Close()
-			fatalWriter.Writer = ioutil.Discard
-
-			// When this process exits, clear this process's pid in the registry.
-			defer func() {
-				stateKey.Set(id, keyShimPid, 0)
-			}()
-
-			defer func() {
-				if terminateOnFailure {
-					if err = c.hc.Terminate(); hcs.IsPending(err) {
-						<-containerExitCh
-					}
-				}
-			}()
-			terminateOnFailure = true
-
-			// Wait for a connection to the named pipe, exiting if the container
-			// exits before this happens.
-			var pipe net.Conn
-			pipeCh := make(chan error)
-			go func() {
-				var err error
-				pipe, err = l.Accept()
-				pipeCh <- err
-			}()
-
-			select {
-			case err = <-pipeCh:
-				if err != nil {
-					return err
-				}
-			case err = <-containerExitCh:
-				if err != nil {
-					return err
-				}
-				return cli.NewExitError("", 1)
-			}
-
-			// The next set of errors goes to the open pipe connection.
-			errorOut = pipe
-			fatalWriter.Writer = pipe
-
-			// The process spec comes from the original container spec.
-			spec = c.Spec.Process
-		}
-
-		// Create the process in the container.
-		var wpp *hcsschema.ProcessParameters // Windows Process Parameters
-		var lpp *lcow.ProcessParameters      // Linux Process Parameters
-
-		var p *hcs.Process
-
-		if c.Spec.Linux == nil {
-			environment := make(map[string]string)
-			for _, v := range spec.Env {
-				s := strings.SplitN(v, "=", 2)
-				if len(s) == 2 && len(s[1]) > 0 {
-					environment[s[0]] = s[1]
-				}
-			}
-			wpp = &hcsschema.ProcessParameters{
-				WorkingDirectory: spec.Cwd,
-				EmulateConsole:   spec.Terminal,
-				Environment:      environment,
-				User:             spec.User.Username,
-			}
-			for i, arg := range spec.Args {
-				e := windows.EscapeArg(arg)
-				if i == 0 {
-					wpp.CommandLine = e
-				} else {
-					wpp.CommandLine += " " + e
-				}
-			}
-			if spec.ConsoleSize != nil {
-				wpp.ConsoleSize = []int32{
-					int32(spec.ConsoleSize.Height),
-					int32(spec.ConsoleSize.Width),
-				}
-			}
-
-			wpp.CreateStdInPipe = stdin != nil
-			wpp.CreateStdOutPipe = stdout != nil
-			wpp.CreateStdErrPipe = stderr != nil
-
-			p, err = c.hc.CreateProcess(wpp)
-
-		} else {
-			lpp = &lcow.ProcessParameters{}
-			if exec {
-				lpp.OCIProcess = spec
-			}
-
-			lpp.CreateStdInPipe = stdin != nil
-			lpp.CreateStdOutPipe = stdout != nil
-			lpp.CreateStdErrPipe = stderr != nil
-
-			p, err = c.hc.CreateProcess(lpp)
-		}
-
-		if err != nil {
-			return err
-		}
-
-		cstdin, cstdout, cstderr, err := p.Stdio()
-		if err != nil {
-			return err
-		}
-
-		if !exec {
-			err = stateKey.Set(c.ID, keyInitPid, p.Pid())
-			if err != nil {
-				return err
-			}
-		}
-
-		// Store the Guest pid map
-		err = stateKey.Set(c.ID, fmt.Sprintf(keyPidMapFmt, os.Getpid()), p.Pid())
-		if err != nil {
-			return err
-		}
-		defer func() {
-			// Remove the Guest pid map when this process is cleaned up
-			stateKey.Clear(c.ID, fmt.Sprintf(keyPidMapFmt, os.Getpid()))
-		}()
-
-		terminateOnFailure = false
-
-		// Alert the connected process that the process was launched
-		// successfully.
-		errorOut.Write(runhcs.ShimSuccess)
-		errorOut.Close()
-		fatalWriter.Writer = ioutil.Discard
-
-		// Relay stdio.
-		var wg sync.WaitGroup
-		if cstdin != nil {
-			go func() {
-				io.Copy(cstdin, stdin)
-				cstdin.Close()
-				p.CloseStdin()
-			}()
-		}
-
-		if cstdout != nil {
-			wg.Add(1)
-			go func() {
-				io.Copy(stdout, cstdout)
-				stdout.Close()
-				cstdout.Close()
-				wg.Done()
-			}()
-		}
-
-		if cstderr != nil {
-			wg.Add(1)
-			go func() {
-				io.Copy(stderr, cstderr)
-				stderr.Close()
-				cstderr.Close()
-				wg.Done()
-			}()
-		}
-
-		err = p.Wait()
-		wg.Wait()
-
-		// Attempt to get the exit code from the process.
-		code := 1
-		if err == nil {
-			code, err = p.ExitCode()
-			if err != nil {
-				code = 1
-			}
-		}
-
-		if !exec {
-			// Shutdown the container, waiting 5 minutes before terminating is
-			// forcefully.
-			const shutdownTimeout = time.Minute * 5
-			waited := false
-			err = c.hc.Shutdown()
-			if hcs.IsPending(err) {
-				select {
-				case err = <-containerExitCh:
-					waited = true
-				case <-time.After(shutdownTimeout):
-					err = hcs.ErrTimeout
-				}
-			}
-			if hcs.IsAlreadyStopped(err) {
-				err = nil
-			}
-
-			if err != nil {
-				err = c.hc.Terminate()
-				if waited {
-					err = c.hc.Wait()
-				} else {
-					err = <-containerExitCh
-				}
-			}
-		}
-
-		return cli.NewExitError("", code)
-	},
-}

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/signalmap.go

@@ -1,48 +0,0 @@
-package main
-
-var signalMapLcow = map[string]int{
-	"ABRT":   0x6,
-	"ALRM":   0xe,
-	"BUS":    0x7,
-	"CHLD":   0x11,
-	"CLD":    0x11,
-	"CONT":   0x12,
-	"FPE":    0x8,
-	"HUP":    0x1,
-	"ILL":    0x4,
-	"INT":    0x2,
-	"IO":     0x1d,
-	"IOT":    0x6,
-	"KILL":   0x9,
-	"PIPE":   0xd,
-	"POLL":   0x1d,
-	"PROF":   0x1b,
-	"PWR":    0x1e,
-	"QUIT":   0x3,
-	"SEGV":   0xb,
-	"STKFLT": 0x10,
-	"STOP":   0x13,
-	"SYS":    0x1f,
-	"TERM":   0xf,
-	"TRAP":   0x5,
-	"TSTP":   0x14,
-	"TTIN":   0x15,
-	"TTOU":   0x16,
-	"URG":    0x17,
-	"USR1":   0xa,
-	"USR2":   0xc,
-	"VTALRM": 0x1a,
-	"WINCH":  0x1c,
-	"XCPU":   0x18,
-	"XFSZ":   0x19,
-}
-
-var signalMapWindows = map[string]int{
-	"CTRLC":        0x0,
-	"CTRLBREAK":    0x1,
-	"CTRLCLOSE":    0x2,
-	"CTRLLOGOFF":   0x5,
-	"CTRLSHUTDOWN": 0x6,
-	"TERM":         0x0, // Docker sends the UNIX signal. Convert to CTRLC
-	"KILL":         0x6, // Docker sends the UNIX signal. Convert to CTRLSHUTDOWN
-}

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/spec.go

@@ -1,42 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"os"
-
-	"github.com/opencontainers/runtime-spec/specs-go"
-	"github.com/urfave/cli"
-)
-
-// loadSpec loads the specification from the provided path.
-func loadSpec(cPath string) (spec *specs.Spec, err error) {
-	cf, err := os.Open(cPath)
-	if err != nil {
-		if os.IsNotExist(err) {
-			return nil, fmt.Errorf("JSON specification file %s not found", cPath)
-		}
-		return nil, err
-	}
-	defer cf.Close()
-
-	if err = json.NewDecoder(cf).Decode(&spec); err != nil {
-		return nil, err
-	}
-	return spec, nil
-}
-
-// setupSpec performs initial setup based on the cli.Context for the container
-func setupSpec(context *cli.Context) (*specs.Spec, error) {
-	bundle := context.String("bundle")
-	if bundle != "" {
-		if err := os.Chdir(bundle); err != nil {
-			return nil, err
-		}
-	}
-	spec, err := loadSpec(specConfig)
-	if err != nil {
-		return nil, err
-	}
-	return spec, nil
-}

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/start.go

@@ -1,43 +0,0 @@
-package main
-
-import (
-	"errors"
-	"fmt"
-
-	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/urfave/cli"
-)
-
-var startCommand = cli.Command{
-	Name:  "start",
-	Usage: "executes the user defined process in a created container",
-	ArgsUsage: `<container-id>
-
-Where "<container-id>" is your name for the instance of the container that you
-are starting. The name you provide for the container instance must be unique on
-your host.`,
-	Description: `The start command executes the user defined process in a created container.`,
-	Before:      appargs.Validate(argID),
-	Action: func(context *cli.Context) error {
-		id := context.Args().First()
-		container, err := getContainer(id, false)
-		if err != nil {
-			return err
-		}
-		defer container.Close()
-		status, err := container.Status()
-		if err != nil {
-			return err
-		}
-		switch status {
-		case containerCreated:
-			return container.Exec()
-		case containerStopped:
-			return errors.New("cannot start a container that has stopped")
-		case containerRunning:
-			return errors.New("cannot start an already running container")
-		default:
-			return fmt.Errorf("cannot start a container in the '%s' state", status)
-		}
-	},
-}

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/state.go

@@ -1,49 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"os"
-
-	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/Microsoft/hcsshim/internal/runhcs"
-	"github.com/urfave/cli"
-)
-
-var stateCommand = cli.Command{
-	Name:  "state",
-	Usage: "output the state of a container",
-	ArgsUsage: `<container-id>
-
-Where "<container-id>" is your name for the instance of the container.`,
-	Description: `The state command outputs current state information for the
-instance of a container.`,
-	Before: appargs.Validate(argID),
-	Action: func(context *cli.Context) error {
-		id := context.Args().First()
-		c, err := getContainer(id, false)
-		if err != nil {
-			return err
-		}
-		defer c.Close()
-		status, err := c.Status()
-		if err != nil {
-			return err
-		}
-		cs := runhcs.ContainerState{
-			Version:        c.Spec.Version,
-			ID:             c.ID,
-			InitProcessPid: c.ShimPid,
-			Status:         string(status),
-			Bundle:         c.Bundle,
-			Rootfs:         c.Rootfs,
-			Created:        c.Created,
-			Annotations:    c.Spec.Annotations,
-		}
-		data, err := json.MarshalIndent(cs, "", "  ")
-		if err != nil {
-			return err
-		}
-		os.Stdout.Write(data)
-		return nil
-	},
-}

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/tty.go

@@ -1,56 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"strconv"
-
-	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/urfave/cli"
-)
-
-var resizeTtyCommand = cli.Command{
-	Name:      "resize-tty",
-	Usage:     "resize-tty updates the terminal size for a container process",
-	ArgsUsage: `<container-id> <width> <height>`,
-	Flags: []cli.Flag{
-		&cli.IntFlag{
-			Name:  "pid, p",
-			Usage: "the process pid (defaults to init pid)",
-		},
-	},
-	Before: appargs.Validate(
-		argID,
-		appargs.Int(10, 1, 65535),
-		appargs.Int(10, 1, 65535),
-	),
-	Action: func(context *cli.Context) error {
-		id := context.Args()[0]
-		width, _ := strconv.ParseUint(context.Args()[1], 10, 16)
-		height, _ := strconv.ParseUint(context.Args()[2], 10, 16)
-		c, err := getContainer(id, true)
-		if err != nil {
-			return err
-		}
-		defer c.Close()
-
-		pid := context.Int("pid")
-		if pid == 0 {
-			if err := stateKey.Get(id, keyInitPid, &pid); err != nil {
-				return err
-			}
-		} else {
-			// If a pid was provided map it to its hcs pid.
-			if err := stateKey.Get(id, fmt.Sprintf(keyPidMapFmt, pid), &pid); err != nil {
-				return err
-			}
-		}
-
-		p, err := c.hc.OpenProcess(pid)
-		if err != nil {
-			return err
-		}
-		defer p.Close()
-
-		return p.ResizeConsole(uint16(width), uint16(height))
-	},
-}

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/utils.go

@@ -1,52 +0,0 @@
-package main
-
-import (
-	"fmt"
-	"net"
-	"os"
-	"path/filepath"
-	"strings"
-
-	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/Microsoft/hcsshim/internal/runhcs"
-)
-
-var argID = appargs.NonEmptyString
-
-func absPathOrEmpty(path string) (string, error) {
-	if path == "" {
-		return "", nil
-	}
-	if strings.HasPrefix(path, runhcs.SafePipePrefix) {
-		if len(path) > len(runhcs.SafePipePrefix) {
-			return runhcs.SafePipePath(path[len(runhcs.SafePipePrefix):]), nil
-		}
-	}
-	return filepath.Abs(path)
-}
-
-// createPidFile creates a file with the processes pid inside it atomically
-// it creates a temp file with the paths filename + '.' infront of it
-// then renames the file
-func createPidFile(path string, pid int) error {
-	var (
-		tmpDir  = filepath.Dir(path)
-		tmpName = filepath.Join(tmpDir, fmt.Sprintf(".%s", filepath.Base(path)))
-	)
-	f, err := os.OpenFile(tmpName, os.O_RDWR|os.O_CREATE|os.O_EXCL|os.O_SYNC, 0666)
-	if err != nil {
-		return err
-	}
-	_, err = fmt.Fprintf(f, "%d", pid)
-	f.Close()
-	if err != nil {
-		return err
-	}
-	return os.Rename(tmpName, path)
-}
-
-func closeWritePipe(pipe net.Conn) error {
-	return pipe.(interface {
-		CloseWrite() error
-	}).CloseWrite()
-}

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/utils_test.go

@@ -1,39 +0,0 @@
-package main
-
-import (
-	"os"
-	"testing"
-
-	"github.com/Microsoft/hcsshim/internal/runhcs"
-)
-
-func Test_AbsPathOrEmpty(t *testing.T) {
-	wd, err := os.Getwd()
-	if err != nil {
-		t.Fatalf("failed to get test wd: %v", err)
-	}
-
-	tests := []string{
-		"",
-		runhcs.SafePipePrefix + "test",
-		runhcs.SafePipePrefix + "test with spaces",
-		"test",
-		"C:\\test..\\test",
-	}
-	expected := []string{
-		"",
-		runhcs.SafePipePrefix + "test",
-		runhcs.SafePipePrefix + "test%20with%20spaces",
-		wd + "\\test",
-		"C:\\test..\\test",
-	}
-	for i, test := range tests {
-		actual, err := absPathOrEmpty(test)
-		if err != nil {
-			t.Fatalf("absPathOrEmpty: error '%v'", err)
-		}
-		if actual != expected[i] {
-			t.Fatalf("absPathOrEmpty: actual '%s' != '%s'", actual, expected[i])
-		}
-	}
-}

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/versioninfo.json

@@ -1,43 +0,0 @@
-{
-    "FixedFileInfo": {
-        "FileVersion": {
-            "Major": 1,
-            "Minor": 0,
-            "Patch": 0,
-            "Build": 0
-        },
-        "ProductVersion": {
-            "Major": 1,
-            "Minor": 0,
-            "Patch": 0,
-            "Build": 0
-        },
-        "FileFlagsMask": "3f",
-        "FileFlags ": "00",
-        "FileOS": "040004",
-        "FileType": "01",
-        "FileSubType": "00"
-    },
-    "StringFileInfo": {
-        "Comments": "",
-        "CompanyName": "",
-        "FileDescription": "",
-        "FileVersion": "",
-        "InternalName": "",
-        "LegalCopyright": "",
-        "LegalTrademarks": "",
-        "OriginalFilename": "",
-        "PrivateBuild": "",
-        "ProductName": "",
-        "ProductVersion": "v1.0.0.0",
-        "SpecialBuild": ""
-    },
-    "VarFileInfo": {
-        "Translation": {
-            "LangID": "0409",
-            "CharsetID": "04B0"
-        }
-    },
-    "IconPath": "",
-    "ManifestPath": "runhcs.exe.manifest"
-}

vendor/github.com/Microsoft/hcsshim/cmd/runhcs/vm.go

@@ -1,209 +0,0 @@
-package main
-
-import (
-	"encoding/json"
-	"fmt"
-	"io/ioutil"
-	"net"
-	"os"
-	"syscall"
-
-	winio "github.com/Microsoft/go-winio"
-	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/Microsoft/hcsshim/internal/logfields"
-	"github.com/Microsoft/hcsshim/internal/runhcs"
-	"github.com/Microsoft/hcsshim/internal/uvm"
-	"github.com/pkg/errors"
-	"github.com/sirupsen/logrus"
-	"github.com/urfave/cli"
-)
-
-func vmID(id string) string {
-	return id + "@vm"
-}
-
-var vmshimCommand = cli.Command{
-	Name:   "vmshim",
-	Usage:  `launch a VM and containers inside it (do not call it outside of runhcs)`,
-	Hidden: true,
-	Flags: []cli.Flag{
-		cli.StringFlag{Name: "log-pipe", Hidden: true},
-		cli.StringFlag{Name: "os", Hidden: true},
-	},
-	Before: appargs.Validate(argID),
-	Action: func(context *cli.Context) error {
-		logPipe := context.String("log-pipe")
-		if logPipe != "" {
-			lpc, err := winio.DialPipe(logPipe, nil)
-			if err != nil {
-				return err
-			}
-			defer lpc.Close()
-			logrus.SetOutput(lpc)
-		} else {
-			logrus.SetOutput(os.Stderr)
-		}
-		fatalWriter.Writer = os.Stdout
-
-		pipePath := context.Args().First()
-
-		optsj, err := ioutil.ReadAll(os.Stdin)
-		if err != nil {
-			return err
-		}
-		os.Stdin.Close()
-
-		var opts interface{}
-		isLCOW := context.String("os") == "linux"
-		if isLCOW {
-			opts = &uvm.OptionsLCOW{}
-		} else {
-			opts = &uvm.OptionsWCOW{}
-		}
-
-		err = json.Unmarshal(optsj, opts)
-		if err != nil {
-			return err
-		}
-
-		// Listen on the named pipe associated with this VM.
-		l, err := winio.ListenPipe(pipePath, &winio.PipeConfig{MessageMode: true})
-		if err != nil {
-			return err
-		}
-
-		var vm *uvm.UtilityVM
-		if isLCOW {
-			vm, err = uvm.CreateLCOW(opts.(*uvm.OptionsLCOW))
-		} else {
-			vm, err = uvm.CreateWCOW(opts.(*uvm.OptionsWCOW))
-		}
-		if err != nil {
-			return err
-		}
-		defer vm.Close()
-		if err = vm.Start(); err != nil {
-			return err
-		}
-
-		// Asynchronously wait for the VM to exit.
-		exitCh := make(chan error)
-		go func() {
-			exitCh <- vm.Wait()
-		}()
-
-		defer vm.Terminate()
-
-		// Alert the parent process that initialization has completed
-		// successfully.
-		os.Stdout.Write(runhcs.ShimSuccess)
-		os.Stdout.Close()
-		fatalWriter.Writer = ioutil.Discard
-
-		pipeCh := make(chan net.Conn)
-		go func() {
-			for {
-				conn, err := l.Accept()
-				if err != nil {
-					logrus.Error(err)
-					continue
-				}
-				pipeCh <- conn
-			}
-		}()
-
-		for {
-			select {
-			case <-exitCh:
-				return nil
-			case pipe := <-pipeCh:
-				err = processRequest(vm, pipe)
-				if err == nil {
-					_, err = pipe.Write(runhcs.ShimSuccess)
-					// Wait until the pipe is closed before closing the
-					// container so that it is properly handed off to the other
-					// process.
-					if err == nil {
-						err = closeWritePipe(pipe)
-					}
-					if err == nil {
-						ioutil.ReadAll(pipe)
-					}
-				} else {
-					logrus.WithError(err).
-						Error("failed creating container in VM")
-					fmt.Fprintf(pipe, "%v", err)
-				}
-				pipe.Close()
-			}
-		}
-	},
-}
-
-func processRequest(vm *uvm.UtilityVM, pipe net.Conn) error {
-	var req runhcs.VMRequest
-	err := json.NewDecoder(pipe).Decode(&req)
-	if err != nil {
-		return err
-	}
-	logrus.WithFields(logrus.Fields{
-		logfields.ContainerID:     req.ID,
-		logfields.VMShimOperation: req.Op,
-	}).Debug("process request")
-	c, err := getContainer(req.ID, false)
-	if err != nil {
-		return err
-	}
-	defer func() {
-		if c != nil {
-			c.Close()
-		}
-	}()
-	switch req.Op {
-	case runhcs.OpCreateContainer:
-		err = createContainerInHost(c, vm)
-		if err != nil {
-			return err
-		}
-		c2 := c
-		c = nil
-		go func() {
-			c2.hc.Wait()
-			c2.Close()
-		}()
-
-	case runhcs.OpUnmountContainer, runhcs.OpUnmountContainerDiskOnly:
-		err = c.unmountInHost(vm, req.Op == runhcs.OpUnmountContainer)
-		if err != nil {
-			return err
-		}
-
-	case runhcs.OpSyncNamespace:
-		return errors.New("Not implemented")
-	default:
-		panic("unknown operation")
-	}
-	return nil
-}
-
-type noVMError struct {
-	ID string
-}
-
-func (err *noVMError) Error() string {
-	return "VM " + err.ID + " cannot be contacted"
-}
-
-func (c *container) issueVMRequest(op runhcs.VMRequestOp) error {
-	req := runhcs.VMRequest{
-		ID: c.ID,
-		Op: op,
-	}
-	if err := runhcs.IssueVMRequest(c.VMPipePath(), &req); err != nil {
-		if perr, ok := err.(*os.PathError); ok && perr.Err == syscall.ERROR_FILE_NOT_FOUND {
-			return &noVMError{c.HostID}
-		}
-		return err
-	}
-	return nil
-}

vendor/github.com/Microsoft/hcsshim/cmd/tar2ext4/tar2ext4.go

@@ -1,64 +0,0 @@
-package main
-
-import (
-	"flag"
-	"fmt"
-	"io"
-	"io/ioutil"
-	"os"
-
-	"github.com/Microsoft/hcsshim/ext4/tar2ext4"
-)
-
-var (
-	input      = flag.String("i", "", "input file")
-	output     = flag.String("o", "", "output file")
-	overlay    = flag.Bool("overlay", false, "produce overlayfs-compatible layer image")
-	vhd        = flag.Bool("vhd", false, "add a VHD footer to the end of the image")
-	inlineData = flag.Bool("inline", false, "write small file data into the inode; not compatible with DAX")
-)
-
-func main() {
-	flag.Parse()
-	if flag.NArg() != 0 || len(*output) == 0 {
-		flag.Usage()
-		os.Exit(1)
-	}
-
-	err := func() (err error) {
-		in := os.Stdin
-		if *input != "" {
-			in, err = os.Open(*input)
-			if err != nil {
-				return err
-			}
-		}
-		out, err := os.Create(*output)
-		if err != nil {
-			return err
-		}
-
-		var opts []tar2ext4.Option
-		if *overlay {
-			opts = append(opts, tar2ext4.ConvertWhiteout)
-		}
-		if *vhd {
-			opts = append(opts, tar2ext4.AppendVhdFooter)
-		}
-		if *inlineData {
-			opts = append(opts, tar2ext4.InlineData)
-		}
-		err = tar2ext4.Convert(in, out, opts...)
-		if err != nil {
-			return err
-		}
-
-		// Exhaust the tar stream.
-		io.Copy(ioutil.Discard, in)
-		return nil
-	}()
-	if err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-}

vendor/github.com/Microsoft/hcsshim/cmd/wclayer/create.go

@@ -1,36 +0,0 @@
-package main
-
-import (
-	"path/filepath"
-
-	"github.com/Microsoft/hcsshim"
-	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/urfave/cli"
-)
-
-var createCommand = cli.Command{
-	Name:  "create",
-	Usage: "creates a new writable container layer",
-	Flags: []cli.Flag{
-		cli.StringSliceFlag{
-			Name:  "layer, l",
-			Usage: "paths to the read-only parent layers",
-		},
-	},
-	ArgsUsage: "<layer path>",
-	Before:    appargs.Validate(appargs.NonEmptyString),
-	Action: func(context *cli.Context) error {
-		path, err := filepath.Abs(context.Args().First())
-		if err != nil {
-			return err
-		}
-
-		layers, err := normalizeLayers(context.StringSlice("layer"), true)
-		if err != nil {
-			return err
-		}
-
-		di := driverInfo
-		return hcsshim.CreateScratchLayer(di, path, layers[len(layers)-1], layers)
-	},
-}

vendor/github.com/Microsoft/hcsshim/cmd/wclayer/export.go

@@ -1,66 +0,0 @@
-package main
-
-import (
-	"compress/gzip"
-	"io"
-	"os"
-	"path/filepath"
-
-	winio "github.com/Microsoft/go-winio"
-	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/Microsoft/hcsshim/internal/ociwclayer"
-	"github.com/urfave/cli"
-)
-
-var exportCommand = cli.Command{
-	Name:  "export",
-	Usage: "exports a layer to a tar file",
-	Flags: []cli.Flag{
-		cli.StringSliceFlag{
-			Name:  "layer, l",
-			Usage: "paths to the read-only parent layers",
-		},
-		cli.StringFlag{
-			Name:  "output, o",
-			Usage: "output layer tar (defaults to stdout)",
-		},
-		cli.BoolFlag{
-			Name:  "gzip, z",
-			Usage: "compress output with gzip compression",
-		},
-	},
-	ArgsUsage: "<layer path>",
-	Before:    appargs.Validate(appargs.NonEmptyString),
-	Action: func(context *cli.Context) (err error) {
-		path, err := filepath.Abs(context.Args().First())
-		if err != nil {
-			return err
-		}
-
-		layers, err := normalizeLayers(context.StringSlice("layer"), true)
-		if err != nil {
-			return err
-		}
-
-		err = winio.EnableProcessPrivileges([]string{winio.SeBackupPrivilege})
-		if err != nil {
-			return err
-		}
-
-		fp := context.String("output")
-		f := os.Stdout
-		if fp != "" {
-			f, err = os.Create(fp)
-			if err != nil {
-				return err
-			}
-			defer f.Close()
-		}
-		w := io.Writer(f)
-		if context.Bool("gzip") {
-			w = gzip.NewWriter(w)
-		}
-
-		return ociwclayer.ExportLayer(w, path, layers)
-	},
-}

vendor/github.com/Microsoft/hcsshim/cmd/wclayer/import.go

@@ -1,74 +0,0 @@
-package main
-
-import (
-	"bufio"
-	"compress/gzip"
-	"io"
-	"os"
-	"path/filepath"
-
-	"github.com/Microsoft/go-winio"
-	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/Microsoft/hcsshim/internal/ociwclayer"
-	"github.com/urfave/cli"
-)
-
-var importCommand = cli.Command{
-	Name:  "import",
-	Usage: "imports a layer from a tar file",
-	Flags: []cli.Flag{
-		cli.StringSliceFlag{
-			Name:  "layer, l",
-			Usage: "paths to the read-only parent layers",
-		},
-		cli.StringFlag{
-			Name:  "input, i",
-			Usage: "input layer tar (defaults to stdin)",
-		},
-	},
-	ArgsUsage: "<layer path>",
-	Before:    appargs.Validate(appargs.NonEmptyString),
-	Action: func(context *cli.Context) (err error) {
-		path, err := filepath.Abs(context.Args().First())
-		if err != nil {
-			return err
-		}
-
-		layers, err := normalizeLayers(context.StringSlice("layer"), false)
-		if err != nil {
-			return err
-		}
-
-		fp := context.String("input")
-		f := os.Stdin
-		if fp != "" {
-			f, err = os.Open(fp)
-			if err != nil {
-				return err
-			}
-			defer f.Close()
-		}
-		r, err := addDecompressor(f)
-		if err != nil {
-			return err
-		}
-		err = winio.EnableProcessPrivileges([]string{winio.SeBackupPrivilege, winio.SeRestorePrivilege})
-		if err != nil {
-			return err
-		}
-		_, err = ociwclayer.ImportLayer(r, path, layers)
-		return err
-	},
-}
-
-func addDecompressor(r io.Reader) (io.Reader, error) {
-	b := bufio.NewReader(r)
-	hdr, err := b.Peek(3)
-	if err != nil {
-		return nil, err
-	}
-	if hdr[0] == 0x1f && hdr[1] == 0x8b && hdr[2] == 8 {
-		return gzip.NewReader(b)
-	}
-	return b, nil
-}

vendor/github.com/Microsoft/hcsshim/cmd/wclayer/mount.go

@@ -1,88 +0,0 @@
-package main
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"github.com/Microsoft/hcsshim"
-	"github.com/Microsoft/hcsshim/internal/appargs"
-	"github.com/urfave/cli"
-)
-
-var mountCommand = cli.Command{
-	Name:      "mount",
-	Usage:     "mounts a scratch",
-	ArgsUsage: "<scratch path>",
-	Flags: []cli.Flag{
-		cli.StringSliceFlag{
-			Name:  "layer, l",
-			Usage: "paths to the parent layers for this layer",
-		},
-	},
-	Action: func(context *cli.Context) (err error) {
-		if context.NArg() != 1 {
-			return errors.New("invalid usage")
-		}
-		path, err := filepath.Abs(context.Args().First())
-		if err != nil {
-			return err
-		}
-
-		layers, err := normalizeLayers(context.StringSlice("layer"), true)
-		if err != nil {
-			return err
-		}
-
-		err = hcsshim.ActivateLayer(driverInfo, path)
-		if err != nil {
-			return err
-		}
-		defer func() {
-			if err != nil {
-				hcsshim.DeactivateLayer(driverInfo, path)
-			}
-		}()
-
-		err = hcsshim.PrepareLayer(driverInfo, path, layers)
-		if err != nil {
-			return err
-		}
-		defer func() {
-			if err != nil {
-				hcsshim.UnprepareLayer(driverInfo, path)
-			}
-		}()
-
-		mountPath, err := hcsshim.GetLayerMountPath(driverInfo, path)
-		if err != nil {
-			return err
-		}
-		_, err = fmt.Println(mountPath)
-		return err
-	},
-}
-
-var unmountCommand = cli.Command{
-	Name:      "unmount",
-	Usage:     "unmounts a scratch",
-	ArgsUsage: "<layer path>",
-	Before:    appargs.Validate(appargs.NonEmptyString),
-	Action: func(context *cli.Context) (err error) {
-		path, err := filepath.Abs(context.Args().First())
-		if err != nil {
-			return err
-		}
-
-		err = hcsshim.UnprepareLayer(driverInfo, path)
-		if err != nil {
-			fmt.Fprintln(os.Stderr, err)
-		}
-		err = hcsshim.DeactivateLayer(driverInfo, path)
-		if err != nil {
-			return err
-		}
-		return nil
-	},
-}

vendor/github.com/Microsoft/hcsshim/cmd/wclayer/remove.go

@@ -1,31 +0,0 @@
-package main
-
-import (
-	"path/filepath"
-
-	winio "github.com/Microsoft/go-winio"
-	"github.com/Microsoft/hcsshim"
-	"github.com/Microsoft/hcsshim/internal/appargs"
-
-	"github.com/urfave/cli"
-)
-
-var removeCommand = cli.Command{
-	Name:      "remove",
-	Usage:     "permanently removes a layer directory in its entirety",
-	ArgsUsage: "<layer path>",
-	Before:    appargs.Validate(appargs.NonEmptyString),
-	Action: func(context *cli.Context) (err error) {
-		path, err := filepath.Abs(context.Args().First())
-		if err != nil {
-			return err
-		}
-
-		err = winio.EnableProcessPrivileges([]string{winio.SeBackupPrivilege, winio.SeRestorePrivilege})
-		if err != nil {
-			return err
-		}
-
-		return hcsshim.DestroyLayer(driverInfo, path)
-	},
-}

vendor/github.com/Microsoft/hcsshim/cmd/wclayer/versioninfo.json

@@ -1,43 +0,0 @@
-{
-    "FixedFileInfo": {
-        "FileVersion": {
-            "Major": 1,
-            "Minor": 0,
-            "Patch": 0,
-            "Build": 0
-        },
-        "ProductVersion": {
-            "Major": 1,
-            "Minor": 0,
-            "Patch": 0,
-            "Build": 0
-        },
-        "FileFlagsMask": "3f",
-        "FileFlags ": "00",
-        "FileOS": "040004",
-        "FileType": "01",
-        "FileSubType": "00"
-    },
-    "StringFileInfo": {
-        "Comments": "",
-        "CompanyName": "",
-        "FileDescription": "",
-        "FileVersion": "",
-        "InternalName": "",
-        "LegalCopyright": "",
-        "LegalTrademarks": "",
-        "OriginalFilename": "",
-        "PrivateBuild": "",
-        "ProductName": "",
-        "ProductVersion": "v1.0.0.0",
-        "SpecialBuild": ""
-    },
-    "VarFileInfo": {
-        "Translation": {
-            "LangID": "0409",
-            "CharsetID": "04B0"
-        }
-    },
-    "IconPath": "",
-    "ManifestPath": "wclayer.exe.manifest"
-}

vendor/github.com/Microsoft/hcsshim/cmd/wclayer/wclayer.exe.manifest

@@ -1,10 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<assembly xmlns="urn:schemas-microsoft-com:asm.v1" manifestVersion="1.0">
-    <description>wclayer</description>
-    <compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
-        <application>
-            <!-- Windows 10 -->
-            <supportedOS Id="{8e0f7a12-bfb3-4fe8-b9a5-48fd50a15a9a}"/>
-        </application>
-    </compatibility>
-</assembly>

vendor/github.com/Microsoft/hcsshim/cmd/wclayer/wclayer.go

@@ -1,60 +0,0 @@
-package main
-
-import (
-	"errors"
-	"fmt"
-	"os"
-	"path/filepath"
-
-	"github.com/Microsoft/hcsshim"
-	"github.com/urfave/cli"
-)
-
-// Add a manifest to get proper Windows version detection.
-//
-// goversioninfo can be installed with "go get github.com/josephspurrier/goversioninfo/cmd/goversioninfo"
-
-//go:generate goversioninfo -platform-specific
-
-var usage = `Windows Container layer utility
-
-wclayer is a command line tool for manipulating Windows Container
-storage layers. It can import and export layers from and to OCI format
-layer tar files, create new writable layers, and mount and unmount
-container images.`
-
-var driverInfo = hcsshim.DriverInfo{}
-
-func main() {
-	app := cli.NewApp()
-	app.Name = "wclayer"
-	app.Commands = []cli.Command{
-		createCommand,
-		exportCommand,
-		importCommand,
-		mountCommand,
-		removeCommand,
-		unmountCommand,
-	}
-	app.Usage = usage
-
-	if err := app.Run(os.Args); err != nil {
-		fmt.Fprintln(os.Stderr, err)
-		os.Exit(1)
-	}
-}
-
-func normalizeLayers(il []string, needOne bool) ([]string, error) {
-	if needOne && len(il) == 0 {
-		return nil, errors.New("at least one read-only layer must be specified")
-	}
-	ol := make([]string, len(il))
-	for i := range il {
-		var err error
-		ol[i], err = filepath.Abs(il[i])
-		if err != nil {
-			return nil, err
-		}
-	}
-	return ol, nil
-}

vendor/github.com/Microsoft/hcsshim/ext4/internal/compactext4/compact_test.go

@@ -1,355 +0,0 @@
-package compactext4
-
-import (
-	"bytes"
-	"encoding/binary"
-	"fmt"
-	"io"
-	"os"
-	"strings"
-	"testing"
-	"time"
-
-	"github.com/Microsoft/hcsshim/ext4/internal/format"
-)
-
-type testFile struct {
-	Path        string
-	File        *File
-	Data        []byte
-	DataSize    int64
-	Link        string
-	ExpectError bool
-}
-
-var (
-	data []byte
-	name string
-)
-
-func init() {
-	data = make([]byte, blockSize*2)
-	for i := range data {
-		data[i] = uint8(i)
-	}
-
-	nameb := make([]byte, 300)
-	for i := range nameb {
-		nameb[i] = byte('0' + i%10)
-	}
-	name = string(nameb)
-}
-
-type largeData struct {
-	pos int64
-}
-
-func (d *largeData) Read(b []byte) (int, error) {
-	p := d.pos
-	var pb [8]byte
-	for i := range b {
-		binary.LittleEndian.PutUint64(pb[:], uint64(p+int64(i)))
-		b[i] = pb[i%8]
-	}
-	p += int64(len(b))
-	return len(b), nil
-}
-
-func (tf *testFile) Reader() io.Reader {
-	if tf.DataSize != 0 {
-		return io.LimitReader(&largeData{}, tf.DataSize)
-	}
-	return bytes.NewReader(tf.Data)
-}
-
-func createTestFile(t *testing.T, w *Writer, tf testFile) {
-	var err error
-	if tf.File != nil {
-		tf.File.Size = int64(len(tf.Data))
-		if tf.File.Size == 0 {
-			tf.File.Size = tf.DataSize
-		}
-		err = w.Create(tf.Path, tf.File)
-	} else {
-		err = w.Link(tf.Link, tf.Path)
-	}
-	if tf.ExpectError && err == nil {
-		t.Errorf("%s: expected error", tf.Path)
-	} else if !tf.ExpectError && err != nil {
-		t.Error(err)
-	} else {
-		_, err := io.Copy(w, tf.Reader())
-		if err != nil {
-			t.Error(err)
-		}
-	}
-}
-
-func expectedMode(f *File) uint16 {
-	switch f.Mode & format.TypeMask {
-	case 0:
-		return f.Mode | S_IFREG
-	case S_IFLNK:
-		return f.Mode | 0777
-	default:
-		return f.Mode
-	}
-}
-
-func expectedSize(f *File) int64 {
-	switch f.Mode & format.TypeMask {
-	case 0, S_IFREG:
-		return f.Size
-	case S_IFLNK:
-		return int64(len(f.Linkname))
-	default:
-		return 0
-	}
-}
-
-func xattrsEqual(x1, x2 map[string][]byte) bool {
-	if len(x1) != len(x2) {
-		return false
-	}
-	for name, value := range x1 {
-		if !bytes.Equal(x2[name], value) {
-			return false
-		}
-	}
-	return true
-}
-
-func fileEqual(f1, f2 *File) bool {
-	return f1.Linkname == f2.Linkname &&
-		expectedSize(f1) == expectedSize(f2) &&
-		expectedMode(f1) == expectedMode(f2) &&
-		f1.Uid == f2.Uid &&
-		f1.Gid == f2.Gid &&
-		f1.Atime.Equal(f2.Atime) &&
-		f1.Ctime.Equal(f2.Ctime) &&
-		f1.Mtime.Equal(f2.Mtime) &&
-		f1.Crtime.Equal(f2.Crtime) &&
-		f1.Devmajor == f2.Devmajor &&
-		f1.Devminor == f2.Devminor &&
-		xattrsEqual(f1.Xattrs, f2.Xattrs)
-}
-
-func runTestsOnFiles(t *testing.T, testFiles []testFile, opts ...Option) {
-	image := "testfs.img"
-	imagef, err := os.Create(image)
-	if err != nil {
-		t.Fatal(err)
-	}
-	defer os.Remove(image)
-	defer imagef.Close()
-
-	w := NewWriter(imagef, opts...)
-	for _, tf := range testFiles {
-		createTestFile(t, w, tf)
-		if !tf.ExpectError && tf.File != nil {
-			f, err := w.Stat(tf.Path)
-			if err != nil {
-				if !strings.Contains(err.Error(), "cannot retrieve") {
-					t.Error(err)
-				}
-			} else if !fileEqual(f, tf.File) {
-				t.Errorf("%s: stat mismatch: %#v %#v", tf.Path, tf.File, f)
-			}
-		}
-	}
-
-	if t.Failed() {
-		return
-	}
-
-	if err := w.Close(); err != nil {
-		t.Fatal(err)
-	}
-
-	fsck(t, image)
-
-	mountPath := "testmnt"
-
-	if mountImage(t, image, mountPath) {
-		defer unmountImage(t, mountPath)
-		validated := make(map[string]*testFile)
-		for i := range testFiles {
-			tf := testFiles[len(testFiles)-i-1]
-			if validated[tf.Link] != nil {
-				// The link target was subsequently replaced. Find the
-				// earlier instance.
-				for j := range testFiles[:len(testFiles)-i-1] {
-					otf := testFiles[j]
-					if otf.Path == tf.Link && !otf.ExpectError {
-						tf = otf
-						break
-					}
-				}
-			}
-			if !tf.ExpectError && validated[tf.Path] == nil {
-				verifyTestFile(t, mountPath, tf)
-				validated[tf.Path] = &tf
-			}
-		}
-	}
-}
-
-func TestBasic(t *testing.T) {
-	now := time.Now()
-	testFiles := []testFile{
-		{Path: "empty", File: &File{Mode: 0644}},
-		{Path: "small", File: &File{Mode: 0644}, Data: data[:40]},
-		{Path: "time", File: &File{Atime: now, Ctime: now.Add(time.Second), Mtime: now.Add(time.Hour)}},
-		{Path: "block_1", File: &File{Mode: 0644}, Data: data[:blockSize]},
-		{Path: "block_2", File: &File{Mode: 0644}, Data: data[:blockSize*2]},
-		{Path: "symlink", File: &File{Linkname: "block_1", Mode: format.S_IFLNK}},
-		{Path: "symlink_59", File: &File{Linkname: name[:59], Mode: format.S_IFLNK}},
-		{Path: "symlink_60", File: &File{Linkname: name[:60], Mode: format.S_IFLNK}},
-		{Path: "symlink_120", File: &File{Linkname: name[:120], Mode: format.S_IFLNK}},
-		{Path: "symlink_300", File: &File{Linkname: name[:300], Mode: format.S_IFLNK}},
-		{Path: "dir", File: &File{Mode: format.S_IFDIR | 0755}},
-		{Path: "dir/fifo", File: &File{Mode: format.S_IFIFO}},
-		{Path: "dir/sock", File: &File{Mode: format.S_IFSOCK}},
-		{Path: "dir/blk", File: &File{Mode: format.S_IFBLK, Devmajor: 0x5678, Devminor: 0x1234}},
-		{Path: "dir/chr", File: &File{Mode: format.S_IFCHR, Devmajor: 0x5678, Devminor: 0x1234}},
-		{Path: "dir/hard_link", Link: "small"},
-	}
-
-	runTestsOnFiles(t, testFiles)
-}
-
-func TestLargeDirectory(t *testing.T) {
-	testFiles := []testFile{
-		{Path: "bigdir", File: &File{Mode: format.S_IFDIR | 0755}},
-	}
-	for i := 0; i < 50000; i++ {
-		testFiles = append(testFiles, testFile{
-			Path: fmt.Sprintf("bigdir/%d", i), File: &File{Mode: 0644},
-		})
-	}
-
-	runTestsOnFiles(t, testFiles)
-}
-
-func TestInlineData(t *testing.T) {
-	testFiles := []testFile{
-		{Path: "inline_30", File: &File{Mode: 0644}, Data: data[:30]},
-		{Path: "inline_60", File: &File{Mode: 0644}, Data: data[:60]},
-		{Path: "inline_120", File: &File{Mode: 0644}, Data: data[:120]},
-		{Path: "inline_full", File: &File{Mode: 0644}, Data: data[:inlineDataSize]},
-		{Path: "block_min", File: &File{Mode: 0644}, Data: data[:inlineDataSize+1]},
-	}
-
-	runTestsOnFiles(t, testFiles, InlineData)
-}
-
-func TestXattrs(t *testing.T) {
-	testFiles := []testFile{
-		{Path: "withsmallxattrs",
-			File: &File{
-				Mode: format.S_IFREG | 0644,
-				Xattrs: map[string][]byte{
-					"user.foo": []byte("test"),
-					"user.bar": []byte("test2"),
-				},
-			},
-		},
-		{Path: "withlargexattrs",
-			File: &File{
-				Mode: format.S_IFREG | 0644,
-				Xattrs: map[string][]byte{
-					"user.foo": data[:100],
-					"user.bar": data[:50],
-				},
-			},
-		},
-	}
-	runTestsOnFiles(t, testFiles)
-}
-
-func TestReplace(t *testing.T) {
-	testFiles := []testFile{
-		{Path: "lost+found", ExpectError: true, File: &File{}}, // can't change type
-		{Path: "lost+found", File: &File{Mode: format.S_IFDIR | 0777}},
-
-		{Path: "dir", File: &File{Mode: format.S_IFDIR | 0777}},
-		{Path: "dir/file", File: &File{}},
-		{Path: "dir", File: &File{Mode: format.S_IFDIR | 0700}},
-
-		{Path: "file", File: &File{}},
-		{Path: "file", File: &File{Mode: 0600}},
-		{Path: "file2", File: &File{}},
-		{Path: "link", Link: "file2"},
-		{Path: "file2", File: &File{Mode: 0600}},
-
-		{Path: "nolinks", File: &File{}},
-		{Path: "nolinks", ExpectError: true, Link: "file"}, // would orphan nolinks
-
-		{Path: "onelink", File: &File{}},
-		{Path: "onelink2", Link: "onelink"},
-		{Path: "onelink", Link: "file"},
-
-		{Path: "", ExpectError: true, File: &File{}},
-		{Path: "", ExpectError: true, Link: "file"},
-		{Path: "", File: &File{Mode: format.S_IFDIR | 0777}},
-
-		{Path: "smallxattr", File: &File{Xattrs: map[string][]byte{"user.foo": data[:4]}}},
-		{Path: "smallxattr", File: &File{Xattrs: map[string][]byte{"user.foo": data[:8]}}},
-
-		{Path: "smallxattr_delete", File: &File{Xattrs: map[string][]byte{"user.foo": data[:4]}}},
-		{Path: "smallxattr_delete", File: &File{}},
-
-		{Path: "largexattr", File: &File{Xattrs: map[string][]byte{"user.small": data[:8], "user.foo": data[:200]}}},
-		{Path: "largexattr", File: &File{Xattrs: map[string][]byte{"user.small": data[:12], "user.foo": data[:400]}}},
-
-		{Path: "largexattr", File: &File{Xattrs: map[string][]byte{"user.foo": data[:200]}}},
-		{Path: "largexattr_delete", File: &File{}},
-	}
-	runTestsOnFiles(t, testFiles)
-}
-
-func TestTime(t *testing.T) {
-	now := time.Now()
-	now2 := fsTimeToTime(timeToFsTime(now))
-	if now.UnixNano() != now2.UnixNano() {
-		t.Fatalf("%s != %s", now, now2)
-	}
-}
-
-func TestLargeFile(t *testing.T) {
-	testFiles := []testFile{
-		{Path: "small", File: &File{}, DataSize: 1024 * 1024},        // can't change type
-		{Path: "medium", File: &File{}, DataSize: 200 * 1024 * 1024}, // can't change type
-		{Path: "large", File: &File{}, DataSize: 600 * 1024 * 1024},  // can't change type
-	}
-	runTestsOnFiles(t, testFiles)
-}
-
-func TestFileLinkLimit(t *testing.T) {
-	testFiles := []testFile{
-		{Path: "file", File: &File{}},
-	}
-	for i := 0; i < format.MaxLinks; i++ {
-		testFiles = append(testFiles, testFile{Path: fmt.Sprintf("link%d", i), Link: "file"})
-	}
-	testFiles[len(testFiles)-1].ExpectError = true
-	runTestsOnFiles(t, testFiles)
-}
-
-func TestDirLinkLimit(t *testing.T) {
-	testFiles := []testFile{
-		{Path: "dir", File: &File{Mode: S_IFDIR}},
-	}
-	for i := 0; i < format.MaxLinks-1; i++ {
-		testFiles = append(testFiles, testFile{Path: fmt.Sprintf("dir/%d", i), File: &File{Mode: S_IFDIR}})
-	}
-	testFiles[len(testFiles)-1].ExpectError = true
-	runTestsOnFiles(t, testFiles)
-}
-
-func TestLargeDisk(t *testing.T) {
-	testFiles := []testFile{
-		{Path: "file", File: &File{}},
-	}
-	runTestsOnFiles(t, testFiles, MaximumDiskSize(maxMaxDiskSize))
-}

vendor/github.com/Microsoft/hcsshim/ext4/internal/compactext4/verify_linux_test.go

@@ -1,248 +0,0 @@
-package compactext4
-
-import (
-	"bytes"
-	"fmt"
-	"io"
-	"os"
-	"os/exec"
-	"path"
-	"syscall"
-	"testing"
-	"time"
-	"unsafe"
-
-	"github.com/Microsoft/hcsshim/ext4/internal/format"
-)
-
-func timeEqual(ts syscall.Timespec, t time.Time) bool {
-	sec, nsec := t.Unix(), t.Nanosecond()
-	if t.IsZero() {
-		sec, nsec = 0, 0
-	}
-	return ts.Sec == sec && int(ts.Nsec) == nsec
-}
-
-func expectedDevice(f *File) uint64 {
-	return uint64(f.Devminor&0xff | f.Devmajor<<8 | (f.Devminor&0xffffff00)<<12)
-}
-
-func llistxattr(path string, b []byte) (int, error) {
-	pathp := syscall.StringBytePtr(path)
-	var p unsafe.Pointer
-	if len(b) > 0 {
-		p = unsafe.Pointer(&b[0])
-	}
-	r, _, e := syscall.Syscall(syscall.SYS_LLISTXATTR, uintptr(unsafe.Pointer(pathp)), uintptr(p), uintptr(len(b)))
-	if e != 0 {
-		return 0, &os.PathError{Path: path, Op: "llistxattr", Err: syscall.Errno(e)}
-	}
-	return int(r), nil
-}
-
-func lgetxattr(path string, name string, b []byte) (int, error) {
-	pathp := syscall.StringBytePtr(path)
-	namep := syscall.StringBytePtr(name)
-	var p unsafe.Pointer
-	if len(b) > 0 {
-		p = unsafe.Pointer(&b[0])
-	}
-	r, _, e := syscall.Syscall6(syscall.SYS_LGETXATTR, uintptr(unsafe.Pointer(pathp)), uintptr(unsafe.Pointer(namep)), uintptr(p), uintptr(len(b)), 0, 0)
-	if e != 0 {
-		return 0, &os.PathError{Path: path, Op: "lgetxattr", Err: syscall.Errno(e)}
-	}
-	return int(r), nil
-}
-
-func readXattrs(path string) (map[string][]byte, error) {
-	xattrs := make(map[string][]byte)
-	var buf [4096]byte
-	var buf2 [4096]byte
-	b := buf[:]
-	n, err := llistxattr(path, b)
-	if err != nil {
-		return nil, err
-	}
-	b = b[:n]
-	for len(b) != 0 {
-		nn := bytes.IndexByte(b, 0)
-		name := string(b[:nn])
-		b = b[nn+1:]
-		vn, err := lgetxattr(path, name, buf2[:])
-		if err != nil {
-			return nil, err
-		}
-		value := buf2[:vn]
-		xattrs[name] = value
-	}
-	return xattrs, nil
-}
-
-func streamEqual(r1, r2 io.Reader) (bool, error) {
-	var b [4096]byte
-	var b2 [4096]byte
-	for {
-		n, err := r1.Read(b[:])
-		if n == 0 {
-			if err == io.EOF {
-				break
-			}
-			if err == nil {
-				continue
-			}
-			return false, err
-		}
-		_, err = io.ReadFull(r2, b2[:n])
-		if err == io.EOF || err == io.ErrUnexpectedEOF {
-			return false, nil
-		}
-		if err != nil {
-			return false, err
-		}
-		if !bytes.Equal(b[n:], b2[n:]) {
-			return false, nil
-		}
-	}
-	// Check the tail of r2
-	_, err := r2.Read(b[:1])
-	if err == nil {
-		return false, nil
-	}
-	if err != io.EOF {
-		return false, err
-	}
-	return true, nil
-}
-
-func verifyTestFile(t *testing.T, mountPath string, tf testFile) {
-	name := path.Join(mountPath, tf.Path)
-	fi, err := os.Lstat(name)
-	if err != nil {
-		t.Error(err)
-		return
-	}
-	st := fi.Sys().(*syscall.Stat_t)
-	if tf.File != nil {
-		if st.Mode != uint32(expectedMode(tf.File)) ||
-			st.Uid != tf.File.Uid ||
-			st.Gid != tf.File.Gid ||
-			(!fi.IsDir() && st.Size != expectedSize(tf.File)) ||
-			st.Rdev != expectedDevice(tf.File) ||
-			!timeEqual(st.Atim, tf.File.Atime) ||
-			!timeEqual(st.Mtim, tf.File.Mtime) ||
-			!timeEqual(st.Ctim, tf.File.Ctime) {
-
-			t.Errorf("%s: stat mismatch, expected: %#v got: %#v", tf.Path, tf.File, st)
-		}
-
-		xattrs, err := readXattrs(name)
-		if err != nil {
-			t.Error(err)
-		} else if !xattrsEqual(xattrs, tf.File.Xattrs) {
-			t.Errorf("%s: xattr mismatch, expected: %#v got: %#v", tf.Path, tf.File.Xattrs, xattrs)
-		}
-
-		switch tf.File.Mode & format.TypeMask {
-		case S_IFREG:
-			if f, err := os.Open(name); err != nil {
-				t.Error(err)
-			} else {
-				same, err := streamEqual(f, tf.Reader())
-				if err != nil {
-					t.Error(err)
-				} else if !same {
-					t.Errorf("%s: data mismatch", tf.Path)
-				}
-				f.Close()
-			}
-		case S_IFLNK:
-			if link, err := os.Readlink(name); err != nil {
-				t.Error(err)
-			} else if link != tf.File.Linkname {
-				t.Errorf("%s: link mismatch, expected: %s got: %s", tf.Path, tf.File.Linkname, link)
-			}
-		}
-	} else {
-		lfi, err := os.Lstat(path.Join(mountPath, tf.Link))
-		if err != nil {
-			t.Error(err)
-			return
-		}
-
-		lst := lfi.Sys().(*syscall.Stat_t)
-		if lst.Ino != st.Ino {
-			t.Errorf("%s: hard link mismatch with %s, expected inode: %d got inode: %d", tf.Path, tf.Link, lst.Ino, st.Ino)
-		}
-	}
-}
-
-type capHeader struct {
-	version uint32
-	pid     int
-}
-
-type capData struct {
-	effective   uint32
-	permitted   uint32
-	inheritable uint32
-}
-
-const CAP_SYS_ADMIN = 21
-
-type caps struct {
-	hdr  capHeader
-	data [2]capData
-}
-
-func getCaps() (caps, error) {
-	var c caps
-
-	// Get capability version
-	if _, _, errno := syscall.Syscall(syscall.SYS_CAPGET, uintptr(unsafe.Pointer(&c.hdr)), uintptr(unsafe.Pointer(nil)), 0); errno != 0 {
-		return c, fmt.Errorf("SYS_CAPGET: %v", errno)
-	}
-
-	// Get current capabilities
-	if _, _, errno := syscall.Syscall(syscall.SYS_CAPGET, uintptr(unsafe.Pointer(&c.hdr)), uintptr(unsafe.Pointer(&c.data[0])), 0); errno != 0 {
-		return c, fmt.Errorf("SYS_CAPGET: %v", errno)
-	}
-
-	return c, nil
-}
-
-func mountImage(t *testing.T, image string, mountPath string) bool {
-	caps, err := getCaps()
-	if err != nil || caps.data[0].effective&(1<<uint(CAP_SYS_ADMIN)) == 0 {
-		t.Log("cannot mount to run verification tests without CAP_SYS_ADMIN")
-		return false
-	}
-
-	err = os.MkdirAll(mountPath, 0777)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	out, err := exec.Command("mount", "-o", "loop,ro", "-t", "ext4", image, mountPath).CombinedOutput()
-	t.Logf("%s", out)
-	if err != nil {
-		t.Fatal(err)
-	}
-	return true
-}
-
-func unmountImage(t *testing.T, mountPath string) {
-	out, err := exec.Command("umount", mountPath).CombinedOutput()
-	t.Logf("%s", out)
-	if err != nil {
-		t.Log(err)
-	}
-}
-
-func fsck(t *testing.T, image string) {
-	cmd := exec.Command("e2fsck", "-v", "-f", "-n", image)
-	out, err := cmd.CombinedOutput()
-	t.Logf("%s", out)
-	if err != nil {
-		t.Fatal(err)
-	}
-}

vendor/github.com/Microsoft/hcsshim/ext4/internal/compactext4/verify_test.go

@@ -1,18 +0,0 @@
-// +build !linux
-
-package compactext4
-
-import "testing"
-
-func verifyTestFile(t *testing.T, mountPath string, tf testFile) {
-}
-
-func mountImage(t *testing.T, image string, mountPath string) bool {
-	return false
-}
-
-func unmountImage(t *testing.T, mountPath string) {
-}
-
-func fsck(t *testing.T, image string) {
-}

vendor/github.com/Microsoft/hcsshim/ext4/internal/format/format.go

@@ -1,411 +0,0 @@
-package format
-
-type SuperBlock struct {
-	InodesCount          uint32
-	BlocksCountLow       uint32
-	RootBlocksCountLow   uint32
-	FreeBlocksCountLow   uint32
-	FreeInodesCount      uint32
-	FirstDataBlock       uint32
-	LogBlockSize         uint32
-	LogClusterSize       uint32
-	BlocksPerGroup       uint32
-	ClustersPerGroup     uint32
-	InodesPerGroup       uint32
-	Mtime                uint32
-	Wtime                uint32
-	MountCount           uint16
-	MaxMountCount        uint16
-	Magic                uint16
-	State                uint16
-	Errors               uint16
-	MinorRevisionLevel   uint16
-	LastCheck            uint32
-	CheckInterval        uint32
-	CreatorOS            uint32
-	RevisionLevel        uint32
-	DefaultReservedUid   uint16
-	DefaultReservedGid   uint16
-	FirstInode           uint32
-	InodeSize            uint16
-	BlockGroupNr         uint16
-	FeatureCompat        CompatFeature
-	FeatureIncompat      IncompatFeature
-	FeatureRoCompat      RoCompatFeature
-	UUID                 [16]uint8
-	VolumeName           [16]byte
-	LastMounted          [64]byte
-	AlgorithmUsageBitmap uint32
-	PreallocBlocks       uint8
-	PreallocDirBlocks    uint8
-	ReservedGdtBlocks    uint16
-	JournalUUID          [16]uint8
-	JournalInum          uint32
-	JournalDev           uint32
-	LastOrphan           uint32
-	HashSeed             [4]uint32
-	DefHashVersion       uint8
-	JournalBackupType    uint8
-	DescSize             uint16
-	DefaultMountOpts     uint32
-	FirstMetaBg          uint32
-	MkfsTime             uint32
-	JournalBlocks        [17]uint32
-	BlocksCountHigh      uint32
-	RBlocksCountHigh     uint32
-	FreeBlocksCountHigh  uint32
-	MinExtraIsize        uint16
-	WantExtraIsize       uint16
-	Flags                uint32
-	RaidStride           uint16
-	MmpInterval          uint16
-	MmpBlock             uint64
-	RaidStripeWidth      uint32
-	LogGroupsPerFlex     uint8
-	ChecksumType         uint8
-	ReservedPad          uint16
-	KbytesWritten        uint64
-	SnapshotInum         uint32
-	SnapshotID           uint32
-	SnapshotRBlocksCount uint64
-	SnapshotList         uint32
-	ErrorCount           uint32
-	FirstErrorTime       uint32
-	FirstErrorInode      uint32
-	FirstErrorBlock      uint64
-	FirstErrorFunc       [32]uint8
-	FirstErrorLine       uint32
-	LastErrorTime        uint32
-	LastErrorInode       uint32
-	LastErrorLine        uint32
-	LastErrorBlock       uint64
-	LastErrorFunc        [32]uint8
-	MountOpts            [64]uint8
-	UserQuotaInum        uint32
-	GroupQuotaInum       uint32
-	OverheadBlocks       uint32
-	BackupBgs            [2]uint32
-	EncryptAlgos         [4]uint8
-	EncryptPwSalt        [16]uint8
-	LpfInode             uint32
-	ProjectQuotaInum     uint32
-	ChecksumSeed         uint32
-	WtimeHigh            uint8
-	MtimeHigh            uint8
-	MkfsTimeHigh         uint8
-	LastcheckHigh        uint8
-	FirstErrorTimeHigh   uint8
-	LastErrorTimeHigh    uint8
-	Pad                  [2]uint8
-	Reserved             [96]uint32
-	Checksum             uint32
-}
-
-const SuperBlockMagic uint16 = 0xef53
-
-type CompatFeature uint32
-type IncompatFeature uint32
-type RoCompatFeature uint32
-
-const (
-	CompatDirPrealloc   CompatFeature = 0x1
-	CompatImagicInodes  CompatFeature = 0x2
-	CompatHasJournal    CompatFeature = 0x4
-	CompatExtAttr       CompatFeature = 0x8
-	CompatResizeInode   CompatFeature = 0x10
-	CompatDirIndex      CompatFeature = 0x20
-	CompatLazyBg        CompatFeature = 0x40
-	CompatExcludeInode  CompatFeature = 0x80
-	CompatExcludeBitmap CompatFeature = 0x100
-	CompatSparseSuper2  CompatFeature = 0x200
-
-	IncompatCompression IncompatFeature = 0x1
-	IncompatFiletype    IncompatFeature = 0x2
-	IncompatRecover     IncompatFeature = 0x4
-	IncompatJournalDev  IncompatFeature = 0x8
-	IncompatMetaBg      IncompatFeature = 0x10
-	IncompatExtents     IncompatFeature = 0x40
-	Incompat_64Bit      IncompatFeature = 0x80
-	IncompatMmp         IncompatFeature = 0x100
-	IncompatFlexBg      IncompatFeature = 0x200
-	IncompatEaInode     IncompatFeature = 0x400
-	IncompatDirdata     IncompatFeature = 0x1000
-	IncompatCsumSeed    IncompatFeature = 0x2000
-	IncompatLargedir    IncompatFeature = 0x4000
-	IncompatInlineData  IncompatFeature = 0x8000
-	IncompatEncrypt     IncompatFeature = 0x10000
-
-	RoCompatSparseSuper  RoCompatFeature = 0x1
-	RoCompatLargeFile    RoCompatFeature = 0x2
-	RoCompatBtreeDir     RoCompatFeature = 0x4
-	RoCompatHugeFile     RoCompatFeature = 0x8
-	RoCompatGdtCsum      RoCompatFeature = 0x10
-	RoCompatDirNlink     RoCompatFeature = 0x20
-	RoCompatExtraIsize   RoCompatFeature = 0x40
-	RoCompatHasSnapshot  RoCompatFeature = 0x80
-	RoCompatQuota        RoCompatFeature = 0x100
-	RoCompatBigalloc     RoCompatFeature = 0x200
-	RoCompatMetadataCsum RoCompatFeature = 0x400
-	RoCompatReplica      RoCompatFeature = 0x800
-	RoCompatReadonly     RoCompatFeature = 0x1000
-	RoCompatProject      RoCompatFeature = 0x2000
-)
-
-type BlockGroupFlag uint16
-
-const (
-	BlockGroupInodeUninit BlockGroupFlag = 0x1
-	BlockGroupBlockUninit BlockGroupFlag = 0x2
-	BlockGroupInodeZeroed BlockGroupFlag = 0x4
-)
-
-type GroupDescriptor struct {
-	BlockBitmapLow     uint32
-	InodeBitmapLow     uint32
-	InodeTableLow      uint32
-	FreeBlocksCountLow uint16
-	FreeInodesCountLow uint16
-	UsedDirsCountLow   uint16
-	Flags              BlockGroupFlag
-	ExcludeBitmapLow   uint32
-	BlockBitmapCsumLow uint16
-	InodeBitmapCsumLow uint16
-	ItableUnusedLow    uint16
-	Checksum           uint16
-}
-
-type GroupDescriptor64 struct {
-	GroupDescriptor
-	BlockBitmapHigh     uint32
-	InodeBitmapHigh     uint32
-	InodeTableHigh      uint32
-	FreeBlocksCountHigh uint16
-	FreeInodesCountHigh uint16
-	UsedDirsCountHigh   uint16
-	ItableUnusedHigh    uint16
-	ExcludeBitmapHigh   uint32
-	BlockBitmapCsumHigh uint16
-	InodeBitmapCsumHigh uint16
-	Reserved            uint32
-}
-
-const (
-	S_IXOTH  = 0x1
-	S_IWOTH  = 0x2
-	S_IROTH  = 0x4
-	S_IXGRP  = 0x8
-	S_IWGRP  = 0x10
-	S_IRGRP  = 0x20
-	S_IXUSR  = 0x40
-	S_IWUSR  = 0x80
-	S_IRUSR  = 0x100
-	S_ISVTX  = 0x200
-	S_ISGID  = 0x400
-	S_ISUID  = 0x800
-	S_IFIFO  = 0x1000
-	S_IFCHR  = 0x2000
-	S_IFDIR  = 0x4000
-	S_IFBLK  = 0x6000
-	S_IFREG  = 0x8000
-	S_IFLNK  = 0xA000
-	S_IFSOCK = 0xC000
-
-	TypeMask uint16 = 0xF000
-)
-
-type InodeNumber uint32
-
-const (
-	InodeRoot = 2
-)
-
-type Inode struct {
-	Mode                 uint16
-	Uid                  uint16
-	SizeLow              uint32
-	Atime                uint32
-	Ctime                uint32
-	Mtime                uint32
-	Dtime                uint32
-	Gid                  uint16
-	LinksCount           uint16
-	BlocksLow            uint32
-	Flags                InodeFlag
-	Version              uint32
-	Block                [60]byte
-	Generation           uint32
-	XattrBlockLow        uint32
-	SizeHigh             uint32
-	ObsoleteFragmentAddr uint32
-	BlocksHigh           uint16
-	XattrBlockHigh       uint16
-	UidHigh              uint16
-	GidHigh              uint16
-	ChecksumLow          uint16
-	Reserved             uint16
-	ExtraIsize           uint16
-	ChecksumHigh         uint16
-	CtimeExtra           uint32
-	MtimeExtra           uint32
-	AtimeExtra           uint32
-	Crtime               uint32
-	CrtimeExtra          uint32
-	VersionHigh          uint32
-	Projid               uint32
-}
-
-type InodeFlag uint32
-
-const (
-	InodeFlagSecRm              InodeFlag = 0x1
-	InodeFlagUnRm               InodeFlag = 0x2
-	InodeFlagCompressed         InodeFlag = 0x4
-	InodeFlagSync               InodeFlag = 0x8
-	InodeFlagImmutable          InodeFlag = 0x10
-	InodeFlagAppend             InodeFlag = 0x20
-	InodeFlagNoDump             InodeFlag = 0x40
-	InodeFlagNoAtime            InodeFlag = 0x80
-	InodeFlagDirtyCompressed    InodeFlag = 0x100
-	InodeFlagCompressedClusters InodeFlag = 0x200
-	InodeFlagNoCompress         InodeFlag = 0x400
-	InodeFlagEncrypted          InodeFlag = 0x800
-	InodeFlagHashedIndex        InodeFlag = 0x1000
-	InodeFlagMagic              InodeFlag = 0x2000
-	InodeFlagJournalData        InodeFlag = 0x4000
-	InodeFlagNoTail             InodeFlag = 0x8000
-	InodeFlagDirSync            InodeFlag = 0x10000
-	InodeFlagTopDir             InodeFlag = 0x20000
-	InodeFlagHugeFile           InodeFlag = 0x40000
-	InodeFlagExtents            InodeFlag = 0x80000
-	InodeFlagEaInode            InodeFlag = 0x200000
-	InodeFlagEOFBlocks          InodeFlag = 0x400000
-	InodeFlagSnapfile           InodeFlag = 0x01000000
-	InodeFlagSnapfileDeleted    InodeFlag = 0x04000000
-	InodeFlagSnapfileShrunk     InodeFlag = 0x08000000
-	InodeFlagInlineData         InodeFlag = 0x10000000
-	InodeFlagProjectIDInherit   InodeFlag = 0x20000000
-	InodeFlagReserved           InodeFlag = 0x80000000
-)
-
-const (
-	MaxLinks = 65000
-)
-
-type ExtentHeader struct {
-	Magic      uint16
-	Entries    uint16
-	Max        uint16
-	Depth      uint16
-	Generation uint32
-}
-
-const ExtentHeaderMagic uint16 = 0xf30a
-
-type ExtentIndexNode struct {
-	Block    uint32
-	LeafLow  uint32
-	LeafHigh uint16
-	Unused   uint16
-}
-
-type ExtentLeafNode struct {
-	Block     uint32
-	Length    uint16
-	StartHigh uint16
-	StartLow  uint32
-}
-
-type ExtentTail struct {
-	Checksum uint32
-}
-
-type DirectoryEntry struct {
-	Inode        InodeNumber
-	RecordLength uint16
-	NameLength   uint8
-	FileType     FileType
-	//Name         []byte
-}
-
-type FileType uint8
-
-const (
-	FileTypeUnknown      FileType = 0x0
-	FileTypeRegular      FileType = 0x1
-	FileTypeDirectory    FileType = 0x2
-	FileTypeCharacter    FileType = 0x3
-	FileTypeBlock        FileType = 0x4
-	FileTypeFIFO         FileType = 0x5
-	FileTypeSocket       FileType = 0x6
-	FileTypeSymbolicLink FileType = 0x7
-)
-
-type DirectoryEntryTail struct {
-	ReservedZero1 uint32
-	RecordLength  uint16
-	ReservedZero2 uint8
-	FileType      uint8
-	Checksum      uint32
-}
-
-type DirectoryTreeRoot struct {
-	Dot            DirectoryEntry
-	DotName        [4]byte
-	DotDot         DirectoryEntry
-	DotDotName     [4]byte
-	ReservedZero   uint32
-	HashVersion    uint8
-	InfoLength     uint8
-	IndirectLevels uint8
-	UnusedFlags    uint8
-	Limit          uint16
-	Count          uint16
-	Block          uint32
-	//Entries        []DirectoryTreeEntry
-}
-
-type DirectoryTreeNode struct {
-	FakeInode        uint32
-	FakeRecordLength uint16
-	NameLength       uint8
-	FileType         uint8
-	Limit            uint16
-	Count            uint16
-	Block            uint32
-	//Entries          []DirectoryTreeEntry
-}
-
-type DirectoryTreeEntry struct {
-	Hash  uint32
-	Block uint32
-}
-
-type DirectoryTreeTail struct {
-	Reserved uint32
-	Checksum uint32
-}
-
-type XAttrInodeBodyHeader struct {
-	Magic uint32
-}
-
-type XAttrHeader struct {
-	Magic          uint32
-	ReferenceCount uint32
-	Blocks         uint32
-	Hash           uint32
-	Checksum       uint32
-	Reserved       [3]uint32
-}
-
-const XAttrHeaderMagic uint32 = 0xea020000
-
-type XAttrEntry struct {
-	NameLength  uint8
-	NameIndex   uint8
-	ValueOffset uint16
-	ValueInum   uint32
-	ValueSize   uint32
-	Hash        uint32
-	//Name        []byte
-}

vendor/github.com/Microsoft/hcsshim/ext4/tar2ext4/tar2ext4.go

@@ -1,174 +0,0 @@
-package tar2ext4
-
-import (
-	"archive/tar"
-	"bufio"
-	"encoding/binary"
-	"io"
-	"path"
-	"strings"
-
-	"github.com/Microsoft/hcsshim/ext4/internal/compactext4"
-)
-
-type params struct {
-	convertWhiteout bool
-	appendVhdFooter bool
-	ext4opts        []compactext4.Option
-}
-
-// Option is the type for optional parameters to Convert.
-type Option func(*params)
-
-// ConvertWhiteout instructs the converter to convert OCI-style whiteouts
-// (beginning with .wh.) to overlay-style whiteouts.
-func ConvertWhiteout(p *params) {
-	p.convertWhiteout = true
-}
-
-// AppendVhdFooter instructs the converter to add a fixed VHD footer to the
-// file.
-func AppendVhdFooter(p *params) {
-	p.appendVhdFooter = true
-}
-
-// InlineData instructs the converter to write small files into the inode
-// structures directly. This creates smaller images but currently is not
-// compatible with DAX.
-func InlineData(p *params) {
-	p.ext4opts = append(p.ext4opts, compactext4.InlineData)
-}
-
-// MaximumDiskSize instructs the writer to limit the disk size to the specified
-// value. This also reserves enough metadata space for the specified disk size.
-// If not provided, then 16GB is the default.
-func MaximumDiskSize(size int64) Option {
-	return func(p *params) {
-		p.ext4opts = append(p.ext4opts, compactext4.MaximumDiskSize(size))
-	}
-}
-
-const (
-	whiteoutPrefix = ".wh."
-	opaqueWhiteout = ".wh..wh..opq"
-)
-
-// Convert writes a compact ext4 file system image that contains the files in the
-// input tar stream.
-func Convert(r io.Reader, w io.ReadWriteSeeker, options ...Option) error {
-	var p params
-	for _, opt := range options {
-		opt(&p)
-	}
-	t := tar.NewReader(bufio.NewReader(r))
-	fs := compactext4.NewWriter(w, p.ext4opts...)
-	for {
-		hdr, err := t.Next()
-		if err == io.EOF {
-			break
-		}
-		if err != nil {
-			return err
-		}
-
-		if p.convertWhiteout {
-			dir, name := path.Split(hdr.Name)
-			if strings.HasPrefix(name, whiteoutPrefix) {
-				if name == opaqueWhiteout {
-					// Update the directory with the appropriate xattr.
-					f, err := fs.Stat(dir)
-					if err != nil {
-						return err
-					}
-					f.Xattrs["trusted.overlay.opaque"] = []byte("y")
-					err = fs.Create(dir, f)
-					if err != nil {
-						return err
-					}
-				} else {
-					// Create an overlay-style whiteout.
-					f := &compactext4.File{
-						Mode:     compactext4.S_IFCHR,
-						Devmajor: 0,
-						Devminor: 0,
-					}
-					err = fs.Create(path.Join(dir, name[len(whiteoutPrefix):]), f)
-					if err != nil {
-						return err
-					}
-				}
-
-				continue
-			}
-		}
-
-		if hdr.Typeflag == tar.TypeLink {
-			err = fs.Link(hdr.Linkname, hdr.Name)
-			if err != nil {
-				return err
-			}
-		} else {
-			f := &compactext4.File{
-				Mode:     uint16(hdr.Mode),
-				Atime:    hdr.AccessTime,
-				Mtime:    hdr.ModTime,
-				Ctime:    hdr.ChangeTime,
-				Crtime:   hdr.ModTime,
-				Size:     hdr.Size,
-				Uid:      uint32(hdr.Uid),
-				Gid:      uint32(hdr.Gid),
-				Linkname: hdr.Linkname,
-				Devmajor: uint32(hdr.Devmajor),
-				Devminor: uint32(hdr.Devminor),
-				Xattrs:   make(map[string][]byte),
-			}
-			for key, value := range hdr.PAXRecords {
-				const xattrPrefix = "SCHILY.xattr."
-				if strings.HasPrefix(key, xattrPrefix) {
-					f.Xattrs[key[len(xattrPrefix):]] = []byte(value)
-				}
-			}
-
-			var typ uint16
-			switch hdr.Typeflag {
-			case tar.TypeReg, tar.TypeRegA:
-				typ = compactext4.S_IFREG
-			case tar.TypeSymlink:
-				typ = compactext4.S_IFLNK
-			case tar.TypeChar:
-				typ = compactext4.S_IFCHR
-			case tar.TypeBlock:
-				typ = compactext4.S_IFBLK
-			case tar.TypeDir:
-				typ = compactext4.S_IFDIR
-			case tar.TypeFifo:
-				typ = compactext4.S_IFIFO
-			}
-			f.Mode &= ^compactext4.TypeMask
-			f.Mode |= typ
-			err = fs.Create(hdr.Name, f)
-			if err != nil {
-				return err
-			}
-			_, err = io.Copy(fs, t)
-			if err != nil {
-				return err
-			}
-		}
-	}
-	err := fs.Close()
-	if err != nil {
-		return err
-	}
-	if p.appendVhdFooter {
-		size, err := w.Seek(0, io.SeekEnd)
-		if err != nil {
-			return err
-		}
-		err = binary.Write(w, binary.BigEndian, makeFixedVHDFooter(size))
-		if err != nil {
-			return err
-		}
-	}
-	return nil
-}

vendor/github.com/Microsoft/hcsshim/ext4/tar2ext4/vhdfooter.go

@@ -1,76 +0,0 @@
-package tar2ext4
-
-import (
-	"bytes"
-	"crypto/rand"
-	"encoding/binary"
-)
-
-// Constants for the VHD footer
-const (
-	cookieMagic            = "conectix"
-	featureMask            = 0x2
-	fileFormatVersionMagic = 0x00010000
-	fixedDataOffset        = -1
-	creatorVersionMagic    = 0x000a0000
-	diskTypeFixed          = 2
-)
-
-type vhdFooter struct {
-	Cookie             [8]byte
-	Features           uint32
-	FileFormatVersion  uint32
-	DataOffset         int64
-	TimeStamp          uint32
-	CreatorApplication [4]byte
-	CreatorVersion     uint32
-	CreatorHostOS      [4]byte
-	OriginalSize       int64
-	CurrentSize        int64
-	DiskGeometry       uint32
-	DiskType           uint32
-	Checksum           uint32
-	UniqueID           [16]uint8
-	SavedState         uint8
-	Reserved           [427]uint8
-}
-
-func makeFixedVHDFooter(size int64) *vhdFooter {
-	footer := &vhdFooter{
-		Features:          featureMask,
-		FileFormatVersion: fileFormatVersionMagic,
-		DataOffset:        fixedDataOffset,
-		CreatorVersion:    creatorVersionMagic,
-		OriginalSize:      size,
-		CurrentSize:       size,
-		DiskType:          diskTypeFixed,
-		UniqueID:          generateUUID(),
-	}
-	copy(footer.Cookie[:], cookieMagic)
-	footer.Checksum = calculateCheckSum(footer)
-	return footer
-}
-
-func calculateCheckSum(footer *vhdFooter) uint32 {
-	oldchk := footer.Checksum
-	footer.Checksum = 0
-
-	buf := &bytes.Buffer{}
-	binary.Write(buf, binary.BigEndian, footer)
-
-	var chk uint32
-	bufBytes := buf.Bytes()
-	for i := 0; i < len(bufBytes); i++ {
-		chk += uint32(bufBytes[i])
-	}
-	footer.Checksum = oldchk
-	return uint32(^chk)
-}
-
-func generateUUID() [16]byte {
-	res := [16]byte{}
-	if _, err := rand.Read(res[:]); err != nil {
-		panic(err)
-	}
-	return res
-}

vendor/github.com/Microsoft/hcsshim/hcn/hcnendpoint_test.go

@@ -1,298 +0,0 @@
-// +build integration
-
-package hcn
-
-import (
-	"encoding/json"
-	"fmt"
-	"testing"
-)
-
-func TestCreateDeleteEndpoint(t *testing.T) {
-	network, err := HcnCreateTestNATNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-	Endpoint, err := HcnCreateTestEndpoint(network)
-	if err != nil {
-		t.Fatal(err)
-	}
-	jsonString, err := json.Marshal(Endpoint)
-	if err != nil {
-		t.Fatal(err)
-	}
-	fmt.Printf("Endpoint JSON:\n%s \n", jsonString)
-
-	err = Endpoint.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestGetEndpointById(t *testing.T) {
-	network, err := HcnCreateTestNATNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-	Endpoint, err := HcnCreateTestEndpoint(network)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	foundEndpoint, err := GetEndpointByID(Endpoint.Id)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if foundEndpoint == nil {
-		t.Fatal("No Endpoint found")
-	}
-
-	err = foundEndpoint.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestGetEndpointByName(t *testing.T) {
-	network, err := HcnCreateTestNATNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-	Endpoint, err := HcnCreateTestEndpoint(network)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	foundEndpoint, err := GetEndpointByName(Endpoint.Name)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if foundEndpoint == nil {
-		t.Fatal("No Endpoint found")
-	}
-
-	err = foundEndpoint.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestListEndpoints(t *testing.T) {
-	network, err := HcnCreateTestNATNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-	Endpoint, err := HcnCreateTestEndpoint(network)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	foundEndpoints, err := ListEndpoints()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(foundEndpoints) == 0 {
-		t.Fatal("No Endpoint found")
-	}
-
-	err = Endpoint.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestListEndpointsOfNetwork(t *testing.T) {
-	network, err := HcnCreateTestNATNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-	Endpoint, err := HcnCreateTestEndpoint(network)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	foundEndpoints, err := ListEndpointsOfNetwork(network.Id)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(foundEndpoints) == 0 {
-		t.Fatal("No Endpoint found")
-	}
-
-	err = Endpoint.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestEndpointNamespaceAttachDetach(t *testing.T) {
-	network, err := HcnCreateTestNATNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-	endpoint, err := HcnCreateTestEndpoint(network)
-	if err != nil {
-		t.Fatal(err)
-	}
-	namespace, err := HcnCreateTestNamespace()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = endpoint.NamespaceAttach(namespace.Id)
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = endpoint.NamespaceDetach(namespace.Id)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = namespace.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = endpoint.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestCreateEndpointWithNamespace(t *testing.T) {
-	network, err := HcnCreateTestNATNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-	namespace, err := HcnCreateTestNamespace()
-	if err != nil {
-		t.Fatal(err)
-	}
-	Endpoint, err := HcnCreateTestEndpointWithNamespace(network, namespace)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if Endpoint.HostComputeNamespace == "" {
-		t.Fatal("No Namespace detected.")
-	}
-
-	err = Endpoint.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestApplyPolicyOnEndpoint(t *testing.T) {
-	network, err := HcnCreateTestNATNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-	Endpoint, err := HcnCreateTestEndpoint(network)
-	if err != nil {
-		t.Fatal(err)
-	}
-	endpointPolicyList, err := HcnCreateAcls()
-	if err != nil {
-		t.Fatal(err)
-	}
-	jsonString, err := json.Marshal(*endpointPolicyList)
-	if err != nil {
-		t.Fatal(err)
-	}
-	fmt.Printf("ACLS JSON:\n%s \n", jsonString)
-	err = Endpoint.ApplyPolicy(*endpointPolicyList)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	foundEndpoint, err := GetEndpointByName(Endpoint.Name)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(foundEndpoint.Policies) == 0 {
-		t.Fatal("No Endpoint Policies found")
-	}
-
-	err = Endpoint.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestModifyEndpointSettings(t *testing.T) {
-	network, err := HcnCreateTestNATNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-	endpoint, err := HcnCreateTestEndpoint(network)
-	if err != nil {
-		t.Fatal(err)
-	}
-	endpointPolicy, err := HcnCreateAcls()
-	if err != nil {
-		t.Fatal(err)
-	}
-	settingsJson, err := json.Marshal(endpointPolicy)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	requestMessage := &ModifyEndpointSettingRequest{
-		ResourceType: EndpointResourceTypePolicy,
-		RequestType:  RequestTypeUpdate,
-		Settings:     settingsJson,
-	}
-
-	err = ModifyEndpointSettings(endpoint.Id, requestMessage)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	foundEndpoint, err := GetEndpointByName(endpoint.Name)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(foundEndpoint.Policies) == 0 {
-		t.Fatal("No Endpoint Policies found")
-	}
-
-	err = endpoint.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}

vendor/github.com/Microsoft/hcsshim/hcn/hcnerrors_test.go

@@ -1,34 +0,0 @@
-// +build integration
-
-package hcn
-
-import (
-	"testing"
-)
-
-func TestMissingNetworkByName(t *testing.T) {
-	_, err := GetNetworkByName("Not found name")
-	if err == nil {
-		t.Fatal("Error was not thrown.")
-	}
-	if !IsNotFoundError(err) {
-		t.Fatal("Unrelated error was thrown.")
-	}
-	if _, ok := err.(NetworkNotFoundError); !ok {
-		t.Fatal("Wrong error type was thrown.")
-	}
-}
-
-func TestMissingNetworkById(t *testing.T) {
-	// Random guid
-	_, err := GetNetworkByID("5f0b1190-63be-4e0c-b974-bd0f55675a42")
-	if err == nil {
-		t.Fatal("Unrelated error was thrown.")
-	}
-	if !IsNotFoundError(err) {
-		t.Fatal("Unrelated error was thrown.")
-	}
-	if _, ok := err.(NetworkNotFoundError); !ok {
-		t.Fatal("Wrong error type was thrown.")
-	}
-}

vendor/github.com/Microsoft/hcsshim/hcn/hcnloadbalancer.go

@@ -10,10 +10,10 @@ import (
 
 // LoadBalancerPortMapping is associated with HostComputeLoadBalancer
 type LoadBalancerPortMapping struct {
-	Protocol     uint32 `json:",omitempty"` // EX: TCP = 6, UDP = 17
-	InternalPort uint16 `json:",omitempty"`
-	ExternalPort uint16 `json:",omitempty"`
-	Flags        uint32 `json:",omitempty"` // 0: None, 1: EnableILB, 2: LocalRoutedVip
+	Protocol     uint32                       `json:",omitempty"` // EX: TCP = 6, UDP = 17
+	InternalPort uint16                       `json:",omitempty"`
+	ExternalPort uint16                       `json:",omitempty"`
+	Flags        LoadBalancerPortMappingFlags `json:",omitempty"`
 }
 
 // HostComputeLoadBalancer represents software load balancer.
@@ -24,9 +24,35 @@ type HostComputeLoadBalancer struct {
 	FrontendVIPs         []string                  `json:",omitempty"`
 	PortMappings         []LoadBalancerPortMapping `json:",omitempty"`
 	SchemaVersion        SchemaVersion             `json:",omitempty"`
-	Flags                uint32                    `json:",omitempty"` // 0: None, 1: EnableDirectServerReturn
+	Flags                LoadBalancerFlags         `json:",omitempty"` // 0: None, 1: EnableDirectServerReturn
 }
 
+//LoadBalancerFlags modify settings for a loadbalancer.
+type LoadBalancerFlags uint32
+
+var (
+	// LoadBalancerFlagsNone is the default.
+	LoadBalancerFlagsNone LoadBalancerFlags = 0
+	// LoadBalancerFlagsDSR enables Direct Server Return (DSR)
+	LoadBalancerFlagsDSR LoadBalancerFlags = 1
+)
+
+// LoadBalancerPortMappingFlags are special settings on a loadbalancer.
+type LoadBalancerPortMappingFlags uint32
+
+var (
+	// LoadBalancerPortMappingFlagsNone is the default.
+	LoadBalancerPortMappingFlagsNone LoadBalancerPortMappingFlags
+	// LoadBalancerPortMappingFlagsILB enables internal loadbalancing.
+	LoadBalancerPortMappingFlagsILB LoadBalancerPortMappingFlags = 1
+	// LoadBalancerPortMappingFlagsLocalRoutedVIP enables VIP access from the host.
+	LoadBalancerPortMappingFlagsLocalRoutedVIP LoadBalancerPortMappingFlags = 2
+	// LoadBalancerPortMappingFlagsUseMux enables DSR for NodePort access of VIP.
+	LoadBalancerPortMappingFlagsUseMux LoadBalancerPortMappingFlags = 4
+	// LoadBalancerPortMappingFlagsPreserveDIP delivers packets with destination IP as the VIP.
+	LoadBalancerPortMappingFlagsPreserveDIP LoadBalancerPortMappingFlags = 8
+)
+
 func getLoadBalancer(loadBalancerGuid guid.GUID, query string) (*HostComputeLoadBalancer, error) {
 	// Open loadBalancer.
 	var (
@@ -280,20 +306,8 @@ func (loadBalancer *HostComputeLoadBalancer) RemoveEndpoint(endpoint *HostComput
 }
 
 // AddLoadBalancer for the specified endpoints
-func AddLoadBalancer(endpoints []HostComputeEndpoint, isILB bool, isDSR bool, sourceVIP string, frontendVIPs []string, protocol uint16, internalPort uint16, externalPort uint16) (*HostComputeLoadBalancer, error) {
-	logrus.Debugf("hcn::HostComputeLoadBalancer::AddLoadBalancer endpointId=%v, isILB=%v, sourceVIP=%s, frontendVIPs=%v, protocol=%v, internalPort=%v, externalPort=%v", endpoints, isILB, sourceVIP, frontendVIPs, protocol, internalPort, externalPort)
-
-	var portMappingFlags uint32
-	portMappingFlags = 0
-	if isILB {
-		portMappingFlags = 1
-	}
-
-	var lbFlags uint32
-	lbFlags = 0
-	if isDSR {
-		lbFlags = 1 // EnableDirectServerReturn
-	}
+func AddLoadBalancer(endpoints []HostComputeEndpoint, flags LoadBalancerFlags, portMappingFlags LoadBalancerPortMappingFlags, sourceVIP string, frontendVIPs []string, protocol uint16, internalPort uint16, externalPort uint16) (*HostComputeLoadBalancer, error) {
+	logrus.Debugf("hcn::HostComputeLoadBalancer::AddLoadBalancer endpointId=%v, LoadBalancerFlags=%v, LoadBalancerPortMappingFlags=%v, sourceVIP=%s, frontendVIPs=%v, protocol=%v, internalPort=%v, externalPort=%v", endpoints, flags, portMappingFlags, sourceVIP, frontendVIPs, protocol, internalPort, externalPort)
 
 	loadBalancer := &HostComputeLoadBalancer{
 		SourceVIP: sourceVIP,
@@ -310,7 +324,7 @@ func AddLoadBalancer(endpoints []HostComputeEndpoint, isILB bool, isDSR bool, so
 			Major: 2,
 			Minor: 0,
 		},
-		Flags: lbFlags,
+		Flags: flags,
 	}
 
 	for _, endpoint := range endpoints {

vendor/github.com/Microsoft/hcsshim/hcn/hcnloadbalancer_test.go

@@ -1,243 +0,0 @@
-// +build integration
-
-package hcn
-
-import (
-	"encoding/json"
-	"fmt"
-	"testing"
-)
-
-func TestCreateDeleteLoadBalancer(t *testing.T) {
-	network, err := HcnCreateTestNATNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-	endpoint, err := HcnCreateTestEndpoint(network)
-	if err != nil {
-		t.Fatal(err)
-	}
-	loadBalancer, err := HcnCreateTestLoadBalancer(endpoint)
-	if err != nil {
-		t.Fatal(err)
-	}
-	jsonString, err := json.Marshal(loadBalancer)
-	if err != nil {
-		t.Fatal(err)
-	}
-	fmt.Printf("LoadBalancer JSON:\n%s \n", jsonString)
-
-	err = loadBalancer.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = endpoint.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestGetLoadBalancerById(t *testing.T) {
-	network, err := HcnCreateTestNATNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-	endpoint, err := HcnCreateTestEndpoint(network)
-	if err != nil {
-		t.Fatal(err)
-	}
-	loadBalancer, err := HcnCreateTestLoadBalancer(endpoint)
-	if err != nil {
-		t.Fatal(err)
-	}
-	foundLB, err := GetLoadBalancerByID(loadBalancer.Id)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if foundLB == nil {
-		t.Fatalf("No loadBalancer found")
-	}
-	err = loadBalancer.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = endpoint.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestListLoadBalancer(t *testing.T) {
-	_, err := ListLoadBalancers()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestLoadBalancerAddRemoveEndpoint(t *testing.T) {
-	network, err := HcnCreateTestNATNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-	endpoint, err := HcnCreateTestEndpoint(network)
-	if err != nil {
-		t.Fatal(err)
-	}
-	loadBalancer, err := HcnCreateTestLoadBalancer(endpoint)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	secondEndpoint, err := HcnCreateTestEndpoint(network)
-	if err != nil {
-		t.Fatal(err)
-	}
-	updatedLB, err := loadBalancer.AddEndpoint(secondEndpoint)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if len(updatedLB.HostComputeEndpoints) != 2 {
-		t.Fatalf("Endpoint not added to loadBalancer")
-	}
-	updatedLB, err = loadBalancer.RemoveEndpoint(secondEndpoint)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(updatedLB.HostComputeEndpoints) != 1 {
-		t.Fatalf("Endpoint not removed from loadBalancer")
-	}
-
-	err = loadBalancer.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = secondEndpoint.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = endpoint.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestAddLoadBalancer(t *testing.T) {
-	network, err := HcnCreateTestNATNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-	endpoint, err := HcnCreateTestEndpoint(network)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	loadBalancer, err := AddLoadBalancer([]HostComputeEndpoint{*endpoint}, false, false, "10.0.0.1", []string{"1.1.1.2", "1.1.1.3"}, 6, 8080, 80)
-	if err != nil {
-		t.Fatal(err)
-	}
-	foundLB, err := GetLoadBalancerByID(loadBalancer.Id)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if foundLB == nil {
-		t.Fatal(fmt.Errorf("No loadBalancer found"))
-	}
-
-	err = loadBalancer.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = endpoint.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestAddDSRLoadBalancer(t *testing.T) {
-	network, err := CreateTestOverlayNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-	endpoint, err := HcnCreateTestEndpoint(network)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	loadBalancer, err := AddLoadBalancer([]HostComputeEndpoint{*endpoint}, false, true, "10.0.0.1", []string{"1.1.1.2", "1.1.1.3"}, 6, 8080, 80)
-	if err != nil {
-		t.Fatal(err)
-	}
-	foundLB, err := GetLoadBalancerByID(loadBalancer.Id)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if foundLB == nil {
-		t.Fatal(fmt.Errorf("No loadBalancer found"))
-	}
-
-	err = loadBalancer.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = endpoint.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestAddILBLoadBalancer(t *testing.T) {
-	network, err := CreateTestOverlayNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-	endpoint, err := HcnCreateTestEndpoint(network)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	loadBalancer, err := AddLoadBalancer([]HostComputeEndpoint{*endpoint}, true, false, "10.0.0.1", []string{"1.1.1.2", "1.1.1.3"}, 6, 8080, 80)
-	if err != nil {
-		t.Fatal(err)
-	}
-	foundLB, err := GetLoadBalancerByID(loadBalancer.Id)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if foundLB == nil {
-		t.Fatal(fmt.Errorf("No loadBalancer found"))
-	}
-
-	err = loadBalancer.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = endpoint.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}

vendor/github.com/Microsoft/hcsshim/hcn/hcnnamespace_test.go

@@ -1,451 +0,0 @@
-// +build integration
-
-package hcn
-
-import (
-	"encoding/json"
-	"fmt"
-	"testing"
-
-	"github.com/Microsoft/hcsshim/internal/cni"
-	"github.com/Microsoft/hcsshim/internal/guid"
-)
-
-func TestNewNamespace(t *testing.T) {
-	_ = NewNamespace(NamespaceTypeHost)
-	_ = NewNamespace(NamespaceTypeHostDefault)
-	_ = NewNamespace(NamespaceTypeGuest)
-	_ = NewNamespace(NamespaceTypeGuestDefault)
-}
-
-func TestCreateDeleteNamespace(t *testing.T) {
-	namespace, err := HcnCreateTestNamespace()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	jsonString, err := json.Marshal(namespace)
-	if err != nil {
-		t.Fatal(err)
-	}
-	fmt.Printf("Namespace JSON:\n%s \n", jsonString)
-
-	err = namespace.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestCreateDeleteNamespaceGuest(t *testing.T) {
-	namespace := &HostComputeNamespace{
-		Type: NamespaceTypeGuestDefault,
-		SchemaVersion: SchemaVersion{
-			Major: 2,
-			Minor: 0,
-		},
-	}
-
-	hnsNamespace, err := namespace.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = hnsNamespace.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestGetNamespaceById(t *testing.T) {
-	namespace, err := HcnCreateTestNamespace()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	foundNamespace, err := GetNamespaceByID(namespace.Id)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if foundNamespace == nil {
-		t.Fatal("No namespace found")
-	}
-
-	err = namespace.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestListNamespaces(t *testing.T) {
-	namespace, err := HcnCreateTestNamespace()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	foundNamespaces, err := ListNamespaces()
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(foundNamespaces) == 0 {
-		t.Fatal("No Namespaces found")
-	}
-
-	err = namespace.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestGetNamespaceEndpointIds(t *testing.T) {
-	network, err := HcnCreateTestNATNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-	endpoint, err := HcnCreateTestEndpoint(network)
-	if err != nil {
-		t.Fatal(err)
-	}
-	namespace, err := HcnCreateTestNamespace()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = endpoint.NamespaceAttach(namespace.Id)
-	if err != nil {
-		t.Fatal(err)
-	}
-	foundEndpoints, err := GetNamespaceEndpointIds(namespace.Id)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(foundEndpoints) == 0 {
-		t.Fatal("No Endpoint found")
-	}
-	err = endpoint.NamespaceDetach(namespace.Id)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = namespace.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = endpoint.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestGetNamespaceContainers(t *testing.T) {
-	namespace, err := HcnCreateTestNamespace()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	foundEndpoints, err := GetNamespaceContainerIds(namespace.Id)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(foundEndpoints) != 0 {
-		t.Fatal("Found containers when none should exist")
-	}
-
-	err = namespace.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestAddRemoveNamespaceEndpoint(t *testing.T) {
-	network, err := HcnCreateTestNATNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-	endpoint, err := HcnCreateTestEndpoint(network)
-	if err != nil {
-		t.Fatal(err)
-	}
-	namespace, err := HcnCreateTestNamespace()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = AddNamespaceEndpoint(namespace.Id, endpoint.Id)
-	if err != nil {
-		t.Fatal(err)
-	}
-	foundEndpoints, err := GetNamespaceEndpointIds(namespace.Id)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(foundEndpoints) == 0 {
-		t.Fatal("No Endpoint found")
-	}
-	err = RemoveNamespaceEndpoint(namespace.Id, endpoint.Id)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = namespace.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = endpoint.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestModifyNamespaceSettings(t *testing.T) {
-	network, err := HcnCreateTestNATNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-	endpoint, err := HcnCreateTestEndpoint(network)
-	if err != nil {
-		t.Fatal(err)
-	}
-	namespace, err := HcnCreateTestNamespace()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	mapA := map[string]string{"EndpointId": endpoint.Id}
-	settingsJson, err := json.Marshal(mapA)
-	if err != nil {
-		t.Fatal(err)
-	}
-	requestMessage := &ModifyNamespaceSettingRequest{
-		ResourceType: NamespaceResourceTypeEndpoint,
-		RequestType:  RequestTypeAdd,
-		Settings:     settingsJson,
-	}
-
-	err = ModifyNamespaceSettings(namespace.Id, requestMessage)
-	if err != nil {
-		t.Fatal(err)
-	}
-	foundEndpoints, err := GetNamespaceEndpointIds(namespace.Id)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if len(foundEndpoints) == 0 {
-		t.Fatal("No Endpoint found")
-	}
-	err = RemoveNamespaceEndpoint(namespace.Id, endpoint.Id)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = namespace.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = endpoint.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-// Sync Tests
-
-func TestSyncNamespaceHostDefault(t *testing.T) {
-	namespace := &HostComputeNamespace{
-		Type:        NamespaceTypeHostDefault,
-		NamespaceId: 5,
-		SchemaVersion: SchemaVersion{
-			Major: 2,
-			Minor: 0,
-		},
-	}
-
-	hnsNamespace, err := namespace.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Host namespace types should be no-op success
-	err = hnsNamespace.Sync()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = hnsNamespace.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestSyncNamespaceHost(t *testing.T) {
-	namespace := &HostComputeNamespace{
-		Type:        NamespaceTypeHost,
-		NamespaceId: 5,
-		SchemaVersion: SchemaVersion{
-			Major: 2,
-			Minor: 0,
-		},
-	}
-
-	hnsNamespace, err := namespace.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Host namespace types should be no-op success
-	err = hnsNamespace.Sync()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = hnsNamespace.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestSyncNamespaceGuestNoReg(t *testing.T) {
-	namespace := &HostComputeNamespace{
-		Type:        NamespaceTypeGuest,
-		NamespaceId: 5,
-		SchemaVersion: SchemaVersion{
-			Major: 2,
-			Minor: 0,
-		},
-	}
-
-	hnsNamespace, err := namespace.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Guest namespace type with out reg state should be no-op success
-	err = hnsNamespace.Sync()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = hnsNamespace.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestSyncNamespaceGuestDefaultNoReg(t *testing.T) {
-	namespace := &HostComputeNamespace{
-		Type:        NamespaceTypeGuestDefault,
-		NamespaceId: 5,
-		SchemaVersion: SchemaVersion{
-			Major: 2,
-			Minor: 0,
-		},
-	}
-
-	hnsNamespace, err := namespace.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Guest namespace type with out reg state should be no-op success
-	err = hnsNamespace.Sync()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = hnsNamespace.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestSyncNamespaceGuest(t *testing.T) {
-	namespace := &HostComputeNamespace{
-		Type:        NamespaceTypeGuest,
-		NamespaceId: 5,
-		SchemaVersion: SchemaVersion{
-			Major: 2,
-			Minor: 0,
-		},
-	}
-
-	hnsNamespace, err := namespace.Create()
-
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Create registry state
-	pnc := cni.NewPersistedNamespaceConfig(t.Name(), "test-container", guid.New())
-	err = pnc.Store()
-	if err != nil {
-		pnc.Remove()
-		t.Fatal(err)
-	}
-
-	// Guest namespace type with reg state but not Vm shim should pass...
-	// after trying to connect to VM shim that it doesn't find and remove the Key so it doesn't look again.
-	err = hnsNamespace.Sync()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = pnc.Remove()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = hnsNamespace.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestSyncNamespaceGuestDefault(t *testing.T) {
-	namespace := &HostComputeNamespace{
-		Type:        NamespaceTypeGuestDefault,
-		NamespaceId: 5,
-		SchemaVersion: SchemaVersion{
-			Major: 2,
-			Minor: 0,
-		},
-	}
-
-	hnsNamespace, err := namespace.Create()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	// Create registry state
-	pnc := cni.NewPersistedNamespaceConfig(t.Name(), "test-container", guid.New())
-	err = pnc.Store()
-	if err != nil {
-		pnc.Remove()
-		t.Fatal(err)
-	}
-
-	// Guest namespace type with reg state but not Vm shim should pass...
-	// after trying to connect to VM shim that it doesn't find and remove the Key so it doesn't look again.
-	err = hnsNamespace.Sync()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = pnc.Remove()
-	if err != nil {
-		t.Fatal(err)
-	}
-	err = hnsNamespace.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}

vendor/github.com/Microsoft/hcsshim/hcn/hcnnetwork_test.go

@@ -1,165 +0,0 @@
-// +build integration
-
-package hcn
-
-import (
-	"encoding/json"
-	"fmt"
-	"testing"
-)
-
-func TestCreateDeleteNetwork(t *testing.T) {
-	network, err := HcnCreateTestNATNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-	jsonString, err := json.Marshal(network)
-	if err != nil {
-		t.Fatal(err)
-	}
-	fmt.Printf("Network JSON:\n%s \n", jsonString)
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestGetNetworkByName(t *testing.T) {
-	network, err := HcnCreateTestNATNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-	network, err = GetNetworkByName(network.Name)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if network == nil {
-		t.Fatal("No Network found")
-	}
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestGetNetworkById(t *testing.T) {
-	network, err := HcnCreateTestNATNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-	network, err = GetNetworkByID(network.Id)
-	if err != nil {
-		t.Fatal(err)
-	}
-	if network == nil {
-		t.Fatal("No Network found")
-	}
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestListNetwork(t *testing.T) {
-	_, err := ListNetworks()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func testNetworkPolicy(t *testing.T, policiesToTest *PolicyNetworkRequest) {
-	network, err := CreateTestOverlayNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	network.AddPolicy(*policiesToTest)
-
-	//Reload the network object from HNS.
-	network, err = GetNetworkByID(network.Id)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for _, policyToTest := range policiesToTest.Policies {
-		foundPolicy := false
-		for _, policy := range network.Policies {
-			if policy.Type == policyToTest.Type {
-				foundPolicy = true
-				break
-			}
-		}
-		if !foundPolicy {
-			t.Fatalf("Could not find %s policy on network.", policyToTest.Type)
-		}
-	}
-
-	network.RemovePolicy(*policiesToTest)
-
-	//Reload the network object from HNS.
-	network, err = GetNetworkByID(network.Id)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	for _, policyToTest := range policiesToTest.Policies {
-		foundPolicy := false
-		for _, policy := range network.Policies {
-			if policy.Type == policyToTest.Type {
-				foundPolicy = true
-				break
-			}
-		}
-		if foundPolicy {
-			t.Fatalf("Found %s policy on network when it should have been deleted.", policyToTest.Type)
-		}
-	}
-
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestAddRemoveRemoteSubnetRoutePolicy(t *testing.T) {
-
-	remoteSubnetRoutePolicy, err := HcnCreateTestRemoteSubnetRoute()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	testNetworkPolicy(t, remoteSubnetRoutePolicy)
-}
-
-func TestAddRemoveHostRoutePolicy(t *testing.T) {
-
-	hostRoutePolicy, err := HcnCreateTestHostRoute()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	testNetworkPolicy(t, hostRoutePolicy)
-}
-
-func TestNetworkFlags(t *testing.T) {
-
-	network, err := CreateTestOverlayNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	//Reload the network object from HNS.
-	network, err = GetNetworkByID(network.Id)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	if network.Flags != EnableNonPersistent {
-		t.Errorf("EnableNonPersistent flag (%d) is not set on network", EnableNonPersistent)
-	}
-
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}

vendor/github.com/Microsoft/hcsshim/hcn/hcnsupport_test.go

@@ -1,62 +0,0 @@
-// +build integration
-
-package hcn
-
-import (
-	"encoding/json"
-	"fmt"
-	"testing"
-)
-
-func TestSupportedFeatures(t *testing.T) {
-	supportedFeatures := GetSupportedFeatures()
-	jsonString, err := json.Marshal(supportedFeatures)
-	if err != nil {
-		t.Fatal(err)
-	}
-	fmt.Printf("Supported Features:\n%s \n", jsonString)
-}
-
-func TestV2ApiSupport(t *testing.T) {
-	supportedFeatures := GetSupportedFeatures()
-	err := V2ApiSupported()
-	if supportedFeatures.Api.V2 && err != nil {
-		t.Fatal(err)
-	}
-	if !supportedFeatures.Api.V2 && err == nil {
-		t.Fatal(err)
-	}
-}
-
-func TestRemoteSubnetSupport(t *testing.T) {
-	supportedFeatures := GetSupportedFeatures()
-	err := RemoteSubnetSupported()
-	if supportedFeatures.RemoteSubnet && err != nil {
-		t.Fatal(err)
-	}
-	if !supportedFeatures.RemoteSubnet && err == nil {
-		t.Fatal(err)
-	}
-}
-
-func TestHostRouteSupport(t *testing.T) {
-	supportedFeatures := GetSupportedFeatures()
-	err := HostRouteSupported()
-	if supportedFeatures.HostRoute && err != nil {
-		t.Fatal(err)
-	}
-	if !supportedFeatures.HostRoute && err == nil {
-		t.Fatal(err)
-	}
-}
-
-func TestDSRSupport(t *testing.T) {
-	supportedFeatures := GetSupportedFeatures()
-	err := DSRSupported()
-	if supportedFeatures.DSR && err != nil {
-		t.Fatal(err)
-	}
-	if !supportedFeatures.DSR && err == nil {
-		t.Fatal(err)
-	}
-}

vendor/github.com/Microsoft/hcsshim/hcn/hcnutils_test.go

@@ -1,267 +0,0 @@
-// +build integration
-
-package hcn
-
-import (
-	"encoding/json"
-)
-
-func cleanup(networkName string) {
-	// Delete test network (if exists)
-	testNetwork, err := GetNetworkByName(networkName)
-	if err != nil {
-		return
-	}
-	if testNetwork != nil {
-		err := testNetwork.Delete()
-		if err != nil {
-			return
-		}
-	}
-}
-
-func HcnCreateTestNATNetwork() (*HostComputeNetwork, error) {
-	cleanup(NatTestNetworkName)
-	network := &HostComputeNetwork{
-		Type: "NAT",
-		Name: NatTestNetworkName,
-		MacPool: MacPool{
-			Ranges: []MacRange{
-				{
-					StartMacAddress: "00-15-5D-52-C0-00",
-					EndMacAddress:   "00-15-5D-52-CF-FF",
-				},
-			},
-		},
-		Ipams: []Ipam{
-			{
-				Type: "Static",
-				Subnets: []Subnet{
-					{
-						IpAddressPrefix: "192.168.100.0/24",
-						Routes: []Route{
-							{
-								NextHop:           "192.168.100.1",
-								DestinationPrefix: "0.0.0.0",
-							},
-						},
-					},
-				},
-			},
-		},
-		SchemaVersion: SchemaVersion{
-			Major: 2,
-			Minor: 0,
-		},
-	}
-
-	return network.Create()
-}
-
-func CreateTestOverlayNetwork() (*HostComputeNetwork, error) {
-	cleanup(OverlayTestNetworkName)
-	network := &HostComputeNetwork{
-		Type: "Overlay",
-		Name: OverlayTestNetworkName,
-		MacPool: MacPool{
-			Ranges: []MacRange{
-				{
-					StartMacAddress: "00-15-5D-52-C0-00",
-					EndMacAddress:   "00-15-5D-52-CF-FF",
-				},
-			},
-		},
-		Ipams: []Ipam{
-			{
-				Type: "Static",
-				Subnets: []Subnet{
-					{
-						IpAddressPrefix: "192.168.100.0/24",
-						Routes: []Route{
-							{
-								NextHop:           "192.168.100.1",
-								DestinationPrefix: "0.0.0.0/0",
-							},
-						},
-					},
-				},
-			},
-		},
-		Flags: EnableNonPersistent,
-		SchemaVersion: SchemaVersion{
-			Major: 2,
-			Minor: 0,
-		},
-	}
-
-	vsid := &VsidPolicySetting{
-		IsolationId: 5000,
-	}
-	vsidJson, err := json.Marshal(vsid)
-	if err != nil {
-		return nil, err
-	}
-
-	sp := &SubnetPolicy{
-		Type: VSID,
-	}
-	sp.Settings = vsidJson
-
-	spJson, err := json.Marshal(sp)
-	if err != nil {
-		return nil, err
-	}
-
-	network.Ipams[0].Subnets[0].Policies = append(network.Ipams[0].Subnets[0].Policies, spJson)
-
-	return network.Create()
-}
-
-func HcnCreateTestEndpoint(network *HostComputeNetwork) (*HostComputeEndpoint, error) {
-	if network == nil {
-
-	}
-	Endpoint := &HostComputeEndpoint{
-		Name: NatTestEndpointName,
-		SchemaVersion: SchemaVersion{
-			Major: 2,
-			Minor: 0,
-		},
-	}
-
-	return network.CreateEndpoint(Endpoint)
-}
-
-func HcnCreateTestEndpointWithNamespace(network *HostComputeNetwork, namespace *HostComputeNamespace) (*HostComputeEndpoint, error) {
-	Endpoint := &HostComputeEndpoint{
-		Name:                 NatTestEndpointName,
-		HostComputeNamespace: namespace.Id,
-		SchemaVersion: SchemaVersion{
-			Major: 2,
-			Minor: 0,
-		},
-	}
-
-	return network.CreateEndpoint(Endpoint)
-}
-
-func HcnCreateTestNamespace() (*HostComputeNamespace, error) {
-	namespace := &HostComputeNamespace{
-		Type:        NamespaceTypeHostDefault,
-		NamespaceId: 5,
-		SchemaVersion: SchemaVersion{
-			Major: 2,
-			Minor: 0,
-		},
-	}
-
-	return namespace.Create()
-}
-
-func HcnCreateAcls() (*PolicyEndpointRequest, error) {
-	in := AclPolicySetting{
-		Protocols:       "6",
-		Action:          ActionTypeAllow,
-		Direction:       DirectionTypeIn,
-		LocalAddresses:  "192.168.100.0/24,10.0.0.21",
-		RemoteAddresses: "192.168.100.0/24,10.0.0.21",
-		LocalPorts:      "80,8080",
-		RemotePorts:     "80,8080",
-		RuleType:        RuleTypeSwitch,
-		Priority:        200,
-	}
-
-	rawJSON, err := json.Marshal(in)
-	if err != nil {
-		return nil, err
-	}
-	inPolicy := EndpointPolicy{
-		Type:     ACL,
-		Settings: rawJSON,
-	}
-
-	out := AclPolicySetting{
-		Protocols:       "6",
-		Action:          ActionTypeAllow,
-		Direction:       DirectionTypeOut,
-		LocalAddresses:  "192.168.100.0/24,10.0.0.21",
-		RemoteAddresses: "192.168.100.0/24,10.0.0.21",
-		LocalPorts:      "80,8080",
-		RemotePorts:     "80,8080",
-		RuleType:        RuleTypeSwitch,
-		Priority:        200,
-	}
-
-	rawJSON, err = json.Marshal(out)
-	if err != nil {
-		return nil, err
-	}
-	outPolicy := EndpointPolicy{
-		Type:     ACL,
-		Settings: rawJSON,
-	}
-
-	endpointRequest := PolicyEndpointRequest{
-		Policies: []EndpointPolicy{inPolicy, outPolicy},
-	}
-
-	return &endpointRequest, nil
-}
-
-func HcnCreateTestLoadBalancer(endpoint *HostComputeEndpoint) (*HostComputeLoadBalancer, error) {
-	loadBalancer := &HostComputeLoadBalancer{
-		HostComputeEndpoints: []string{endpoint.Id},
-		SourceVIP:            "10.0.0.1",
-		PortMappings: []LoadBalancerPortMapping{
-			{
-				Protocol:     6, // TCP
-				InternalPort: 8080,
-				ExternalPort: 8090,
-			},
-		},
-		FrontendVIPs: []string{"1.1.1.2", "1.1.1.3"},
-		SchemaVersion: SchemaVersion{
-			Major: 2,
-			Minor: 0,
-		},
-	}
-
-	return loadBalancer.Create()
-}
-
-func HcnCreateTestRemoteSubnetRoute() (*PolicyNetworkRequest, error) {
-	rsr := RemoteSubnetRoutePolicySetting{
-		DestinationPrefix:           "192.168.2.0/24",
-		IsolationId:                 5000,
-		ProviderAddress:             "1.1.1.1",
-		DistributedRouterMacAddress: "00-12-34-56-78-9a",
-	}
-
-	rawJSON, err := json.Marshal(rsr)
-	if err != nil {
-		return nil, err
-	}
-	rsrPolicy := NetworkPolicy{
-		Type:     RemoteSubnetRoute,
-		Settings: rawJSON,
-	}
-
-	networkRequest := PolicyNetworkRequest{
-		Policies: []NetworkPolicy{rsrPolicy},
-	}
-
-	return &networkRequest, nil
-}
-
-func HcnCreateTestHostRoute() (*PolicyNetworkRequest, error) {
-	hostRoutePolicy := NetworkPolicy{
-		Type:     HostRoute,
-		Settings: []byte("{}"),
-	}
-
-	networkRequest := PolicyNetworkRequest{
-		Policies: []NetworkPolicy{hostRoutePolicy},
-	}
-
-	return &networkRequest, nil
-}

vendor/github.com/Microsoft/hcsshim/hcn/hcnv1schema_test.go

@@ -1,111 +0,0 @@
-// +build integration
-
-package hcn
-
-import (
-	"encoding/json"
-	"testing"
-
-	"github.com/Microsoft/hcsshim"
-)
-
-func TestV1Network(t *testing.T) {
-	cleanup(NatTestNetworkName)
-
-	v1network := hcsshim.HNSNetwork{
-		Type: "NAT",
-		Name: NatTestNetworkName,
-		MacPools: []hcsshim.MacPool{
-			{
-				StartMacAddress: "00-15-5D-52-C0-00",
-				EndMacAddress:   "00-15-5D-52-CF-FF",
-			},
-		},
-		Subnets: []hcsshim.Subnet{
-			{
-				AddressPrefix:  "192.168.100.0/24",
-				GatewayAddress: "192.168.100.1",
-			},
-		},
-	}
-
-	jsonString, err := json.Marshal(v1network)
-	if err != nil {
-		t.Fatal(err)
-		t.Fail()
-	}
-
-	network, err := createNetwork(string(jsonString))
-	if err != nil {
-		t.Fatal(err)
-		t.Fail()
-	}
-
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-		t.Fail()
-	}
-}
-
-func TestV1Endpoint(t *testing.T) {
-	cleanup(NatTestNetworkName)
-
-	v1network := hcsshim.HNSNetwork{
-		Type: "NAT",
-		Name: NatTestNetworkName,
-		MacPools: []hcsshim.MacPool{
-			{
-				StartMacAddress: "00-15-5D-52-C0-00",
-				EndMacAddress:   "00-15-5D-52-CF-FF",
-			},
-		},
-		Subnets: []hcsshim.Subnet{
-			{
-				AddressPrefix:  "192.168.100.0/24",
-				GatewayAddress: "192.168.100.1",
-			},
-		},
-	}
-
-	jsonString, err := json.Marshal(v1network)
-	if err != nil {
-		t.Fatal(err)
-		t.Fail()
-	}
-
-	network, err := createNetwork(string(jsonString))
-	if err != nil {
-		t.Fatal(err)
-		t.Fail()
-	}
-
-	v1endpoint := hcsshim.HNSEndpoint{
-		Name:           NatTestEndpointName,
-		VirtualNetwork: network.Id,
-	}
-
-	jsonString, err = json.Marshal(v1endpoint)
-	if err != nil {
-		t.Fatal(err)
-		t.Fail()
-	}
-
-	endpoint, err := createEndpoint(network.Id, string(jsonString))
-	if err != nil {
-		t.Fatal(err)
-		t.Fail()
-	}
-
-	err = endpoint.Delete()
-	if err != nil {
-		t.Fatal(err)
-		t.Fail()
-	}
-
-	err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-		t.Fail()
-	}
-}

vendor/github.com/Microsoft/hcsshim/hcn/hnsv1_test.go

@@ -1,97 +0,0 @@
-// +build integration
-
-package hcn
-
-import (
-	"os"
-	"testing"
-
-	"github.com/Microsoft/hcsshim"
-)
-
-const (
-	NatTestNetworkName     string = "GoTestNat"
-	NatTestEndpointName    string = "GoTestNatEndpoint"
-	OverlayTestNetworkName string = "GoTestOverlay"
-)
-
-func TestMain(m *testing.M) {
-	os.Exit(m.Run())
-}
-
-func CreateTestNetwork() (*hcsshim.HNSNetwork, error) {
-	network := &hcsshim.HNSNetwork{
-		Type: "NAT",
-		Name: NatTestNetworkName,
-		Subnets: []hcsshim.Subnet{
-			{
-				AddressPrefix:  "192.168.100.0/24",
-				GatewayAddress: "192.168.100.1",
-			},
-		},
-	}
-
-	return network.Create()
-}
-
-func TestEndpoint(t *testing.T) {
-
-	network, err := CreateTestNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	Endpoint := &hcsshim.HNSEndpoint{
-		Name: NatTestEndpointName,
-	}
-
-	Endpoint, err = network.CreateEndpoint(Endpoint)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = Endpoint.HostAttach(1)
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	err = Endpoint.HostDetach()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = Endpoint.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-
-	_, err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestEndpointGetAll(t *testing.T) {
-	_, err := hcsshim.HNSListEndpointRequest()
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestNetworkGetAll(t *testing.T) {
-	_, err := hcsshim.HNSListNetworkRequest("GET", "", "")
-	if err != nil {
-		t.Fatal(err)
-	}
-}
-
-func TestNetwork(t *testing.T) {
-	network, err := CreateTestNetwork()
-	if err != nil {
-		t.Fatal(err)
-	}
-	_, err = network.Delete()
-	if err != nil {
-		t.Fatal(err)
-	}
-}

vendor/github.com/Microsoft/hcsshim/internal/appargs/appargs.go

@@ -1,93 +0,0 @@
-// Package appargs provides argument validation routines for use with
-// github.com/urfave/cli.
-package appargs
-
-import (
-	"errors"
-	"strconv"
-
-	"github.com/urfave/cli"
-)
-
-// Validator is an argument validator function. It returns the number of
-// arguments consumed or -1 on error.
-type Validator = func([]string) int
-
-// String is a validator for strings.
-func String(args []string) int {
-	if len(args) == 0 {
-		return -1
-	}
-	return 1
-}
-
-// NonEmptyString is a validator for non-empty strings.
-func NonEmptyString(args []string) int {
-	if len(args) == 0 || args[0] == "" {
-		return -1
-	}
-	return 1
-}
-
-// Int returns a validator for integers.
-func Int(base int, min int, max int) Validator {
-	return func(args []string) int {
-		if len(args) == 0 {
-			return -1
-		}
-		i, err := strconv.ParseInt(args[0], base, 0)
-		if err != nil || int(i) < min || int(i) > max {
-			return -1
-		}
-		return 1
-	}
-}
-
-// Optional returns a validator that treats an argument as optional.
-func Optional(v Validator) Validator {
-	return func(args []string) int {
-		if len(args) == 0 {
-			return 0
-		}
-		return v(args)
-	}
-}
-
-// Rest returns a validator that validates each of the remaining arguments.
-func Rest(v Validator) Validator {
-	return func(args []string) int {
-		count := len(args)
-		for len(args) != 0 {
-			n := v(args)
-			if n < 0 {
-				return n
-			}
-			args = args[n:]
-		}
-		return count
-	}
-}
-
-// ErrInvalidUsage is returned when there is a validation error.
-var ErrInvalidUsage = errors.New("invalid command usage")
-
-// Validate can be used as a command's Before function to validate the arguments
-// to the command.
-func Validate(vs ...Validator) cli.BeforeFunc {
-	return func(context *cli.Context) error {
-		remaining := context.Args()
-		for _, v := range vs {
-			consumed := v(remaining)
-			if consumed < 0 {
-				return ErrInvalidUsage
-			}
-			remaining = remaining[consumed:]
-		}
-
-		if len(remaining) > 0 {
-			return ErrInvalidUsage
-		}
-
-		return nil
-	}
-}

vendor/github.com/Microsoft/hcsshim/internal/cni/registry_test.go

@@ -1,137 +0,0 @@
-package cni
-
-import (
-	"testing"
-
-	"github.com/Microsoft/hcsshim/internal/guid"
-	"github.com/Microsoft/hcsshim/internal/regstate"
-)
-
-func Test_LoadPersistedNamespaceConfig_NoConfig(t *testing.T) {
-	pnc, err := LoadPersistedNamespaceConfig(t.Name())
-	if pnc != nil {
-		t.Fatal("config should be nil")
-	}
-	if err == nil {
-		t.Fatal("err should be set")
-	} else {
-		if !regstate.IsNotFoundError(err) {
-			t.Fatal("err should be NotFoundError")
-		}
-	}
-}
-
-func Test_LoadPersistedNamespaceConfig_WithConfig(t *testing.T) {
-	pnc := NewPersistedNamespaceConfig(t.Name(), "test-container", guid.New())
-	err := pnc.Store()
-	if err != nil {
-		pnc.Remove()
-		t.Fatalf("store failed with: %v", err)
-	}
-	defer pnc.Remove()
-
-	pnc2, err := LoadPersistedNamespaceConfig(t.Name())
-	if err != nil {
-		t.Fatal("should have no error on stored config")
-	}
-	if pnc2 == nil {
-		t.Fatal("stored config should have been returned")
-	} else {
-		if pnc.namespaceID != pnc2.namespaceID {
-			t.Fatal("actual/stored namespaceID not equal")
-		}
-		if pnc.ContainerID != pnc2.ContainerID {
-			t.Fatal("actual/stored ContainerID not equal")
-		}
-		if pnc.HostUniqueID != pnc2.HostUniqueID {
-			t.Fatal("actual/stored HostUniqueID not equal")
-		}
-		if !pnc2.stored {
-			t.Fatal("stored should be true for registry load")
-		}
-	}
-}
-
-func Test_PersistedNamespaceConfig_StoreNew(t *testing.T) {
-	pnc := NewPersistedNamespaceConfig(t.Name(), "test-container", guid.New())
-	err := pnc.Store()
-	if err != nil {
-		pnc.Remove()
-		t.Fatalf("store failed with: %v", err)
-	}
-	defer pnc.Remove()
-}
-
-func Test_PersistedNamespaceConfig_StoreUpdate(t *testing.T) {
-	pnc := NewPersistedNamespaceConfig(t.Name(), "test-container", guid.New())
-	err := pnc.Store()
-	if err != nil {
-		pnc.Remove()
-		t.Fatalf("store failed with: %v", err)
-	}
-	defer pnc.Remove()
-
-	pnc.ContainerID = "test-container2"
-	pnc.HostUniqueID = guid.New()
-	err = pnc.Store()
-	if err != nil {
-		pnc.Remove()
-		t.Fatalf("store update failed with: %v", err)
-	}
-
-	// Verify the update
-	pnc2, err := LoadPersistedNamespaceConfig(t.Name())
-	if err != nil {
-		t.Fatal("stored config should have been returned")
-	}
-	if pnc.ContainerID != pnc2.ContainerID {
-		t.Fatal("actual/stored ContainerID not equal")
-	}
-	if pnc.HostUniqueID != pnc2.HostUniqueID {
-		t.Fatal("actual/stored HostUniqueID not equal")
-	}
-}
-
-func Test_PersistedNamespaceConfig_RemoveNotStored(t *testing.T) {
-	pnc := NewPersistedNamespaceConfig(t.Name(), "test-container", guid.New())
-	err := pnc.Remove()
-	if err != nil {
-		t.Fatalf("remove on not stored should not fail: %v", err)
-	}
-}
-
-func Test_PersistedNamespaceConfig_RemoveStoredKey(t *testing.T) {
-	pnc := NewPersistedNamespaceConfig(t.Name(), "test-container", guid.New())
-	err := pnc.Store()
-	if err != nil {
-		t.Fatalf("store failed with: %v", err)
-	}
-	err = pnc.Remove()
-	if err != nil {
-		t.Fatalf("remove on stored key should not fail: %v", err)
-	}
-}
-
-func Test_PersistedNamespaceConfig_RemovedOtherKey(t *testing.T) {
-	pnc := NewPersistedNamespaceConfig(t.Name(), "test-container", guid.New())
-	err := pnc.Store()
-	if err != nil {
-		t.Fatalf("store failed with: %v", err)
-	}
-
-	pnc2, err := LoadPersistedNamespaceConfig(t.Name())
-	if err != nil {
-		t.Fatal("should of found stored config")
-	}
-
-	err = pnc.Remove()
-	if err != nil {
-		t.Fatalf("remove on stored key should not fail: %v", err)
-	}
-
-	// Now remove the other key that has the invalid memory state
-	err = pnc2.Remove()
-	if err != nil {
-		t.Fatalf("remove on in-memory already removed should not fail: %v", err)
-	}
-}