Skip to content

Tasks connected to a swarm network will have 1 endpoint on windows RS3. #1900

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
fcrisciani merged 2 commits into from
Aug 28, 2017
Merged

Tasks connected to a swarm network will have 1 endpoint on windows RS3. #1900

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a9db5c5
For RS3, tasks connected to a swarm network will have 1 endpoint .
pradipd Jul 7, 2017
bf1804d
gofmt and lint changes.
pradipd Aug 9, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions drivers/windows/overlay/joinleave_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,6 +39,11 @@ func (d *driver) Join(nid, eid string, sboxKey string, jinfo driverapi.JoinInfo,
if err := jinfo.AddTableEntry(ovPeerTable, eid, buf); err != nil {
logrus.Errorf("overlay: Failed adding table entry to joininfo: %v", err)
}

if ep.disablegateway {
jinfo.DisableGatewayService()
}

return nil
}

Expand Down
77 changes: 63 additions & 14 deletions drivers/windows/overlay/ov_endpoint_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,11 @@ import (
"net"

"github.com/Microsoft/hcsshim"
"github.com/docker/docker/pkg/system"
"github.com/docker/libnetwork/driverapi"
"github.com/docker/libnetwork/drivers/windows"
"github.com/docker/libnetwork/netlabel"
"github.com/docker/libnetwork/types"
"github.com/sirupsen/logrus"
)

Expand All @@ -15,12 +19,14 @@ type endpointTable map[string]*endpoint
const overlayEndpointPrefix = "overlay/endpoint"

type endpoint struct {
Copy link
Copy Markdown
Contributor Author

@pradipd pradipd Aug 10, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Eventually, we should look at converging type endpoint struct and type hnsEnpoint struct in windows pkg so they can be shared by all windows and overlay drivers. But, I think that is outside the scope of this PR.

id string
nid string
profileId string
remote bool
mac net.HardwareAddr
addr *net.IPNet
id string
nid string
profileID string
remote bool
mac net.HardwareAddr
addr *net.IPNet
disablegateway bool
portMapping []types.PortBinding // Operation port bindings
}

func validateID(nid, eid string) error {
Expand Down Expand Up @@ -71,7 +77,7 @@ func (n *network) removeEndpointWithAddress(addr *net.IPNet) {

if networkEndpoint != nil {
logrus.Debugf("Removing stale endpoint from HNS")
_, err := hcsshim.HNSEndpointRequest("DELETE", networkEndpoint.profileId, "")
_, err := hcsshim.HNSEndpointRequest("DELETE", networkEndpoint.profileID, "")

if err != nil {
logrus.Debugf("Failed to delete stale overlay endpoint (%s) from hns", networkEndpoint.id[0:7])
Expand All @@ -96,7 +102,7 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,
logrus.Debugf("Deleting stale endpoint %s", eid)
n.deleteEndpoint(eid)

_, err := hcsshim.HNSEndpointRequest("DELETE", ep.profileId, "")
_, err := hcsshim.HNSEndpointRequest("DELETE", ep.profileID, "")
if err != nil {
return err
}
Expand All @@ -113,17 +119,19 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,
return fmt.Errorf("create endpoint was not passed interface IP address")
}

if s := n.getSubnetforIP(ep.addr); s == nil {
return fmt.Errorf("no matching subnet for IP %q in network %q\n", ep.addr, nid)
s := n.getSubnetforIP(ep.addr)
if s == nil {
return fmt.Errorf("no matching subnet for IP %q in network %q", ep.addr, nid)
}

// Todo: Add port bindings and qos policies here

hnsEndpoint := &hcsshim.HNSEndpoint{
Name: eid,
VirtualNetwork: n.hnsId,
VirtualNetwork: n.hnsID,
IPAddress: ep.addr.IP,
EnableInternalDNS: true,
GatewayAddress: s.gwIP.String(),
}

if ep.mac != nil {
Expand All @@ -141,6 +149,31 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,

hnsEndpoint.Policies = append(hnsEndpoint.Policies, paPolicy)

if system.GetOSVersion().Build > 16236 {
Copy link
Copy Markdown
Contributor Author

@pradipd pradipd Aug 11, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Will move this check into hns.

Copy link
Copy Markdown
Contributor

@msabansal msabansal Aug 14, 2017

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

lgtm

natPolicy, err := json.Marshal(hcsshim.PaPolicy{
Type: "OutBoundNAT",
})

if err != nil {
return err
}

hnsEndpoint.Policies = append(hnsEndpoint.Policies, natPolicy)

epConnectivity, err := windows.ParseEndpointConnectivity(epOptions)
if err != nil {
return err
}

pbPolicy, err := windows.ConvertPortBindings(epConnectivity.PortBindings)
if err != nil {
return err
}
hnsEndpoint.Policies = append(hnsEndpoint.Policies, pbPolicy...)

ep.disablegateway = true
}

configurationb, err := json.Marshal(hnsEndpoint)
if err != nil {
return err
Expand All @@ -151,7 +184,7 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,
return err
}

ep.profileId = hnsresponse.Id
ep.profileID = hnsresponse.Id

if ep.mac == nil {
ep.mac, err = net.ParseMAC(hnsresponse.MacAddress)
Expand All @@ -164,6 +197,12 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,
}
}

ep.portMapping, err = windows.ParsePortBindingPolicies(hnsresponse.Policies)
if err != nil {
hcsshim.HNSEndpointRequest("DELETE", hnsresponse.Id, "")
return err
}

n.addEndpoint(ep)

return nil
Expand All @@ -186,7 +225,7 @@ func (d *driver) DeleteEndpoint(nid, eid string) error {

n.deleteEndpoint(eid)

_, err := hcsshim.HNSEndpointRequest("DELETE", ep.profileId, "")
_, err := hcsshim.HNSEndpointRequest("DELETE", ep.profileID, "")
if err != nil {
return err
}
Expand All @@ -210,7 +249,17 @@ func (d *driver) EndpointOperInfo(nid, eid string) (map[string]interface{}, erro
}

data := make(map[string]interface{}, 1)
data["hnsid"] = ep.profileId
data["hnsid"] = ep.profileID
data["AllowUnqualifiedDNSQuery"] = true

if ep.portMapping != nil {
// Return a copy of the operational data
pmc := make([]types.PortBinding, 0, len(ep.portMapping))
for _, pm := range ep.portMapping {
pmc = append(pmc, pm.GetCopy())
}
data[netlabel.PortMap] = pmc
}

return data, nil
}
15 changes: 8 additions & 7 deletions drivers/windows/overlay/ov_network_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ type subnetJSON struct {
type network struct {
id string
name string
hnsId string
hnsID string
providerAddress string
interfaceName string
endpoints endpointTable
Expand Down Expand Up @@ -108,7 +108,7 @@ func (d *driver) CreateNetwork(id string, option map[string]interface{}, nInfo d
case "com.docker.network.windowsshim.interface":
interfaceName = value
case "com.docker.network.windowsshim.hnsid":
n.hnsId = value
n.hnsID = value
case netlabel.OverlayVxlanIDList:
vniStrings := strings.Split(value, ",")
for _, vniStr := range vniStrings {
Expand Down Expand Up @@ -181,7 +181,7 @@ func (d *driver) CreateNetwork(id string, option map[string]interface{}, nInfo d
if err != nil {
d.deleteNetwork(id)
} else {
genData["com.docker.network.windowsshim.hnsid"] = n.hnsId
genData["com.docker.network.windowsshim.hnsid"] = n.hnsID
}

return err
Expand All @@ -197,7 +197,7 @@ func (d *driver) DeleteNetwork(nid string) error {
return types.ForbiddenErrorf("could not find network with id %s", nid)
}

_, err := hcsshim.HNSNetworkRequest("DELETE", n.hnsId, "")
_, err := hcsshim.HNSNetworkRequest("DELETE", n.hnsID, "")
if err != nil {
return types.ForbiddenErrorf(err.Error())
}
Expand Down Expand Up @@ -242,7 +242,7 @@ func (d *driver) network(nid string) *network {
// }

// for _, endpoint := range hnsresponse {
// if endpoint.VirtualNetwork != n.hnsId {
// if endpoint.VirtualNetwork != n.hnsID {
// continue
// }

Expand All @@ -260,7 +260,7 @@ func (d *driver) network(nid string) *network {
func (n *network) convertToOverlayEndpoint(v *hcsshim.HNSEndpoint) *endpoint {
ep := &endpoint{
id: v.Name,
profileId: v.Id,
profileID: v.Id,
nid: n.id,
remote: v.IsRemoteEndpoint,
}
Expand Down Expand Up @@ -311,6 +311,7 @@ func (d *driver) createHnsNetwork(n *network) error {
Type: d.Type(),
Subnets: subnets,
NetworkAdapterName: n.interfaceName,
AutomaticDNS: true,
}

configurationb, err := json.Marshal(network)
Expand All @@ -326,7 +327,7 @@ func (d *driver) createHnsNetwork(n *network) error {
return err
}

n.hnsId = hnsresponse.Id
n.hnsID = hnsresponse.Id
n.providerAddress = hnsresponse.ManagementIP

return nil
Expand Down
2 changes: 1 addition & 1 deletion drivers/windows/overlay/overlay_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ func (d *driver) restoreHNSNetworks() error {
func (d *driver) convertToOverlayNetwork(v *hcsshim.HNSNetwork) *network {
n := &network{
id: v.Name,
hnsId: v.Id,
hnsID: v.Id,
driver: d,
endpoints: endpointTable{},
subnets: []*subnet{},
Expand Down
6 changes: 3 additions & 3 deletions drivers/windows/overlay/peerdb_windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func (d *driver) peerAdd(nid, eid string, peerIP net.IP, peerIPMask net.IPMask,

hnsEndpoint := &hcsshim.HNSEndpoint{
Name: eid,
VirtualNetwork: n.hnsId,
VirtualNetwork: n.hnsID,
MacAddress: peerMac.String(),
IPAddress: peerIP,
IsRemoteEndpoint: true,
Expand Down Expand Up @@ -78,7 +78,7 @@ func (d *driver) peerAdd(nid, eid string, peerIP net.IP, peerIPMask net.IPMask,
nid: nid,
addr: addr,
mac: peerMac,
profileId: hnsresponse.Id,
profileID: hnsresponse.Id,
remote: true,
}

Expand Down Expand Up @@ -108,7 +108,7 @@ func (d *driver) peerDelete(nid, eid string, peerIP net.IP, peerIPMask net.IPMas
}

if updateDb {
_, err := hcsshim.HNSEndpointRequest("DELETE", ep.profileId, "")
_, err := hcsshim.HNSEndpointRequest("DELETE", ep.profileID, "")
if err != nil {
return err
}
Expand Down
24 changes: 14 additions & 10 deletions drivers/windows/windows.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,8 @@ type endpointOption struct {
DisableICC bool
}

type endpointConnectivity struct {
// EndpointConnectivity stores the port bindings and exposed ports that the user has specified in epOptions.
type EndpointConnectivity struct {
PortBindings []types.PortBinding
ExposedPorts []types.TransportPort
}
Expand All @@ -67,7 +68,7 @@ type hnsEndpoint struct {
Type string
macAddress net.HardwareAddr
epOption *endpointOption // User specified parameters
epConnectivity *endpointConnectivity // User specified parameters
epConnectivity *EndpointConnectivity // User specified parameters
portMapping []types.PortBinding // Operation port bindings
addr *net.IPNet
gateway net.IP
Expand Down Expand Up @@ -95,7 +96,7 @@ const (
errNotFound = "HNS failed with error : The object identifier does not represent a valid object. "
)

// IsBuiltinWindowsDriver vaidates if network-type is a builtin local-scoped driver
// IsBuiltinLocalDriver validates if network-type is a builtin local-scoped driver
func IsBuiltinLocalDriver(networkType string) bool {
if "l2bridge" == networkType || "l2tunnel" == networkType || "nat" == networkType || "ics" == networkType || "transparent" == networkType {
return true
Expand Down Expand Up @@ -396,7 +397,8 @@ func convertQosPolicies(qosPolicies []types.QosPolicy) ([]json.RawMessage, error
return qps, nil
}

func convertPortBindings(portBindings []types.PortBinding) ([]json.RawMessage, error) {
// ConvertPortBindings converts PortBindings to JSON for HNS request
func ConvertPortBindings(portBindings []types.PortBinding) ([]json.RawMessage, error) {
var pbs []json.RawMessage

// Enumerate through the port bindings specified by the user and convert
Expand Down Expand Up @@ -431,7 +433,8 @@ func convertPortBindings(portBindings []types.PortBinding) ([]json.RawMessage, e
return pbs, nil
}

func parsePortBindingPolicies(policies []json.RawMessage) ([]types.PortBinding, error) {
// ParsePortBindingPolicies parses HNS endpoint response message to PortBindings
func ParsePortBindingPolicies(policies []json.RawMessage) ([]types.PortBinding, error) {
var bindings []types.PortBinding
hcsPolicy := &hcsshim.NatPolicy{}

Expand Down Expand Up @@ -505,12 +508,13 @@ func parseEndpointOptions(epOptions map[string]interface{}) (*endpointOption, er
return ec, nil
}

func parseEndpointConnectivity(epOptions map[string]interface{}) (*endpointConnectivity, error) {
// ParseEndpointConnectivity parses options passed to CreateEndpoint, specifically port bindings, and store in a endpointConnectivity object.
func ParseEndpointConnectivity(epOptions map[string]interface{}) (*EndpointConnectivity, error) {
if epOptions == nil {
return nil, nil
}

ec := &endpointConnectivity{}
ec := &EndpointConnectivity{}

if opt, ok := epOptions[netlabel.PortMap]; ok {
if bs, ok := opt.([]types.PortBinding); ok {
Expand Down Expand Up @@ -550,7 +554,7 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,
if err != nil {
return err
}
epConnectivity, err := parseEndpointConnectivity(epOptions)
epConnectivity, err := ParseEndpointConnectivity(epOptions)
if err != nil {
return err
}
Expand All @@ -561,7 +565,7 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,
endpointStruct.MacAddress = strings.Replace(macAddress.String(), ":", "-", -1)
}

endpointStruct.Policies, err = convertPortBindings(epConnectivity.PortBindings)
endpointStruct.Policies, err = ConvertPortBindings(epConnectivity.PortBindings)
if err != nil {
return err
}
Expand Down Expand Up @@ -615,7 +619,7 @@ func (d *driver) CreateEndpoint(nid, eid string, ifInfo driverapi.InterfaceInfo,
endpoint.profileID = hnsresponse.Id
endpoint.epConnectivity = epConnectivity
endpoint.epOption = epOption
endpoint.portMapping, err = parsePortBindingPolicies(hnsresponse.Policies)
endpoint.portMapping, err = ParsePortBindingPolicies(hnsresponse.Policies)

if err != nil {
hcsshim.HNSEndpointRequest("DELETE", hnsresponse.Id, "")
Expand Down