X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cps-ncmp-service%2Fsrc%2Ftest%2Fgroovy%2Forg%2Fonap%2Fcps%2Fncmp%2Fapi%2Fimpl%2Foperations%2FDmiOperationsBaseSpec.groovy;h=7b295f68b166dbea0a68008b26c4a7e1e05d671f;hb=refs%2Fchanges%2F59%2F126359%2F24;hp=4bf7dad8b98c45a1718b70ccdb4854a6995d0d9c;hpb=a5ce86d02493f141848f9d609c65883d2198894a;p=cps.git diff --git a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/operations/DmiOperationsBaseSpec.groovy b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/operations/DmiOperationsBaseSpec.groovy index 4bf7dad8b..7b295f68b 100644 --- a/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/operations/DmiOperationsBaseSpec.groovy +++ b/cps-ncmp-service/src/test/groovy/org/onap/cps/ncmp/api/impl/operations/DmiOperationsBaseSpec.groovy @@ -1,3 +1,23 @@ +/* + * ============LICENSE_START======================================================= + * Copyright (C) 2021-2022 Nordix Foundation + * ================================================================================ + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * SPDX-License-Identifier: Apache-2.0 + * ============LICENSE_END========================================================= + */ + package org.onap.cps.ncmp.api.impl.operations import com.fasterxml.jackson.databind.ObjectMapper @@ -10,7 +30,7 @@ import spock.lang.Specification abstract class DmiOperationsBaseSpec extends Specification { @Shared - def sampleAdditionalProperty = new PersistenceCmHandle.AdditionalProperty('prop1', 'val1') + def dmiSampleProperty = new PersistenceCmHandle.Property('prop1', 'val1') @SpringBean DmiRestClient mockDmiRestClient = Mock() @@ -26,11 +46,11 @@ abstract class DmiOperationsBaseSpec extends Specification { def static cmHandleId = 'some cm handle' def static resourceIdentifier = 'parent/child' - def mockPersistenceCmHandleRetrieval(additionalProperties) { + def mockPersistenceCmHandleRetrieval(dmiProperties) { persistenceCmHandle.dmiDataServiceName = dmiServiceName persistenceCmHandle.dmiServiceName = dmiServiceName - persistenceCmHandle.additionalProperties = additionalProperties + persistenceCmHandle.dmiProperties = dmiProperties persistenceCmHandle.id = cmHandleId - mockCmHandlePropertiesRetriever.retrieveCmHandleDmiServiceNameAndProperties(cmHandleId) >> persistenceCmHandle + mockCmHandlePropertiesRetriever.retrieveCmHandleDmiServiceNameAndDmiProperties(cmHandleId) >> persistenceCmHandle } }