diff options
Diffstat (limited to 'adapters/mso-catalog-db-adapter/src')
2 files changed, 5 insertions, 3 deletions
diff --git a/adapters/mso-catalog-db-adapter/src/main/resources/db/migration/V2.15__Orchestration_Status_Valid_Action_State_Transition_Table_Updates.sql b/adapters/mso-catalog-db-adapter/src/main/resources/db/migration/V2.15__Orchestration_Status_Valid_Action_State_Transition_Table_Updates.sql index 9992f5531a..454547a72e 100644 --- a/adapters/mso-catalog-db-adapter/src/main/resources/db/migration/V2.15__Orchestration_Status_Valid_Action_State_Transition_Table_Updates.sql +++ b/adapters/mso-catalog-db-adapter/src/main/resources/db/migration/V2.15__Orchestration_Status_Valid_Action_State_Transition_Table_Updates.sql @@ -40,11 +40,11 @@ DELETE FROM orchestration_flow_reference WHERE FLOW_NAME = 'DeactivateNetworkCollectionBB'; UPDATE orchestration_flow_reference -SET SEQ_NO = SEQ_NO - 1 +SET SEQ_NO = SEQ_NO - 1 WHERE COMPOSITE_ACTION = 'Service-Macro-Delete' AND SEQ_NO > 8; UPDATE orchestration_flow_reference -SET SEQ_NO = SEQ_NO - 1 +SET SEQ_NO = SEQ_NO - 1 WHERE COMPOSITE_ACTION = 'NetworkCollection-Macro-Delete' AND SEQ_NO > 4; UPDATE building_block_detail diff --git a/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/CloudConfigTest.java b/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/CloudConfigTest.java index 3b99c62a6d..05d1928a17 100644 --- a/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/CloudConfigTest.java +++ b/adapters/mso-catalog-db-adapter/src/test/java/org/onap/so/adapters/catalogdb/catalogrest/CloudConfigTest.java @@ -89,7 +89,9 @@ public class CloudConfigTest { builder = UriComponentsBuilder.fromHttpUrl("http://localhost:"+ port + uri +"/" + cloudSite.getId()); HttpEntity<String> entity = new HttpEntity<String>(null, headers); ResponseEntity<CloudSite> actualCloudSite = restTemplate.exchange(builder.toUriString(),HttpMethod.GET, entity, CloudSite.class); - + builder = UriComponentsBuilder.fromHttpUrl("http://localhost:"+ port + uri); + ResponseEntity<String> cloudSiteString = restTemplate.exchange(builder.toUriString(),HttpMethod.GET, entity, String.class); + System.out.println(cloudSiteString.getBody()); assertEquals(Response.Status.OK.getStatusCode(), actualCloudSite.getStatusCode().value()); assertThat(actualCloudSite.getBody(), sameBeanAs(cloudSite).ignoring("created").ignoring("updated") .ignoring("identityService.created").ignoring("identityService.updated")); |