AT&T 1712 and 1802 release code

[so.git] / asdc-controller / src / main / java / org / openecomp / mso / asdc / installer / ToscaResourceStructure.java

diff --git a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/ToscaResourceStructure.java b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/ToscaResourceStructure.java
index 2c5d6d4..98b6b6d 100644 (file)
--- a/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/ToscaResourceStructure.java
+++ b/asdc-controller/src/main/java/org/openecomp/mso/asdc/installer/ToscaResourceStructure.java
@@ -45,7 +45,7 @@ import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory;
 \r
 import org.openecomp.sdc.toscaparser.api.NodeTemplate;\r
 import org.openecomp.sdc.toscaparser.api.elements.Metadata;\r
-\r
+import org.openecomp.mso.asdc.client.exceptions.ASDCDownloadException;\r
 import org.openecomp.mso.db.catalog.beans.AllottedResource;\r
 import org.openecomp.mso.db.catalog.beans.AllottedResourceCustomization;\r
 import org.openecomp.mso.db.catalog.beans.NetworkResource;\r
@@ -76,13 +76,16 @@ public class ToscaResourceStructure {
        String volHeatEnvTemplateUUID;\r
        String envHeatTemplateUUID;\r
        String heatFilesUUID;\r
+       String workloadPerformance;\r
        boolean isVnfAlreadyInstalled = false;\r
        String serviceVersion;\r
+       private boolean isDeployedSuccessfully=false;\r
+       \r
        \r
        private NetworkResourceCustomization catalogNetworkResourceCustomization;\r
        \r
        private NetworkResource catalogNetworkResource;\r
-       \r
+               \r
        private AllottedResourceCustomization catalogResourceCustomization;\r
        \r
        private VfModule vfModule;\r
@@ -121,19 +124,18 @@ public class ToscaResourceStructure {
        public ToscaResourceStructure(){\r
        }\r
        \r
-       public void updateResourceStructure(IArtifactInfo artifact){\r
+       public void updateResourceStructure(IArtifactInfo artifact) throws ASDCDownloadException {\r
                \r
                                \r
                try {\r
                                \r
                        SdcToscaParserFactory factory = SdcToscaParserFactory.getInstance();//Autoclosable\r
                        \r
+                       LOGGER.debug("MSO config path is: " + System.getProperty("mso.config.path"));\r
                        \r
                        File spoolFile = new File(System.getProperty("mso.config.path") + "ASDC/" + artifact.getArtifactName());\r
-                       \r
-\r
-                        \r
-                       System.out.println("PATH IS " + spoolFile.getAbsolutePath());\r
+ \r
+                       LOGGER.debug("ASDC File path is: " + spoolFile.getAbsolutePath());\r
                        LOGGER.info(MessageEnum.ASDC_RECEIVE_SERVICE_NOTIF, "***PATH", "ASDC", spoolFile.getAbsolutePath());\r
                        \r
 \r
@@ -143,12 +145,12 @@ public class ToscaResourceStructure {
                        System.out.println("System out " + e.getMessage());\r
                        LOGGER.error(MessageEnum.ASDC_GENERAL_EXCEPTION_ARG,\r
                                        "Exception caught during parser *****LOOK********* " + artifact.getArtifactName(), "ASDC", "processResourceNotification", MsoLogger.ErrorCode.BusinessProcesssError, "Exception in processResourceNotification", e);\r
-               }       \r
                        \r
+                       throw new ASDCDownloadException ("Exception caught when passing the csar file to the parser ", e);\r
+               }       \r
 \r
                        serviceMetadata = sdcCsarHelper.getServiceMetadata();\r
-\r
-               \r
+       \r
        }\r
        \r
        public String getHeatTemplateUUID() {\r
@@ -409,4 +411,127 @@ public class ToscaResourceStructure {
                this.serviceVersion = serviceVersion;\r
        }\r
 \r
+       public String getWorkloadPerformance() {\r
+               return workloadPerformance;\r
+       }\r
+\r
+       public void setWorkloadPerformance(String workloadPerformance) {\r
+               this.workloadPerformance = workloadPerformance;\r
+       }\r
+\r
+       public VfModule getVfModule() {\r
+               return vfModule;\r
+       }\r
+\r
+       public void setVfModule(VfModule vfModule) {\r
+               this.vfModule = vfModule;\r
+       }\r
+\r
+       public VfModuleCustomization getVfModuleCustomization() {\r
+               return vfModuleCustomization;\r
+       }\r
+\r
+       public void setVfModuleCustomization(VfModuleCustomization vfModuleCustomization) {\r
+               this.vfModuleCustomization = vfModuleCustomization;\r
+       }\r
+\r
+       public VnfResource getVnfResource() {\r
+               return vnfResource;\r
+       }\r
+\r
+       public void setVnfResource(VnfResource vnfResource) {\r
+               this.vnfResource = vnfResource;\r
+       }\r
+\r
+       public VnfResourceCustomization getVnfResourceCustomization() {\r
+               return vnfResourceCustomization;\r
+       }\r
+\r
+       public void setVnfResourceCustomization(\r
+                       VnfResourceCustomization vnfResourceCustomization) {\r
+               this.vnfResourceCustomization = vnfResourceCustomization;\r
+       }\r
+\r
+       public AllottedResourceCustomization getAllottedResourceCustomization() {\r
+               return allottedResourceCustomization;\r
+       }\r
+\r
+       public void setAllottedResourceCustomization(\r
+                       AllottedResourceCustomization allottedResourceCustomization) {\r
+               this.allottedResourceCustomization = allottedResourceCustomization;\r
+       }\r
+\r
+       public VnfResCustomToVfModuleCustom getVnfResCustomToVfModuleCustom() {\r
+               return vnfResCustomToVfModuleCustom;\r
+       }\r
+\r
+       public void setVnfResCustomToVfModuleCustom(\r
+                       VnfResCustomToVfModuleCustom vnfResCustomToVfModuleCustom) {\r
+               this.vnfResCustomToVfModuleCustom = vnfResCustomToVfModuleCustom;\r
+       }\r
+\r
+       public TempNetworkHeatTemplateLookup getTempNetworkHeatTemplateLookup() {\r
+               return tempNetworkHeatTemplateLookup;\r
+       }\r
+\r
+       public void setTempNetworkHeatTemplateLookup(\r
+                       TempNetworkHeatTemplateLookup tempNetworkHeatTemplateLookup) {\r
+               this.tempNetworkHeatTemplateLookup = tempNetworkHeatTemplateLookup;\r
+       }\r
+\r
+       public VfModuleToHeatFiles getVfModuleToHeatFiles() {\r
+               return vfModuleToHeatFiles;\r
+       }\r
+\r
+       public void setVfModuleToHeatFiles(VfModuleToHeatFiles vfModuleToHeatFiles) {\r
+               this.vfModuleToHeatFiles = vfModuleToHeatFiles;\r
+       }\r
+\r
+       public ToscaCsar getToscaCsar() {\r
+               return toscaCsar;\r
+       }\r
+\r
+       public void setToscaCsar(ToscaCsar toscaCsar) {\r
+               this.toscaCsar = toscaCsar;\r
+       }\r
+\r
+       public ServiceToResourceCustomization getVfServiceToResourceCustomization() {\r
+               return vfServiceToResourceCustomization;\r
+       }\r
+\r
+       public void setVfServiceToResourceCustomization(\r
+                       ServiceToResourceCustomization vfServiceToResourceCustomization) {\r
+               this.vfServiceToResourceCustomization = vfServiceToResourceCustomization;\r
+       }\r
+\r
+       public ServiceToResourceCustomization getAllottedServiceToResourceCustomization() {\r
+               return allottedServiceToResourceCustomization;\r
+       }\r
+\r
+       public void setAllottedServiceToResourceCustomization(\r
+                       ServiceToResourceCustomization allottedServiceToResourceCustomization) {\r
+               this.allottedServiceToResourceCustomization = allottedServiceToResourceCustomization;\r
+       }\r
+\r
+       public ServiceToResourceCustomization getVlServiceToResourceCustomization() {\r
+               return vlServiceToResourceCustomization;\r
+       }\r
+\r
+       public void setVlServiceToResourceCustomization(\r
+                       ServiceToResourceCustomization vlServiceToResourceCustomization) {\r
+               this.vlServiceToResourceCustomization = vlServiceToResourceCustomization;\r
+       }\r
+\r
+       public static MsoLogger getLogger() {\r
+               return LOGGER;\r
+       }\r
+       \r
+       public boolean isDeployedSuccessfully() {\r
+               return isDeployedSuccessfully;\r
+       }\r
+\r
+       public void setSuccessfulDeployment() {\r
+               isDeployedSuccessfully = true;\r
+       }\r
+\r
 }\r