X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=components%2Fmodel-catalog%2Fblueprint-model%2Fuat-blueprints%2Fpnf_config%2FTests%2Fuat.yaml;h=fbdb2eea869e8ffa0a12d0661ae248d432b9ff50;hb=refs%2Fheads%2Fmaster;hp=37029e18121b58d91fc664311b806a64e4f72e17;hpb=4001ac13397c082ee97c7ff440fa2ead5d50b421;p=ccsdk%2Fcds.git

diff --git a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Tests/uat.yaml b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Tests/uat.yaml
index 37029e181..a58d089ad 100644
--- a/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Tests/uat.yaml
+++ b/components/model-catalog/blueprint-model/uat-blueprints/pnf_config/Tests/uat.yaml
@@ -8,7 +8,7 @@ processes:
         requestId: "123456-1000"
         subRequestId: sub-123456-1000
       actionIdentifiers: &assign-ai
-        blueprintName: configuration_over_restconf
+        blueprintName: pnf_config
         blueprintVersion: "1.0.0"
         actionName: config-assign
         mode: sync
@@ -18,7 +18,6 @@ processes:
           config-assign-properties:
             service-instance-id: siid_1234
             pnf-id: &pnfId pnf-id-2019-07-12
-            pnf-ipv4-address: &pnfAddress "192.168.100.11"
             service-model-uuid: service-model-uuid
             pnf-customization-uuid: pnf-customization-uuid
     expectedResponse:
@@ -31,33 +30,12 @@ processes:
         message: success
       payload:
         config-assign-response: {}
-      stepData:
-        name: config-assign
-        properties:
-          resource-assignment-params:
-            config-assign: &assignPatch
-              ietf-restconf:yang-patch:
-                patch-id: patch-1
-                edit:
-                  - edit-id: edit1
-                    operation: merge
-                    target: /
-                    value: { netconflist: { netconf: [ { netconf-id: "10", netconf-param: "1000" }]}}
-                  - edit-id: edit2
-                    operation: merge
-                    target: /
-                    value: { netconflist: { netconf: [ { netconf-id: "20", netconf-param: "2000" }]}}
-                  - edit-id: edit3
-                    operation: merge
-                    target: /
-                    value: { netconflist: { netconf: [ { netconf-id: "30", netconf-param: "3000" }]}}
-          status: success
   - name: config-deploy
     request:
       commonHeader: *commonHeader
       actionIdentifiers: &deploy-ai
         actionName: config-deploy
-        blueprintName: configuration_over_restconf
+        blueprintName: pnf_config
         blueprintVersion: "1.0.0"
         mode: sync
       payload:
@@ -66,9 +44,10 @@ processes:
           config-deploy-properties:
             service-instance-id: siid_1234
             pnf-id: *pnfId
-            pnf-ipv4-address: *pnfAddress
             service-model-uuid: service-model-uuid
             pnf-customization-uuid: pnf-customization-uuid
+            pnf-ipv4-address: &pnfAddress 13.13.13.13
+            ipaddress-v6-oam: 1::13
     expectedResponse:
       commonHeader: *commonHeader
       actionIdentifiers: *deploy-ai
@@ -79,19 +58,15 @@ processes:
         errorMessage: null
         eventType: EVENT_COMPONENT_EXECUTED
         message: success
-      stepData:
-        name: config-deploy
-        properties:
-          response-data: ""
-          status: success
 
 external-services:
-  - selector: sdncodl
+  - selector: sdnc
     expectations:
       - request:
           method: PUT
-          path: &configUri [ restconf/config, &nodeIdentifier [network-topology:network-topology/topology/topology-netconf/node, *pnfId]]
-          content-type: application/json
+          path: &configUri [ /restconf/config, &nodeIdentifier [network-topology:network-topology/topology/topology-netconf/node, *pnfId]]
+          headers:
+            Content-Type: application/json
           body:
             node:
               - node-id: *pnfId
@@ -107,7 +82,7 @@ external-services:
           status: 201
       - request:
           method: GET
-          path: [ restconf/operational, *nodeIdentifier]
+          path: [ /restconf/operational, *nodeIdentifier]
         response:
           body:
             node: [ { netconf-node-topology:connection-status: connected }]
@@ -119,8 +94,24 @@ external-services:
       - request:
           method: PATCH
           path: [*configUri, *configletResourcePath]
-          content-type: application/yang.patch+json
-          body: *assignPatch
+          headers:
+            Content-Type: application/yang.patch+json
+          body:
+            ietf-restconf:yang-patch:
+              patch-id: patch-1
+              edit:
+                - edit-id: edit1
+                  operation: merge
+                  target: /
+                  value: { netconflist: { netconf: [ { netconf-id: "10", netconf-param: "1000" }]}}
+                - edit-id: edit2
+                  operation: merge
+                  target: /
+                  value: { netconflist: { netconf: [ { netconf-id: "20", netconf-param: "2000" }]}}
+                - edit-id: edit3
+                  operation: merge
+                  target: /
+                  value: { netconflist: { netconf: [ { netconf-id: "30", netconf-param: "3000" }]}}
       - request:
           method: DELETE
-          path: *configUri
+          path: *configUri
\ No newline at end of file