Code Review
/
vid.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
API tests: support TENANT_AND_REGION_FROM_VNF flag
[vid.git]
/
vid-automation
/
src
/
main
/
java
/
org
/
onap
/
simulator
/
presetGenerator
/
presets
/
mso
/
PresetMSOCreateVfModuleALaCarteCypress.java
diff --git
a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteCypress.java
b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteCypress.java
index
2a353a3
..
762ab6e
100644
(file)
--- a/
vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteCypress.java
+++ b/
vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteCypress.java
@@
-1,5
+1,7
@@
package org.onap.simulator.presetGenerator.presets.mso;
package org.onap.simulator.presetGenerator.presets.mso;
+import static org.apache.commons.lang3.StringUtils.defaultIfEmpty;
+
import com.google.common.collect.ImmutableMap;
import java.util.Map;
import com.google.common.collect.ImmutableMap;
import java.util.Map;
@@
-8,9
+10,17
@@
public class PresetMSOCreateVfModuleALaCarteCypress extends PresetMSOCreateVfMod
protected final Map<Keys, String> names;
public enum Keys {
protected final Map<Keys, String> names;
public enum Keys {
+ lcpCloudRegionId, tenantId,
modelVersionId, modelName, modelVersion, modelCustomizationId, modelCustomizationName, instanceName, modelInvariantId
}
modelVersionId, modelName, modelVersion, modelCustomizationId, modelCustomizationName, instanceName, modelInvariantId
}
+ public static Map<Keys, String> lcpCloudRegionIdAndTenantIdNames(String lcpCloudRegionId, String tenantId) {
+ return ImmutableMap.of(
+ Keys.lcpCloudRegionId, lcpCloudRegionId,
+ Keys.tenantId, tenantId
+ );
+ }
+
public static final Map<Keys, String> module0Names = ImmutableMap.<Keys, String>builder()
.put(Keys.instanceName, "mimazepubi")
.put(Keys.modelInvariantId, "b34833bb-6aa9-4ad6-a831-70b06367a091")
public static final Map<Keys, String> module0Names = ImmutableMap.<Keys, String>builder()
.put(Keys.instanceName, "mimazepubi")
.put(Keys.modelInvariantId, "b34833bb-6aa9-4ad6-a831-70b06367a091")
@@
-31,9
+41,9
@@
public class PresetMSOCreateVfModuleALaCarteCypress extends PresetMSOCreateVfMod
.put(Keys.modelCustomizationName, "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2")
.build();
.put(Keys.modelCustomizationName, "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2")
.build();
- public PresetMSOCreateVfModuleALaCarteCypress(String overrideRequestId, String serviceInstanceId, String vnfInstanceId, Map<Keys, String> names, String testApi, boolean withTestApi) {
+ public PresetMSOCreateVfModuleALaCarteCypress(String overrideRequestId, String serviceInstanceId, String vnfInstanceId, Map<Keys, String> names,
Map<Keys, String> lcpCloudRegionIdAndTenantIdNames,
String testApi, boolean withTestApi) {
super(overrideRequestId, DEFAULT_INSTANCE_ID, serviceInstanceId, vnfInstanceId, "vfModule");
super(overrideRequestId, DEFAULT_INSTANCE_ID, serviceInstanceId, vnfInstanceId, "vfModule");
- this.names =
names
;
+ this.names =
ImmutableMap.<Keys, String>builder().putAll(names).putAll(lcpCloudRegionIdAndTenantIdNames).build()
;
this.msoTestApi = testApi;
this.withTestApi = withTestApi;
}
this.msoTestApi = testApi;
this.withTestApi = withTestApi;
}
@@
-53,10
+63,9
@@
public class PresetMSOCreateVfModuleALaCarteCypress extends PresetMSOCreateVfMod
" \"modelCustomizationName\":\"" + names.get(Keys.modelCustomizationName) + "\"" +
" }," +
" \"cloudConfiguration\":{" +
" \"modelCustomizationName\":\"" + names.get(Keys.modelCustomizationName) + "\"" +
" }," +
" \"cloudConfiguration\":{" +
- " \"lcpCloudRegionId\":\"
hvf6
\"," +
+ " \"lcpCloudRegionId\":\"
" + defaultIfEmpty(names.get(Keys.lcpCloudRegionId), "hvf6") + "
\"," +
addCloudOwnerIfNeeded() +
addCloudOwnerIfNeeded() +
- " \"tenantId\":\"624eb554b0d147c19ff8885341760481\"" +
-
+ " \"tenantId\":\"" + defaultIfEmpty(names.get(Keys.tenantId), "624eb554b0d147c19ff8885341760481") + "\"" +
" }," +
" \"requestInfo\":{" +
" \"instanceName\":\"" + names.get(Keys.instanceName) + "\"," +
" }," +
" \"requestInfo\":{" +
" \"instanceName\":\"" + names.get(Keys.instanceName) + "\"," +