From: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
Date: Thu, 22 Nov 2018 12:57:56 +0000 (+0100)
Subject: isBase value - bug fixing
X-Git-Tag: 1.4.1~472
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F75%2F73375%2F1;p=so.git

isBase value - bug fixing

isBase json value is boolean type, not an integer

Change-Id: Ic6d148c65a910bace6940770ee01e6836ab47e0d
Issue-ID: SO-1244
Signed-off-by: Lukasz Muszkieta <lukasz.muszkieta@nokia.com>
---

diff --git a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CatalogDbUtils.groovy b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CatalogDbUtils.groovy
index d5183ff5bb..f1eab6601b 100644
--- a/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CatalogDbUtils.groovy
+++ b/bpmn/MSOCommonBPMN/src/main/groovy/org/onap/so/bpmn/common/scripts/CatalogDbUtils.groovy
@@ -982,22 +982,7 @@ class CatalogDbUtils {
 						vfModuleModelJson.put("modelInfo", vfModuleModelInfo)
 						String vfModuleType = jsonUtils.getJsonValueForKey(vfModule, "type")
 						vfModuleModelJson.put("vfModuleType", vfModuleType)
-						switch(catalogUtilsVersion) {
-							case "v1":
-							//TODO this does not work, isBase is not a integer.
-								Integer isBase = jsonUtils.getJsonIntValueForKey(vfModule, "isBase")
-								if (isBase.intValue() == 1) {
-									vfModuleModelJson.put("isBase", "true")
-								}
-								else {
-									vfModuleModelJson.put("isBase", "false")
-								}
-								break
-							default:
-								boolean isBase = jsonUtils.getJsonBooleanValueForKey(vfModule, "isBase")
-								vfModuleModelJson.put("isBase", isBase)
-								break
-						}
+						vfModuleModelJson.put("isBase", jsonUtils.getJsonBooleanValueForKey(vfModule, "isBase"))
 						String vfModuleLabel = jsonUtils.getJsonValueForKey(vfModule, "label")
 						vfModuleModelJson.put("vfModuleLabel", vfModuleLabel)
 						Integer initialCount = jsonUtils.getJsonIntValueForKey(vfModule, "initialCount")