From be81900287dfc6680357fe9caa08e182d72dc176 Mon Sep 17 00:00:00 2001 From: "Smokowski, Steven" Date: Fri, 31 May 2019 16:12:39 -0400 Subject: issue encoding openstack errors Fix setting of port to fix unit test issues Fix formatting error on the file causing build issue Properly revert change that was made previously Fix issue where base java library not encoding properly Change-Id: I2bfa46825d9a99998195dbd7bd422f88fa76ef09 Issue-ID: SO-1965 Signed-off-by: Benjamin, Max (mb388a) --- .../org/onap/so/db/catalog/client/CatalogDbClientTest.java | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'adapters') diff --git a/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/db/catalog/client/CatalogDbClientTest.java b/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/db/catalog/client/CatalogDbClientTest.java index 31cb1248d6..858216fd27 100644 --- a/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/db/catalog/client/CatalogDbClientTest.java +++ b/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/db/catalog/client/CatalogDbClientTest.java @@ -77,8 +77,12 @@ public class CatalogDbClientTest extends CatalogDbAdapterBaseTest { @Before public void initialize() { client.wiremockPort = String.valueOf(port); + client.setEndpoint(getEndpoint(port)); } + protected String getEndpoint(int port) { + return "http://localhost:" + port; + } @Test public void testGetRainyDayHandler_Regex() { @@ -87,6 +91,14 @@ public class CatalogDbClientTest extends CatalogDbAdapterBaseTest { Assert.assertEquals("Rollback", rainyDayHandlerStatus.getPolicy()); } + @Test + public void testGetRainyDayHandler__Encoding_Regex() { + RainyDayHandlerStatus rainyDayHandlerStatus = client.getRainyDayHandlerStatus("AssignServiceInstanceBB", "*", + "*", "*", "*", + "resources.lba_0_dmz_vmi_0: Unknown id: Error: oper 1 url /fqname-to-id body {\"fq_name\": [\"zrdm6bvota05-dmz_sec_group\"], \"type\": \"security-group\"} response Name ['zrdm6bvota05-dmz_sec_group'] not found"); + Assert.assertEquals("Rollback", rainyDayHandlerStatus.getPolicy()); + } + @Test public void testGetCloudSiteHappyPath() throws Exception { CloudSite cloudSite = client.getCloudSite(MTN13); -- cgit 1.2.3-korg