Commit 5b87eeeb authored by Marta Różańska's avatar Marta Różańska
Browse files

Merge branch 'fix_add_clouds' into 'morph-rc1.5'

Adding new field to cloudJSOn - defaultNetwork

See merge request !32
parents 1f041272 7690aa5f
Pipeline #19240 passed with stages
in 16 minutes and 32 seconds
...@@ -82,6 +82,7 @@ public class ProactiveClientServiceForIntegrationImpl extends ProactiveClientSer ...@@ -82,6 +82,7 @@ public class ProactiveClientServiceForIntegrationImpl extends ProactiveClientSer
nodeGroup = (String) cloudConfiguration.get("nodeGroup"); nodeGroup = (String) cloudConfiguration.get("nodeGroup");
} }
cloudJSON.put("securityGroup", MoreObjects.firstNonNull(securityGroup, JSONObject.NULL)); cloudJSON.put("securityGroup", MoreObjects.firstNonNull(securityGroup, JSONObject.NULL));
cloudJSON.put("defaultNetwork", MoreObjects.firstNonNull(defaultNetwork, JSONObject.NULL));
cloudJSON.put("credentials", credentialsJSON); cloudJSON.put("credentials", credentialsJSON);
cloudJSON.put("nodeGroup", MoreObjects.firstNonNull(nodeGroup, JSONObject.NULL)); cloudJSON.put("nodeGroup", MoreObjects.firstNonNull(nodeGroup, JSONObject.NULL));
cloudsJSONArray.put(cloudJSON); cloudsJSONArray.put(cloudJSON);
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment