NFDeployment Kpt function changes (#418)

#402 1. Updated the Nf Deploy Fn to use latest API changes by removing older generics code. 2. Removed reference to all the older APIs in testdata including other functions 3. Added tests for dependency test cases. Tests Run 1. Executed all pipeline tests - *Pass* 2. Executed dependency tests for single and multiple - *Pass* 3. Execute all functions unite tests - *Pass* 4. Docker build - *Pass* Docker image for testing - `docker.io/lostbrain/nfdeployfn:test-1`
nephio-project · Nov 1, 2023 · 82290d3 · 82290d3
1 parent 066f0b1
commit 82290d3
Show file tree

Hide file tree

Showing 251 changed files with 1,346 additions and 1,290 deletions.
diff --git a/.wordlist.txt b/.wordlist.txt
@@ -137,7 +137,6 @@ SetNadMaster
 SIG
 SiteCode
 SMF
-SMFDeployment
 snetworkplumbingwg
 specializer
 sriov
@@ -146,7 +145,7 @@ toolchain
 TypeOf
 UnMarshal
 UPF
-UPFDeployment
+NFDeployment
 URI
 VLAN
 VLANAllocation

diff --git a/controllers/pkg/go.mod b/controllers/pkg/go.mod
@@ -20,7 +20,7 @@ require (
 	github.com/go-logr/logr v1.2.4
 	github.com/google/go-cmp v0.5.9
 	github.com/henderiw-nephio/network v0.0.0-20230626193806-04743403261e
-	github.com/nephio-project/api v0.0.0-20230627152656-a2bf013a68da
+	github.com/nephio-project/api v1.0.1-0.20231006162045-9ad2d0db2a8d
 	github.com/nephio-project/nephio/krm-functions/configinject-fn v0.0.0-00010101000000-000000000000
 	github.com/nephio-project/nephio/krm-functions/ipam-fn v0.0.0-00010101000000-000000000000
 	github.com/nephio-project/nephio/krm-functions/lib v0.0.0-20230605213956-a1e470f419a4

diff --git a/controllers/pkg/go.sum b/controllers/pkg/go.sum
@@ -150,8 +150,8 @@ github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/
 github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/nephio-project/api v0.0.0-20230627152656-a2bf013a68da h1:GqTpDe8Xbqs+R4TXLJjn4nbO18/XrkXesN7TITXsrwI=
-github.com/nephio-project/api v0.0.0-20230627152656-a2bf013a68da/go.mod h1:9w+JbXeyiT3KZrrXab0pzaWtiUk4upvgLzpqOtSmbpI=
+github.com/nephio-project/api v1.0.1-0.20231006162045-9ad2d0db2a8d h1:I8j2xAJWpBpI5b/GOEdANY/9k4ORzmUEd1HuiFDVGi0=
+github.com/nephio-project/api v1.0.1-0.20231006162045-9ad2d0db2a8d/go.mod h1:9w+JbXeyiT3KZrrXab0pzaWtiUk4upvgLzpqOtSmbpI=
 github.com/nokia/k8s-ipam v0.0.4-0.20230628092530-8a292aec80a4 h1:4v0n24tsumwuz1BDGKoGWxZMFtqAlYpI87gE/enMUUI=
 github.com/nokia/k8s-ipam v0.0.4-0.20230628092530-8a292aec80a4/go.mod h1:ZVMmhD6jllAAO3YGIZFXUQbKRtEiIYgZ772bn/1GVz4=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=

diff --git a/krm-functions/configinject-fn/fn/function.go b/krm-functions/configinject-fn/fn/function.go
@@ -334,7 +334,7 @@ func BuildConfig(meta metav1.ObjectMeta, spec nephiorefv1alpha1.ConfigSpec) *nep
 
 func getForName(annotations map[string]string) string {
 	// forName is the resource that is the root resource of the specialization
-	// e.g. UPFDeployment, SMFDeployment, AMFDeployment
+	// e.g. NFDeployment
 	forFullName := annotations[condkptsdk.SpecializerOwner]
 	if owner, ok := annotations[condkptsdk.SpecializerFor]; ok {
 		forFullName = owner

diff --git a/krm-functions/configinject-fn/go.mod b/krm-functions/configinject-fn/go.mod
@@ -8,7 +8,7 @@ require (
 	github.com/GoogleContainerTools/kpt v1.0.0-beta.29.0.20230327202912-01513604feaa
 	github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20230427202446-3255accc518d
 	github.com/GoogleContainerTools/kpt/porch/api v0.0.0-20230608012444-ee7c8cf378e9
-	github.com/nephio-project/api v0.0.0-20230627152656-a2bf013a68da
+	github.com/nephio-project/api v1.0.1-0.20231006162045-9ad2d0db2a8d
 	github.com/nephio-project/nephio/krm-functions/lib v0.0.0-00010101000000-000000000000
 	k8s.io/api v0.27.3
 	k8s.io/apimachinery v0.27.3

diff --git a/krm-functions/configinject-fn/go.sum b/krm-functions/configinject-fn/go.sum
@@ -123,8 +123,8 @@ github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/
 github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/nephio-project/api v0.0.0-20230627152656-a2bf013a68da h1:GqTpDe8Xbqs+R4TXLJjn4nbO18/XrkXesN7TITXsrwI=
-github.com/nephio-project/api v0.0.0-20230627152656-a2bf013a68da/go.mod h1:9w+JbXeyiT3KZrrXab0pzaWtiUk4upvgLzpqOtSmbpI=
+github.com/nephio-project/api v1.0.1-0.20231006162045-9ad2d0db2a8d h1:I8j2xAJWpBpI5b/GOEdANY/9k4ORzmUEd1HuiFDVGi0=
+github.com/nephio-project/api v1.0.1-0.20231006162045-9ad2d0db2a8d/go.mod h1:9w+JbXeyiT3KZrrXab0pzaWtiUk4upvgLzpqOtSmbpI=
 github.com/nokia/k8s-ipam v0.0.4-0.20230614172255-e361e59e279c h1:zNeqCNUXERQOPbFvcDv8zbEGtZSpTWar/fgqwvKKklo=
 github.com/nokia/k8s-ipam v0.0.4-0.20230614172255-e361e59e279c/go.mod h1:ZVMmhD6jllAAO3YGIZFXUQbKRtEiIYgZ772bn/1GVz4=
 github.com/onsi/ginkgo v1.16.5 h1:8xi0RTUf59SOSfEtZMvwTvXYMzG4gV23XVHOZiXNtnE=

diff --git a/krm-functions/dnn-fn/fn/function.go b/krm-functions/dnn-fn/fn/function.go
@@ -206,7 +206,7 @@ func getAnnotations(annotations map[string]string) map[string]string {
 
 func getForName(annotations map[string]string) string {
 	// forName is the resource that is the root resource of the specialization
-	// e.g. UPFDeployment, SMFDeployment, AMFDeployment
+	// e.g. NFDeployment
 	forFullName := annotations[condkptsdk.SpecializerOwner]
 	if owner, ok := annotations[condkptsdk.SpecializerFor]; ok {
 		forFullName = owner

diff --git a/krm-functions/dnn-fn/fn/testdata/create_owned_resources/_expected.yaml b/krm-functions/dnn-fn/fn/testdata/create_owned_resources/_expected.yaml
@@ -20,7 +20,7 @@ items:
     name: upf-cluster01-internet-pool1
     annotations:
       config.kubernetes.io/local-config: "true"
-      specializer.nephio.org/for: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+      specializer.nephio.org/for: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
       specializer.nephio.org/owner: req.nephio.org/v1alpha1.DataNetwork.internet
   spec:
     kind: pool
@@ -69,7 +69,7 @@ items:
     annotations:
       config.kubernetes.io/local-config: "true"
       prefix: 10.0.0.0/8
-      specializer.nephio.org/owner: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+      specializer.nephio.org/owner: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
   spec:
     networkInstance:
       name: vpc-internet

diff --git a/krm-functions/dnn-fn/fn/testdata/create_owned_resources/dnn.yaml b/krm-functions/dnn-fn/fn/testdata/create_owned_resources/dnn.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     config.kubernetes.io/local-config: "true"
     prefix: 10.0.0.0/8
-    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
 spec:
   networkInstance:
     name: vpc-internet

diff --git a/krm-functions/dnn-fn/fn/testdata/set_dnn_status/Kptfile b/krm-functions/dnn-fn/fn/testdata/set_dnn_status/Kptfile
@@ -12,7 +12,7 @@ pipeline: {}
 status:
   conditions:
   - message: update for condition
-    reason: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+    reason: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
     status: "False"
     type: req.nephio.org/v1alpha1.DataNetwork.internet
   - message: done

diff --git a/krm-functions/dnn-fn/fn/testdata/set_dnn_status/_expected.yaml b/krm-functions/dnn-fn/fn/testdata/set_dnn_status/_expected.yaml
@@ -20,7 +20,7 @@ items:
     name: upf-cluster01-internet-pool1
     annotations:
       config.kubernetes.io/local-config: "true"
-      specializer.nephio.org/for: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+      specializer.nephio.org/for: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
       specializer.nephio.org/owner: req.nephio.org/v1alpha1.DataNetwork.internet
   spec:
     kind: pool
@@ -48,7 +48,7 @@ items:
   status:
     conditions:
     - message: update done
-      reason: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+      reason: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
       status: "True"
       type: req.nephio.org/v1alpha1.DataNetwork.internet
     - message: done
@@ -70,7 +70,7 @@ items:
     name: internet
     annotations:
       config.kubernetes.io/local-config: "true"
-      specializer.nephio.org/owner: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+      specializer.nephio.org/owner: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
       prefix: 10.0.0.0/8
       specializer.nephio.org/debug: "true"
   spec:

diff --git a/krm-functions/dnn-fn/fn/testdata/set_dnn_status/dnn.yaml b/krm-functions/dnn-fn/fn/testdata/set_dnn_status/dnn.yaml
@@ -4,7 +4,7 @@ metadata:
   name: internet
   annotations:
     config.kubernetes.io/local-config: "true"
-    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
     prefix: 10.0.0.0/8
     specializer.nephio.org/debug: "true"
 spec:

diff --git a/krm-functions/dnn-fn/fn/testdata/set_dnn_status/ipclaim.yaml b/krm-functions/dnn-fn/fn/testdata/set_dnn_status/ipclaim.yaml
@@ -4,7 +4,7 @@ metadata:
   name: upf-cluster01-internet-pool1
   annotations:
     config.kubernetes.io/local-config: "true"
-    specializer.nephio.org/for: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+    specializer.nephio.org/for: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
     specializer.nephio.org/owner: req.nephio.org/v1alpha1.DataNetwork.internet
 spec:
   kind: pool

diff --git a/krm-functions/dnn-fn/go.mod b/krm-functions/dnn-fn/go.mod
@@ -6,7 +6,7 @@ replace github.com/nephio-project/nephio/krm-functions/lib => ../lib
 
 require (
 	github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20230427202446-3255accc518d
-	github.com/nephio-project/api v0.0.0-20230627152656-a2bf013a68da
+	github.com/nephio-project/api v1.0.1-0.20231006162045-9ad2d0db2a8d
 	github.com/nephio-project/nephio/krm-functions/lib v0.0.0-20230605213956-a1e470f419a4
 	github.com/nokia/k8s-ipam v0.0.4-0.20230628092530-8a292aec80a4
 	k8s.io/api v0.27.3

diff --git a/krm-functions/dnn-fn/go.sum b/krm-functions/dnn-fn/go.sum
@@ -120,8 +120,8 @@ github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 h1:n6/
 github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00/go.mod h1:Pm3mSP3c5uWn86xMLZ5Sa7JB9GsEZySvHYXCTK4E9q4=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
 github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
-github.com/nephio-project/api v0.0.0-20230627152656-a2bf013a68da h1:GqTpDe8Xbqs+R4TXLJjn4nbO18/XrkXesN7TITXsrwI=
-github.com/nephio-project/api v0.0.0-20230627152656-a2bf013a68da/go.mod h1:9w+JbXeyiT3KZrrXab0pzaWtiUk4upvgLzpqOtSmbpI=
+github.com/nephio-project/api v1.0.1-0.20231006162045-9ad2d0db2a8d h1:I8j2xAJWpBpI5b/GOEdANY/9k4ORzmUEd1HuiFDVGi0=
+github.com/nephio-project/api v1.0.1-0.20231006162045-9ad2d0db2a8d/go.mod h1:9w+JbXeyiT3KZrrXab0pzaWtiUk4upvgLzpqOtSmbpI=
 github.com/nokia/k8s-ipam v0.0.4-0.20230628092530-8a292aec80a4 h1:4v0n24tsumwuz1BDGKoGWxZMFtqAlYpI87gE/enMUUI=
 github.com/nokia/k8s-ipam v0.0.4-0.20230628092530-8a292aec80a4/go.mod h1:ZVMmhD6jllAAO3YGIZFXUQbKRtEiIYgZ772bn/1GVz4=
 github.com/onsi/ginkgo/v2 v2.9.5 h1:+6Hr4uxzP4XIUyAkg61dWBw8lb/gc4/X5luuxN/EC+Q=

diff --git a/krm-functions/gen-configmap-fn/go.mod b/krm-functions/gen-configmap-fn/go.mod
@@ -8,6 +8,7 @@ require (
 	github.com/GoogleContainerTools/kpt-functions-sdk/go/fn v0.0.0-20230427202446-3255accc518d
 	github.com/stretchr/testify v1.8.2
 	k8s.io/apimachinery v0.27.3
+	sigs.k8s.io/kustomize/kyaml v0.14.2
 )
 
 require (
@@ -44,6 +45,5 @@ require (
 	k8s.io/kube-openapi v0.0.0-20230525220651-2546d827e515 // indirect
 	k8s.io/utils v0.0.0-20230505201702-9f6742963106 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
-	sigs.k8s.io/kustomize/kyaml v0.14.2 // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )
diff --git a/krm-functions/interface-fn/fn/function.go b/krm-functions/interface-fn/fn/function.go
@@ -328,7 +328,7 @@ func getAnnotations(annotations map[string]string) map[string]string {
 
 func getForName(annotations map[string]string) string {
 	// forName is the resource that is the root resource of the specialization
-	// e.g. UPFDeployment, SMFDeployment, AMFDeployment
+	// e.g. NFDeployment
 	forFullName := annotations[condkptsdk.SpecializerOwner]
 	if owner, ok := annotations[condkptsdk.SpecializerFor]; ok {
 		forFullName = owner

diff --git a/krm-functions/interface-fn/fn/testdata/cni_mismatch_partial/_expected.yaml b/krm-functions/interface-fn/fn/testdata/cni_mismatch_partial/_expected.yaml
@@ -19,7 +19,7 @@ items:
     name: upf-cluster01-n4-ipv4
     annotations:
       config.kubernetes.io/local-config: "true"
-      specializer.nephio.org/for: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+      specializer.nephio.org/for: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
       specializer.nephio.org/owner: req.nephio.org/v1alpha1.Interface.n4
   spec:
     kind: network
@@ -67,7 +67,7 @@ items:
     name: n3
     annotations:
       config.kubernetes.io/local-config: "true"
-      specializer.nephio.org/owner: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+      specializer.nephio.org/owner: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
   spec:
     networkInstance:
       name: vpc-ran
@@ -80,7 +80,7 @@ items:
     name: n4
     annotations:
       config.kubernetes.io/local-config: "true"
-      specializer.nephio.org/owner: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+      specializer.nephio.org/owner: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
   spec:
     networkInstance:
       name: vpc-ran
@@ -93,7 +93,7 @@ items:
     name: upf-cluster01-n4
     annotations:
       config.kubernetes.io/local-config: "true"
-      specializer.nephio.org/for: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+      specializer.nephio.org/for: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
       specializer.nephio.org/vlanClaimName: vpc-ran-cluster01-bd
       specializer.nephio.org/owner: req.nephio.org/v1alpha1.Interface.n4
   spec:

diff --git a/krm-functions/interface-fn/fn/testdata/cni_mismatch_partial/interface_n3.yaml b/krm-functions/interface-fn/fn/testdata/cni_mismatch_partial/interface_n3.yaml
@@ -4,7 +4,7 @@ metadata:
   name: n3
   annotations:
     config.kubernetes.io/local-config: "true"
-    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
 spec:
   networkInstance:
     name: vpc-ran

diff --git a/krm-functions/interface-fn/fn/testdata/cni_mismatch_partial/interface_n4.yaml b/krm-functions/interface-fn/fn/testdata/cni_mismatch_partial/interface_n4.yaml
@@ -4,7 +4,7 @@ metadata:
   name: n4
   annotations:
     config.kubernetes.io/local-config: "true"
-    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
 spec:
   networkInstance:
     name: vpc-ran

diff --git a/krm-functions/interface-fn/fn/testdata/interface_cni_novlan/_expected.yaml b/krm-functions/interface-fn/fn/testdata/interface_cni_novlan/_expected.yaml
@@ -20,7 +20,7 @@ items:
     name: upf-cluster01-n3-ipv4
     annotations:
       config.kubernetes.io/local-config: "true"
-      specializer.nephio.org/for: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+      specializer.nephio.org/for: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
       specializer.nephio.org/owner: req.nephio.org/v1alpha1.Interface.n3
   spec:
     kind: network
@@ -61,7 +61,7 @@ items:
     name: n3
     annotations:
       config.kubernetes.io/local-config: "true"
-      specializer.nephio.org/owner: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+      specializer.nephio.org/owner: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
   spec:
     networkInstance:
       name: vpc-ran

diff --git a/krm-functions/interface-fn/fn/testdata/interface_cni_novlan/interface.yaml b/krm-functions/interface-fn/fn/testdata/interface_cni_novlan/interface.yaml
@@ -4,7 +4,7 @@ metadata:
   name: n3
   annotations:
     config.kubernetes.io/local-config: "true"
-    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
 spec:
   networkInstance:
     name: vpc-ran

diff --git a/krm-functions/interface-fn/fn/testdata/interface_cni_vlan-dualstack/Kptfile b/krm-functions/interface-fn/fn/testdata/interface_cni_vlan-dualstack/Kptfile
@@ -12,9 +12,9 @@ pipeline: {}
 status:
   conditions:
   - message: update condition for initial resource
-    reason: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+    reason: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
     status: "False"
     type: req.nephio.org/v1alpha1.Interface.n3
   - message: update for condition
     status: "False"
-    type: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+    type: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
diff --git a/krm-functions/interface-fn/fn/testdata/interface_cni_vlan-dualstack/_expected.yaml b/krm-functions/interface-fn/fn/testdata/interface_cni_vlan-dualstack/_expected.yaml
@@ -20,7 +20,7 @@ items:
     name: upf-cluster01-n3-ipv4
     annotations:
       config.kubernetes.io/local-config: "true"
-      specializer.nephio.org/for: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+      specializer.nephio.org/for: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
       specializer.nephio.org/owner: req.nephio.org/v1alpha1.Interface.n3
   spec:
     kind: network
@@ -38,7 +38,7 @@ items:
     name: upf-cluster01-n3-ipv6
     annotations:
       config.kubernetes.io/local-config: "true"
-      specializer.nephio.org/for: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+      specializer.nephio.org/for: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
       specializer.nephio.org/owner: req.nephio.org/v1alpha1.Interface.n3
   spec:
     kind: network
@@ -64,12 +64,12 @@ items:
   status:
     conditions:
     - message: update condition for initial resource
-      reason: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+      reason: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
       status: "False"
       type: req.nephio.org/v1alpha1.Interface.n3
     - message: update for condition
       status: "False"
-      type: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+      type: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
     - message: create initial resource
       reason: req.nephio.org/v1alpha1.Interface.n3
       status: "False"
@@ -93,7 +93,7 @@ items:
     annotations:
       nephio.org/network-name: n3
       config.kubernetes.io/local-config: "true"
-      specializer.nephio.org/owner: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+      specializer.nephio.org/owner: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
   spec:
     networkInstance:
       name: vpc-ran
@@ -107,16 +107,18 @@ items:
     name: upf-cluster01-n3
     annotations:
       config.kubernetes.io/local-config: "true"
-      specializer.nephio.org/for: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+      specializer.nephio.org/for: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
       specializer.nephio.org/vlanClaimName: vpc-ran-cluster01-bd
       specializer.nephio.org/owner: req.nephio.org/v1alpha1.Interface.n3
   spec:
     vlanIndex:
       name: cluster01
   status: {}
 - apiVersion: workload.nephio.org/v1alpha1
-  kind: UPFDeployment
+  kind: NFDeployment
   metadata:
     name: upf-cluster01
     annotations:
       specializer.nephio.org/debug: "true"
+  spec:
+    provider: upf.free5gc.io
diff --git a/krm-functions/interface-fn/fn/testdata/interface_cni_vlan-dualstack/interface.yaml b/krm-functions/interface-fn/fn/testdata/interface_cni_vlan-dualstack/interface.yaml
@@ -5,7 +5,7 @@ metadata:
   annotations:
     nephio.org/network-name: n3
     config.kubernetes.io/local-config: "true"
-    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+    specializer.nephio.org/owner: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
 spec:
   networkInstance:
     name: vpc-ran

diff --git a/krm-functions/interface-fn/fn/testdata/interface_cni_vlan-dualstack/upfdeployment.yaml b/krm-functions/interface-fn/fn/testdata/interface_cni_vlan-dualstack/upfdeployment.yaml
@@ -1,6 +1,8 @@
 apiVersion: workload.nephio.org/v1alpha1
-kind: UPFDeployment
+kind: NFDeployment
 metadata:
   name: upf-cluster01
   annotations:
-    specializer.nephio.org/debug: "true"
+    specializer.nephio.org/debug: "true"
+spec:
+  provider: upf.free5gc.io
diff --git a/krm-functions/interface-fn/fn/testdata/interface_cni_vlan-ipv6only/Kptfile b/krm-functions/interface-fn/fn/testdata/interface_cni_vlan-ipv6only/Kptfile
@@ -12,9 +12,9 @@ pipeline: {}
 status:
   conditions:
   - message: update condition for initial resource
-    reason: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+    reason: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01
     status: "False"
     type: req.nephio.org/v1alpha1.Interface.n3
   - message: update for condition
     status: "False"
-    type: workload.nephio.org/v1alpha1.UPFDeployment.upf-cluster01
+    type: workload.nephio.org/v1alpha1.NFDeployment.upf-cluster01