[NPM] Adding prefixes to IPSets in dataplane

common/ioshim_linux.go

@@ -0,0 +1,22 @@
+package common
+
+import (
+	testutils "github.com/Azure/azure-container-networking/test/utils"
+	utilexec "k8s.io/utils/exec"
+)
+
+type IOShim struct {
+	Exec utilexec.Interface
+}
+
+func NewIOShim() *IOShim {
+	return &IOShim{
+		Exec: utilexec.New(),
+	}
+}
+
+func NewMockIOShim(calls []testutils.TestCmd) *IOShim {
+	return &IOShim{
+		Exec: testutils.GetFakeExecWithScripts(calls),
+	}
+}

common/ioshim_windows.go

@@ -0,0 +1,26 @@
+package common
+
+import (
+	"github.com/Azure/azure-container-networking/network/hnswrapper"
+	testutils "github.com/Azure/azure-container-networking/test/utils"
+	utilexec "k8s.io/utils/exec"
+)
+
+type IOShim struct {
+	Exec utilexec.Interface
+	Hns  hnswrapper.HnsV2WrapperInterface
+}
+
+func NewIOShim() *IOShim {
+	return &IOShim{
+		Exec: utilexec.New(),
+		Hns:  &hnswrapper.Hnsv2wrapper{},
+	}
+}
+
+func NewMockIOShim(calls []testutils.TestCmd) *IOShim {
+	return &IOShim{
+		Exec: testutils.GetFakeExecWithScripts(calls),
+		Hns:  &hnswrapper.Hnsv2wrapperFake{},
+	}
+}

network/hnswrapper/hnsv2wrapper.go

@@ -1,6 +1,7 @@
 // Copyright 2017 Microsoft. All rights reserved.
 // MIT License
 
+//go:build windows
 // +build windows
 
 package hnswrapper
@@ -10,25 +11,32 @@ import (
 )
 
 type Hnsv2wrapper struct {
-
 }
 
-func (Hnsv2wrapper) CreateEndpoint(endpoint *hcn.HostComputeEndpoint)  (*hcn.HostComputeEndpoint, error)  {
+func (Hnsv2wrapper) CreateEndpoint(endpoint *hcn.HostComputeEndpoint) (*hcn.HostComputeEndpoint, error) {
 	return endpoint.Create()
 }
 
-func (Hnsv2wrapper) DeleteEndpoint(endpoint *hcn.HostComputeEndpoint) error  {
+func (Hnsv2wrapper) DeleteEndpoint(endpoint *hcn.HostComputeEndpoint) error {
 	return endpoint.Delete()
 }
 
-func (Hnsv2wrapper) CreateNetwork(network *hcn.HostComputeNetwork)  (*hcn.HostComputeNetwork, error)  {
+func (Hnsv2wrapper) CreateNetwork(network *hcn.HostComputeNetwork) (*hcn.HostComputeNetwork, error) {
 	return network.Create()
 }
 
-func (Hnsv2wrapper) DeleteNetwork(network *hcn.HostComputeNetwork) error  {
+func (Hnsv2wrapper) DeleteNetwork(network *hcn.HostComputeNetwork) error {
 	return network.Delete()
 }
 
+func (Hnsv2wrapper) AddNetworkPolicy(network *hcn.HostComputeNetwork, networkPolicy hcn.PolicyNetworkRequest) error {
+	return network.AddPolicy(networkPolicy)
+}
+
+func (Hnsv2wrapper) RemoveNetworkPolicy(network *hcn.HostComputeNetwork, networkPolicy hcn.PolicyNetworkRequest) error {
+	return network.RemovePolicy(networkPolicy)
+}
+
 func (w Hnsv2wrapper) GetNamespaceByID(netNamespacePath string) (*hcn.HostComputeNamespace, error) {
 	return hcn.GetNamespaceByID(netNamespacePath)
 }
@@ -41,10 +49,22 @@ func (w Hnsv2wrapper) RemoveNamespaceEndpoint(namespaceId string, endpointId str
 	return hcn.RemoveNamespaceEndpoint(namespaceId, endpointId)
 }
 
+func (w Hnsv2wrapper) GetNetworkByName(networkName string) (*hcn.HostComputeNetwork, error) {
+	return hcn.GetNetworkByName(networkName)
+}
+
 func (w Hnsv2wrapper) GetNetworkByID(networkId string) (*hcn.HostComputeNetwork, error) {
 	return hcn.GetNetworkByID(networkId)
 }
 
 func (f Hnsv2wrapper) GetEndpointByID(endpointId string) (*hcn.HostComputeEndpoint, error) {
 	return hcn.GetEndpointByID(endpointId)
-}
+}
+
+func (f Hnsv2wrapper) ListEndpointsOfNetwork(networkId string) ([]hcn.HostComputeEndpoint, error) {
+	return hcn.ListEndpointsOfNetwork(networkId)
+}
+
+func (f Hnsv2wrapper) ApplyEndpointPolicy(endpoint *hcn.HostComputeEndpoint, requestType hcn.RequestType, endpointPolicy hcn.PolicyEndpointRequest) error {
+	return endpoint.ApplyPolicy(requestType, endpointPolicy)
+}

network/hnswrapper/hnsv2wrapperfake.go

@@ -1,6 +1,7 @@
 // Copyright 2017 Microsoft. All rights reserved.
 // MIT License
 
+//go:build windows
 // +build windows
 
 package hnswrapper
@@ -13,24 +14,36 @@ type Hnsv2wrapperFake struct {
 }
 
 func (f Hnsv2wrapperFake) CreateNetwork(network *hcn.HostComputeNetwork) (*hcn.HostComputeNetwork, error) {
-	return network,nil
+	return network, nil
 }
 
 func (f Hnsv2wrapperFake) DeleteNetwork(network *hcn.HostComputeNetwork) error {
 	return nil
 }
 
+func (Hnsv2wrapperFake) AddNetworkPolicy(network *hcn.HostComputeNetwork, networkPolicy hcn.PolicyNetworkRequest) error {
+	return nil
+}
+
+func (Hnsv2wrapperFake) RemoveNetworkPolicy(network *hcn.HostComputeNetwork, networkPolicy hcn.PolicyNetworkRequest) error {
+	return nil
+}
+
+func (Hnsv2wrapperFake) GetNetworkByName(networkName string) (*hcn.HostComputeNetwork, error) {
+	return &hcn.HostComputeNetwork{}, nil
+}
+
 func (f Hnsv2wrapperFake) GetNetworkByID(networkId string) (*hcn.HostComputeNetwork, error) {
 	network := &hcn.HostComputeNetwork{Id: "c84257e3-3d60-40c4-8c47-d740a1c260d3"}
-	return network,nil
+	return network, nil
 }
 
 func (f Hnsv2wrapperFake) GetEndpointByID(endpointId string) (*hcn.HostComputeEndpoint, error) {
 	endpoint := &hcn.HostComputeEndpoint{Id: "7a2ae98a-0c84-4b35-9684-1c02a2bf7e03"}
-	return endpoint,nil
+	return endpoint, nil
 }
 
-func (Hnsv2wrapperFake) CreateEndpoint(endpoint *hcn.HostComputeEndpoint)  (*hcn.HostComputeEndpoint, error)  {
+func (Hnsv2wrapperFake) CreateEndpoint(endpoint *hcn.HostComputeEndpoint) (*hcn.HostComputeEndpoint, error) {
 	return endpoint, nil
 }
 
@@ -50,3 +63,11 @@ func (Hnsv2wrapperFake) AddNamespaceEndpoint(namespaceId string, endpointId stri
 func (Hnsv2wrapperFake) RemoveNamespaceEndpoint(namespaceId string, endpointId string) error {
 	return nil
 }
+
+func (Hnsv2wrapperFake) ListEndpointsOfNetwork(networkId string) ([]hcn.HostComputeEndpoint, error) {
+	return []hcn.HostComputeEndpoint{}, nil
+}
+
+func (Hnsv2wrapperFake) ApplyEndpointPolicy(endpoint *hcn.HostComputeEndpoint, requestType hcn.RequestType, endpointPolicy hcn.PolicyEndpointRequest) error {
+	return nil
+}

network/hnswrapper/hnsv2wrapperinterface.go

@@ -1,6 +1,7 @@
 // Copyright 2017 Microsoft. All rights reserved.
 // MIT License
 
+//go:build windows
 // +build windows
 
 package hnswrapper
@@ -11,10 +12,15 @@ type HnsV2WrapperInterface interface {
 	CreateEndpoint(endpoint *hcn.HostComputeEndpoint) (*hcn.HostComputeEndpoint, error)
 	DeleteEndpoint(endpoint *hcn.HostComputeEndpoint) error
 	CreateNetwork(network *hcn.HostComputeNetwork) (*hcn.HostComputeNetwork, error)
-	DeleteNetwork(network *hcn.HostComputeNetwork)  error
+	DeleteNetwork(network *hcn.HostComputeNetwork) error
+	AddNetworkPolicy(network *hcn.HostComputeNetwork, networkPolicy hcn.PolicyNetworkRequest) error
+	RemoveNetworkPolicy(network *hcn.HostComputeNetwork, networkPolicy hcn.PolicyNetworkRequest) error
 	GetNamespaceByID(netNamespacePath string) (*hcn.HostComputeNamespace, error)
 	AddNamespaceEndpoint(namespaceId string, endpointId string) error
 	RemoveNamespaceEndpoint(namespaceId string, endpointId string) error
+	GetNetworkByName(networkName string) (*hcn.HostComputeNetwork, error)
 	GetNetworkByID(networkId string) (*hcn.HostComputeNetwork, error)
 	GetEndpointByID(endpointId string) (*hcn.HostComputeEndpoint, error)
-}
+	ListEndpointsOfNetwork(networkId string) ([]hcn.HostComputeEndpoint, error)
+	ApplyEndpointPolicy(endpoint *hcn.HostComputeEndpoint, requestType hcn.RequestType, endpointPolicy hcn.PolicyEndpointRequest) error
+}