summaryrefslogtreecommitdiffstats
path: root/adapters/mso-openstack-adapters
diff options
context:
space:
mode:
authorEric Multanen <eric.w.multanen@intel.com>2018-10-01 01:39:34 -0700
committerEric Multanen <eric.w.multanen@intel.com>2018-10-01 01:39:34 -0700
commit679afc5a7883de77c55ed4707cbd964aeb565fb4 (patch)
tree3e43bdff20e885a7536e6e78952b5fe2e48e636b /adapters/mso-openstack-adapters
parent420b438ecfe653aabb4cb6b048777e522cf8c233 (diff)
Fix up handling of multicloud return status
Add calls to query vfmodule status to return when doing create and delete. Return status based on the query result and not the rest response. Put in the completion polling support on create. Change-Id: Ife50509e54e001b92f4a65ec6be2905aef99f9b5 Issue-ID: SO-1082 Signed-off-by: Eric Multanen <eric.w.multanen@intel.com>
Diffstat (limited to 'adapters/mso-openstack-adapters')
-rw-r--r--adapters/mso-openstack-adapters/src/test/java/org/onap/so/adapters/vnf/MsoVnfMulticloudAdapterImplTest.java5
-rw-r--r--adapters/mso-openstack-adapters/src/test/resources/__files/MulticloudResponse_Stack.json4
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"
+ }