diff options
| author |   Marcus Williams <marcus.williams@intel.com> | 2018-10-01 22:03:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2018-10-01 22:03:31 +0000 |
| commit | 170400b8a2bb2c6fe424aa8853cb377c62edfc43 (patch) | |
| tree | ee427f8d48f69bba8888568b68d36034d6581b09 /adapters/mso-openstack-adapters | |
| parent | 2de9390da2b1e792daefeb46fb0a178be96206f0 (diff) | |
| parent | 679afc5a7883de77c55ed4707cbd964aeb565fb4 (diff) | |
Merge "Fix up handling of multicloud return status"
Diffstat (limited to 'adapters/mso-openstack-adapters')
2 files changed, 7 insertions, 2 deletions
diff --git a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfMulticloudAdapterImplTest.java b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfMulticloudAdapterImplTest.java index 07fa47df42..26d8779ba0 100644 --- a/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfMulticloudAdapterImplTest.java +++ b/adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfMulticloudAdapterImplTest.java @@ -80,6 +80,11 @@ public class MsoVnfMulticloudAdapterImplTest extends BaseRestTestUtils{ //.withHeader() .withStatus(HttpStatus.SC_NOT_FOUND))); + stubFor(get(urlPathEqualTo("/api/multicloud/v1/cloud_owner/cloud_region_id/infra_workload/workload-id")).willReturn(aResponse() + //.withHeader() + .withBodyFile("MulticloudResponse_Stack.json") + .withStatus(HttpStatus.SC_OK))); + stubFor(get(urlPathEqualTo("/api/multicloud/v1/cloud_owner/cloud_region_id/infra_workload/vfname/outputs")).willReturn(aResponse() .withStatus(HttpStatus.SC_NOT_FOUND))); diff --git a/adapters/mso-openstack-adapters/src/test/resources/__files/MulticloudResponse_Stack.json b/adapters/mso-openstack-adapters/src/test/resources/__files/MulticloudResponse_Stack.json index 068cb83a33..cabf6ac6ba 100644 --- a/adapters/mso-openstack-adapters/src/test/resources/__files/MulticloudResponse_Stack.json +++ b/adapters/mso-openstack-adapters/src/test/resources/__files/MulticloudResponse_Stack.json @@ -1,5 +1,5 @@ { "template_type":"heat", "workload_id": "vfname", - "workload_status":"STATUS" - }
\ No newline at end of file + "workload_status":"CREATE_COMPLETE" + } |