removed cni circular dependency

Author: rejain789

cni/netconfig.go

@@ -7,6 +7,7 @@ import (
 	"encoding/json"
 	"strings"
 
+	acn "github.com/Azure/azure-container-networking/common"
 	"github.com/Azure/azure-container-networking/network/policy"
 	cniTypes "github.com/containernetworking/cni/pkg/types"
 )
@@ -15,12 +16,6 @@ const (
 	PolicyStr string = "Policy"
 )
 
-// KVPair represents a K-V pair of a json object.
-type KVPair struct {
-	Name  string          `json:"name"`
-	Value json.RawMessage `json:"value"`
-}
-
 type PortMapping struct {
 	HostPort      int    `json:"hostPort"`
 	ContainerPort int    `json:"containerPort"`
@@ -78,7 +73,7 @@ type NetworkConfig struct {
 	DNS                           cniTypes.DNS    `json:"dns,omitempty"`
 	RuntimeConfig                 RuntimeConfig   `json:"runtimeConfig,omitempty"`
 	WindowsSettings               WindowsSettings `json:"windowsSettings,omitempty"`
-	AdditionalArgs                []KVPair        `json:"AdditionalArgs,omitempty"`
+	AdditionalArgs                []acn.KVPair    `json:"AdditionalArgs,omitempty"`
 }
 
 type WindowsSettings struct {
@@ -121,7 +116,7 @@ func ParseNetworkConfig(b []byte) (*NetworkConfig, error) {
 }
 
 // GetPoliciesFromNwCfg returns network policies from network config.
-func GetPoliciesFromNwCfg(kvp []KVPair) []policy.Policy {
+func GetPoliciesFromNwCfg(kvp []acn.KVPair) []policy.Policy {
 	var policies []policy.Policy
 	for _, pair := range kvp {
 		if strings.Contains(pair.Name, PolicyStr) {

cni/network/network_windows_test.go

@@ -12,6 +12,7 @@ import (
 
 	"github.com/Azure/azure-container-networking/cni"
 	"github.com/Azure/azure-container-networking/cns"
+	acn "github.com/Azure/azure-container-networking/common"
 	"github.com/Azure/azure-container-networking/network"
 	"github.com/Azure/azure-container-networking/network/hnswrapper"
 	"github.com/Azure/azure-container-networking/network/policy"
@@ -941,7 +942,7 @@ func TestPluginWindowsAdd(t *testing.T) {
 		EnableExactMatchForPodName: true,
 		Master:                     "eth0",
 		// these are added to test that policies propagate to endpoint info
-		AdditionalArgs: []cni.KVPair{
+		AdditionalArgs: []acn.KVPair{
 			{
 				Name:  "EndpointPolicy",
 				Value: GetRawOutBoundNATPolicy(),

cns/NetworkContainerContract.go

@@ -7,8 +7,8 @@ import (
 	"strconv"
 	"strings"
 
-	"github.com/Azure/azure-container-networking/cni"
 	"github.com/Azure/azure-container-networking/cns/types"
+	acn "github.com/Azure/azure-container-networking/common"
 	"github.com/Azure/azure-container-networking/crd/nodenetworkconfig/api/v1alpha"
 	"github.com/google/uuid"
 	"github.com/pkg/errors"
@@ -505,7 +505,7 @@ type PodIpInfo struct {
 	// PnpId is set for backend interfaces, Pnp Id identifies VF. Plug and play id(pnp) is also called as PCI ID
 	PnPID string
 	// Defauly Deny ACL's to configure on HNS endpoints for Swiftv2 window nodes
-	DefaultDenyACL []cni.KVPair
+	DefaultDenyACL []acn.KVPair
 }
 
 type HostIPInfo struct {

cns/middlewares/k8sSwiftV2_windows.go

@@ -3,9 +3,9 @@ package middlewares
 import (
 	"encoding/json"
 
-	"github.com/Azure/azure-container-networking/cni"
 	"github.com/Azure/azure-container-networking/cns"
 	"github.com/Azure/azure-container-networking/cns/middlewares/utils"
+	acn "github.com/Azure/azure-container-networking/common"
 	"github.com/Azure/azure-container-networking/crd/multitenancy/api/v1alpha1"
 	"github.com/Microsoft/hcsshim/hcn"
 	"github.com/pkg/errors"
@@ -75,7 +75,7 @@ func addDefaultDenyACL(podIPInfo *cns.PodIpInfo) error {
 		return errors.Wrap(err, "Failed to create default deny ACL policy ingress")
 	}
 
-	additionalArgs := []cni.KVPair{
+	additionalArgs := []acn.KVPair{
 		{
 			Name:  "EndpointPolicy",
 			Value: blockEgressACL,

cns/middlewares/k8sSwiftV2_windows_test.go

@@ -5,9 +5,9 @@ import (
 	"reflect"
 	"testing"
 
-	"github.com/Azure/azure-container-networking/cni"
 	"github.com/Azure/azure-container-networking/cns"
 	"github.com/Azure/azure-container-networking/cns/middlewares/mock"
+	acn "github.com/Azure/azure-container-networking/common"
 	"github.com/Azure/azure-container-networking/crd/multitenancy/api/v1alpha1"
 	"github.com/stretchr/testify/require"
 	"gotest.tools/v3/assert"
@@ -119,7 +119,7 @@ func TestAddDefaultDenyACL(t *testing.T) {
 		"Priority": 10000
 	}`)
 
-	expectedDefaultDenyACL := []cni.KVPair{
+	expectedDefaultDenyACL := []acn.KVPair{
 		{
 			Name:  "EndpointPolicy",
 			Value: valueOut,
@@ -151,8 +151,8 @@ func TestAddDefaultDenyACL(t *testing.T) {
 }
 
 // normalizeKVPairs normalizes the JSON values in the KV pairs by unmarshaling them into a map, then marshaling them back to compact JSON to remove any extra space, new lines, etc
-func normalizeKVPairs(t *testing.T, kvPairs []cni.KVPair) []cni.KVPair {
-	normalized := make([]cni.KVPair, len(kvPairs))
+func normalizeKVPairs(t *testing.T, kvPairs []acn.KVPair) []acn.KVPair {
+	normalized := make([]acn.KVPair, len(kvPairs))
 
 	for i, kv := range kvPairs {
 		var unmarshaledValue map[string]interface{}
@@ -165,7 +165,7 @@ func normalizeKVPairs(t *testing.T, kvPairs []cni.KVPair) []cni.KVPair {
 		require.NoError(t, err, "Failed to re-marshal JSON value")
 
 		// Replace Value with the normalized compact JSON
-		normalized[i] = cni.KVPair{
+		normalized[i] = acn.KVPair{
 			Name:  kv.Name,
 			Value: normalizedValue,
 		}

common/config.go

@@ -3,6 +3,10 @@
 
 package common
 
+import (
+	"encoding/json"
+)
+
 // Command line options.
 const (
 	// Operating environment.
@@ -146,3 +150,9 @@ const (
 	// OptCNIConflistScenarioAlias "shorthand" for the cni conflist scenairo, see above
 	OptCNIConflistScenarioAlias = "cniconflistscenario"
 )
+
+// KVPair represents a K-V pair of a json object.
+type KVPair struct {
+	Name  string          `json:"name"`
+	Value json.RawMessage `json:"value"`
+}