Fix xpath building for data nodes addressing YANG augmentation

[cps.git] / cps-service / src / test / groovy / org / onap / cps / api / impl / E2ENetworkSliceSpec.groovy

diff --git a/cps-service/src/test/groovy/org/onap/cps/api/impl/E2ENetworkSliceSpec.groovy b/cps-service/src/test/groovy/org/onap/cps/api/impl/E2ENetworkSliceSpec.groovy
index a24bd0a..a09166d 100755 (executable)
--- a/cps-service/src/test/groovy/org/onap/cps/api/impl/E2ENetworkSliceSpec.groovy
+++ b/cps-service/src/test/groovy/org/onap/cps/api/impl/E2ENetworkSliceSpec.groovy
@@ -52,7 +52,11 @@ class E2ENetworkSliceSpec extends Specification {
 \r
     def 'E2E model can be parsed by CPS.'() {\r
         given: 'Valid yang resource as name-to-content map'\r
-            def yangResourcesNameToContentMap = TestUtils.getYangResourcesAsMap('e2e/basic/ietf-inet-types.yang','e2e/basic/ietf-yang-types.yang','e2e/basic/ran-network2020-08-06.yang')\r
+            def yangResourcesNameToContentMap = TestUtils.getYangResourcesAsMap(\r
+                    'ietf/ietf-inet-types@2013-07-15.yang',\r
+                    'ietf/ietf-yang-types@2013-07-15.yang',\r
+                    'e2e/basic/ran-network2020-08-06.yang'\r
+            )\r
         when: 'Create schema set method is invoked'\r
             cpsModuleServiceImpl.createSchemaSet(dataspaceName, schemaSetName, yangResourcesNameToContentMap)\r
         then: 'Parameters are validated and processing is delegated to persistence service'\r
@@ -144,8 +148,8 @@ class E2ENetworkSliceSpec extends Specification {
     def 'E2E RAN Schema Model.'(){\r
         given: 'yang resources'\r
             def yangResourcesNameToContentMap = TestUtils.getYangResourcesAsMap(\r
-                    'e2e/basic/ietf-inet-types.yang',\r
-                    'e2e/basic/ietf-yang-types.yang',\r
+                    'ietf/ietf-inet-types@2013-07-15.yang',\r
+                    'ietf/ietf-yang-types@2013-07-15.yang',\r
                     'e2e/basic/cps-ran-schema-model@2021-01-28.yang'\r
             )\r
         and : 'json data'\r