From a26907336f4f04d754689b7750d0cd592f7057bb Mon Sep 17 00:00:00 2001 From: dglFromAtt Date: Mon, 20 May 2019 14:29:02 -0400 Subject: [PATCH] Fix conflict in unit tests Change-Id: I433213a61a9da64278e1ecaa25f067a36e99ce61 Signed-off-by: dglFromAtt Issue-ID: DMAAP-1205 --- src/test/java/org/onap/dmaap/dbcapi/service/MR_ClusterServiceTest.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/test/java/org/onap/dmaap/dbcapi/service/MR_ClusterServiceTest.java b/src/test/java/org/onap/dmaap/dbcapi/service/MR_ClusterServiceTest.java index 6552037..228078c 100644 --- a/src/test/java/org/onap/dmaap/dbcapi/service/MR_ClusterServiceTest.java +++ b/src/test/java/org/onap/dmaap/dbcapi/service/MR_ClusterServiceTest.java @@ -69,7 +69,7 @@ public class MR_ClusterServiceTest { String locname = "central-demo"; DcaeLocationService dls = new DcaeLocationService(); - DcaeLocation loc = new DcaeLocation( "CLLI1234", "central-onap", locname, "aZone", "10.10.10.0/24" ); + DcaeLocation loc = new DcaeLocation( "CLLI1234", "some-onap", locname, "aZone", "10.10.10.0/24" ); dls.addDcaeLocation( loc ); ApiError err = new ApiError(); -- 2.16.6