summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlalena.aria <lalena.aria@att.com>2018-11-27 15:55:14 -0500
committerlalena.aria <lalena.aria@att.com>2018-11-27 15:55:50 -0500
commitb348e62904cfa3687d5cbe062e56cf99c0f7fde2 (patch)
tree79537c0fd2f4526d27fd7882349a7445ce1e33ea
parentf1874ea2a80f5d5ebd98a207df2b68bd5970dd49 (diff)
Update sdc-tosca version to 1.4.7
Changes made: Update sdc-tosca version to 1.4.7. Replace org.onap.sdc.tosca.parser.impl.SdcTypes with org.onap.sdc.tosca.parser.enums.SdcTypes. Replace getNodeTemplatePropertyAsObject with getNodeTemplatePropertyValueAsObject. Change-Id: I9482cad49e2baae1c1383afabff9377c72441246 Issue-ID: CCSDK-758 Signed-off-by: lalena.aria <lalena.aria@att.com>
-rwxr-xr-xueb-listener/pom.xml2
-rw-r--r--ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncBaseModel.java2
-rw-r--r--ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncNodeModel.java2
-rw-r--r--ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java2
4 files changed, 3 insertions, 5 deletions
diff --git a/ueb-listener/pom.xml b/ueb-listener/pom.xml
index 1a97b1811..d91a5746b 100755
--- a/ueb-listener/pom.xml
+++ b/ueb-listener/pom.xml
@@ -20,7 +20,7 @@
<properties>
<sdc.client.version>1.3.0</sdc.client.version>
- <sdc.tosca.version>1.4.4</sdc.tosca.version>
+ <sdc.tosca.version>1.4.7</sdc.tosca.version>
<fasterxml.jackson.version>2.9.4</fasterxml.jackson.version>
<skip.SWM>true</skip.SWM>
<ueb.listener.base>/opt/app/ueb-listener</ueb.listener.base>
diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncBaseModel.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncBaseModel.java
index b1e065e25..0d5e9d6dd 100644
--- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncBaseModel.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncBaseModel.java
@@ -763,7 +763,7 @@ public class SdncBaseModel {
}
protected Object extractObjectValue (NodeTemplate nodeTemplate, String name) {
- Object value = sdcCsarHelper.getNodeTemplatePropertyAsObject(nodeTemplate, name);
+ Object value = sdcCsarHelper.getNodeTemplatePropertyValueAsObject(nodeTemplate, name);
if (value != null) {
return value;
} else {
diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncNodeModel.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncNodeModel.java
index 667f95aae..4870f29e3 100644
--- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncNodeModel.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncNodeModel.java
@@ -130,7 +130,7 @@ public class SdncNodeModel extends SdncBaseModel {
public void insertRelatedNetworkRoleData () throws IOException {
- Object propertyValue = sdcCsarHelper.getNodeTemplatePropertyAsObject(nodeTemplate, "network_assignments#related_networks");
+ Object propertyValue = sdcCsarHelper.getNodeTemplatePropertyValueAsObject(nodeTemplate, "network_assignments#related_networks");
ArrayList<Map<String, String>> relatedNetworkList = (ArrayList)propertyValue;
String networkModelCustomizationUUID = getCustomizationUUID();
diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java
index 3903eb414..ba644f302 100644
--- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java
@@ -73,9 +73,7 @@ import org.onap.sdc.api.results.IDistributionClientResult;
import org.onap.sdc.tosca.parser.api.ISdcCsarHelper;
import org.onap.sdc.tosca.parser.exceptions.SdcToscaParserException;
import org.onap.sdc.tosca.parser.impl.SdcToscaParserFactory;
-import org.onap.sdc.tosca.parser.impl.SdcTypes;
import org.onap.sdc.toscaparser.api.NodeTemplate;
-import org.onap.sdc.toscaparser.api.Policy;
import org.onap.sdc.toscaparser.api.elements.Metadata;
import org.onap.sdc.utils.ArtifactTypeEnum;
import org.onap.sdc.utils.DistributionActionResultEnum;