Updating RAN Inventory tests to use the latest model and data

[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 75c98a8..a24bd0a 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
@@ -106,7 +106,7 @@ class E2ENetworkSliceSpec extends Specification {
         def dataNodeStored\r
         given: 'valid yang resource as name-to-content map'\r
             def yangResourcesNameToContentMap = TestUtils.getYangResourcesAsMap(\r
-                    'e2e/basic/cps-ran-inventory.yang')\r
+                    'e2e/basic/cps-ran-inventory@2021-01-28.yang')\r
             def schemaContext = YangTextSchemaSourceSetBuilder.of(yangResourcesNameToContentMap).getSchemaContext()\r
         and : 'a valid json is provided for the model'\r
             def jsonData = TestUtils.getResourceFileContent('e2e/basic/cps-ran-inventory-data.json')\r
@@ -122,18 +122,23 @@ class E2ENetworkSliceSpec extends Specification {
                     { args -> dataNodeStored = args[2]}\r
         and: 'the size of the tree is correct'\r
             def cpsRanInventory = TestUtils.getFlattenMapByXpath(dataNodeStored)\r
-            assert  cpsRanInventory.size() == 3\r
+            assert  cpsRanInventory.size() == 4\r
         and: 'ran-inventory contains the correct child node'\r
             def ranInventory = cpsRanInventory.get('/ran-inventory')\r
-            def sliceProfilesList = cpsRanInventory.get('/ran-inventory/sliceProfilesList[@sliceProfileId=\'f33a9dd8-ae51-4acf-8073-c9390c25f6f1\']')\r
-            def pLMNIdList = cpsRanInventory.get('/ran-inventory/sliceProfilesList[@sliceProfileId=\'f33a9dd8-ae51-4acf-8073-c9390c25f6f1\']/pLMNIdList[@mcc=\'310\' and @mnc=\'410\']')\r
+            def ranSlices = cpsRanInventory.get('/ran-inventory/ran-slices[@rannfnssiid=\'14559ead-f4fe-4c1c-a94c-8015fad3ea35\']')\r
+            def sliceProfilesList = cpsRanInventory.get('/ran-inventory/ran-slices[@rannfnssiid=\'14559ead-f4fe-4c1c-a94c-8015fad3ea35\']/sliceProfilesList[@sliceProfileId=\'f33a9dd8-ae51-4acf-8073-c9390c25f6f1\']')\r
+            def pLMNIdList = cpsRanInventory.get('/ran-inventory/ran-slices[@rannfnssiid=\'14559ead-f4fe-4c1c-a94c-8015fad3ea35\']/sliceProfilesList[@sliceProfileId=\'f33a9dd8-ae51-4acf-8073-c9390c25f6f1\']/pLMNIdList[@mcc=\'310\' and @mnc=\'410\']')\r
             ranInventory.getChildDataNodes().size() == 1\r
-            ranInventory.getChildDataNodes().find( {it.xpath == sliceProfilesList.xpath})\r
+            ranInventory.getChildDataNodes().find( {it.xpath == ranSlices.xpath})\r
+        and: 'ranSlices contains the correct child node'\r
+            ranSlices.getChildDataNodes().size() == 1\r
+            ranSlices.getChildDataNodes().find( {it.xpath == sliceProfilesList.xpath})\r
         and: 'sliceProfilesList contains the correct child node'\r
             sliceProfilesList.getChildDataNodes().size() == 1\r
             sliceProfilesList.getChildDataNodes().find( {it.xpath == pLMNIdList.xpath})\r
-        and: 'pLMNIdList contains the no child nodes'\r
+        and: 'pLMNIdList contains no children'\r
             pLMNIdList.getChildDataNodes().size() == 0\r
+\r
     }\r
 \r
     def 'E2E RAN Schema Model.'(){\r