Rever isDSR breaking change to HNSAddLoadBalancer

John Howard · John Howard · commit 63dd75c8beaf · 2018-11-30T11:57:13.000-08:00
Signed-off-by: John Howard &lt;jhoward@microsoft.com&gt;
diff --git a/hnspolicylist.go b/hnspolicylist.go
@@ -37,8 +37,8 @@ func GetPolicyListByID(policyListID string) (*PolicyList, error) {
 }
 
 // AddLoadBalancer policy list for the specified endpoints
-func AddLoadBalancer(endpoints []HNSEndpoint, isILB bool, isDSR bool, sourceVIP, vip string, protocol uint16, internalPort uint16, externalPort uint16) (*PolicyList, error) {
-	return hns.AddLoadBalancer(endpoints, isILB, isDSR, sourceVIP, vip, protocol, internalPort, externalPort)
+func AddLoadBalancer(endpoints []HNSEndpoint, isILB bool, sourceVIP, vip string, protocol uint16, internalPort uint16, externalPort uint16) (*PolicyList, error) {
+	return hns.AddLoadBalancer(endpoints, isILB, sourceVIP, vip, protocol, internalPort, externalPort)
 }
 
 // AddRoute adds route policy list for the specified endpoints
diff --git a/internal/hns/hnspolicylist.go b/internal/hns/hnspolicylist.go
@@ -140,7 +140,7 @@ func (policylist *PolicyList) RemoveEndpoint(endpoint *HNSEndpoint) (*PolicyList
 }
 
 // AddLoadBalancer policy list for the specified endpoints
-func AddLoadBalancer(endpoints []HNSEndpoint, isILB bool, isDSR bool, sourceVIP, vip string, protocol uint16, internalPort uint16, externalPort uint16) (*PolicyList, error) {
+func AddLoadBalancer(endpoints []HNSEndpoint, isILB bool, sourceVIP, vip string, protocol uint16, internalPort uint16, externalPort uint16) (*PolicyList, error) {
 	operation := "AddLoadBalancer"
 	title := "hcsshim::PolicyList::" + operation
 	logrus.Debugf(title+" endpointId=%v, isILB=%v, sourceVIP=%s, vip=%s, protocol=%v, internalPort=%v, externalPort=%v", endpoints, isILB, sourceVIP, vip, protocol, internalPort, externalPort)
@@ -150,7 +150,6 @@ func AddLoadBalancer(endpoints []HNSEndpoint, isILB bool, isDSR bool, sourceVIP,
 	elbPolicy := &ELBPolicy{
 		SourceVIP: sourceVIP,
 		ILB:       isILB,
-		DSR:       isDSR,
 	}
 
 	if len(vip) > 0 {

Original file line number	Diff line number	Diff line change
`@@ -37,8 +37,8 @@ func GetPolicyListByID(policyListID string) (*PolicyList, error) {`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`// AddLoadBalancer policy list for the specified endpoints`
`40`		`-func AddLoadBalancer(endpoints []HNSEndpoint, isILB bool, isDSR bool, sourceVIP, vip string, protocol uint16, internalPort uint16, externalPort uint16) (*PolicyList, error) {`
`41`		`- return hns.AddLoadBalancer(endpoints, isILB, isDSR, sourceVIP, vip, protocol, internalPort, externalPort)`
	`40`	`+func AddLoadBalancer(endpoints []HNSEndpoint, isILB bool, sourceVIP, vip string, protocol uint16, internalPort uint16, externalPort uint16) (*PolicyList, error) {`
	`41`	`+ return hns.AddLoadBalancer(endpoints, isILB, sourceVIP, vip, protocol, internalPort, externalPort)`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`// AddRoute adds route policy list for the specified endpoints`
Original file line number	Diff line number	Diff line change
`@@ -140,7 +140,7 @@ func (policylist PolicyList) RemoveEndpoint(endpoint HNSEndpoint) (*PolicyList`
`140`	`140`	`}`
`141`	`141`
`142`	`142`	`// AddLoadBalancer policy list for the specified endpoints`
`143`		`-func AddLoadBalancer(endpoints []HNSEndpoint, isILB bool, isDSR bool, sourceVIP, vip string, protocol uint16, internalPort uint16, externalPort uint16) (*PolicyList, error) {`
	`143`	`+func AddLoadBalancer(endpoints []HNSEndpoint, isILB bool, sourceVIP, vip string, protocol uint16, internalPort uint16, externalPort uint16) (*PolicyList, error) {`
`144`	`144`	`operation := "AddLoadBalancer"`
`145`	`145`	`title := "hcsshim::PolicyList::" + operation`
`146`	`146`	`logrus.Debugf(title+" endpointId=%v, isILB=%v, sourceVIP=%s, vip=%s, protocol=%v, internalPort=%v, externalPort=%v", endpoints, isILB, sourceVIP, vip, protocol, internalPort, externalPort)`
`@@ -150,7 +150,6 @@ func AddLoadBalancer(endpoints []HNSEndpoint, isILB bool, isDSR bool, sourceVIP,`
`150`	`150`	`elbPolicy := &ELBPolicy{`
`151`	`151`	`SourceVIP: sourceVIP,`
`152`	`152`	`ILB: isILB,`
`153`		`- DSR: isDSR,`
`154`	`153`	`}`
`155`	`154`
`156`	`155`	`if len(vip) > 0 {`