@@ -1,14 +1,14 @@

 # the following lines are in sorted order, FYI

-github.com/Azure/go-ansiterm 388960b655244e76e24c75f48631564eaefade62

-github.com/Microsoft/hcsshim v0.5.25

+github.com/Azure/go-ansiterm 19f72df4d05d31cbe1c56bfc8045c96babff6c7e

+github.com/Microsoft/hcsshim v0.6.1

 github.com/Microsoft/go-winio v0.4.2

-github.com/moby/buildkit fed5c1d9cee6f734f58f3addca6e8d1750df48a6

+github.com/moby/buildkit da2b9dc7dab99e824b2b1067ad7d0523e32dd2d9 https://github.com/dmcgowan/buildkit.git

 github.com/davecgh/go-spew 346938d642f2ec3594ed81d874461961cd0faa76

 github.com/docker/libtrust 9cbd2a1374f46905c68a4eb3694a130610adc62a

 github.com/go-check/check 4ed411733c5785b40214c70bce814c3a3a689609 https://github.com/cpuguy83/check.git

 github.com/gorilla/context v1.1

 github.com/gorilla/mux v1.1

-github.com/jhowardmsft/opengcs v0.0.9

+github.com/jhowardmsft/opengcs b9d0120d36f26e981a50bf18bac1bb3f0c2b8fef https://github.com/dmcgowan/opengcs.git

 github.com/kr/pty 5cf931ef8f

 github.com/mattn/go-shellwords v1.0.3

 github.com/sirupsen/logrus v1.0.1

@@ -27,8 +27,8 @@ github.com/imdario/mergo 0.2.1

 golang.org/x/sync de49d9dcd27d4f764488181bea099dfe6179bcf0

 #get libnetwork packages

-github.com/docker/libnetwork e23c06b2917c82f6eed18c368f515060af78a09f

-github.com/docker/go-events 18b43f1bc85d9cdd42c05a6cd2d444c7a200a894

+github.com/docker/libnetwork 248fd5ea6a67f8810da322e6e7441e8de96a9045 https://github.com/dmcgowan/libnetwork.git

+github.com/docker/go-events 9461782956ad83b30282bf90e31fa6a70c255ba9

 github.com/armon/go-radix e39d623f12e8e41c7b5529e9a9dd67a1e2261f80

 github.com/armon/go-metrics eb0af217e5e9747e41dd5303755356b62d28e3ec

 github.com/hashicorp/go-msgpack 71c2886f5a673a35f909803f38ece5810165097b

@@ -51,7 +51,7 @@ github.com/boltdb/bolt fff57c100f4dea1905678da7e90d92429dff2904

 github.com/miekg/dns 75e6e86cc601825c5dbcd4e0c209eab180997cd7

 # get graph and distribution packages

-github.com/docker/distribution b38e5838b7b2f2ad48e06ec4b500011976080621

+github.com/docker/distribution edc3ab29cdff8694dd6feb85cfeb4b5f1b38ed9c

 github.com/vbatts/tar-split v0.10.1

 github.com/opencontainers/go-digest a6d0ee40d4207ea02364bd3b9e8e77b9159ba1eb

@@ -62,7 +62,7 @@ github.com/pborman/uuid v1.0

 google.golang.org/grpc v1.3.0

 # When updating, also update RUNC_COMMIT in hack/dockerfile/binaries-commits accordingly

-github.com/opencontainers/runc 2d41c047c83e09a6d61d464906feb2a2f3c52aa4 https://github.com/docker/runc

+github.com/opencontainers/runc e9325d442f5979c4f79bfa9e09bdf7abb74ba03b https://github.com/dmcgowan/runc.git

 github.com/opencontainers/image-spec 372ad780f63454fbbbbcc7cf80e5b90245c13e13

 github.com/opencontainers/runtime-spec d42f1eb741e6361e858d83fc75aa6893b66292c4 # specs

@@ -101,13 +101,13 @@ github.com/googleapis/gax-go da06d194a00e19ce00d9011a13931c3f6f6887c7

 google.golang.org/genproto d80a6e20e776b0b17a324d0ba1ab50a39c8e8944

 # containerd

-github.com/containerd/containerd 3addd840653146c90a254301d6c3a663c7fd6429

+github.com/containerd/containerd fc10004571bb9b26695ccbf2dd4a83213f60b93e https://github.com/dmcgowan/containerd.git

 github.com/tonistiigi/fifo 1405643975692217d6720f8b54aeee1bf2cd5cf4

 github.com/stevvooe/continuity cd7a8e21e2b6f84799f5dd4b65faf49c8d3ee02d

 github.com/tonistiigi/fsutil 0ac4c11b053b9c5c7c47558f81f96c7100ce50fb

 # cluster

-github.com/docker/swarmkit 3e2dd3c0a76149b1620b42d28dd6ff48270404e5

+github.com/docker/swarmkit 8bdecc57887ffc598b63d6433f58e0d2852112c3 https://github.com/dmcgowan/swarmkit.git

 github.com/gogo/protobuf v0.4

 github.com/cloudflare/cfssl 7fb22c8cba7ecaf98e4082d22d65800cf45e042a

 github.com/google/certificate-transparency d90e65c3a07988180c5b1ece71791c0b6506826e

@@ -7,3 +7,6 @@ For example the parser might receive "ESC, [, A" as a stream of three characters

 The parser (parser.go) is a partial implementation of this state machine (http://vt100.net/emu/vt500_parser.png).  There are also two event handler implementations, one for tests (test_event_handler.go) to validate that the expected events are being produced and called, the other is a Windows implementation (winterm/win_event_handler.go).

 See parser_test.go for examples exercising the state machine and generating appropriate function calls.

+

+-----

+This project has adopted the [Microsoft Open Source Code of Conduct](https://opensource.microsoft.com/codeofconduct/). For more information see the [Code of Conduct FAQ](https://opensource.microsoft.com/codeofconduct/faq/) or contact [opencode@microsoft.com](mailto:opencode@microsoft.com) with any additional questions or comments.

@@ -5,7 +5,7 @@ import (

 	"io/ioutil"

 	"os"

-	"github.com/Sirupsen/logrus"

+	"github.com/sirupsen/logrus"

 )

 var logger *logrus.Logger

@@ -9,7 +9,7 @@ import (

 	"strconv"

 	"github.com/Azure/go-ansiterm"

-	"github.com/Sirupsen/logrus"

+	"github.com/sirupsen/logrus"

 )

 var logger *logrus.Logger

@@ -1,6 +1,6 @@

 package hcsshim

-import "github.com/Sirupsen/logrus"

+import "github.com/sirupsen/logrus"

 // ActivateLayer will find the layer with the given id and mount it's filesystem.

 // For a read/write layer, the mounted filesystem will appear as a volume on the

@@ -8,7 +8,7 @@ import (

 	"syscall"

 	"time"

-	"github.com/Sirupsen/logrus"

+	"github.com/sirupsen/logrus"

 )

 var (

@@ -16,9 +16,10 @@ var (

 )

 const (

-	pendingUpdatesQuery = `{ "PropertyTypes" : ["PendingUpdates"]}`

-	statisticsQuery     = `{ "PropertyTypes" : ["Statistics"]}`

-	processListQuery    = `{ "PropertyTypes" : ["ProcessList"]}`

+	pendingUpdatesQuery    = `{ "PropertyTypes" : ["PendingUpdates"]}`

+	statisticsQuery        = `{ "PropertyTypes" : ["Statistics"]}`

+	processListQuery       = `{ "PropertyTypes" : ["ProcessList"]}`

+	mappedVirtualDiskQuery = `{ "PropertyTypes" : ["MappedVirtualDisk"]}`

 )

 type container struct {

@@ -30,20 +31,21 @@ type container struct {

 // ContainerProperties holds the properties for a container and the processes running in that container

 type ContainerProperties struct {

-	ID                string `json:"Id"`

-	Name              string

-	SystemType        string

-	Owner             string

-	SiloGUID          string            `json:"SiloGuid,omitempty"`

-	RuntimeID         string            `json:"RuntimeId,omitempty"`

-	IsRuntimeTemplate bool              `json:",omitempty"`

-	RuntimeImagePath  string            `json:",omitempty"`

-	Stopped           bool              `json:",omitempty"`

-	ExitType          string            `json:",omitempty"`

-	AreUpdatesPending bool              `json:",omitempty"`

-	ObRoot            string            `json:",omitempty"`

-	Statistics        Statistics        `json:",omitempty"`

-	ProcessList       []ProcessListItem `json:",omitempty"`

+	ID                           string `json:"Id"`

+	Name                         string

+	SystemType                   string

+	Owner                        string

+	SiloGUID                     string                              `json:"SiloGuid,omitempty"`

+	RuntimeID                    string                              `json:"RuntimeId,omitempty"`

+	IsRuntimeTemplate            bool                                `json:",omitempty"`

+	RuntimeImagePath             string                              `json:",omitempty"`

+	Stopped                      bool                                `json:",omitempty"`

+	ExitType                     string                              `json:",omitempty"`

+	AreUpdatesPending            bool                                `json:",omitempty"`

+	ObRoot                       string                              `json:",omitempty"`

+	Statistics                   Statistics                          `json:",omitempty"`

+	ProcessList                  []ProcessListItem                   `json:",omitempty"`

+	MappedVirtualDiskControllers map[int]MappedVirtualDiskController `json:",omitempty"`

 }

 // MemoryStats holds the memory statistics for a container

@@ -103,6 +105,11 @@ type ProcessListItem struct {

 	UserTime100ns                uint64    `json:",omitempty"`

 }

+// MappedVirtualDiskController is the structure of an item returned by a MappedVirtualDiskList call on a container

+type MappedVirtualDiskController struct {

+	MappedVirtualDisks map[int]MappedVirtualDisk `json:",omitempty"`

+}

+

 // Type of Request Support in ModifySystem

 type RequestType string

@@ -487,6 +494,55 @@ func (container *container) ProcessList() ([]ProcessListItem, error) {

 	return properties.ProcessList, nil

 }

+// MappedVirtualDisks returns a map of the controllers and the disks mapped

+// to a container.

+//

+// Example of JSON returned by the query.

+//{

+//   "Id":"1126e8d7d279c707a666972a15976371d365eaf622c02cea2c442b84f6f550a3_svm",

+//   "SystemType":"Container",

+//   "RuntimeOsType":"Linux",

+//   "RuntimeId":"00000000-0000-0000-0000-000000000000",

+//   "State":"Running",

+//   "MappedVirtualDiskControllers":{

+//      "0":{

+//         "MappedVirtualDisks":{

+//            "2":{

+//               "HostPath":"C:\\lcow\\lcow\\scratch\\1126e8d7d279c707a666972a15976371d365eaf622c02cea2c442b84f6f550a3.vhdx",

+//               "ContainerPath":"/mnt/gcs/LinuxServiceVM/scratch",

+//               "Lun":2,

+//               "CreateInUtilityVM":true

+//            },

+//            "3":{

+//               "HostPath":"C:\\lcow\\lcow\\1126e8d7d279c707a666972a15976371d365eaf622c02cea2c442b84f6f550a3\\sandbox.vhdx",

+//               "Lun":3,

+//               "CreateInUtilityVM":true,

+//               "AttachOnly":true

+//            }

+//         }

+//      }

+//   }

+//}

+func (container *container) MappedVirtualDisks() (map[int]MappedVirtualDiskController, error) {

+	container.handleLock.RLock()

+	defer container.handleLock.RUnlock()

+	operation := "MappedVirtualDiskList"

+	title := "HCSShim::Container::" + operation

+	logrus.Debugf(title+" id=%s", container.id)

+

+	if container.handle == 0 {

+		return nil, makeContainerError(container, operation, "", ErrAlreadyClosed)

+	}

+

+	properties, err := container.properties(mappedVirtualDiskQuery)

+	if err != nil {

+		return nil, makeContainerError(container, operation, "", err)

+	}

+

+	logrus.Debugf(title+" succeeded id=%s", container.id)

+	return properties.MappedVirtualDiskControllers, nil

+}

+

 // Pause pauses the execution of the container. This feature is not enabled in TP5.

 func (container *container) Pause() error {

 	container.handleLock.RLock()

@@ -1,6 +1,6 @@

 package hcsshim

-import "github.com/Sirupsen/logrus"

+import "github.com/sirupsen/logrus"

 // CreateLayer creates a new, empty, read-only layer on the filesystem based on

 // the parent layer provided.

@@ -1,6 +1,6 @@

 package hcsshim

-import "github.com/Sirupsen/logrus"

+import "github.com/sirupsen/logrus"

 // CreateSandboxLayer creates and populates new read-write layer for use by a container.

 // This requires both the id of the direct parent layer, as well as the full list

@@ -1,6 +1,6 @@

 package hcsshim

-import "github.com/Sirupsen/logrus"

+import "github.com/sirupsen/logrus"

 // DeactivateLayer will dismount a layer that was mounted via ActivateLayer.

 func DeactivateLayer(info DriverInfo, id string) error {

@@ -1,6 +1,6 @@

 package hcsshim

-import "github.com/Sirupsen/logrus"

+import "github.com/sirupsen/logrus"

 // DestroyLayer will remove the on-disk files representing the layer with the given

 // id, including that layer's containing folder, if any.

@@ -1,6 +1,6 @@

 package hcsshim

-import "github.com/Sirupsen/logrus"

+import "github.com/sirupsen/logrus"

 // ExpandSandboxSize expands the size of a layer to at least size bytes.

 func ExpandSandboxSize(info DriverInfo, layerId string, size uint64) error {

@@ -7,7 +7,7 @@ import (

 	"syscall"

 	"github.com/Microsoft/go-winio"

-	"github.com/Sirupsen/logrus"

+	"github.com/sirupsen/logrus"

 )

 // ExportLayer will create a folder at exportFolderPath and fill that folder with

@@ -3,7 +3,7 @@ package hcsshim

 import (

 	"syscall"

-	"github.com/Sirupsen/logrus"

+	"github.com/sirupsen/logrus"

 )

 // GetLayerMountPath will look for a mounted layer with the given id and return

@@ -1,6 +1,6 @@

 package hcsshim

-import "github.com/Sirupsen/logrus"

+import "github.com/sirupsen/logrus"

 // GetSharedBaseImages will enumerate the images stored in the common central

 // image store and return descriptive info about those images for the purpose

@@ -8,7 +8,7 @@ import (

 	"syscall"

 	"unsafe"

-	"github.com/Sirupsen/logrus"

+	"github.com/sirupsen/logrus"

 )

 //go:generate go run mksyscall_windows.go -output zhcsshim.go hcsshim.go

new file mode 100644

@@ -0,0 +1,183 @@

+package hcsshim

+

+import (

+	"encoding/json"

+	"fmt"

+	"net"

+

+	"github.com/sirupsen/logrus"

+)

+

+// HNSEndpoint represents a network endpoint in HNS

+type HNSEndpoint struct {

+	Id                 string            `json:"ID,omitempty"`

+	Name               string            `json:",omitempty"`

+	VirtualNetwork     string            `json:",omitempty"`

+	VirtualNetworkName string            `json:",omitempty"`

+	Policies           []json.RawMessage `json:",omitempty"`

+	MacAddress         string            `json:",omitempty"`

+	IPAddress          net.IP            `json:",omitempty"`

+	DNSSuffix          string            `json:",omitempty"`

+	DNSServerList      string            `json:",omitempty"`

+	GatewayAddress     string            `json:",omitempty"`

+	EnableInternalDNS  bool              `json:",omitempty"`

+	DisableICC         bool              `json:",omitempty"`

+	PrefixLength       uint8             `json:",omitempty"`

+	IsRemoteEndpoint   bool              `json:",omitempty"`

+}

+

+// HNSEndpointRequest makes a HNS call to modify/query a network endpoint

+func HNSEndpointRequest(method, path, request string) (*HNSEndpoint, error) {

+	endpoint := &HNSEndpoint{}

+	err := hnsCall(method, "/endpoints/"+path, request, &endpoint)

+	if err != nil {

+		return nil, err

+	}

+

+	return endpoint, nil

+}

+

+// HNSListEndpointRequest makes a HNS call to query the list of available endpoints

+func HNSListEndpointRequest() ([]HNSEndpoint, error) {

+	var endpoint []HNSEndpoint

+	err := hnsCall("GET", "/endpoints/", "", &endpoint)

+	if err != nil {

+		return nil, err

+	}

+

+	return endpoint, nil

+}

+

+// HotAttachEndpoint makes a HCS Call to attach the endpoint to the container

+func HotAttachEndpoint(containerID string, endpointID string) error {

+	return modifyNetworkEndpoint(containerID, endpointID, Add)

+}

+

+// HotDetachEndpoint makes a HCS Call to detach the endpoint from the container

+func HotDetachEndpoint(containerID string, endpointID string) error {

+	return modifyNetworkEndpoint(containerID, endpointID, Remove)

+}

+

+// ModifyContainer corresponding to the container id, by sending a request

+func modifyContainer(id string, request *ResourceModificationRequestResponse) error {

+	container, err := OpenContainer(id)

+	if err != nil {

+		if IsNotExist(err) {

+			return ErrComputeSystemDoesNotExist

+		}

+		return getInnerError(err)

+	}

+	defer container.Close()

+	err = container.Modify(request)

+	if err != nil {

+		if IsNotSupported(err) {

+			return ErrPlatformNotSupported

+		}

+		return getInnerError(err)

+	}

+

+	return nil

+}

+

+func modifyNetworkEndpoint(containerID string, endpointID string, request RequestType) error {

+	requestMessage := &ResourceModificationRequestResponse{

+		Resource: Network,

+		Request:  request,

+		Data:     endpointID,

+	}

+	err := modifyContainer(containerID, requestMessage)

+

+	if err != nil {

+		return err

+	}

+

+	return nil

+}

+

+// GetHNSEndpointByID

+func GetHNSEndpointByID(endpointID string) (*HNSEndpoint, error) {

+	return HNSEndpointRequest("GET", endpointID, "")

+}

+

+// GetHNSNetworkName filtered by Name

+func GetHNSEndpointByName(endpointName string) (*HNSEndpoint, error) {

+	hnsResponse, err := HNSListEndpointRequest()

+	if err != nil {

+		return nil, err

+	}

+	for _, hnsEndpoint := range hnsResponse {

+		if hnsEndpoint.Name == endpointName {

+			return &hnsEndpoint, nil

+		}

+	}

+	return nil, fmt.Errorf("Endpoint %v not found", endpointName)

+}

+

+// Create Endpoint by sending EndpointRequest to HNS. TODO: Create a separate HNS interface to place all these methods

+func (endpoint *HNSEndpoint) Create() (*HNSEndpoint, error) {

+	operation := "Create"

+	title := "HCSShim::HNSEndpoint::" + operation

+	logrus.Debugf(title+" id=%s", endpoint.Id)

+

+	jsonString, err := json.Marshal(endpoint)

+	if err != nil {

+		return nil, err

+	}

+	return HNSEndpointRequest("POST", "", string(jsonString))

+}

+

+// Delete Endpoint by sending EndpointRequest to HNS

+func (endpoint *HNSEndpoint) Delete() (*HNSEndpoint, error) {

+	operation := "Delete"

+	title := "HCSShim::HNSEndpoint::" + operation

+	logrus.Debugf(title+" id=%s", endpoint.Id)

+

+	return HNSEndpointRequest("DELETE", endpoint.Id, "")

+}

+

+// Delete Endpoint by sending EndpointRequest to HNS

+func (endpoint *HNSEndpoint) Update() (*HNSEndpoint, error) {

+	operation := "Update"

+	title := "HCSShim::HNSEndpoint::" + operation

+	logrus.Debugf(title+" id=%s", endpoint.Id)

+	jsonString, err := json.Marshal(endpoint)

+	if err != nil {

+		return nil, err

+	}

+	err = hnsCall("POST", "/endpoints/"+endpoint.Id+"/update", string(jsonString), &endpoint)

+

+	return endpoint, err

+}

+

+// Hot Attach an endpoint to a container

+func (endpoint *HNSEndpoint) HotAttach(containerID string) error {

+	operation := "HotAttach"

+	title := "HCSShim::HNSEndpoint::" + operation

+	logrus.Debugf(title+" id=%s, containerId=%s", endpoint.Id, containerID)

+

+	return modifyNetworkEndpoint(containerID, endpoint.Id, Add)

+}

+

+// Hot Detach an endpoint from a container

+func (endpoint *HNSEndpoint) HotDetach(containerID string) error {

+	operation := "HotDetach"

+	title := "HCSShim::HNSEndpoint::" + operation

+	logrus.Debugf(title+" id=%s, containerId=%s", endpoint.Id, containerID)

+

+	return modifyNetworkEndpoint(containerID, endpoint.Id, Remove)

+}

+

+// Apply Acl Policy on the Endpoint

+func (endpoint *HNSEndpoint) ApplyACLPolicy(policy *ACLPolicy) error {

+	operation := "ApplyACLPolicy"

+	title := "HCSShim::HNSEndpoint::" + operation

+	logrus.Debugf(title+" id=%s", endpoint.Id)

+

+	jsonString, err := json.Marshal(policy)

+	if err != nil {

+		return err

+	}

+	endpoint.Policies[0] = jsonString

+	_, err = endpoint.Update()

+	return err

+}

@@ -3,99 +3,10 @@ package hcsshim

 import (

 	"encoding/json"

 	"fmt"

-	"net"

-	"github.com/Sirupsen/logrus"

+	"github.com/sirupsen/logrus"

 )

-type NatPolicy struct {

-	Type         string

-	Protocol     string

-	InternalPort uint16

-	ExternalPort uint16

-}

-

-type QosPolicy struct {

-	Type                            string

-	MaximumOutgoingBandwidthInBytes uint64

-}

-

-type VlanPolicy struct {

-	Type string

-	VLAN uint

-}

-

-type VsidPolicy struct {

-	Type string

-	VSID uint

-}

-

-type PaPolicy struct {

-	Type string

-	PA   string

-}

-

-// Subnet is assoicated with a network and represents a list

-// of subnets available to the network

-type Subnet struct {

-	AddressPrefix  string            `json:",omitempty"`

-	GatewayAddress string            `json:",omitempty"`

-	Policies       []json.RawMessage `json:",omitempty"`

-}

-

-// MacPool is assoicated with a network and represents a list

-// of macaddresses available to the network

-type MacPool struct {

-	StartMacAddress string `json:",omitempty"`

-	EndMacAddress   string `json:",omitempty"`

-}

-

-// HNSNetwork represents a network in HNS

-type HNSNetwork struct {

-	Id                   string            `json:"ID,omitempty"`

-	Name                 string            `json:",omitempty"`

-	Type                 string            `json:",omitempty"`

-	NetworkAdapterName   string            `json:",omitempty"`

-	SourceMac            string            `json:",omitempty"`

-	Policies             []json.RawMessage `json:",omitempty"`

-	MacPools             []MacPool         `json:",omitempty"`

-	Subnets              []Subnet          `json:",omitempty"`

-	DNSSuffix            string            `json:",omitempty"`

-	DNSServerList        string            `json:",omitempty"`

-	DNSServerCompartment uint32            `json:",omitempty"`

-	ManagementIP         string            `json:",omitempty"`

-}

-

-// HNSEndpoint represents a network endpoint in HNS

-type HNSEndpoint struct {

-	Id                 string            `json:"ID,omitempty"`

-	Name               string            `json:",omitempty"`

-	VirtualNetwork     string            `json:",omitempty"`

-	VirtualNetworkName string            `json:",omitempty"`

-	Policies           []json.RawMessage `json:",omitempty"`

-	MacAddress         string            `json:",omitempty"`

-	IPAddress          net.IP            `json:",omitempty"`

-	DNSSuffix          string            `json:",omitempty"`

-	DNSServerList      string            `json:",omitempty"`

-	GatewayAddress     string            `json:",omitempty"`

-	EnableInternalDNS  bool              `json:",omitempty"`

-	DisableICC         bool              `json:",omitempty"`

-	PrefixLength       uint8             `json:",omitempty"`

-	IsRemoteEndpoint   bool              `json:",omitempty"`

-}

-

-type hnsNetworkResponse struct {

-	Success bool

-	Error   string

-	Output  HNSNetwork

-}

-

-type hnsResponse struct {

-	Success bool

-	Error   string

-	Output  json.RawMessage

-}

-

 func hnsCall(method, path, request string, returnResponse interface{}) error {

 	var responseBuffer *uint16

 	logrus.Debugf("[%s]=>[%s] Request : %s", method, path, request)

@@ -127,145 +38,3 @@ func hnsCall(method, path, request string, returnResponse interface{}) error {

 	return nil

 }

-

-// HNSNetworkRequest makes a call into HNS to update/query a single network

-func HNSNetworkRequest(method, path, request string) (*HNSNetwork, error) {

-	var network HNSNetwork

-	err := hnsCall(method, "/networks/"+path, request, &network)

-	if err != nil {

-		return nil, err

-	}

-

-	return &network, nil

-}

-

-// HNSListNetworkRequest makes a HNS call to query the list of available networks

-func HNSListNetworkRequest(method, path, request string) ([]HNSNetwork, error) {

-	var network []HNSNetwork

-	err := hnsCall(method, "/networks/"+path, request, &network)

-	if err != nil {

-		return nil, err

-	}

-

-	return network, nil

-}

-

-// HNSEndpointRequest makes a HNS call to modify/query a network endpoint

-func HNSEndpointRequest(method, path, request string) (*HNSEndpoint, error) {

-	endpoint := &HNSEndpoint{}

-	err := hnsCall(method, "/endpoints/"+path, request, &endpoint)

-	if err != nil {

-		return nil, err

-	}

-

-	return endpoint, nil

-}

-

-// HNSListEndpointRequest makes a HNS call to query the list of available endpoints

-func HNSListEndpointRequest() ([]HNSEndpoint, error) {

-	var endpoint []HNSEndpoint

-	err := hnsCall("GET", "/endpoints/", "", &endpoint)

-	if err != nil {

-		return nil, err

-	}

-

-	return endpoint, nil

-}

-

-// HotAttachEndpoint makes a HCS Call to attach the endpoint to the container

-func HotAttachEndpoint(containerID string, endpointID string) error {

-	return modifyNetworkEndpoint(containerID, endpointID, Add)

-}

-

-// HotDetachEndpoint makes a HCS Call to detach the endpoint from the container

-func HotDetachEndpoint(containerID string, endpointID string) error {

-	return modifyNetworkEndpoint(containerID, endpointID, Remove)

-}

-

-// ModifyContainer corresponding to the container id, by sending a request

-func modifyContainer(id string, request *ResourceModificationRequestResponse) error {

-	container, err := OpenContainer(id)

-	if err != nil {

-		if IsNotExist(err) {

-			return ErrComputeSystemDoesNotExist

-		}

-		return getInnerError(err)

-	}

-	defer container.Close()

-	err = container.Modify(request)

-	if err != nil {

-		if IsNotSupported(err) {

-			return ErrPlatformNotSupported

-		}

-		return getInnerError(err)

-	}

-

-	return nil

-}

-

-func modifyNetworkEndpoint(containerID string, endpointID string, request RequestType) error {

-	requestMessage := &ResourceModificationRequestResponse{

-		Resource: Network,

-		Request:  request,

-		Data:     endpointID,

-	}

-	err := modifyContainer(containerID, requestMessage)

-

-	if err != nil {

-		return err

-	}

-

-	return nil

-}

-

-// GetHNSNetworkByID

-func GetHNSNetworkByID(networkID string) (*HNSNetwork, error) {

-	return HNSNetworkRequest("GET", networkID, "")

-}

-

-// GetHNSNetworkName filtered by Name

-func GetHNSNetworkByName(networkName string) (*HNSNetwork, error) {

-	hsnnetworks, err := HNSListNetworkRequest("GET", "", "")

-	if err != nil {

-		return nil, err

-	}

-	for _, hnsnetwork := range hsnnetworks {

-		if hnsnetwork.Name == networkName {

-			return &hnsnetwork, nil

-		}

-	}

-	return nil, fmt.Errorf("Network %v not found", networkName)

-}

-

-// Create Endpoint by sending EndpointRequest to HNS. TODO: Create a separate HNS interface to place all these methods

-func (endpoint *HNSEndpoint) Create() (*HNSEndpoint, error) {

-	jsonString, err := json.Marshal(endpoint)

-	if err != nil {

-		return nil, err

-	}

-	return HNSEndpointRequest("POST", "", string(jsonString))

-}

-

-// Create Endpoint by sending EndpointRequest to HNS

-func (endpoint *HNSEndpoint) Delete() (*HNSEndpoint, error) {

-	return HNSEndpointRequest("DELETE", endpoint.Id, "")

-}

-

-// GetHNSEndpointByID

-func GetHNSEndpointByID(endpointID string) (*HNSEndpoint, error) {

-	return HNSEndpointRequest("GET", endpointID, "")

-}

-

-// GetHNSNetworkName filtered by Name

-func GetHNSEndpointByName(endpointName string) (*HNSEndpoint, error) {

-	hnsResponse, err := HNSListEndpointRequest()

-	if err != nil {

-		return nil, err

-	}

-	for _, hnsEndpoint := range hnsResponse {

-		if hnsEndpoint.Name == endpointName {

-			return &hnsEndpoint, nil

-		}

-	}

-	return nil, fmt.Errorf("Endpoint %v not found", endpointName)

-}

new file mode 100644

@@ -0,0 +1,142 @@

+package hcsshim

+

+import (

+	"encoding/json"

+	"fmt"

+	"net"

+

+	"github.com/sirupsen/logrus"

+)

+

+// Subnet is assoicated with a network and represents a list

+// of subnets available to the network

+type Subnet struct {

+	AddressPrefix  string            `json:",omitempty"`

+	GatewayAddress string            `json:",omitempty"`

+	Policies       []json.RawMessage `json:",omitempty"`

+}

+

+// MacPool is assoicated with a network and represents a list

+// of macaddresses available to the network

+type MacPool struct {

+	StartMacAddress string `json:",omitempty"`

+	EndMacAddress   string `json:",omitempty"`

+}

+

+// HNSNetwork represents a network in HNS

+type HNSNetwork struct {

+	Id                   string            `json:"ID,omitempty"`

+	Name                 string            `json:",omitempty"`

+	Type                 string            `json:",omitempty"`

+	NetworkAdapterName   string            `json:",omitempty"`

+	SourceMac            string            `json:",omitempty"`

+	Policies             []json.RawMessage `json:",omitempty"`

+	MacPools             []MacPool         `json:",omitempty"`

+	Subnets              []Subnet          `json:",omitempty"`

+	DNSSuffix            string            `json:",omitempty"`

+	DNSServerList        string            `json:",omitempty"`

+	DNSServerCompartment uint32            `json:",omitempty"`

+	ManagementIP         string            `json:",omitempty"`

+	AutomaticDNS         bool              `json:",omitempty"`

+}

+

+type hnsNetworkResponse struct {

+	Success bool

+	Error   string

+	Output  HNSNetwork

+}

+

+type hnsResponse struct {

+	Success bool

+	Error   string

+	Output  json.RawMessage

+}

+

+// HNSNetworkRequest makes a call into HNS to update/query a single network

+func HNSNetworkRequest(method, path, request string) (*HNSNetwork, error) {

+	var network HNSNetwork

+	err := hnsCall(method, "/networks/"+path, request, &network)

+	if err != nil {

+		return nil, err

+	}