From 17a6cea68f83a736a19a8b4012f3df59ca597d3f Mon Sep 17 00:00:00 2001 From: Sandeep Shah Date: Thu, 1 Aug 2019 08:46:22 -0500 Subject: Bug fix in SDNR oofpcipoc provider class Bug fix to refer to the correct YANG model when determining if pertinent DG exist0s. yang model: oofpcipoc-api Issue-ID: CCSDK-1560 Signed-off-by: SandeepLinux Change-Id: Idf02978a4a4e179f290403b6547c3daffbd843df --- .../northbound/oofpcipoc/OofpcipocProvider.java | 26 +++++++++++----------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/sdnr/northbound/oofpcipoc/provider/src/main/java/org/onap/ccsdk/features/sdnr/northbound/oofpcipoc/OofpcipocProvider.java b/sdnr/northbound/oofpcipoc/provider/src/main/java/org/onap/ccsdk/features/sdnr/northbound/oofpcipoc/OofpcipocProvider.java index bfb9b04f2..f0749fbee 100644 --- a/sdnr/northbound/oofpcipoc/provider/src/main/java/org/onap/ccsdk/features/sdnr/northbound/oofpcipoc/OofpcipocProvider.java +++ b/sdnr/northbound/oofpcipoc/provider/src/main/java/org/onap/ccsdk/features/sdnr/northbound/oofpcipoc/OofpcipocProvider.java @@ -54,7 +54,7 @@ public class OofpcipocProvider implements AutoCloseable, OofpcipocApiService { private static final Logger LOG = LoggerFactory.getLogger(OofpcipocProvider.class); - private static final String APPLICATION_NAME = "Oofpcipoc"; + private static final String APPLICATION_NAME = "oofpcipoc-api"; private final ExecutorService executor; @@ -125,12 +125,12 @@ public class OofpcipocProvider implements AutoCloseable, OofpcipocApiService { // Call SLI sync method try { - if (OofpcipocClient.hasGraph("Oofpcipoc", svcOperation , null, "sync")) + if (OofpcipocClient.hasGraph("oofpcipoc-api", svcOperation , null, "sync")) { LOG.info( "OofpcipocClient has a Directed Graph for '" + svcOperation + "'"); try { - OofpcipocClient.execute("Oofpcipoc", svcOperation, null, "sync", serviceDataBuilder, parms); + OofpcipocClient.execute("oofpcipoc-api", svcOperation, null, "sync", serviceDataBuilder, parms); } catch (Exception e) { @@ -195,13 +195,13 @@ public class OofpcipocProvider implements AutoCloseable, OofpcipocApiService { try { - if (OofpcipocClient.hasGraph("Oofpcipoc", svcOperation , null, "sync")) + if (OofpcipocClient.hasGraph("oofpcipoc-api", svcOperation , null, "sync")) { LOG.info( "OofpcipocClient has a Directed Graph for '" + svcOperation + "'"); try { - OofpcipocClient.execute("Oofpcipoc", svcOperation, null, "sync", serviceDataBuilder, parms); + OofpcipocClient.execute("oofpcipoc-api", svcOperation, null, "sync", serviceDataBuilder, parms); } catch (Exception e) { @@ -264,13 +264,13 @@ public class OofpcipocProvider implements AutoCloseable, OofpcipocApiService { try { - if (OofpcipocClient.hasGraph("Oofpcipoc", svcOperation , null, "sync")) + if (OofpcipocClient.hasGraph("oofpcipoc-api", svcOperation , null, "sync")) { LOG.info( "OofpcipocClient has a Directed Graph for '" + svcOperation + "'"); try { - OofpcipocClient.execute("Oofpcipoc", svcOperation, null, "sync", serviceDataBuilder, parms); + OofpcipocClient.execute("oofpcipoc-api", svcOperation, null, "sync", serviceDataBuilder, parms); } catch (Exception e) { @@ -333,13 +333,13 @@ public class OofpcipocProvider implements AutoCloseable, OofpcipocApiService { try { - if (OofpcipocClient.hasGraph("Oofpcipoc", svcOperation , null, "sync")) + if (OofpcipocClient.hasGraph("oofpcipoc-api", svcOperation , null, "sync")) { LOG.info( "OofpcipocClient has a Directed Graph for '" + svcOperation + "'"); try { - OofpcipocClient.execute("Oofpcipoc", svcOperation, null, "sync", serviceDataBuilder, parms); + OofpcipocClient.execute("oofpcipoc-api", svcOperation, null, "sync", serviceDataBuilder, parms); } catch (Exception e) { @@ -402,13 +402,13 @@ public class OofpcipocProvider implements AutoCloseable, OofpcipocApiService { try { - if (OofpcipocClient.hasGraph("Oofpcipoc", svcOperation , null, "sync")) + if (OofpcipocClient.hasGraph("oofpcipoc-api", svcOperation , null, "sync")) { LOG.info( "OofpcipocClient has a Directed Graph for '" + svcOperation + "'"); try { - OofpcipocClient.execute("Oofpcipoc", svcOperation, null, "sync", serviceDataBuilder, parms); + OofpcipocClient.execute("oofpcipoc-api", svcOperation, null, "sync", serviceDataBuilder, parms); } catch (Exception e) { @@ -470,12 +470,12 @@ public class OofpcipocProvider implements AutoCloseable, OofpcipocApiService { // Call SLI sync method try { - if (OofpcipocClient.hasGraph("Oofpcipoc", svcOperation , null, "sync")) + if (OofpcipocClient.hasGraph("oofpcipoc-api", svcOperation , null, "sync")) { LOG.info( "OofpcipocClient has a Directed Graph for '" + svcOperation + "'"); try { - OofpcipocClient.execute("Oofpcipoc", svcOperation, null, "sync", serviceDataBuilder, parms); + OofpcipocClient.execute("oofpcipoc-api", svcOperation, null, "sync", serviceDataBuilder, parms); } catch (Exception e) { -- cgit 1.2.3-korg