Tests for AdminNetworkPolicy

pkg/internal/testutils/parsed_resources_tests.go

@@ -33,7 +33,7 @@
 func newDefaultPod(namespace, name string, ports []int, protocols []v1.Protocol) *v1.Pod {
 	podObj := v1.Pod{}
 	podObj.TypeMeta.APIVersion = "v1"
 	podObj.TypeMeta.Kind = "Pod"
 	podObj.ObjectMeta.Name = name
 	podObj.ObjectMeta.Namespace = namespace
 	podObj.Labels = map[string]string{"pod": name}
@@ -135,24 +135,52 @@
 	res := []parser.K8sObject{}
 	test.TestInfo = fmt.Sprintf("test: %q, output format: %q", test.Name, test.OutputFormat)
 	for _, ns := range test.Resources.NsList {
-		res = append(res, parser.CreateNamespaceK8sObject(ns))
+		res = append(res, CreateNamespaceK8sObject(ns))
 	}
 	for _, pod := range test.Resources.PodList {
-		res = append(res, parser.CreatePodK8sObject(pod))
+		res = append(res, CreatePodK8sObject(pod))
 	}
 	for _, np := range test.NpList {
-		res = append(res, parser.CreateNetwordPolicyK8sObject(np))
+		res = append(res, CreateNetwordPolicyK8sObject(np))
 	}
 	for _, anp := range test.AnpList {
-		res = append(res, parser.CreateAdminNetwordPolicyK8sObject(anp))
+		res = append(res, CreateAdminNetwordPolicyK8sObject(anp))
 	}
 	// Tanya: uncomment the code below when BaselineAdminNetworkPolicy is implemented
 	// if test.Banp != nil {
-	// 	res = append(res, parser.CreateBaselineAdminNetwordPolicyK8sObject(test.Banp))
+	// 	res = append(res, CreateBaselineAdminNetwordPolicyK8sObject(test.Banp))
 	// }
 	return res
 }
 
+func CreatePodK8sObject(pod *v1.Pod) parser.K8sObject {
+	k8sObj := parser.K8sObject{}
+	k8sObj.Kind = "Pod"
+	k8sObj.Pod = pod
+	return k8sObj
+}
+
+func CreateNamespaceK8sObject(ns *v1.Namespace) parser.K8sObject {
+	k8sObj := parser.K8sObject{}
+	k8sObj.Kind = "Namespace"
+	k8sObj.Namespace = ns
+	return k8sObj
+}
+
+func CreateNetwordPolicyK8sObject(np *netv1.NetworkPolicy) parser.K8sObject {
+	k8sObj := parser.K8sObject{}
+	k8sObj.Kind = "NetworkPolicy"
+	k8sObj.NetworkPolicy = np
+	return k8sObj
+}
+
+func CreateAdminNetwordPolicyK8sObject(anp *v1alpha1.AdminNetworkPolicy) parser.K8sObject {
+	k8sObj := parser.K8sObject{}
+	k8sObj.Kind = "AdminNetworkPolicy"
+	k8sObj.AdminNetworkPolicy = anp
+	return k8sObj
+}
+
 //////////////////////////////////// The following tests are taken from /////////////////////////////////////
 // https://github.com/kubernetes-sigs/network-policy-api/blob/main/cmd/policy-assistant/test/integration/integration_test.go
 

pkg/manifests/parser/parser.go

@@ -10,12 +10,9 @@ import (
 	"errors"
 	"fmt"
 
-	v1 "k8s.io/api/core/v1"
-	netv1 "k8s.io/api/networking/v1"
 	"k8s.io/apimachinery/pkg/apis/meta/v1/unstructured"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/cli-runtime/pkg/resource"
-	apisv1a "sigs.k8s.io/network-policy-api/apis/v1alpha1"
 
 	"github.com/np-guard/netpol-analyzer/pkg/internal/netpolerrors"
 	"github.com/np-guard/netpol-analyzer/pkg/logger"
@@ -95,38 +92,6 @@ func resourceInfoToK8sObject(info *resource.Info, l logger.Logger, muteErrsAndWa
 	return &resObject, nil
 }
 
-func CreatePodK8sObject(pod *v1.Pod) K8sObject {
-	k8sObj := K8sObject{}
-	k8sObj.Kind = "Pod"
-	k8sObj.Pod = pod
-	k8sObj.initDefaultNamespace()
-	return k8sObj
-}
-
-func CreateNamespaceK8sObject(ns *v1.Namespace) K8sObject {
-	k8sObj := K8sObject{}
-	k8sObj.Kind = "Namespace"
-	k8sObj.Namespace = ns
-	k8sObj.initDefaultNamespace()
-	return k8sObj
-}
-
-func CreateNetwordPolicyK8sObject(np *netv1.NetworkPolicy) K8sObject {
-	k8sObj := K8sObject{}
-	k8sObj.Kind = "NetworkPolicy"
-	k8sObj.NetworkPolicy = np
-	k8sObj.initDefaultNamespace()
-	return k8sObj
-}
-
-func CreateAdminNetwordPolicyK8sObject(anp *apisv1a.AdminNetworkPolicy) K8sObject {
-	k8sObj := K8sObject{}
-	k8sObj.Kind = "AdminNetworkPolicy"
-	k8sObj.AdminNetworkPolicy = anp
-	k8sObj.initDefaultNamespace()
-	return k8sObj
-}
-
 // error for resource with kind: , name: ,namespace: ,
 func getResourceInfoStr(kind, name, namespace string) string {
 	res := ""