aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexey Sandler <alexey.sandler@intl.att.com>2020-04-18 14:45:11 +0300
committerAlexey Sandler <alexey.sandler@intl.att.com>2020-04-19 16:51:09 +0300
commit01f85c23e21cacd236d365d689788275d2046211 (patch)
treeb1a31f00658cd3d4bcc2e0385e8bf2de694b7a90
parent98353ac591a001812ae0c331611e9a8dfc7288ed (diff)
empty lineOfBusiness value when create new network (old screens) - fix
Issue-ID: VID-808 Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com> Change-Id: I9f77e449411afdf1553f890c1c6a94eaa34afc7e Signed-off-by: Alexey Sandler <alexey.sandler@intl.att.com>
-rwxr-xr-xvid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js32
-rw-r--r--vid-automation/src/main/java/org/onap/simulator/presetGenerator/presets/mso/PresetMSOCreateNetworkALaCarteOldViewEdit.java3
2 files changed, 8 insertions, 27 deletions
diff --git a/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js b/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js
index 15ba51941..242a3dc8a 100755
--- a/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js
+++ b/vid-app-common/src/main/webapp/app/vid/scripts/services/creationService.js
@@ -714,45 +714,23 @@ var CreationService = function($log, AaiService, AsdcService, DataService,VIDCON
break;
case COMPONENT.VNF:
-
- requestDetails.requestInfo.productFamilyId = getValueFromList(
- FIELD.ID.PRODUCT_FAMILY, parameterList);
-
- var lineOfBusiness = getValueFromList(FIELD.ID.LINE_OF_BUSINESS, parameterList);
-
- if(lineOfBusiness) {
- requestDetails.lineOfBusiness = {
- lineOfBusinessName: lineOfBusiness
- };
- }
-
- requestDetails.platform = {
- platformName: getValueFromList(FIELD.ID.PLATFORM, parameterList)
- };
-
- break;
case COMPONENT.NETWORK:
requestDetails.requestInfo.productFamilyId = getValueFromList(
FIELD.ID.PRODUCT_FAMILY, parameterList);
var lineOfBusiness = getValueFromList(FIELD.ID.LINE_OF_BUSINESS, parameterList);
-
if(lineOfBusiness) {
- var lineOfBusinessNamesString = _.map(lineOfBusiness, "name").join(", ");
-
requestDetails.lineOfBusiness = {
- lineOfBusinessName: lineOfBusinessNamesString
+ lineOfBusinessName: lineOfBusiness
};
}
var platform = getValueFromList(FIELD.ID.PLATFORM, parameterList);
- if(platform !== null && platform !== ""){
- requestDetails.platform = {
- platformName: platform
- };
+ if (platform !== null && platform !== "") {
+ requestDetails.platform = {
+ platformName: platform
+ };
}
-
-
break;
case COMPONENT.VF_MODULE:
requestDetails.requestParameters.usePreload = getValueFromList(
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 fd70723ad..64ed5c91b 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
@@ -41,6 +41,9 @@ public class PresetMSOCreateNetworkALaCarteOldViewEdit extends PresetMSOBaseCrea
" \"testApi\": \"GR_API\"," +
" \"userParams\": []" +
" }," +
+ " \"lineOfBusiness\": {" +
+ " \"lineOfBusinessName\": \"zzz1\"" +
+ " }," +
" \"cloudConfiguration\": {" +
" \"lcpCloudRegionId\": \"One\"," +
addCloudOwnerIfNeeded() +