diff options
Diffstat (limited to 'vid-automation/src/main/java/org/onap')
2 files changed, 14 insertions, 6 deletions
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteE2E.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteE2E.java index 185c4bfe8..440db879e 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteE2E.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleALaCarteE2E.java @@ -11,6 +11,8 @@ public class PresetMSOCreateVfModuleALaCarteE2E extends PresetMSOCreateVfModuleB private final String instanceName; private final ModelInfoWithCustomization resourceModelInfo; private final String relatedInstance; + protected final String lcpCloudRegionId; + protected final String tenantId; public PresetMSOCreateVfModuleALaCarteE2E( String overrideRequestId, @@ -21,13 +23,15 @@ public class PresetMSOCreateVfModuleALaCarteE2E extends PresetMSOCreateVfModuleB ModelInfo serviceModelInfo, String instanceName, ModelInfoWithCustomization resourceModelInfo, - String relatedInstance) { + String relatedInstance, String lcpCloudRegionId, String tenantId) { super(overrideRequestId, responseInstanceId, serviceInstanceId, vnfInstanceId, resourceModelInfo.resourceType); this.requestorId = requestorId; this.serviceModelInfo = serviceModelInfo; this.instanceName = instanceName; this.resourceModelInfo = resourceModelInfo; this.relatedInstance = relatedInstance; + this.lcpCloudRegionId = lcpCloudRegionId; + this.tenantId = tenantId; } @Override @@ -36,9 +40,9 @@ public class PresetMSOCreateVfModuleALaCarteE2E extends PresetMSOCreateVfModuleB + " \"requestDetails\": {" + resourceModelInfo.createMsoModelInfo() + " \"cloudConfiguration\": {" - + " \"lcpCloudRegionId\": \"hvf6\"," + + " \"lcpCloudRegionId\": \"" + lcpCloudRegionId + "\"," + addCloudOwnerIfNeeded() - + " \"tenantId\": \"bae71557c5bb4d5aac6743a4e5f1d054\"" + + " \"tenantId\": \"" + tenantId + "\"" + " }," + " \"requestInfo\": {" + addInstanceName() diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteE2E.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteE2E.java index 07839ba6b..5e9266a33 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteE2E.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteE2E.java @@ -6,6 +6,8 @@ public class PresetMSOCreateVnfALaCarteE2E extends PresetMSOCreateVnfBase { private final String requestorId; protected String lineOfBusinessName; + protected final String lcpCloudRegionId; + protected final String tenantId; protected final ModelInfo serviceModelInfo; public PresetMSOCreateVnfALaCarteE2E( @@ -14,10 +16,12 @@ public class PresetMSOCreateVnfALaCarteE2E extends PresetMSOCreateVnfBase { String vnfInstanceId, String lineOfBusinessName, String requestorId, - ModelInfo serviceModelInfo) { + String lcpCloudRegionId, String tenantId, ModelInfo serviceModelInfo) { super(overrideRequestId, serviceInstanceId, vnfInstanceId); this.lineOfBusinessName = lineOfBusinessName; this.requestorId = requestorId; + this.lcpCloudRegionId = lcpCloudRegionId; + this.tenantId = tenantId; this.serviceModelInfo = serviceModelInfo; } @@ -35,9 +39,9 @@ public class PresetMSOCreateVnfALaCarteE2E extends PresetMSOCreateVnfBase { + " \"modelVersion\": \"4.0\"" + " }," + " \"cloudConfiguration\": {" - + " \"lcpCloudRegionId\": \"some legacy region\"," + + " \"lcpCloudRegionId\": \"" + lcpCloudRegionId + "\"," + addCloudOwnerIfNeeded() - + " \"tenantId\": \"092eb9e8e4b7412e8787dd091bc58e86\"" + + " \"tenantId\": \"" + tenantId + "\"" + " }," + " \"requestInfo\": {" + " \"productFamilyId\":\"e433710f-9217-458d-a79d-1c7aff376d89\"," |