-/*-\r
+/*\r
* ============LICENSE_START=======================================================\r
- * Copyright (C) 2021 Nordix Foundation. All rights reserved.\r
- * Modifications Copyright (C) 2021 Bell Canada.\r
+ * Copyright (C) 2021 Nordix Foundation.\r
+ * Modifications Copyright (C) 2021-2022 Bell Canada.\r
+ * Modifications Copyright (C) 2021 Pantheon.tech\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
\r
import org.onap.cps.TestUtils\r
import org.onap.cps.api.CpsAdminService\r
+import org.onap.cps.notification.NotificationService\r
import org.onap.cps.spi.CpsDataPersistenceService\r
import org.onap.cps.spi.CpsModulePersistenceService\r
import org.onap.cps.spi.model.Anchor\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 mockNotificationService = Mock(NotificationService)\r
def mockYangTextSchemaSourceSetCache = Mock(YangTextSchemaSourceSetCache)\r
+ def cpsModuleServiceImpl = new CpsModuleServiceImpl(mockModuleStoreService,\r
+ mockYangTextSchemaSourceSetCache,mockCpsAdminService )\r
+ def cpsDataServiceImpl = new CpsDataServiceImpl(mockDataStoreService, mockCpsAdminService,\r
+ mockYangTextSchemaSourceSetCache, mockNotificationService)\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
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
{ args -> dataNodeStored = args[2]}\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
{ args -> dataNodeStored = args[2]}\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/cps-ran-schema-model@2021-01-28.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