diff options
Diffstat (limited to 'plans/so/integration-etsi-testing/so-simulators')
3 files changed, 8 insertions, 8 deletions
diff --git a/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/ExternalSystemEsrController.java b/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/ExternalSystemEsrController.java index efe5b207..b356006c 100644 --- a/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/ExternalSystemEsrController.java +++ b/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/main/java/org/onap/so/aaisimulator/controller/ExternalSystemEsrController.java @@ -61,7 +61,7 @@ public class ExternalSystemEsrController { this.cacheServiceProvider = cacheServiceProvider; } - @PutMapping(value = "esr-vnfm/{vnfm-id}", consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}, + @PutMapping(value = "/esr-vnfm/{vnfm-id}", consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}, produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) public ResponseEntity<?> putEsrVnfm(@RequestBody final EsrVnfm esrVnfm, @PathVariable("vnfm-id") final String vnfmId, final HttpServletRequest request) { @@ -75,7 +75,7 @@ public class ExternalSystemEsrController { return ResponseEntity.accepted().build(); } - @GetMapping(value = "esr-vnfm/{vnfm-id}", produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) + @GetMapping(value = "/esr-vnfm/{vnfm-id}", produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) public ResponseEntity<?> getEsrVnfm(@PathVariable("vnfm-id") final String vnfmId, final HttpServletRequest request) { LOGGER.info("Will retrieve ESR VNFM for 'vnfm id': {} ...", vnfmId); @@ -104,7 +104,7 @@ public class ExternalSystemEsrController { return ResponseEntity.ok(esrVnfmList); } - @PutMapping(value = "esr-vnfm/{vnfm-id}/esr-system-info-list/esr-system-info/{esr-system-info-id}", + @PutMapping(value = "/esr-vnfm/{vnfm-id}/esr-system-info-list/esr-system-info/{esr-system-info-id}", consumes = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}, produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) public ResponseEntity<?> putEsrSystemInfo(@RequestBody final EsrSystemInfo esrSystemInfo, @@ -127,7 +127,7 @@ public class ExternalSystemEsrController { return getRequestErrorResponseEntity(request, ESR_SYSTEM_INFO_LIST); } - @GetMapping(value = "esr-vnfm/{vnfm-id}/esr-system-info-list", + @GetMapping(value = "/esr-vnfm/{vnfm-id}/esr-system-info-list", produces = {MediaType.APPLICATION_JSON, MediaType.APPLICATION_XML}) public ResponseEntity<?> getEsrSystemInfoList(@PathVariable("vnfm-id") final String vnfmId, final HttpServletRequest request) { diff --git a/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/Constants.java b/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/Constants.java index dd644d16..b4b562be 100644 --- a/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/Constants.java +++ b/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/main/java/org/onap/so/aaisimulator/utils/Constants.java @@ -43,11 +43,11 @@ public class Constants { public static final String PLATFORMS_URL = BUSINESS_URL + "/platforms/platform/"; - public static final String EXTERNAL_SYSTEM_ESR_VNFM_LIST_URL = "/external-system/esr-vnfm-list/"; + public static final String EXTERNAL_SYSTEM_ESR_VNFM_LIST_URL = BASE_URL + "/external-system/esr-vnfm-list"; public static final String NETWORK_URL = BASE_URL + "/network"; - public static final String GENERIC_VNFS_URL = NETWORK_URL + "/generic-vnfs/"; + public static final String GENERIC_VNFS_URL = NETWORK_URL + "/generic-vnfs"; public static final String RELATIONSHIP_LIST_RELATIONSHIP_URL = "/relationship-list/relationship"; diff --git a/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestConstants.java b/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestConstants.java index d0a46811..79bf624a 100644 --- a/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestConstants.java +++ b/plans/so/integration-etsi-testing/so-simulators/aai-simulator/src/test/java/org/onap/so/aaisimulator/utils/TestConstants.java @@ -50,7 +50,7 @@ public class TestConstants { public static final String GENERIC_VNF_NAME = "EsyVnfInstantiationTest2"; - public static final String GENERIC_VNF_URL = Constants.GENERIC_VNFS_URL + "generic-vnf/"; + public static final String GENERIC_VNF_URL = Constants.GENERIC_VNFS_URL + "/generic-vnf/"; public static final String GENERIC_VNFS_URL = "/generic-vnfs"; @@ -68,7 +68,7 @@ public class TestConstants { public static final String TENANTS_TENANT = "/tenants/tenant/"; - public static final String ESR_VNFM_URL = EXTERNAL_SYSTEM_ESR_VNFM_LIST_URL + "esr-vnfm/"; + public static final String ESR_VNFM_URL = EXTERNAL_SYSTEM_ESR_VNFM_LIST_URL + "/esr-vnfm/"; public static final String ESR_VNFM_ID = "c5e99cee-1996-4606-b697-838d51d4e1a3"; |