fixed dnn mapping (#326)

dnn mapping was taking network instance iso din name
nephio-project · Jun 29, 2023 · 1d5a6bc · 1d5a6bc
1 parent 983f92f
commit 1d5a6bc
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 6 deletions.
diff --git a/krm-functions/nfdeploy-fn/common/function.go b/krm-functions/nfdeploy-fn/common/function.go
@@ -216,7 +216,7 @@ func (f *NfDeployFn[T, PT]) DnnUpdate(o *fn.KubeObject) error {
 	}
 
 	dnn := nephiodeployv1alpha1.DataNetwork{
-		Name: &dnnReq.Spec.NetworkInstance.Name,
+		Name: &dnnReq.Name,
 		Pool: pools,
 	}
 

diff --git a/krm-functions/nfdeploy-fn/smfdeployfn/testdata/createsmfdeployment/_expected.yaml b/krm-functions/nfdeploy-fn/smfdeployfn/testdata/createsmfdeployment/_expected.yaml
@@ -125,7 +125,7 @@ items:
     networkInstances:
     - name: vpc-internet
       dataNetworks:
-      - name: vpc-internet
+      - name: internet
         pool:
         - prefix: 10.0.0.3/24
       interfaces:

diff --git a/...nctions/nfdeploy-fn/upfdeployfn/testdata/golden/createupfdeployment_stage2/_expected.yaml b/...nctions/nfdeploy-fn/upfdeployfn/testdata/golden/createupfdeployment_stage2/_expected.yaml
@@ -183,7 +183,7 @@ items:
       - n4
     - name: vpc-internet
       dataNetworks:
-      - name: vpc-internet
+      - name: internet
         pool:
         - prefix: 10.0.0.3/24
       interfaces:

diff --git a/krm-functions/pipeline-tests/testdata/real_deployment/_expected.yaml b/krm-functions/pipeline-tests/testdata/real_deployment/_expected.yaml
@@ -448,7 +448,7 @@ items:
       - n4
     - name: vpc-internet
       dataNetworks:
-      - name: vpc-internet
+      - name: internet
         pool:
         - prefix: 172.0.0.0/8
       interfaces:

diff --git a/krm-functions/pipeline-tests/testdata/real_deployment_2/_expected.yaml b/krm-functions/pipeline-tests/testdata/real_deployment_2/_expected.yaml
@@ -448,7 +448,7 @@ items:
       - n4
     - name: vpc-internet
       dataNetworks:
-      - name: vpc-internet
+      - name: internet
         pool:
         - prefix: 172.0.0.0/8
       interfaces:

diff --git a/krm-functions/pipeline-tests/testdata/simplified_deployment/_expected.yaml b/krm-functions/pipeline-tests/testdata/simplified_deployment/_expected.yaml
@@ -448,7 +448,7 @@ items:
       - n4
     - name: vpc-internet
       dataNetworks:
-      - name: vpc-internet
+      - name: internet
         pool:
         - prefix: 172.0.0.0/8
       interfaces: