-/*-\r
+/*\r
* ============LICENSE_START=======================================================\r
- * Copyright (C) 2021 Nordix Foundation. All rights reserved.\r
- * Modifications Copyright (C) 2021 Bell Canada.\r
+ * Copyright (C) 2021-2023 Nordix Foundation.\r
+ * Modifications Copyright (C) 2021-2022 Bell Canada.\r
+ * Modifications Copyright (C) 2021 Pantheon.tech\r
+ * Modifications Copyright (C) 2022-2023 TechMahindra Ltd.\r
* ================================================================================\r
* Licensed under the Apache License, Version 2.0 (the "License");\r
* you may not use this file except in compliance with the License.\r
* You may obtain a copy of the License at\r
*\r
- * http://www.apache.org/licenses/LICENSE-2.0\r
+ * http://www.apache.org/licenses/LICENSE-2.0\r
*\r
* Unless required by applicable law or agreed to in writing, software\r
* distributed under the License is distributed on an "AS IS" BASIS,\r
package org.onap.cps.api.impl\r
\r
import org.onap.cps.TestUtils\r
-import org.onap.cps.api.CpsAdminService\r
+import org.onap.cps.api.CpsAnchorService\r
+import org.onap.cps.api.CpsDeltaService\r
+import org.onap.cps.spi.CpsDataPersistenceService\r
import org.onap.cps.spi.CpsDataPersistenceService\r
import org.onap.cps.spi.CpsModulePersistenceService\r
import org.onap.cps.spi.model.Anchor\r
+import org.onap.cps.spi.utils.CpsValidator\r
+import org.onap.cps.utils.TimedYangParser\r
import org.onap.cps.utils.YangUtils\r
+import org.onap.cps.yang.TimedYangTextSchemaSourceSetBuilder\r
import org.onap.cps.yang.YangTextSchemaSourceSetBuilder\r
import spock.lang.Specification\r
\r
class E2ENetworkSliceSpec extends Specification {\r
def mockModuleStoreService = Mock(CpsModulePersistenceService)\r
def mockDataStoreService = Mock(CpsDataPersistenceService)\r
- def mockCpsAdminService = Mock(CpsAdminService)\r
- def cpsModuleServiceImpl = new CpsModuleServiceImpl()\r
- def cpsDataServiceImple = new CpsDataServiceImpl()\r
+ def mockCpsAnchorService = Mock(CpsAnchorService)\r
def mockYangTextSchemaSourceSetCache = Mock(YangTextSchemaSourceSetCache)\r
+ def mockCpsValidator = Mock(CpsValidator)\r
+ def timedYangTextSchemaSourceSetBuilder = new TimedYangTextSchemaSourceSetBuilder()\r
+ def timedYangParser = new TimedYangParser()\r
+ def mockCpsDeltaService = Mock(CpsDeltaService)\r
+\r
+ def cpsModuleServiceImpl = new CpsModuleServiceImpl(mockModuleStoreService,\r
+ mockYangTextSchemaSourceSetCache, mockCpsAnchorService, mockCpsValidator,timedYangTextSchemaSourceSetBuilder)\r
+\r
+ def cpsDataServiceImpl = new CpsDataServiceImpl(mockDataStoreService, mockCpsAnchorService,\r
+ mockYangTextSchemaSourceSetCache, mockCpsValidator, timedYangParser, mockCpsDeltaService)\r
\r
def dataspaceName = 'someDataspace'\r
def anchorName = 'someAnchor'\r
def schemaSetName = 'someSchemaSet'\r
-\r
- def setup() {\r
- cpsDataServiceImple.cpsDataPersistenceService = mockDataStoreService\r
- cpsDataServiceImple.cpsAdminService = mockCpsAdminService\r
- cpsDataServiceImple.yangTextSchemaSourceSetCache = mockYangTextSchemaSourceSetCache\r
- cpsModuleServiceImpl.yangTextSchemaSourceSetCache = mockYangTextSchemaSourceSetCache\r
- cpsModuleServiceImpl.cpsModulePersistenceService = mockModuleStoreService\r
- }\r
+ def noTimestamp = null\r
\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
and : 'a valid json is provided for the model'\r
def jsonData = TestUtils.getResourceFileContent('e2e/basic/cps-Cavsta-Data.txt')\r
and : 'all the further dependencies are mocked '\r
- mockCpsAdminService.getAnchor(dataspaceName, anchorName) >>\r
- new Anchor().builder().name(anchorName).schemaSetName(schemaSetName).build()\r
+ mockCpsAnchorService.getAnchor(dataspaceName, anchorName) >>\r
+ new Anchor().builder().name(anchorName).schemaSetName(schemaSetName).dataspaceName(dataspaceName).build()\r
mockYangTextSchemaSourceSetCache.get(dataspaceName, schemaSetName) >>\r
YangTextSchemaSourceSetBuilder.of(yangResourcesNameToContentMap)\r
mockModuleStoreService.getYangSchemaResources(dataspaceName, schemaSetName) >> schemaContext\r
when: 'saveData method is invoked'\r
- cpsDataServiceImple.saveData(dataspaceName, anchorName, jsonData)\r
+ cpsDataServiceImpl.saveData(dataspaceName, anchorName, jsonData, noTimestamp)\r
then: 'Parameters are validated and processing is delegated to persistence service'\r
- 1 * mockDataStoreService.storeDataNode('someDataspace', 'someAnchor', _) >>\r
+ 1 * mockDataStoreService.storeDataNodes('someDataspace', 'someAnchor', _) >>\r
{ args -> dataNodeStored = args[2]}\r
- def child = dataNodeStored.childDataNodes[0]\r
+ def child = dataNodeStored[0].childDataNodes[0]\r
assert child.childDataNodes.size() == 1\r
and: 'list of Tracking Area for a Coverage Area are stored with correct xpath and child nodes '\r
def listOfTAForCoverageArea = child.childDataNodes[0]\r
and : 'a valid json is provided for the model'\r
def jsonData = TestUtils.getResourceFileContent('e2e/basic/cps-ran-inventory-data.json')\r
and : 'all the further dependencies are mocked '\r
- mockCpsAdminService.getAnchor('someDataspace', 'someAnchor') >>\r
- new Anchor().builder().name('someAnchor').schemaSetName('someSchemaSet').build()\r
+ mockCpsAnchorService.getAnchor('someDataspace', 'someAnchor') >>\r
+ new Anchor().builder().name('someAnchor').schemaSetName('someSchemaSet').dataspaceName(dataspaceName).build()\r
mockYangTextSchemaSourceSetCache.get('someDataspace', 'someSchemaSet') >> YangTextSchemaSourceSetBuilder.of(yangResourcesNameToContentMap)\r
mockModuleStoreService.getYangSchemaResources('someDataspace', 'someSchemaSet') >> schemaContext\r
when: 'saveData method is invoked'\r
- cpsDataServiceImple.saveData('someDataspace', 'someAnchor', jsonData)\r
+ cpsDataServiceImpl.saveData('someDataspace', 'someAnchor', jsonData, noTimestamp)\r
then: 'parameters are validated and processing is delegated to persistence service'\r
- 1 * mockDataStoreService.storeDataNode('someDataspace', 'someAnchor', _) >>\r
+ 1 * mockDataStoreService.storeDataNodes('someDataspace', 'someAnchor', _) >>\r
{ args -> dataNodeStored = args[2]}\r
and: 'the size of the tree is correct'\r
- def cpsRanInventory = TestUtils.getFlattenMapByXpath(dataNodeStored)\r
+ def cpsRanInventory = TestUtils.getFlattenMapByXpath(dataNodeStored[0])\r
assert cpsRanInventory.size() == 4\r
and: 'ran-inventory contains the correct child node'\r
def ranInventory = cpsRanInventory.get('/ran-inventory')\r
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
- 'e2e/basic/cps-ran-schema-model@2021-01-28.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-05-19.yang'\r
)\r
and : 'json data'\r
def jsonData = TestUtils.getResourceFileContent('e2e/basic/cps-ran-schema-model-data-v4.json')\r
Code Review / cps.git / blobdiff