diff options
Diffstat (limited to 'asdc-controller')
4 files changed, 6 insertions, 5 deletions
diff --git a/asdc-controller/pom.xml b/asdc-controller/pom.xml index 1bd0389cba..447dbfdf30 100644 --- a/asdc-controller/pom.xml +++ b/asdc-controller/pom.xml @@ -4,7 +4,7 @@ <parent> <groupId>org.onap.so</groupId> <artifactId>so</artifactId> - <version>1.7.1-SNAPSHOT</version> + <version>1.8.0-SNAPSHOT</version> </parent> <groupId>org.onap.so</groupId> diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/installer/VfResourceStructure.java b/asdc-controller/src/main/java/org/onap/so/asdc/installer/VfResourceStructure.java index 6497a99e5e..8fe01caa46 100644 --- a/asdc-controller/src/main/java/org/onap/so/asdc/installer/VfResourceStructure.java +++ b/asdc-controller/src/main/java/org/onap/so/asdc/installer/VfResourceStructure.java @@ -68,7 +68,7 @@ public class VfResourceStructure extends ResourceStructure { /** * The list of VfModulesMetadata defined for this resource. */ - private List<IVfModuleData> vfModulesMetadataList; + private List<VfModuleMetaData> vfModulesMetadataList; private VnfResource catalogVnfResource; @@ -203,7 +203,7 @@ public class VfResourceStructure extends ResourceStructure { this.catalogService = catalogService; } - public List<IVfModuleData> decodeVfModuleArtifact(byte[] arg0) { + public List<VfModuleMetaData> decodeVfModuleArtifact(byte[] arg0) { try { return new ObjectMapper().readValue(arg0, new TypeReference<List<VfModuleMetaData>>() {}); diff --git a/asdc-controller/src/main/java/org/onap/so/asdc/util/ASDCNotificationLogging.java b/asdc-controller/src/main/java/org/onap/so/asdc/util/ASDCNotificationLogging.java index 6908fe4eda..fa17e727a5 100644 --- a/asdc-controller/src/main/java/org/onap/so/asdc/util/ASDCNotificationLogging.java +++ b/asdc-controller/src/main/java/org/onap/so/asdc/util/ASDCNotificationLogging.java @@ -35,6 +35,7 @@ import org.onap.sdc.tosca.parser.impl.SdcPropertyNames; import org.onap.sdc.toscaparser.api.elements.Metadata; import org.onap.so.asdc.installer.IVfModuleData; import org.onap.so.asdc.installer.ToscaResourceStructure; +import org.onap.so.asdc.installer.VfModuleMetaData; import org.onap.so.asdc.installer.heat.ToscaResourceInstaller; public class ASDCNotificationLogging { @@ -850,7 +851,7 @@ public class ASDCNotificationLogging { return buffer.toString(); } - public static String dumpVfModuleMetaDataList(List<IVfModuleData> moduleMetaDataList) { + public static String dumpVfModuleMetaDataList(List<VfModuleMetaData> moduleMetaDataList) { if (moduleMetaDataList == null) { return null; } diff --git a/asdc-controller/src/test/java/org/onap/so/asdc/util/ASDCNotificationLoggingTest.java b/asdc-controller/src/test/java/org/onap/so/asdc/util/ASDCNotificationLoggingTest.java index 6fd853915e..3ac32d616f 100644 --- a/asdc-controller/src/test/java/org/onap/so/asdc/util/ASDCNotificationLoggingTest.java +++ b/asdc-controller/src/test/java/org/onap/so/asdc/util/ASDCNotificationLoggingTest.java @@ -115,7 +115,7 @@ public class ASDCNotificationLoggingTest { @Test public void dumpVfModuleMetaDataListTest() { INotificationData asdcNotification = iNotificationDataObject(); - List<IVfModuleData> list = new ArrayList<>(); + List<VfModuleMetaData> list = new ArrayList<>(); list.add(new VfModuleMetaData()); String result = null; try { |