X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=rapp-manager-models%2Fsrc%2Fmain%2Fjava%2Fcom%2Foransc%2Frappmanager%2Fmodels%2Fcsar%2FRappCsarConfigurationHandler.java;h=05bf0568479fb88740e46b22ec3e86164b5e2fff;hb=refs%2Fchanges%2F03%2F11803%2F1;hp=73c644e6cf804bf91c816c3a2fd780bca1eef380;hpb=cc9f90ef6d725e90cf477ef6b83ec5a2948127b3;p=nonrtric%2Fplt%2Frappmanager.git

diff --git a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java
index 73c644e..05bf056 100755
--- a/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java
+++ b/rapp-manager-models/src/main/java/com/oransc/rappmanager/models/csar/RappCsarConfigurationHandler.java
@@ -47,11 +47,12 @@ public class RappCsarConfigurationHandler {
     private static final String ACM_COMPOSITION_JSON_LOCATION = "Files/Acm/definition/compositions.json";
     private static final String ACM_DEFINITION_LOCATION = "Files/Acm/definition";
     private static final String ACM_INSTANCES_LOCATION = "Files/Acm/instances";
-
     private static final String SME_PROVIDER_FUNCS_LOCATION = "Files/Sme/providers";
     private static final String SME_SERVICE_APIS_LOCATION = "Files/Sme/serviceapis";
-
     private static final String SME_INVOKERS_LOCATION = "Files/Sme/invokers";
+    private static final String DME_INFO_TYPES_LOCATION = "Files/Dme/infotypes";
+    private static final String DME_INFO_PRODUCERS_LOCATION = "Files/Dme/infoproducers";
+    private static final String DME_INFO_CONSUMERS_LOCATION = "Files/Dme/infoconsumers";
 
 
     public boolean isValidRappPackage(MultipartFile multipartFile) {
@@ -88,7 +89,7 @@ public class RappCsarConfigurationHandler {
     }
 
     String getPayload(Rapp rapp, String location) {
-        logger.info("Getting payload for {} from {}", rapp.getRappId(), location);
+        logger.debug("Getting payload for {} from {}", rapp.getRappId(), location);
         File csarFile = getCsarFile(rapp);
         return getFileFromCsar(csarFile, location).toString();
     }
@@ -136,6 +137,18 @@ public class RappCsarConfigurationHandler {
                 getResourceUri(ACM_DEFINITION_LOCATION, rapp.getRappResources().getAcm().getCompositionDefinitions()));
     }
 
+    public String getDmeInfoProducerPayload(Rapp rapp, String producerIdentifier) {
+        return getPayload(rapp, getResourceUri(DME_INFO_PRODUCERS_LOCATION, producerIdentifier));
+    }
+
+    public String getDmeInfoTypePayload(Rapp rapp, String infoTypeIdentifier) {
+        return getPayload(rapp, getResourceUri(DME_INFO_TYPES_LOCATION, infoTypeIdentifier));
+    }
+
+    public String getDmeInfoConsumerPayload(Rapp rapp, String infoConsumerIdentifier) {
+        return getPayload(rapp, getResourceUri(DME_INFO_CONSUMERS_LOCATION, infoConsumerIdentifier));
+    }
+
     String getResourceUri(String resourceLocation, String resource) {
         return resourceLocation + "/" + resource + ".json";
     }
@@ -152,6 +165,10 @@ public class RappCsarConfigurationHandler {
                                 getFileListFromCsar(csarFile, SME_PROVIDER_FUNCS_LOCATION))
                                              .serviceApis(getFileListFromCsar(csarFile, SME_SERVICE_APIS_LOCATION))
                                              .invokers(getFileListFromCsar(csarFile, SME_INVOKERS_LOCATION)).build());
+                rappResources.setDme(RappResources.DMEResources.builder()
+                                             .infoTypes(getFileListFromCsar(csarFile, DME_INFO_TYPES_LOCATION))
+                                             .infoProducers(getFileListFromCsar(csarFile, DME_INFO_PRODUCERS_LOCATION))
+                                             .infoConsumers(getFileListFromCsar(csarFile, DME_INFO_CONSUMERS_LOCATION)).build());
             }
         } catch (Exception e) {
             logger.warn("Error in getting the rapp resources", e);