diff options
| author |   Ittay Stern <ittay.stern@att.com> | 2019-09-10 07:00:40 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2019-09-10 07:00:40 +0000 |
| commit | 124eacf8f310b91e7c94fe8921f2570d2c723858 (patch) | |
| tree | a7e17ace86ef45d52a5d9b5e60dc887dc3ba2ee3 /vid-app-common/src/test/resources | |
| parent | c6f2f4f6ef1a03721c4a803499d6568e20669501 (diff) | |
| parent | d01c185ffbb1a41a4c9773ab416b04a0a770c2a2 (diff) | |
Merge "update MSO create service instance URL"
Diffstat (limited to 'vid-app-common/src/test/resources')
| -rw-r--r-- | vid-app-common/src/test/resources/WEB-INF/conf/system.properties | 4 | ||||
| -rw-r--r-- | vid-app-common/src/test/resources/mso.properties | 17 |
2 files changed, 1 insertions, 20 deletions
diff --git a/vid-app-common/src/test/resources/WEB-INF/conf/system.properties b/vid-app-common/src/test/resources/WEB-INF/conf/system.properties index 33778babb..f2f29f172 100644 --- a/vid-app-common/src/test/resources/WEB-INF/conf/system.properties +++ b/vid-app-common/src/test/resources/WEB-INF/conf/system.properties @@ -155,8 +155,7 @@ mso.polling.interval.msecs=10000 mso.max.polls=10 mso.user.name=infraportal mso.password.x=OBF:1ghz1kfx1j1w1m7w1i271e8q1eas1hzj1m4i1iyy1kch1gdz -mso.restapi.svc.instance=/serviceInstances/v7 -mso.restapi.svc.instance.deleteAndUnassign=/serviceInstantiation/v7/serviceInstances +mso.restapi.service.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances mso.restapi.vnf.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/vnfs mso.restapi.vnf.changemanagement.instance=/serviceInstances/v7/<service_instance_id>/vnfs/<vnf_instance_id>/<request_type> mso.restapi.network.instance=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/<service_instance_id>/networks @@ -174,7 +173,6 @@ mso.restapi.configuration.instance=${mso.restapi.configurations}<configuration_i mso.restapi.changeManagement.workflowSpecifications=/workflowSpecifications/v1/workflows?vnfModelVersionId=<model_version_id> mso.restapi.serviceInstantiationApiRoot=/serviceInstantiation/v7 -mso.restapi.serviceInstanceCreate=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances mso.restapi.serviceInstanceAssign=${mso.restapi.serviceInstantiationApiRoot}/serviceInstances/assign mso.restapi.cloudResourcesApiRoot=/cloudResources/v1 diff --git a/vid-app-common/src/test/resources/mso.properties b/vid-app-common/src/test/resources/mso.properties deleted file mode 100644 index d021ffde1..000000000 --- a/vid-app-common/src/test/resources/mso.properties +++ /dev/null @@ -1,17 +0,0 @@ -mso.server.url=http://mtanjv9moah01-eth0.aic.cip.att.com:8080/ecomp/mso/infra -mso.polling.interval.msecs=2000 -mso.max.polls=3 -mso.user.name=infraportal -mso.password.x=OBF:1ghz1kfx1j1w1m7w1i271e8q1eas1hzj1m4i1iyy1kch1gdz -mso.restapi.svc.instance=/serviceInstances/v3 -mso.restapi.vnf.instance=/serviceInstances/v3/<service_instance_id>/vnfs -mso.restapi.network.instance=/serviceInstances/v3/<service_instance_id>/networks -mso.restapi.vf.module.instance=/serviceInstantiation/v7/<service_instance_id>/vnfs/<vnf_instance_id>/vfModules/scaleOut -mso.restapi.volume.group.instance=/serviceInstances/v3/<service_instance_id>/vnfs/<vnf_instance_id>/volumeGroups -mso.restapi.configurations=/serviceInstances/v6/<service_instance_id>/configurations -mso.restapi.get.orc.req=/orchestrationRequests/v3 -mso.restapi.get.orc.reqs=/orchestrationRequests/v3? -mso.restapi.get.man.tasks=/tasks/v1 -mso.dme2.client.timeout=30000 -mso.dme2.client.read.timeout=120000 -mso.dme2.server.url=http://mso-api-handler-anap-v1.mso.ecomp.att.com/services/ecomp/mso?version=1607&envContext=TEST&routeOffer=st_mtsnj
\ No newline at end of file |