Commit f1a2c270 authored by maciek riedl's avatar maciek riedl
Browse files

Merge branch 'fpga-support' into 'morphemic-rc2.5'

adding subnet argument

See merge request !39
parents 7a05ae68 16edfa23
Pipeline #20463 passed with stages
in 13 minutes and 15 seconds
......@@ -58,9 +58,10 @@ public class ProactiveClientServiceForIntegrationImpl extends ProactiveClientSer
String securityGroup = null;
String nodeGroup = null;
Integer identityVersion;
String scopePrefix = null;
String scopeValue = null;
String scopePrefix;
String scopeValue;
String defaultNetwork = null;
String subnet = null;
String regionBlacklist = null;
JSONObject scopeJSON = new JSONObject();
......@@ -77,12 +78,14 @@ public class ProactiveClientServiceForIntegrationImpl extends ProactiveClientSer
if (ObjectUtils.isNotEmpty(properties)) {
securityGroup = (String) properties.get("securityGroup");
defaultNetwork = (String) properties.get("defaultNetwork");
subnet = (String) properties.get("subnet");
regionBlacklist = (String) properties.get("regionBlacklist");
}
nodeGroup = (String) cloudConfiguration.get("nodeGroup");
}
cloudJSON.put("securityGroup", MoreObjects.firstNonNull(securityGroup, JSONObject.NULL));
cloudJSON.put("defaultNetwork", MoreObjects.firstNonNull(defaultNetwork, JSONObject.NULL));
cloudJSON.put("subnet", MoreObjects.firstNonNull(subnet, JSONObject.NULL));
cloudJSON.put("credentials", credentialsJSON);
cloudJSON.put("nodeGroup", MoreObjects.firstNonNull(nodeGroup, JSONObject.NULL));
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