diff options
| author |   dglFromAtt <dgl@research.att.com> | 2019-05-20 14:29:02 -0400 |
|---|---|---|
| committer | dglFromAtt <dgl@research.att.com> | 2019-05-20 14:29:08 -0400 |
| commit | a26907336f4f04d754689b7750d0cd592f7057bb (patch) | |
| tree | a072b24a790bbf561cb9b2d89389d34fc119832d /src | |
| parent | b6c6c770247f737e7e2cfe52cec6e7a0b7f7178d (diff) | |
Fix conflict in unit tests
Change-Id: I433213a61a9da64278e1ecaa25f067a36e99ce61
Signed-off-by: dglFromAtt <dgl@research.att.com>
Issue-ID: DMAAP-1205
Diffstat (limited to 'src')
| -rw-r--r-- | src/test/java/org/onap/dmaap/dbcapi/service/MR_ClusterServiceTest.java | 2 |
1 files changed, 1 insertions, 1 deletions
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(); |