diff options
| author |   Ittay Stern <ittay.stern@att.com> | 2019-07-08 15:46:44 +0300 |
|---|---|---|
| committer | Ittay Stern <ittay.stern@att.com> | 2019-07-08 18:50:38 +0300 |
| commit | f4dff328c0386c8901b5841943b11f0c13b3169f (patch) | |
| tree | 4e64c3ee540410b2593c1ebecd0dddd3a4780592 /vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso | |
| parent | f792671ae247a931f34d902e9276202b5016ef9a (diff) | |
Merge from ecomp 718fd196 - Integration Tests
Issue-ID: VID-378
Change-Id: Icc0bdb9ef37b1d429d47c2070f76d1ee63ad7489
Signed-off-by: Ittay Stern <ittay.stern@att.com>
Diffstat (limited to 'vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso')
27 files changed, 373 insertions, 117 deletions
diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarte5G.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarte5G.java index 42b1578f4..0b7c6517f 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarte5G.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarte5G.java @@ -54,7 +54,7 @@ public class PresetMSOCreateNetworkALaCarte5G extends PresetMSOBaseCreateInstanc " \"platformName\": \"platform\"" + " }," + " \"lineOfBusiness\": {" + - " \"lineOfBusinessName\": \"ECOMP\"" + + " \"lineOfBusinessName\": \"ONAP\"" + " }," + " \"relatedInstanceList\": [{" + " \"relatedInstance\": {" + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteOldViewEdit.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteOldViewEdit.java index bccb07251..307aef2c0 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteOldViewEdit.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteOldViewEdit.java @@ -3,11 +3,13 @@ package org.onap.simulator.presetGenerator.presets.mso; public class PresetMSOCreateNetworkALaCarteOldViewEdit extends PresetMSOBaseCreateInstancePost { private final String networkInstanceName; private final String serviceInstanceId; + private final String platform; - public PresetMSOCreateNetworkALaCarteOldViewEdit(String overrideRequestId, String serviceInstanceId, String responseInstanceId, String networkInstanceName) { + public PresetMSOCreateNetworkALaCarteOldViewEdit(String overrideRequestId, String serviceInstanceId, String responseInstanceId, String networkInstanceName, String platform) { super(overrideRequestId, responseInstanceId); this.serviceInstanceId = serviceInstanceId; this.networkInstanceName = networkInstanceName; + this.platform = platform == null ? "" : platform; } @Override @@ -17,12 +19,12 @@ public class PresetMSOCreateNetworkALaCarteOldViewEdit extends PresetMSOBaseCrea @Override public Object getRequestBody() { - return "{\"requestDetails\": {" + + return "{\"requestDetails\": {" + " \"requestInfo\": {" + - " \"instanceName\": \""+networkInstanceName+"\"," + + " \"instanceName\": \"" + networkInstanceName + "\"," + " \"source\": \"VID\"," + " \"suppressRollback\": false," + - " \"requestorId\": \"mo57174000\"," + + " \"requestorId\": \"em1536000\"," + " \"productFamilyId\": \"a9a77d5a-123e-4ca2-9eb9-0b015d2ee0fb\"" + " }," + " \"modelInfo\": {" + @@ -40,16 +42,14 @@ public class PresetMSOCreateNetworkALaCarteOldViewEdit extends PresetMSOBaseCrea " }," + " \"cloudConfiguration\": {" + " \"lcpCloudRegionId\": \"One\"," + - addCloudOwnerIfNeeded() + + addCloudOwnerIfNeeded() + " \"tenantId\": \"c630e297a3ae486497d63eacec1d7c14\"" + " }," + - " \"platform\": {" + - " \"platformName\": \"xxx1\"" + - " }," + + addPlatformIfNeeded(platform) + " \"relatedInstanceList\": [" + " {" + " \"relatedInstance\": {" + - " \"instanceId\": \""+serviceInstanceId+"\"," + + " \"instanceId\": \"" + serviceInstanceId + "\"," + " \"modelInfo\": {" + " \"modelType\": \"service\"," + " \"modelName\": \"Using VID for VoIP Network Instantiations Shani\"," + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork.java index afd96a46f..40c18fa55 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork.java @@ -1,9 +1,9 @@ package org.onap.simulator.presetGenerator.presets.mso; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME; - import java.util.Map; +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME; + public class PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork extends PresetMSOCreateServiceInstanceGen2WithNames { private final String requestorId; @@ -31,13 +31,13 @@ public class PresetMSOCreateServiceInstanceAlacarte5GServiceWithNetwork extends " }," + " \"owningEntity\": {" + " \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\"," + - " \"owningEntityName\": \"MetroPacketCore\"" + + " \"owningEntityName\": \"WayneHolland\"" + " }," + " \"subscriberInfo\": {" + " \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\"" + " }," + " \"project\": {" + - " \"projectName\": \"DFW\"" + + " \"projectName\": \"WATKINS\"" + " }," + " \"requestInfo\": {" + " \"instanceName\": \""+names.get(SERVICE_NAME)+"\"," + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2.java index 3a7b09b43..0fd70b765 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2.java @@ -26,13 +26,13 @@ public class PresetMSOCreateServiceInstanceGen2 extends PresetMSOBaseCreateInsta " }, " + " \"owningEntity\": { " + " \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\", " + - " \"owningEntityName\": \"MetroPacketCore\" " + + " \"owningEntityName\": \"WayneHolland\" " + " }, " + " \"subscriberInfo\": { " + " \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\" " + " }, " + " \"project\": { " + - " \"projectName\": \"DFW\" " + + " \"projectName\": \"WATKINS\" " + " }, " + " \"requestInfo\": { " + // " \"instanceName\": \"some instance name_0" + suffix + "\", " + @@ -73,7 +73,7 @@ public class PresetMSOCreateServiceInstanceGen2 extends PresetMSOBaseCreateInsta " \"platformName\": \"platform\" " + " }, " + " \"lineOfBusiness\": { " + - " \"lineOfBusinessName\": \"ECOMP\" " + + " \"lineOfBusinessName\": \"ONAP\" " + " }, " + " \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\", " + " \"instanceParams\": [], " + @@ -82,7 +82,7 @@ public class PresetMSOCreateServiceInstanceGen2 extends PresetMSOBaseCreateInsta " \"modelInfo\": { " + " \"modelInvariantId\": \"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1\", " + " \"modelVersionId\": \"25284168-24bb-4698-8cb4-3f509146eca5\", " + - " \"modelName\": \"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\", " + + " \"modelName\": \"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\", " + " \"modelType\": \"vfModule\", " + " \"modelVersion\": \"6\" " + " }, " + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2AlacarteService.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2AlacarteService.java index f76293f1d..f80f6bb57 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2AlacarteService.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2AlacarteService.java @@ -26,11 +26,11 @@ public class PresetMSOCreateServiceInstanceGen2AlacarteService extends PresetMSO " \"modelVersion\": \"1.0\" " + " }, " + " \"owningEntity\": { " + - " \"owningEntityName\": \"MetroPacketCore\", " + + " \"owningEntityName\": \"WayneHolland\", " + " \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\" " + " }, " + " \"project\": { " + - " \"projectName\": \"DFW\" " + + " \"projectName\": \"WATKINS\" " + " }, " + " \"subscriberInfo\": { " + " \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\" " + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService.java index 8f0b14115..28705ad89 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService.java @@ -35,10 +35,10 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesAlacarteGroupingService " }, " + " \"owningEntity\": { " + " \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\", " + - " \"owningEntityName\": \"MetroPacketCore\" " + + " \"owningEntityName\": \"WayneHolland\" " + " }, " + " \"project\": { " + - " \"projectName\": \"DFW\" " + + " \"projectName\": \"WATKINS\" " + " }, " + " \"subscriberInfo\": { " + " \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\" " + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteServiceCypress.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteServiceCypress.java index a864b0d10..e4c14fc01 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteServiceCypress.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesAlacarteServiceCypress.java @@ -28,11 +28,11 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesAlacarteServiceCypress e " \"modelVersion\": \"1.0\" " + " }, " + " \"owningEntity\": { " + - " \"owningEntityName\": \"MetroPacketCore\", " + + " \"owningEntityName\": \"WayneHolland\", " + " \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\" " + " }, " + " \"project\": { " + - " \"projectName\": \"DFW\" " + + " \"projectName\": \"WATKINS\" " + " }, " + " \"subscriberInfo\": { " + " \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\" " + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse.java index 2a8d7586e..d983a6152 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse.java @@ -1,14 +1,10 @@ package org.onap.simulator.presetGenerator.presets.mso; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VFM_NAME1; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VFM_NAME2; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VG_NAME; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VNF_NAME; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VNF_NAME2; +import vid.automation.test.infra.Features; import java.util.Map; -import vid.automation.test.infra.Features; + +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.*; public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends PresetMSOCreateServiceInstanceGen2WithNames { @@ -60,10 +56,6 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends } protected String getVnfInstanceParams() { - if (!Features.FLAG_SHIFT_VFMODULE_PARAMS_TO_VNF.isActive()) { - return ""; - } - if (Features.FLAG_SUPPLEMENTARY_FILE.isActive()) { return INSTANCE_PARAMS_WITH_SUPP_FILE_VNF; } @@ -91,13 +83,13 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends " }, " + " \"owningEntity\": { " + " \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\", " + - " \"owningEntityName\": \"MetroPacketCore\" " + + " \"owningEntityName\": \"WayneHolland\" " + " }, " + " \"subscriberInfo\": { " + " \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\" " + " }, " + " \"project\": { " + - " \"projectName\": \"DFW\" " + + " \"projectName\": \"WATKINS\" " + " }, " + " \"requestInfo\": { " + " \"instanceName\": \"" + names.get(SERVICE_NAME) + suffix + "\", " + @@ -118,7 +110,7 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends " \"modelType\": \"service\" " + " }, " + " \"instanceParams\": [{ " + - " \"2017488_PASQUALEvpe0_ASN\": \"AV_vPE\"" + + " \"2017488_pasqualevpe0_ASN\": \"AV_vPE\"" + " }" + " ], " + " \"resources\": { " + @@ -142,7 +134,7 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends " \"platformName\": \"platform\" " + " }, " + " \"lineOfBusiness\": { " + - " \"lineOfBusinessName\": \"ECOMP\" " + + " \"lineOfBusinessName\": \"ONAP\" " + " }, " + " \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\", " + " \"instanceParams\": [" + INSTANCE_PARAMS_VNF + "] " + @@ -167,18 +159,18 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends " \"platformName\": \"platform\" " + " }, " + " \"lineOfBusiness\": { " + - " \"lineOfBusinessName\": \"ECOMP\" " + + " \"lineOfBusinessName\": \"ONAP\" " + " }, " + " \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\", " + " \"instanceParams\": [" + getVnfInstanceParams() + "], " + " \"vfModules\": [{ " + " \"instanceName\": \"" + names.get(VFM_NAME1) + suffix + "\", " + " \"modelInfo\": { " + - " \"modelCustomizationName\": \"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\", " + + " \"modelCustomizationName\": \"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\", " + " \"modelCustomizationId\": \"a55961b2-2065-4ab0-a5b7-2fcee1c227e3\", " + " \"modelInvariantId\": \"b34833bb-6aa9-4ad6-a831-70b06367a091\", " + " \"modelVersionId\": \"f8360508-3f17-4414-a2ed-6bc71161e8db\", " + - " \"modelName\": \"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\", " + + " \"modelName\": \"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\", " + " \"modelType\": \"vfModule\", " + " \"modelVersion\": \"5\" " + " }, " + @@ -187,11 +179,11 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends " \"instanceName\": \"" + names.get(VFM_NAME2) + suffix + "\", " + " \"volumeGroupInstanceName\": \"" + names.get(VG_NAME) + suffix + "\", " + " \"modelInfo\": { " + - " \"modelCustomizationName\": \"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\", " + + " \"modelCustomizationName\": \"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\", " + " \"modelCustomizationId\": \"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401\", " + " \"modelInvariantId\": \"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1\", " + " \"modelVersionId\": \"25284168-24bb-4698-8cb4-3f509146eca5\", " + - " \"modelName\": \"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\", " + + " \"modelName\": \"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\", " + " \"modelType\": \"vfModule\", " + " \"modelVersion\": \"6\" " + " }, " + @@ -212,10 +204,6 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends } private String addDuplicatedVnfIfFeatureOn() { - if (!Features.FLAG_DUPLICATE_VNF.isActive()) { - return ""; - } - return " ,{ " + //start of vnf " \"instanceName\": \"" + names.get(VNF_NAME)+ "_001" + suffix + "\", " + @@ -237,18 +225,18 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends " \"platformName\": \"platform\" " + " }, " + " \"lineOfBusiness\": { " + - " \"lineOfBusinessName\": \"ECOMP\" " + + " \"lineOfBusinessName\": \"ONAP\" " + " }, " + " \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\", " + " \"instanceParams\": [" + getVnfInstanceParams() + "], " + " \"vfModules\": [{ " + " \"instanceName\": \"" + names.get(VFM_NAME1) + "_001" + suffix + "\", " + " \"modelInfo\": { " + - " \"modelCustomizationName\": \"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\", " + + " \"modelCustomizationName\": \"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\", " + " \"modelCustomizationId\": \"a55961b2-2065-4ab0-a5b7-2fcee1c227e3\", " + " \"modelInvariantId\": \"b34833bb-6aa9-4ad6-a831-70b06367a091\", " + " \"modelVersionId\": \"f8360508-3f17-4414-a2ed-6bc71161e8db\", " + - " \"modelName\": \"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\", " + + " \"modelName\": \"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\", " + " \"modelType\": \"vfModule\", " + " \"modelVersion\": \"5\" " + " }, " + @@ -257,11 +245,11 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends " \"instanceName\": \"" + names.get(VFM_NAME2) + "_001" + suffix + "\", " + " \"volumeGroupInstanceName\": \"" + names.get(VG_NAME) + "_001" + suffix + "\", " + " \"modelInfo\": { " + - " \"modelCustomizationName\": \"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\", " + + " \"modelCustomizationName\": \"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\", " + " \"modelCustomizationId\": \"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401\", " + " \"modelInvariantId\": \"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1\", " + " \"modelVersionId\": \"25284168-24bb-4698-8cb4-3f509146eca5\", " + - " \"modelName\": \"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\", " + + " \"modelName\": \"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\", " + " \"modelType\": \"vfModule\", " + " \"modelVersion\": \"6\" " + " }, " + @@ -289,18 +277,18 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends " \"platformName\": \"platform\" " + " }, " + " \"lineOfBusiness\": { " + - " \"lineOfBusinessName\": \"ECOMP\" " + + " \"lineOfBusinessName\": \"ONAP\" " + " }, " + " \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\", " + " \"instanceParams\": [" + getVnfInstanceParams() + "], " + " \"vfModules\": [{ " + " \"instanceName\": \"" + names.get(VFM_NAME1) + "_002" + suffix + "\", " + " \"modelInfo\": { " + - " \"modelCustomizationName\": \"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\", " + + " \"modelCustomizationName\": \"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\", " + " \"modelCustomizationId\": \"a55961b2-2065-4ab0-a5b7-2fcee1c227e3\", " + " \"modelInvariantId\": \"b34833bb-6aa9-4ad6-a831-70b06367a091\", " + " \"modelVersionId\": \"f8360508-3f17-4414-a2ed-6bc71161e8db\", " + - " \"modelName\": \"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\", " + + " \"modelName\": \"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\", " + " \"modelType\": \"vfModule\", " + " \"modelVersion\": \"5\" " + " }, " + @@ -309,11 +297,11 @@ public class PresetMSOCreateServiceInstanceGen2WithNamesEcompNamingFalse extends " \"instanceName\": \"" + names.get(VFM_NAME2) + "_002" + suffix + "\", " + " \"volumeGroupInstanceName\": \"" + names.get(VG_NAME) + "_002" + suffix + "\", " + " \"modelInfo\": { " + - " \"modelCustomizationName\": \"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\", " + + " \"modelCustomizationName\": \"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\", " + " \"modelCustomizationId\": \"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401\", " + " \"modelInvariantId\": \"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1\", " + " \"modelVersionId\": \"25284168-24bb-4698-8cb4-3f509146eca5\", " + - " \"modelName\": \"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\", " + + " \"modelName\": \"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\", " + " \"modelType\": \"vfModule\", " + " \"modelVersion\": \"6\" " + " }, " + 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 dabc526c7..7b434d559 100644 --- 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,6 +1,7 @@ package org.onap.simulator.presetGenerator.presets.mso; import com.google.common.collect.ImmutableMap; + import java.util.Map; public class PresetMSOCreateVfModuleALaCarteCypress extends PresetMSOBaseCreateInstancePost { @@ -16,20 +17,20 @@ public class PresetMSOCreateVfModuleALaCarteCypress extends PresetMSOBaseCreateI .put(Keys.instanceName, "mimazepubi") .put(Keys.modelInvariantId, "b34833bb-6aa9-4ad6-a831-70b06367a091") .put(Keys.modelVersionId, "f8360508-3f17-4414-a2ed-6bc71161e8db") - .put(Keys.modelName, "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0") + .put(Keys.modelName, "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0") .put(Keys.modelVersion, "5") .put(Keys.modelCustomizationId, "a55961b2-2065-4ab0-a5b7-2fcee1c227e3") - .put(Keys.modelCustomizationName, "2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0") + .put(Keys.modelCustomizationName, "2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0") .build(); public static final Map<Keys, String> module2Names = ImmutableMap.<Keys, String>builder() .put(Keys.instanceName, "bnmgtrx") .put(Keys.modelInvariantId, "eff8cc59-53a1-4101-aed7-8cf24ecf8339") .put(Keys.modelVersionId, "0a0dd9d4-31d3-4c3a-ae89-a02f383e6a9a") - .put(Keys.modelName, "2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2") + .put(Keys.modelName, "2017488PasqualeVpe..PASQUALE_vPFE_BV..module-2") .put(Keys.modelVersion, "6") .put(Keys.modelCustomizationId, "3cd946bb-50e0-40d8-96d3-c9023520b557") - .put(Keys.modelCustomizationName, "2017488PASQUALEVpe..PASQUALE_vPFE_BV..module-2") + .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) { diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleOldViewEdit.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleOldViewEdit.java index bf085cae5..61601eef2 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleOldViewEdit.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleOldViewEdit.java @@ -29,16 +29,16 @@ public class PresetMSOCreateVfModuleOldViewEdit extends PresetMSOBaseCreateInsta " \"instanceName\": \""+instanceName+"\"," + " \"source\": \"VID\"," + " \"suppressRollback\": false," + - " \"requestorId\": \"mo37915000\"" + + " \"requestorId\": \"em35993000\"" + " }," + " \"modelInfo\": {" + " \"modelType\": \"vfModule\"," + " \"modelInvariantId\": \"d9f9c851-9543-476e-b3c2-a2e5284a26aa\"," + " \"modelVersionId\": \"d205e01d-e5da-4e68-8c52-f95cb0607959\"," + - " \"modelName\": \"Vsp1710pid298109Vmmsc..mmsc_mod1_ltm..module-8\"," + + " \"modelName\": \"Vsp1710pid298109Vwinifred..mmsc_mod1_ltm..module-8\"," + " \"modelVersion\": \"1\"," + " \"modelCustomizationId\": \"e81b58ce-ae9b-4bde-9f81-9962a5007756\"," + - " \"modelCustomizationName\": \"Vsp1710pid298109Vmmsc..mmsc_mod1_ltm..module-8\"" + + " \"modelCustomizationName\": \"Vsp1710pid298109Vwinifred..mmsc_mod1_ltm..module-8\"" + " }," + " \"requestParameters\": {" + addTestApi() + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java index c8fb7fcf9..764237e18 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress.java @@ -44,10 +44,10 @@ public class PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress extends Prese " \"modelType\":\"" + select("volumeGroup", "vfModule") + "\"," + " \"modelInvariantId\":\"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1\"," + " \"modelVersionId\":\"25284168-24bb-4698-8cb4-3f509146eca5\"," + - " \"modelName\":\"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\"," + + " \"modelName\":\"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\"," + " \"modelVersion\":\"6\"," + " \"modelCustomizationId\":\"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401\"," + - " \"modelCustomizationName\":\"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\"" + + " \"modelCustomizationName\":\"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\"" + " }," + " \"cloudConfiguration\":{" + " \"lcpCloudRegionId\":\"my region\"," + @@ -97,11 +97,11 @@ public class PresetMSOCreateVfModuleWithVolumeGroupALaCarteCypress extends Prese " \"requestParameters\":{" + addTestApi()+ " \"userParams\":[{" + - " \"2017488_PASQUALEvpe0_vnf_instance_name\":\"mtnj309me6\"," + - " \"2017488_PASQUALEvpe0_vnf_config_template_version\":\"17.2\"," + - " \"PASQUALEvpe0_bandwidth\":\"10\"," + - " \"2017488_PASQUALEvpe0_AIC_CLLI\":\"ATLMY8GA\"," + - " \"PASQUALEvpe0_bandwidth_units\":\"Gbps\"" + + " \"2017488_pasqualevpe0_vnf_instance_name\":\"mtnj309me6\"," + + " \"2017488_pasqualevpe0_vnf_config_template_version\":\"17.2\"," + + " \"pasqualevpe0_bandwidth\":\"10\"," + + " \"2017488_pasqualevpe0_AIC_CLLI\":\"ATLMY8GA\"," + + " \"pasqualevpe0_bandwidth_units\":\"Gbps\"" + " }" + " ]," + " \"usePreload\":true" + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteOldViewEdit.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteOldViewEdit.java index 7947c5b83..d4eaa6dd5 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteOldViewEdit.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfALaCarteOldViewEdit.java @@ -21,7 +21,7 @@ public class PresetMSOCreateVnfALaCarteOldViewEdit extends PresetMSOCreateVnfBas " \"instanceName\": \""+vnfInstanceName+"\"," + " \"source\": \"VID\"," + " \"suppressRollback\": false," + - " \"requestorId\": \"mo37915000\"," + + " \"requestorId\": \"em35993000\"," + " \"productFamilyId\": \"ebc3bc3d-62fd-4a3f-a037-f619df4ff034\"" + " }," + " \"modelInfo\": {" + @@ -42,7 +42,7 @@ public class PresetMSOCreateVnfALaCarteOldViewEdit extends PresetMSOCreateVnfBas addCloudOwnerIfNeeded() + " \"tenantId\": \"092eb9e8e4b7412e8787dd091bc58e86\"" + " }," + - selectLob("\"lineOfBusiness\": {\"lineOfBusinessName\": \"ECOMP\"},", "") + + selectLob("\"lineOfBusiness\": {\"lineOfBusinessName\": \"ONAP\"},", "") + " \"platform\": {" + " \"platformName\": \"platform\"" + " }," + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfVlanTagging.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfVlanTagging.java index 9fd0a678f..d5faa3f1c 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfVlanTagging.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVnfVlanTagging.java @@ -34,10 +34,10 @@ public class PresetMSOCreateVnfVlanTagging extends PresetMSOBaseCreateInstancePo " \"requestorId\": \"us16807000\"" + " }," + " \"lineOfBusiness\": {" + - " \"lineOfBusinessName\": \"ECOMP\"" + + " \"lineOfBusinessName\": \"ONAP\"" + " }," + " \"cloudConfiguration\": {" + - " \"lcpCloudRegionId\": \"JANET25\"," + + " \"lcpCloudRegionId\": \"AAIAIC25\"," + addCloudOwnerIfNeeded() + " \"tenantId\": \"092eb9e8e4b7412e8787dd091bc58e86\"" + " }," + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java index ed5bee788..42e2a7097 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateVolumeGroupOldViewEdit.java @@ -27,16 +27,16 @@ public class PresetMSOCreateVolumeGroupOldViewEdit extends PresetMSOBaseCreateIn " \"instanceName\": \""+instanceName+"\"," + " \"source\": \"VID\"," + " \"suppressRollback\": false," + - " \"requestorId\": \"mo37915000\"" + + " \"requestorId\": \"em35993000\"" + " }," + " \"modelInfo\": {" + " \"modelType\": \"volumeGroup\"," + " \"modelInvariantId\": \"6931e88a-fbcc-4ca9-8583-876b669c3106\"," + " \"modelVersionId\": \"13f022c4-651e-4326-b8e1-61e9a8c7a7ad\"," + - " \"modelName\": \"Vsp1710pid298109Vmmsc..mmsc_mod6_eca_oam..module-3\"," + + " \"modelName\": \"Vsp1710pid298109Vwinifred..mmsc_mod6_eca_oam..module-3\"," + " \"modelVersion\": \"1\"," + " \"modelCustomizationId\": \"020af091-cc66-46db-876c-02f14b4a795f\"," + - " \"modelCustomizationName\": \"Vsp1710pid298109Vmmsc..mmsc_mod6_eca_oam..module-3\"" + + " \"modelCustomizationName\": \"Vsp1710pid298109Vwinifred..mmsc_mod6_eca_oam..module-3\"" + " }," + " \"requestParameters\": {" + addTestApi() + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteBaseVfModuleCypress.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteBaseVfModuleCypress.java index fc9cc3c5c..2f8d218a6 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteBaseVfModuleCypress.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteBaseVfModuleCypress.java @@ -15,16 +15,16 @@ public class PresetMSODeleteBaseVfModuleCypress extends PresetMSODeleteVfModule return "{" + " \"requestDetails\":{" + " \"modelInfo\":{" + - " \"modelCustomizationName\":\"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\"," + + " \"modelCustomizationName\":\"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\"," + " \"modelCustomizationId\":\"a55961b2-2065-4ab0-a5b7-2fcee1c227e3\"," + " \"modelInvariantId\":\"b34833bb-6aa9-4ad6-a831-70b06367a091\"," + " \"modelVersionId\":\"f8360508-3f17-4414-a2ed-6bc71161e8db\"," + - " \"modelName\":\"2017488PASQUALEVpe..PASQUALE_base_vPE_BV..module-0\"," + + " \"modelName\":\"2017488PasqualeVpe..PASQUALE_base_vPE_BV..module-0\"," + " \"modelType\":\"vfModule\"," + " \"modelVersion\":\"5\"" + " }," + " \"cloudConfiguration\":{" + - " \"lcpCloudRegionId\":\"JANET25\"," + + " \"lcpCloudRegionId\":\"AAIAIC25\"," + addCloudOwnerIfNeeded() + " \"tenantId\":\"092eb9e8e4b7412e8787dd091bc58e86\"," + " }," + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteInstanceGroup.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteInstanceGroup.java index 9174cd2bb..bf18ab31b 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteInstanceGroup.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteInstanceGroup.java @@ -22,7 +22,6 @@ public class PresetMSODeleteInstanceGroup extends PresetMSOBaseDelete { Map<String, String> map = super.getRequestHeaders(); map.put("X-RequestorID", userId); return map; - } } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteMacroService.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteMacroService.java new file mode 100644 index 000000000..10f1c04aa --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteMacroService.java @@ -0,0 +1,33 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +public class PresetMSODeleteMacroService extends PresetMSODeleteService { + + public PresetMSODeleteMacroService(String requestId, String serviceInstanceId) + { + super(requestId, serviceInstanceId); + } + + @Override + public Object getRequestBody() + { + return "{ " + + " \"requestDetails\":{ " + + " \"modelInfo\":{ " + + " \"modelInvariantId\":\"dfc2c44c-2429-44ca-ae26-1e6dc1f207fb\"," + + " \"modelVersionId\":\"f028b2e2-7080-4b13-91b2-94944d4c42d8\"," + + " \"modelName\":\"Service with VRF\"," + + " \"modelType\":\"service\"," + + " \"modelVersion\":\"5.0\"" + + " }," + + " \"requestInfo\":{ " + + " \"source\":\"VID\"," + + " \"requestorId\":\"us16807000\"" + + " }," + + " \"requestParameters\":{ " + + " \"aLaCarte\":false" + + " }" + + " }" + + "}"; + + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteService.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteService.java index b407b167a..c7b4fa899 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteService.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteService.java @@ -1,7 +1,5 @@ package org.onap.simulator.presetGenerator.presets.mso; -import vid.automation.test.infra.Features; - public class PresetMSODeleteService extends PresetMSOBaseDelete { private final String serviceInstanceId; public static final String DEFAULT_SERVICE_INSTANCE_ID = "3f93c7cb-2fd0-4557-9514-e189b7b04f9d"; @@ -22,9 +20,7 @@ public class PresetMSODeleteService extends PresetMSOBaseDelete { @Override protected String getRootPath() { - return Features.FLAG_UNASSIGN_SERVICE.isActive() ? - "/mso/serviceInstantiation/v./serviceInstances/" : - "/mso/serviceInstances/v./"; + return "/mso/serviceInstantiation/v./serviceInstances/" ; } } diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVfModuleCypress.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVfModuleCypress.java index d4a21cc36..c3ea07f2b 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVfModuleCypress.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSODeleteVfModuleCypress.java @@ -15,16 +15,16 @@ public class PresetMSODeleteVfModuleCypress extends PresetMSODeleteVfModule { return "{" + " \"requestDetails\":{" + " \"modelInfo\":{" + - " \"modelCustomizationName\":\"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\"," + + " \"modelCustomizationName\":\"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\"," + " \"modelCustomizationId\":\"f7e7c365-60cf-49a9-9ebf-a1aa11b9d401\"," + " \"modelInvariantId\":\"7253ff5c-97f0-4b8b-937c-77aeb4d79aa1\"," + " \"modelVersionId\":\"25284168-24bb-4698-8cb4-3f509146eca5\"," + - " \"modelName\":\"2017488PASQUALEVpe..PASQUALE_vRE_BV..module-1\"," + + " \"modelName\":\"2017488PasqualeVpe..PASQUALE_vRE_BV..module-1\"," + " \"modelType\":\"vfModule\"," + " \"modelVersion\":\"6\"" + " }," + " \"cloudConfiguration\":{" + - " \"lcpCloudRegionId\":\"JANET25\"," + + " \"lcpCloudRegionId\":\"AAIAIC25\"," + addCloudOwnerIfNeeded() + " \"tenantId\":\"092eb9e8e4b7412e8787dd091bc58e86\"," + " }," + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestGet.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestGet.java index 381ac856b..602e32df4 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestGet.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestGet.java @@ -1,16 +1,23 @@ package org.onap.simulator.presetGenerator.presets.mso; +import com.google.common.collect.ImmutableMap; import org.apache.commons.lang3.StringUtils; import org.apache.logging.log4j.LogManager; import org.apache.logging.log4j.Logger; import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; import org.springframework.http.HttpMethod; +import vid.automation.test.infra.Features; import java.time.Instant; import java.time.ZoneOffset; import java.time.ZonedDateTime; import java.time.format.DateTimeFormatter; import java.time.temporal.ChronoUnit; +import java.util.Collections; +import java.util.List; +import java.util.Map; + +import static java.util.Collections.singletonList; /** * Created by itzikliderman on 13/12/2017. @@ -26,6 +33,7 @@ public class PresetMSOOrchestrationRequestGet extends BaseMSOPreset { private String statusMessage; private String requestState; private int startedHoursAgo = 1; + private boolean isDetailed = true; public PresetMSOOrchestrationRequestGet() { @@ -38,6 +46,16 @@ public class PresetMSOOrchestrationRequestGet extends BaseMSOPreset { this.requestId = DEFAULT_REQUEST_ID; } + /** + * @param requestState + * @param isDetailed - is expect to query param format=detail. Angular1 flows dont' expect it + */ + public PresetMSOOrchestrationRequestGet(String requestState, boolean isDetailed) { + this.requestState = requestState; + this.requestId = DEFAULT_REQUEST_ID; + this.isDetailed = isDetailed; + } + public PresetMSOOrchestrationRequestGet(String requestState, String overrideRequestId) { this.requestState = requestState; this.requestId = overrideRequestId; @@ -49,6 +67,16 @@ public class PresetMSOOrchestrationRequestGet extends BaseMSOPreset { this.statusMessage = statusMessage; } + /** + * @param isDetailed - is expect to query param format=detail. Angular1 flows dont' expect it + */ + public PresetMSOOrchestrationRequestGet(String requestState, String overrideRequestId, String statusMessage, boolean isDetailed) { + this.requestState = requestState; + this.requestId = overrideRequestId; + this.statusMessage = statusMessage; + this.isDetailed = isDetailed; + } + public PresetMSOOrchestrationRequestGet(String requestState, String overrideRequestId, String statusMessage, int startedHoursAgo) { this.requestState = requestState; this.requestId = overrideRequestId; @@ -72,6 +100,13 @@ public class PresetMSOOrchestrationRequestGet extends BaseMSOPreset { } @Override + public Map<String, List> getQueryParams() { + return (isDetailed && Features.FLAG_1908_RESUME_MACRO_SERVICE.isActive()) ? + ImmutableMap.of("format", singletonList("detail")) : + Collections.emptyMap(); + } + + @Override public Object getResponseBody() { String body = "{" + " \"request\": {" + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork.java index 3d83ca55d..1d3b8c00a 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork.java @@ -1,13 +1,14 @@ package org.onap.simulator.presetGenerator.presets.mso; -import static java.util.Collections.singletonList; - import com.google.common.collect.ImmutableMap; -import java.util.List; -import java.util.Map; import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; import org.springframework.http.HttpMethod; +import java.util.List; +import java.util.Map; + +import static java.util.Collections.singletonList; + public class PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork extends BaseMSOPreset { public PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork(ResponseDetails parentDetails, ResponseDetails childDetails, String parentInstanceId) { @@ -84,7 +85,7 @@ public class PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork extend " \"testApi\": \"VNF_API\"" + " }," + " \"project\": {" + - " \"projectName\": \"DFW\"" + + " \"projectName\": \"WATKINS\"" + " }," + " \"owningEntity\": {" + " \"owningEntityId\": \"3f592a6f-459b-435e-b0d4-59959ab1d385\"," + @@ -155,7 +156,7 @@ public class PresetMSOOrchestrationRequestsGet5GServiceInstanceAndNetwork extend " \"platformName\": \"plat1\"" + " }," + " \"lineOfBusiness\": {" + - " \"lineOfBusinessName\": \"ECOMP\"" + + " \"lineOfBusinessName\": \"ONAP\"" + " }" + " }," + " \"instanceReferences\": {" + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByRequestId.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByRequestId.java index 69780d0aa..8524d92cd 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByRequestId.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByRequestId.java @@ -1,13 +1,14 @@ package org.onap.simulator.presetGenerator.presets.mso; -import static java.util.Collections.singletonList; - import com.google.common.collect.ImmutableMap; -import java.util.List; -import java.util.Map; import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; import org.springframework.http.HttpMethod; +import java.util.List; +import java.util.Map; + +import static java.util.Collections.singletonList; + public class PresetMSOOrchestrationRequestsGetByRequestId extends BaseMSOPreset { @Override diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByServiceInstanceId.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByServiceInstanceId.java index 58686f26b..921776569 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByServiceInstanceId.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOOrchestrationRequestsGetByServiceInstanceId.java @@ -1,15 +1,26 @@ package org.onap.simulator.presetGenerator.presets.mso; -import static java.util.Collections.singletonList; - import com.google.common.collect.ImmutableMap; -import java.util.List; -import java.util.Map; import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; import org.springframework.http.HttpMethod; +import java.util.List; +import java.util.Map; + +import static java.util.Collections.singletonList; + public class PresetMSOOrchestrationRequestsGetByServiceInstanceId extends BaseMSOPreset { + private final String instanceId; + + public PresetMSOOrchestrationRequestsGetByServiceInstanceId() { + this.instanceId = "bc305d54-75b4-431b-adb2-eb6b9e546014"; + } + + public PresetMSOOrchestrationRequestsGetByServiceInstanceId(String instanceId) { + this.instanceId = instanceId; + } + @Override public HttpMethod getReqMethod() { return HttpMethod.GET; @@ -22,7 +33,7 @@ public class PresetMSOOrchestrationRequestsGetByServiceInstanceId extends BaseMS @Override public Map<String, List> getQueryParams() { - return ImmutableMap.of("filter", singletonList("serviceInstanceId:EQUALS:bc305d54-75b4-431b-adb2-eb6b9e546014")); + return ImmutableMap.of("filter", singletonList("serviceInstanceId:EQUALS:" + instanceId)); } @Override diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOResumeRequest.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOResumeRequest.java new file mode 100644 index 000000000..ca13f6ad7 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOResumeRequest.java @@ -0,0 +1,48 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +import org.onap.simulator.presetGenerator.presets.BasePresets.BaseMSOPreset; +import org.springframework.http.HttpMethod; + +import java.util.Map; + +public class PresetMSOResumeRequest extends BaseMSOPreset { + + private final String originalRequestId; + private final String requestId; + private final String instanceId; + private final String userId; + + public PresetMSOResumeRequest(String originalRequestId, String requestId, String instanceId, String userId) { + this.originalRequestId = originalRequestId; + this.requestId = requestId; + this.instanceId = instanceId; + this.userId = userId; + } + + @Override + public HttpMethod getReqMethod() { + return HttpMethod.POST; + } + + @Override + public String getReqPath() { + return super.getRootPath() + "/orchestrationRequests/v./" + originalRequestId + "/resume"; + } + + @Override + public int getResponseCode() { + return 202; + } + + @Override + public Object getResponseBody() { + return "{\"requestReferences\":{\"instanceId\":\"" + instanceId + "\",\"requestId\":\"" + requestId + "\"}}"; + } + + @Override + public Map<String, String> getRequestHeaders() { + Map<String, String> map = super.getRequestHeaders(); + map.put("X-RequestorID", userId); + return map; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOServiceInstanceGen2WithNames.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOServiceInstanceGen2WithNames.java index b851da2d2..793037dbf 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOServiceInstanceGen2WithNames.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOServiceInstanceGen2WithNames.java @@ -1,13 +1,8 @@ package org.onap.simulator.presetGenerator.presets.mso; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.SERVICE_NAME; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VFM_NAME1; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VFM_NAME2; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VG_NAME; -import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.VNF_NAME; - import java.util.Map; -import vid.automation.test.infra.Features; + +import static org.onap.simulator.presetGenerator.presets.mso.PresetMSOServiceInstanceGen2WithNames.Keys.*; public abstract class PresetMSOServiceInstanceGen2WithNames extends PresetMSOBaseCreateInstancePost { @@ -42,9 +37,6 @@ public abstract class PresetMSOServiceInstanceGen2WithNames extends PresetMSOBas } protected String getVnfInstanceParams() { - if (!Features.FLAG_SHIFT_VFMODULE_PARAMS_TO_VNF.isActive()) { - return ""; - } return " {" + " \"vmx_int_net_len\": \"24\"," + " \"vre_a_volume_size_0\": \"100\"," + diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMsoCreateMacroCommonPre1806.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMsoCreateMacroCommonPre1806.java new file mode 100644 index 000000000..8a1e37f45 --- /dev/null +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMsoCreateMacroCommonPre1806.java @@ -0,0 +1,151 @@ +package org.onap.simulator.presetGenerator.presets.mso; + +import org.apache.commons.lang3.StringUtils; + +public class PresetMsoCreateMacroCommonPre1806 extends PresetMSOBaseCreateInstancePost { + + private String modelInfo; + private String cloudConfiguration; + private String relatedInstanceList; + private String instanceName; + + private PresetMsoCreateMacroCommonPre1806(String requestId, String responseInstanceId, String instanceName, String modelInfo, String relatedInstanceList, String cloudConfiguration) { + super(requestId, responseInstanceId); + this.modelInfo = modelInfo; + this.cloudConfiguration = cloudConfiguration; + this.relatedInstanceList = relatedInstanceList; + this.instanceName = instanceName; + } + + public static PresetMsoCreateMacroCommonPre1806 ofTransportService(String requestId, String responseInstanceId) { + return new PresetMsoCreateMacroCommonPre1806(requestId, responseInstanceId, "", transportServiceModelInfo(), "", ""); + } + + public static PresetMsoCreateMacroCommonPre1806 ofCollectionResource(String requestId, String responseInstanceId) { + return new PresetMsoCreateMacroCommonPre1806( + requestId, + responseInstanceId, + "", + collectionResourceModelInfo(), + "", + hvf6CloudConfiguration()); + } + + public static PresetMsoCreateMacroCommonPre1806 ofServiceWithVRF(String requestId, String responseInstanceId, String instanceName) { + return new PresetMsoCreateMacroCommonPre1806( + requestId, + responseInstanceId, + instanceName, + "" + + " \"modelInfo\": { " + + " \"modelInvariantId\": \"dfc2c44c-2429-44ca-ae26-1e6dc1f207fb\", " + + " \"modelVersionId\": \"f028b2e2-7080-4b13-91b2-94944d4c42d8\", " + + " \"modelName\": \"infraVPN\", " + + " \"modelType\": \"service\", " + + " \"modelVersion\": \"1.0\" " + + " }, ", + "" + + ", " + + " \"relatedInstanceList\": [{ " + + " \"relatedInstance\": { " + + " \"modelInfo\": { " + + " \"modelType\": \"vpnBinding\" " + + " }, " + + " \"instanceId\": \"120d39fb-3627-473d-913c-d228dd0f8e5b\", " + + " \"instanceName\": \"LPPVPN\" " + + " } " + + " }, { " + + " \"relatedInstance\": { " + + " \"modelInfo\": { " + + " \"modelCustomizationId\": \"10a74149-c9d7-4918-bbcf-d5fb9b1799ce\", " + + " \"modelInvariantId\": \"3b3308d4-0cd3-43e4-9a7b-d1925c861135\", " + + " \"modelVersionId\": \"77010093-df36-4dcb-8428-c3d02bf3f88d\", " + + " \"modelType\": \"network\" " + + " }, " + + " \"instanceId\": \"10a74149-c9d7-4918-bbcf-d5fb9b1799ce\", " + + " \"instanceName\": \"AUK51a_oam_calea_net_2\" " + + " } " + + " } " + + " ] ", + hvf6CloudConfiguration()); + } + + @Override + public String getReqPath() { + return getRootPath() + "/serviceInstantiation/v./serviceInstances"; + } + + @Override + public boolean isStrictMatch() { + return true; + } + + @Override + public Object getRequestBody() { + return "{" + + " \"requestDetails\": {" + + modelInfo + + " \"owningEntity\": {" + + " \"owningEntityId\": \"d61e6f2d-12fa-4cc2-91df-7c244011d6fc\"," + + " \"owningEntityName\": \"WayneHolland\"" + + " }," + + " \"subscriberInfo\": {" + + " \"globalSubscriberId\": \"e433710f-9217-458d-a79d-1c7aff376d89\"," + + " \"subscriberName\": \"SILVIA ROBBINS\"" + + " }," + + " \"project\": {" + + " \"projectName\": \"WATKINS\"" + + " }," + + " \"requestParameters\": {" + + " \"subscriptionServiceType\": \"TYLER SILVIA\"," + + " \"aLaCarte\": false," + + " \"userParams\": []" + + " }," + + " \"requestInfo\": {" + + (StringUtils.isEmpty(instanceName) ? "" : "\"instanceName\": \"" + instanceName + "\",") + + " \"productFamilyId\": \"e433710f-9217-458d-a79d-1c7aff376d89\"," + + " \"source\": \"VID\"," + + " \"suppressRollback\": false," + + " \"requestorId\": \"us16807000\"" + + " }" + + relatedInstanceList + + cloudConfiguration + + " }" + + "}"; + } + + private String addModelInfo() { + return modelInfo; + } + + private static String transportServiceModelInfo() { + return " \"modelInfo\": {" + + " \"modelInvariantId\": \"561faa57-7bbb-40ec-a81c-c0d4133e98d4\"," + + " \"modelVersionId\": \"12550cd7-7708-4f53-a09e-41d3d6327ebc\"," + + " \"modelName\": \"AIM Transport SVC_ym161f\"," + + " \"modelType\": \"service\"," + + " \"modelVersion\": \"1.0\"" + + " },"; + } + + private static String hvf6CloudConfiguration() { + return + ","+ + "\"cloudConfiguration\": {" + + " \"lcpCloudRegionId\": \"hvf6\"," + + " \"tenantId\": \"bae71557c5bb4d5aac6743a4e5f1d054\"," + + " \"cloudOwner\": \"irma-aic\"" + + " }"; + } + + private static String collectionResourceModelInfo() { + return + "\"modelInfo\": {" + + " \"modelInvariantId\": \"04bdd793-32ed-4045-adea-4e096304a067\"," + + " \"modelVersionId\": \"abd0cb02-5f97-42cd-be93-7dd3e31a6a64\"," + + " \"modelName\": \"CR_sanity\"," + + " \"modelType\": \"service\"," + + " \"modelVersion\": \"1.0\"" + + " },"; + } +} diff --git a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOCreateConfiguration.java b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOCreateConfiguration.java index bba0f20d8..2a7e262a4 100644 --- a/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOCreateConfiguration.java +++ b/vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/configuration/PresetMSOCreateConfiguration.java @@ -63,7 +63,7 @@ public class PresetMSOCreateConfiguration extends PresetMSOBaseCreateInstancePos " }," + " \"cloudConfiguration\": {" + addCloudOwnerIfNeeded() + - " \"lcpCloudRegionId\": \"JANET25\"" + + " \"lcpCloudRegionId\": \"AAIAIC25\"" + " }," + " \"requestInfo\": {" + " \"instanceName\": \"dummy_instance\"," + |