commit | 04aa13df605e9fe05743fa53cc82e3d087a299bc | [log] [tgz] |
---|---|---|
author | Seshu Kumar M <seshu.kumar.m@huawei.com> | Tue Mar 31 07:18:53 2020 +0000 |
committer | Gerrit Code Review <gerrit@onap.org> | Tue Mar 31 07:18:53 2020 +0000 |
tree | e7a50024021a16a29f14981244786ba8dcf9e66d | |
parent | 1abba93dea5053711929f8c18bb922cd31b10bf5 [diff] | |
parent | f9fc50fee216aea657b9686aa6b8ef37236e719e [diff] |
Merge "fix for getpnfworkflows url"
diff --git a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandlerTest.java b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandlerTest.java index 21e6d53..4ab88f4 100644 --- a/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandlerTest.java +++ b/mso-api-handlers/mso-api-handler-infra/src/test/java/org/onap/so/apihandlerinfra/WorkflowSpecificationsHandlerTest.java
@@ -375,7 +375,7 @@ headers.set("Content-Type", MediaType.APPLICATION_JSON); HttpEntity<String> entity = new HttpEntity(null, headers); - wireMockServer.stubFor(get(urlMatching("/workflow/search/findByResourceTarget[?]resource_target=pnf")) + wireMockServer.stubFor(get(urlMatching("/workflow/search/findByResourceTarget[?]resourceTarget=pnf")) .willReturn(aResponse().withHeader(HttpHeaders.CONTENT_TYPE, MediaType.APPLICATION_JSON) .withBody( getWiremockResponseForCatalogdb("WorkflowSpecificationsForPnfWorkflows_Response.json"))
diff --git a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java index b130835..4c5bbaf 100644 --- a/mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java +++ b/mso-catalog-db/src/main/java/org/onap/so/db/catalog/client/CatalogDbClient.java
@@ -158,7 +158,7 @@ protected static final String HOMING_INSTANCE = "/homingInstance"; protected static final String ARTIFACT_UUID = "artifactUUID"; protected static final String SOURCE = "source"; - protected static final String RESOURCE_TARGET = "resource_target"; + protected static final String RESOURCE_TARGET = "resourceTarget"; private static final String TARGET_ENTITY = "SO:CatalogDB"; private static final String ASTERISK = "*";