X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=cps-ncmp-service%2Fsrc%2Fmain%2Fjava%2Forg%2Fonap%2Fcps%2Fncmp%2Fapi%2Fimpl%2Fyangmodels%2FYangModelCmHandle.java;h=d4c64eac909c8b3c3b90d1e757b1449babf19485;hb=09156406ac7201a7329663e8fedb29dc28547048;hp=289d782cde436770f14a244f62691c5175861e9e;hpb=6369af0f6cb53619daa253d5da0f360f2bf67fc3;p=cps.git diff --git a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/yangmodels/YangModelCmHandle.java b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/yangmodels/YangModelCmHandle.java index 289d782cd..d4c64eac9 100644 --- a/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/yangmodels/YangModelCmHandle.java +++ b/cps-ncmp-service/src/main/java/org/onap/cps/ncmp/api/impl/yangmodels/YangModelCmHandle.java @@ -34,6 +34,7 @@ import lombok.Getter; import lombok.NoArgsConstructor; import lombok.Setter; import org.onap.cps.ncmp.api.impl.operations.RequiredDmiService; +import org.onap.cps.ncmp.api.inventory.CompositeState; import org.onap.cps.ncmp.api.models.NcmpServiceCmHandle; import org.onap.cps.utils.CpsValidator; @@ -56,7 +57,7 @@ public class YangModelCmHandle { private String dmiDataServiceName; @JsonProperty("state") - private String cmHandleState; + private CompositeState compositeState; @JsonProperty("dmi-model-service-name") private String dmiModelServiceName; @@ -69,8 +70,9 @@ public class YangModelCmHandle { /** * Create a yangModelCmHandle. - * @param dmiServiceName dmi service name - * @param dmiDataServiceName dmi data service name + * + * @param dmiServiceName dmi service name + * @param dmiDataServiceName dmi data service name * @param dmiModelServiceName dmi model service name * @param ncmpServiceCmHandle the cm handle * @return instance of yangModelCmHandle @@ -87,12 +89,13 @@ public class YangModelCmHandle { yangModelCmHandle.setDmiModelServiceName(dmiModelServiceName); yangModelCmHandle.setDmiProperties(asYangModelCmHandleProperties(ncmpServiceCmHandle.getDmiProperties())); yangModelCmHandle.setPublicProperties(asYangModelCmHandleProperties( - ncmpServiceCmHandle.getPublicProperties())); + ncmpServiceCmHandle.getPublicProperties())); return yangModelCmHandle; } /** * Resolve a dmi service name. + * * @param requiredService indicates what typo of service is required * @return dmi service name */