summary |
shortlog |
log |
commit | commitdiff |
review |
tree
raw |
patch |
inline | side by side (from parent 1:
9e7f202)
Issue-ID: VID-622
Signed-off-by: Eylon Malin <eylon.malin@intl.att.com>
Change-Id: I695a8822338fd1c8253b23b88ad260a43d02be9c
mso.restapi.get.orc.reqs=/orchestrationRequests/v7?
mso.restapi.resume.orc.req=/orchestrationRequests/v7/<request_id>/resume
mso.restapi.get.man.tasks=/tasks/v1
mso.restapi.get.orc.reqs=/orchestrationRequests/v7?
mso.restapi.resume.orc.req=/orchestrationRequests/v7/<request_id>/resume
mso.restapi.get.man.tasks=/tasks/v1
-mso.restapi.configurations=/serviceInstances/v7/<service_instance_id>/configurations
+mso.restapi.configurations=${mso.restapi.service.instance}/<service_instance_id>/configurations
mso.restapi.configuration.instance=${mso.restapi.configurations}/<configuration_id>
mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId=<model_version_id>
mso.restapi.configuration.instance=${mso.restapi.configurations}/<configuration_id>
mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId=<model_version_id>
mso.restapi.get.orc.reqs=/orchestrationRequests/v7?
mso.restapi.resume.orc.req=/orchestrationRequests/v7/<request_id>/resume
mso.restapi.get.man.tasks=/tasks/v1
mso.restapi.get.orc.reqs=/orchestrationRequests/v7?
mso.restapi.resume.orc.req=/orchestrationRequests/v7/<request_id>/resume
mso.restapi.get.man.tasks=/tasks/v1
-mso.restapi.configurations=/serviceInstances/v7/<service_instance_id>/configurations
+mso.restapi.configurations=${mso.restapi.service.instance}/<service_instance_id>/configurations
mso.restapi.configuration.instance=${mso.restapi.configurations}/<configuration_id>
mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId=<model_version_id>
mso.restapi.configuration.instance=${mso.restapi.configurations}/<configuration_id>
mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId=<model_version_id>
public void shouldProperlyCreateConfigurationInstanceWithCorrectServiceInstanceId() throws Exception {
// given
String serviceInstanceId = "3f93c7cb-2fd0-4557-9514-e189b7b04f9d";
public void shouldProperlyCreateConfigurationInstanceWithCorrectServiceInstanceId() throws Exception {
// given
String serviceInstanceId = "3f93c7cb-2fd0-4557-9514-e189b7b04f9d";
- String endpointTemplate = String.format("/serviceInstances/v6/%s/configurations", serviceInstanceId);
+ String endpointTemplate = String.format("/serviceInstantiation/v7/serviceInstances/%s/configurations", serviceInstanceId);
RequestDetailsWrapper requestDetailsWrapper = createRequestDetails();
MsoResponseWrapper expectedResponse = createOkResponse();
given(msoInterface.createConfigurationInstance(requestDetailsWrapper, endpointTemplate))
RequestDetailsWrapper requestDetailsWrapper = createRequestDetails();
MsoResponseWrapper expectedResponse = createOkResponse();
given(msoInterface.createConfigurationInstance(requestDetailsWrapper, endpointTemplate))
@Test
public void testSetConfigurationActiveStatus() throws Exception {
@Test
public void testSetConfigurationActiveStatus() throws Exception {
- String endpoint = "/serviceInstances/v7/<service_instance_id>/configurations/<configuration_id>";
+ String endpoint = "/serviceInstantiation/v7/serviceInstances/<service_instance_id>/configurations/<configuration_id>";
endpoint = endpoint.replace(MsoController.SVC_INSTANCE_ID, SERVICE_INSTANCE_ID);
endpoint = endpoint.replace(MsoController.CONFIGURATION_ID, SAMPLE_CONFIGURATION_ID);
endpoint = endpoint + "/activate";
endpoint = endpoint.replace(MsoController.SVC_INSTANCE_ID, SERVICE_INSTANCE_ID);
endpoint = endpoint.replace(MsoController.CONFIGURATION_ID, SAMPLE_CONFIGURATION_ID);
endpoint = endpoint + "/activate";
mso.restapi.get.orc.reqs=/orchestrationRequests/v7?
mso.restapi.resume.orc.req=/orchestrationRequests/v7/<request_id>/resume
mso.restapi.get.man.tasks=/tasks/v1
mso.restapi.get.orc.reqs=/orchestrationRequests/v7?
mso.restapi.resume.orc.req=/orchestrationRequests/v7/<request_id>/resume
mso.restapi.get.man.tasks=/tasks/v1
-mso.restapi.configurations=/serviceInstances/v6/<service_instance_id>/configurations
+mso.restapi.configurations=${mso.restapi.service.instance}/<service_instance_id>/configurations
mso.restapi.configuration.instance=${mso.restapi.configurations}<configuration_id>
mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId=<model_version_id>
mso.restapi.configuration.instance=${mso.restapi.configurations}<configuration_id>
mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId=<model_version_id>
@Override
public String getReqPath() {
@Override
public String getReqPath() {
- return getRootPath() + "/serviceInstances/v./c187e9fe-40c3-4862-b73e-84ff056205f6/configurations/9533-config-LB1113/" + action;
+ return getRootPath() + "/serviceInstantiation/v./serviceInstances/c187e9fe-40c3-4862-b73e-84ff056205f6/configurations/9533-config-LB1113/" + action;
@Override
public String getReqPath() {
@Override
public String getReqPath() {
- return getRootPath() + "/serviceInstances/v./" + this.serviceInstanceId + "/configurations";
+ return getRootPath() + "/serviceInstantiation/v./serviceInstances/" + this.serviceInstanceId + "/configurations";
@Override
public String getReqPath() {
@Override
public String getReqPath() {
- return getRootPath() + "/serviceInstances/v./c187e9fe-40c3-4862-b73e-84ff056205f6/configurations/9533-config-LB1113";
+ return getRootPath() + "/serviceInstantiation/v./serviceInstances/c187e9fe-40c3-4862-b73e-84ff056205f6/configurations/9533-config-LB1113";
@Override
public String getReqPath() {
@Override
public String getReqPath() {
- return "/mso/serviceInstances/v./"+serviceInstanceId+"/configurations/"+configurationId+"/" + action;
+ return getRootPath() + "/serviceInstantiation/v./serviceInstances/"+serviceInstanceId+"/configurations/"+configurationId+"/" + action;