Rename networkpolicyaccessreview to networkpolicyevaluation

Signed-off-by: Qiyue Yao <yaoq@vmware.com>

pkg/antctl/transform/networkpolicy/transform.go

@@ -167,15 +167,15 @@ func (r Response) SortRows() bool {
 }
 
 type EvaluationResponse struct {
-	*cpv1beta.NetworkPolicyAccessReview
+	*cpv1beta.NetworkPolicyEvaluation
 }
 
 func EvaluationTransform(reader io.Reader, _ bool, _ map[string]string) (interface{}, error) {
-	refVal := reflect.New(reflect.TypeOf(cpv1beta.NetworkPolicyAccessReview{}))
+	refVal := reflect.New(reflect.TypeOf(cpv1beta.NetworkPolicyEvaluation{}))
 	if err := json.NewDecoder(reader).Decode(refVal.Interface()); err != nil {
 		return nil, err
 	}
-	return EvaluationResponse{refVal.Interface().(*cpv1beta.NetworkPolicyAccessReview)}, nil
+	return EvaluationResponse{refVal.Interface().(*cpv1beta.NetworkPolicyEvaluation)}, nil
 }
 
 var _ common.TableOutput = new(EvaluationResponse)
@@ -185,7 +185,7 @@ func (r EvaluationResponse) GetTableHeader() []string {
 }
 
 func (r EvaluationResponse) GetTableRow(_ int) []string {
-	if r.NetworkPolicyAccessReview != nil && r.Response != nil {
+	if r.NetworkPolicyEvaluation != nil && r.Response != nil {
 		return []string{
 			r.Response.NetworkPolicy.Name,
 			r.Response.NetworkPolicy.Namespace,
@@ -224,10 +224,10 @@ func NewNetworkPolicyEvaluation(args map[string]string) (runtime.Object, error)
 		ns2, pod2 = parsePeer(val)
 	}
 	if pod1 == "" || pod2 == "" {
-		return nil, fmt.Errorf("missing entities for NetworkPolicyAccessReview request: %v", args)
+		return nil, fmt.Errorf("missing entities for NetworkPolicyEvaluation request: %v", args)
 	}
-	return &cpv1beta.NetworkPolicyAccessReview{
-		Request: &cpv1beta.NetworkPolicyAccessRequest{
+	return &cpv1beta.NetworkPolicyEvaluation{
+		Request: &cpv1beta.NetworkPolicyEvaluationRequest{
 			Source:      cpv1beta.Entity{Pod: &cpv1beta.PodReference{Namespace: ns1, Name: pod1}},
 			Destination: cpv1beta.Entity{Pod: &cpv1beta.PodReference{Namespace: ns2, Name: pod2}},
 		},

pkg/antctl/transform/networkpolicy/transform_test.go

@@ -145,8 +145,8 @@ func TestNewNetworkPolicyEvaluation(t *testing.T) {
 				"source":      "ns/pod1",
 				"destination": "ns/pod2",
 			},
-			expectedObject: &cpv1beta.NetworkPolicyAccessReview{
-				Request: &cpv1beta.NetworkPolicyAccessRequest{
+			expectedObject: &cpv1beta.NetworkPolicyEvaluation{
+				Request: &cpv1beta.NetworkPolicyEvaluationRequest{
 					Source:      cpv1beta.Entity{Pod: &cpv1beta.PodReference{Namespace: "ns", Name: "pod1"}},
 					Destination: cpv1beta.Entity{Pod: &cpv1beta.PodReference{Namespace: "ns", Name: "pod2"}},
 				},
@@ -157,16 +157,16 @@ func TestNewNetworkPolicyEvaluation(t *testing.T) {
 			args: map[string]string{
 				"destination": "ns",
 			},
-			expectedError: "missing entities for NetworkPolicyAccessReview request",
+			expectedError: "missing entities for NetworkPolicyEvaluation request",
 		},
 		{
 			name: "Default namespaces",
 			args: map[string]string{
 				"source":      "pod1",
 				"destination": "pod2",
 			},
-			expectedObject: &cpv1beta.NetworkPolicyAccessReview{
-				Request: &cpv1beta.NetworkPolicyAccessRequest{
+			expectedObject: &cpv1beta.NetworkPolicyEvaluation{
+				Request: &cpv1beta.NetworkPolicyEvaluationRequest{
 					Source:      cpv1beta.Entity{Pod: &cpv1beta.PodReference{Namespace: "default", Name: "pod1"}},
 					Destination: cpv1beta.Entity{Pod: &cpv1beta.PodReference{Namespace: "default", Name: "pod2"}},
 				},
@@ -188,11 +188,11 @@ func TestNewNetworkPolicyEvaluation(t *testing.T) {
 }
 
 func TestAccessResponse(t *testing.T) {
-	test := EvaluationResponse{&cpv1beta.NetworkPolicyAccessReview{}}
+	test := EvaluationResponse{&cpv1beta.NetworkPolicyEvaluation{}}
 	assert.Equal(t, []string{"NAME", "NAMESPACE", "POLICY-TYPE", "RULE-INDEX", "DIRECTION"}, test.GetTableHeader())
 	assert.False(t, test.SortRows())
 	assert.Equal(t, []string{"", "", "", "", ""}, test.GetTableRow(32))
-	test.Response = &cpv1beta.NetworkPolicyAccessResponse{
+	test.Response = &cpv1beta.NetworkPolicyEvaluationResponse{
 		NetworkPolicy: cpv1beta.NetworkPolicyReference{
 			Type:      cpv1beta.K8sNetworkPolicy,
 			Namespace: "ns",

pkg/apis/controlplane/register.go

@@ -54,7 +54,7 @@ func addKnownTypes(scheme *runtime.Scheme) error {
 		&NetworkPolicy{},
 		&NetworkPolicyList{},
 		&NetworkPolicyStatus{},
-		&NetworkPolicyAccessReview{},
+		&NetworkPolicyEvaluation{},
 		&NodeStatsSummary{},
 		&ClusterGroupMembers{},
 		&GroupMembers{},

pkg/apis/controlplane/types.go

@@ -450,20 +450,20 @@ type NetworkPolicyNodeStatus struct {
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
 
-// NetworkPolicyAccessReview contains the request and response for a NetworkPolicy access review.
-type NetworkPolicyAccessReview struct {
+// NetworkPolicyEvaluation contains the request and response for a NetworkPolicy access review.
+type NetworkPolicyEvaluation struct {
 	metav1.TypeMeta
-	Request  *NetworkPolicyAccessRequest
-	Response *NetworkPolicyAccessResponse
+	Request  *NetworkPolicyEvaluationRequest
+	Response *NetworkPolicyEvaluationResponse
 }
 
 // Entity contains Namespace and Pod name as a request parameter.
 type Entity struct {
 	Pod *PodReference
 }
 
-// NetworkPolicyAccessRequest is the request body of NetworkPolicy access review.
-type NetworkPolicyAccessRequest struct {
+// NetworkPolicyEvaluationRequest is the request body of NetworkPolicy access review.
+type NetworkPolicyEvaluationRequest struct {
 	Source      Entity
 	Destination Entity
 }
@@ -475,8 +475,8 @@ type RuleRef struct {
 	Action    *crdv1beta1.RuleAction
 }
 
-// NetworkPolicyAccessResponse is the response of NetworkPolicy access review.
-type NetworkPolicyAccessResponse struct {
+// NetworkPolicyEvaluationResponse is the response of NetworkPolicy access review.
+type NetworkPolicyEvaluationResponse struct {
 	// The reference of the effective NetworkPolicy.
 	NetworkPolicy NetworkPolicyReference
 	RuleIndex     int32