From aee6aa9b24d9358224ddc97d701ac0b4753628bc Mon Sep 17 00:00:00 2001
From: "Tait,Trevor(rt0435)" <rtait@amdocs.com>
Date: Tue, 11 Sep 2018 10:57:39 -0400
Subject: Update SDC Context Builder to use APIv1
Issue-ID: LOG-448
The changes to adapt to pomba-audit-common-1.3.1-SNAPSHOT are in
pom.xml, ToscaModelConverter.java and SDCContextBuilderTest.java.
The other changes are just for whitespace on line length warnings that
were issued by the ONAP audit tools.
Change-Id: Ied25e9e186776d8b36f30d0e80484af8d057da35
Signed-off-by: Tait,Trevor(rt0435) <rtait@amdocs.com>
---
.../contextbuilder/sdc/model/handlers/ToscaModelConverter.java | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
(limited to 'src/main/java')
diff --git a/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaModelConverter.java b/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaModelConverter.java
index ba6a37b..1e7580d 100644
--- a/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaModelConverter.java
+++ b/src/main/java/org/onap/pomba/contextbuilder/sdc/model/handlers/ToscaModelConverter.java
@@ -48,7 +48,7 @@ public class ToscaModelConverter {
public static ModelContext convert(ISdcCsarHelper helper) throws ToscaCsarException {
ModelContext context = new ModelContext();
context.setService(generateService(helper.getServiceMetadata()));
- context.setVf(generateVfList(helper));
+ context.setVfs(generateVfList(helper));
return context;
}
@@ -86,7 +86,7 @@ public class ToscaModelConverter {
vf.setUuid(vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_UUID));
String customizationUUID = vfNodeTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID);
- vf.setVnfc(generateVnfcList(helper.getVfcListByVf(customizationUUID)));
+ vf.setVnfcs(generateVnfcList(helper.getVfcListByVf(customizationUUID)));
vf.setVfModules(generateVfModuleList(helper.getVfModulesByVf(customizationUUID)));
vfList.add(vf);
@@ -110,7 +110,7 @@ public class ToscaModelConverter {
Object nfcNamingCode = vfcNodeTemplate.getPropertyValue(PROPERTY_NAME_NFC_NAMING_CODE);
if (nfcNamingCode != null) {
- vnfc.setNfcNamingCode((String)nfcNamingCode);
+ vnfc.setType((String)nfcNamingCode);
}
vnfcList.add(vnfc);
--
cgit