summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--adapters/mso-adapter-utils/src/test/resources/__files/HeatStack.json10
-rw-r--r--adapters/mso-adapter-utils/src/test/resources/__files/OpenstackResponse_Access.json6
-rw-r--r--adapters/mso-adapter-utils/src/test/resources/__files/OpenstackResponse_Stack_DeleteComplete.json8
-rw-r--r--adapters/mso-adapter-utils/src/test/resources/__files/UpdateStack.json10
-rw-r--r--adapters/mso-adapters-rest-interface/src/test/resources/stack-example.json13
-rw-r--r--pom.xml2
6 files changed, 24 insertions, 25 deletions
diff --git a/adapters/mso-adapter-utils/src/test/resources/__files/HeatStack.json b/adapters/mso-adapter-utils/src/test/resources/__files/HeatStack.json
index 411a3e0bd7..679e8e1832 100644
--- a/adapters/mso-adapter-utils/src/test/resources/__files/HeatStack.json
+++ b/adapters/mso-adapter-utils/src/test/resources/__files/HeatStack.json
@@ -1,11 +1,11 @@
{
"description" : "description",
"links" : [],
- "stackStatusReason" : "stackStatusReason",
- "stackName" : "stackName",
- "updatedTime" : null,
- "creationTime" : null,
- "stackStatus" : "stackStatus",
+ "stack_status_reason" : "stackStatusReason",
+ "stack_name" : "stackName",
+ "updated_time" : null,
+ "creation_time" : null,
+ "stack_status" : "stackStatus",
"id" : "id",
"files" : {}
} \ No newline at end of file
diff --git a/adapters/mso-adapter-utils/src/test/resources/__files/OpenstackResponse_Access.json b/adapters/mso-adapter-utils/src/test/resources/__files/OpenstackResponse_Access.json
index f1c08cc093..cd516ad082 100644
--- a/adapters/mso-adapter-utils/src/test/resources/__files/OpenstackResponse_Access.json
+++ b/adapters/mso-adapter-utils/src/test/resources/__files/OpenstackResponse_Access.json
@@ -18,7 +18,7 @@
"adminURL": null
}
],
- "endpointsLinks": null
+ "endpoints_links": null
},
{
"type": "network",
@@ -31,7 +31,7 @@
"adminURL": null
}
],
- "endpointsLinks": null
+ "endpoints_links": null
},
{
"type": "identity",
@@ -44,7 +44,7 @@
"adminURL": null
}
],
- "endpointsLinks": null
+ "endpoints_links": null
}
],
"user": null,
diff --git a/adapters/mso-adapter-utils/src/test/resources/__files/OpenstackResponse_Stack_DeleteComplete.json b/adapters/mso-adapter-utils/src/test/resources/__files/OpenstackResponse_Stack_DeleteComplete.json
index 8612258eee..a26a551f7d 100644
--- a/adapters/mso-adapter-utils/src/test/resources/__files/OpenstackResponse_Stack_DeleteComplete.json
+++ b/adapters/mso-adapter-utils/src/test/resources/__files/OpenstackResponse_Stack_DeleteComplete.json
@@ -2,10 +2,10 @@
"stack": {
"description": null,
"links": null,
- "stackStatusReason": null,
- "stackName": null,
- "updatedTime": null,
- "creationTime": null,
+ "stack_status_reason": null,
+ "stack_name": null,
+ "updated_time": null,
+ "creation_time": null,
"stack_status": "DELETE_COMPLETE",
"id": "stackId",
"files": null,
diff --git a/adapters/mso-adapter-utils/src/test/resources/__files/UpdateStack.json b/adapters/mso-adapter-utils/src/test/resources/__files/UpdateStack.json
index 0a09d599ba..bf61cc8c8b 100644
--- a/adapters/mso-adapter-utils/src/test/resources/__files/UpdateStack.json
+++ b/adapters/mso-adapter-utils/src/test/resources/__files/UpdateStack.json
@@ -1,11 +1,11 @@
{
"description" : "description",
"links" : [],
- "stackStatusReason" : "stackStatusReason",
- "stackName" : "stackName",
- "updatedTime" : null,
- "creationTime" : null,
- "stackStatus" : "UPDATE_COMPLETE",
+ "stack_status_reason" : "stackStatusReason",
+ "stack_name" : "stackName",
+ "updated_time" : null,
+ "creation_time" : null,
+ "stack_status" : "UPDATE_COMPLETE",
"id" : "id",
"files" : {}
} \ No newline at end of file
diff --git a/adapters/mso-adapters-rest-interface/src/test/resources/stack-example.json b/adapters/mso-adapters-rest-interface/src/test/resources/stack-example.json
index c0f08f8bd7..968f6179b0 100644
--- a/adapters/mso-adapters-rest-interface/src/test/resources/stack-example.json
+++ b/adapters/mso-adapters-rest-interface/src/test/resources/stack-example.json
@@ -1,13 +1,12 @@
{
"outputs" : [{
- "outputKey": "key1",
- "outputValue": "value1"
+ "output_key": "key1",
+ "output_value": "value1"
},{
- "outputKey": "key2",
- "outputValue": "value2"
+ "output_key": "key2",
+ "output_value": "value2"
},{
- "outputKey": "key3",
- "outputValue": "value3"
+ "output_key": "key3",
+ "output_value": "value3"
}]
-
} \ No newline at end of file
diff --git a/pom.xml b/pom.xml
index 078f9b3adc..f6fc55aa6c 100644
--- a/pom.xml
+++ b/pom.xml
@@ -47,7 +47,7 @@
<sonar.cpd.exclusions>**/*</sonar.cpd.exclusions>
<jacoco.version>0.7.5.201505241946</jacoco.version>
<org.apache.maven.user-settings/>
- <openstack.version>1.2.2</openstack.version>
+ <openstack.version>1.3.0</openstack.version>
<maven.build.timestamp.format>yyyyMMdd'T'HHmm</maven.build.timestamp.format>
<springboot.version>1.5.13.RELEASE</springboot.version>
<originalClassifier>original</originalClassifier>