refactor(win-bridge): netconf

- support v2 api - unify v1 and v2 api BREAKING CHANGE: - remove `HcnPolicyArgs` field - merge `HcnPolicyArgs` into `Policies` field Signed-off-by: thxcode <[email protected]>
containernetworking · Apr 19, 2021 · 222fe58 · 222fe58
1 parent 1927832
commit 222fe58
Show file tree

Hide file tree

Showing 8 changed files with 695 additions and 192 deletions.
diff --git a/pkg/hns/endpoint_windows.go b/pkg/hns/endpoint_windows.go
@@ -95,7 +95,7 @@ func GenerateHnsEndpoint(epInfo *EndpointInfo, n *NetConf) (*hcsshim.HNSEndpoint
 	}
 
 	if n.LoopbackDSR {
-		n.ApplyLoopbackDSR(&epInfo.IpAddress)
+		n.ApplyLoopbackDSRPolicy(&epInfo.IpAddress)
 	}
 	hnsEndpoint = &hcsshim.HNSEndpoint{
 		Name:           epInfo.EndpointName,
@@ -104,7 +104,7 @@ func GenerateHnsEndpoint(epInfo *EndpointInfo, n *NetConf) (*hcsshim.HNSEndpoint
 		DNSSuffix:      strings.Join(epInfo.DNS.Search, ","),
 		GatewayAddress: GetIpString(&epInfo.Gateway),
 		IPAddress:      epInfo.IpAddress,
-		Policies:       n.MarshalPolicies(),
+		Policies:       n.GetHNSEndpointPolicies(),
 	}
 	return hnsEndpoint, nil
 }
@@ -240,7 +240,7 @@ func GenerateHcnEndpoint(epInfo *EndpointInfo, n *NetConf) (*hcn.HostComputeEndp
 	}
 
 	if n.LoopbackDSR {
-		n.ApplyLoopbackDSR(&epInfo.IpAddress)
+		n.ApplyLoopbackDSRPolicy(&epInfo.IpAddress)
 	}
 	hcnEndpoint = &hcn.HostComputeEndpoint{
 		SchemaVersion: hcn.SchemaVersion{
@@ -266,12 +266,7 @@ func GenerateHcnEndpoint(epInfo *EndpointInfo, n *NetConf) (*hcn.HostComputeEndp
 				IpAddress: GetIpString(&epInfo.IpAddress),
 			},
 		},
-		Policies: func() []hcn.EndpointPolicy {
-			if n.HcnPolicyArgs == nil {
-				n.HcnPolicyArgs = []hcn.EndpointPolicy{}
-			}
-			return n.HcnPolicyArgs
-		}(),
+		Policies: n.GetHostComputeEndpointPolicies(),
 	}
 	return hcnEndpoint, nil
 }

diff --git a/pkg/hns/netconf_suite_windows_test.go b/pkg/hns/netconf_suite_windows_test.go
@@ -20,7 +20,7 @@ import (
 	"testing"
 )
 
-func TestHns(t *testing.T) {
+func TestNetConf(t *testing.T) {
 	RegisterFailHandler(Fail)
-	RunSpecs(t, "HNS NetConf Suite")
+	RunSpecs(t, "NetConf Suite")
 }