[SDC-141] improving CsarToscaTester

Change-Id: Ia8b5c78cceb3148894805111bcee156655dc0ba3
Signed-off-by: Pavel Aharoni <pa0916@att.com>

diff --git a/sdc-distribution-ci/pom.xml b/sdc-distribution-ci/pom.xml
index e4c2152..8cfc4a1 100644 (file)
--- a/sdc-distribution-ci/pom.xml
+++ b/sdc-distribution-ci/pom.xml
@@ -32,7 +32,7 @@
                <dependency>
                        <groupId>org.openecomp.sdc.sdc-tosca</groupId>
                        <artifactId>sdc-tosca</artifactId>
-                       <version>1.1.31-SNAPSHOT</version>
+                       <version>1.1.32-SNAPSHOT</version>
                        <scope>compile</scope>
                </dependency>
                

diff --git a/sdc-distribution-ci/src/main/java/org/openecomp/test/CsarToscaTester.java b/sdc-distribution-ci/src/main/java/org/openecomp/test/CsarToscaTester.java
index 8690257..1ce3619 100644 (file)
--- a/sdc-distribution-ci/src/main/java/org/openecomp/test/CsarToscaTester.java
+++ b/sdc-distribution-ci/src/main/java/org/openecomp/test/CsarToscaTester.java
@@ -7,10 +7,16 @@ import java.text.SimpleDateFormat;
 import java.util.Arrays;\r
 import java.util.Date;\r
 import java.util.List;\r
+import java.util.Map;\r
 \r
+import org.openecomp.sdc.tosca.parser.api.ISdcCsarHelper;\r
 import org.openecomp.sdc.tosca.parser.exceptions.SdcToscaParserException;\r
-import org.openecomp.sdc.tosca.parser.impl.SdcPropertyNames;\r
 import org.openecomp.sdc.tosca.parser.impl.SdcToscaParserFactory;\r
+import org.openecomp.sdc.tosca.parser.impl.SdcTypes;\r
+import org.openecomp.sdc.toscaparser.api.Group;\r
+import org.openecomp.sdc.toscaparser.api.NodeTemplate;\r
+import org.openecomp.sdc.toscaparser.api.elements.Metadata;\r
+import org.openecomp.sdc.toscaparser.api.parameters.Input;\r
 import org.openecomp.sdc.toscaparser.api.utils.ThreadLocalsHolder;\r
 \r
 public class CsarToscaTester {\r
@@ -36,7 +42,7 @@ public class CsarToscaTester {
                                dir = new File(currentCsarDir);\r
                                dir.mkdir();\r
                                try {\r
-                                       factory.getSdcCsarHelper(file.getAbsolutePath());\r
+                                       processCsar(factory, file);\r
                                } catch (SdcToscaParserException e){\r
                                        System.out.println("SdcToscaParserException caught. Code: "+e.getCode()+", message: "+ e.getMessage());\r
                                }\r
@@ -60,6 +66,54 @@ public class CsarToscaTester {
                }               \r
        }\r
 \r
+       private static void processCsar(SdcToscaParserFactory factory, File file) throws SdcToscaParserException {\r
+               ISdcCsarHelper sdcCsarHelper = factory.getSdcCsarHelper(file.getAbsolutePath());\r
+               //Service level\r
+               System.out.println("Invoking sdc-tosca methods on this CSAR....");\r
+               String conformanceLevel = sdcCsarHelper.getConformanceLevel();\r
+               System.out.println("getConformanceLevel() - conformance level is "+conformanceLevel);\r
+               String serviceSubstitutionMappingsTypeName = sdcCsarHelper.getServiceSubstitutionMappingsTypeName();\r
+               System.out.println("serviceSubstitutionMappingsTypeName() - subst mappings type of service is "+serviceSubstitutionMappingsTypeName);\r
+               List<Input> serviceInputs = sdcCsarHelper.getServiceInputs();\r
+               System.out.println("getServiceInputs() - service inputs are "+serviceInputs);\r
+               Metadata serviceMetadata = sdcCsarHelper.getServiceMetadata();\r
+               System.out.println("getServiceMetadata() - service metadata is "+serviceMetadata);\r
+               Map<String, Object> serviceMetadataProperties = sdcCsarHelper.getServiceMetadataProperties();\r
+               System.out.println("getServiceMetadataProperties() - service metadata properties is "+serviceMetadataProperties);\r
+               List<NodeTemplate> allottedResources = sdcCsarHelper.getAllottedResources();\r
+               System.out.println("getAllottedResources() - service allotted resources are "+allottedResources);\r
+               List<NodeTemplate> serviceVfList = sdcCsarHelper.getServiceVfList();\r
+               System.out.println("getServiceVfList() - VF list is "+serviceVfList);\r
+               List<NodeTemplate> serviceNodeTemplateBySdcType = sdcCsarHelper.getServiceNodeTemplateBySdcType(SdcTypes.VF);\r
+               System.out.println("getServiceNodeTemplateBySdcType() - VF list is "+serviceNodeTemplateBySdcType);\r
+               List<NodeTemplate> serviceNodeTemplates = sdcCsarHelper.getServiceNodeTemplates();\r
+               System.out.println("getServiceNodeTemplates() - all node templates list of service is "+serviceNodeTemplates);\r
+               \r
+               serviceVfList.forEach(x -> {\r
+                       String nodeTemplateCustomizationUuid = sdcCsarHelper.getNodeTemplateCustomizationUuid(x);\r
+                       System.out.println("getNodeTemplateCustomizationUuid() - VF ID is "+nodeTemplateCustomizationUuid);\r
+                       String typeOfNodeTemplate = sdcCsarHelper.getTypeOfNodeTemplate(x);\r
+                       System.out.println("getTypeOfNodeTemplate() - VF tosca type is "+typeOfNodeTemplate);\r
+                       List<Group> vfModulesByVf = sdcCsarHelper.getVfModulesByVf(nodeTemplateCustomizationUuid);\r
+                       System.out.println("getVfModulesByVf() - VF modules list is "+vfModulesByVf);\r
+                       vfModulesByVf.forEach(y -> {\r
+                               List<NodeTemplate> membersOfVfModule = sdcCsarHelper.getMembersOfVfModule(x, y);\r
+                               System.out.println("getMembersOfVfModule() - members of VfModule are "+membersOfVfModule);\r
+                       });\r
+                       List<NodeTemplate> vfcListByVf = sdcCsarHelper.getVfcListByVf(nodeTemplateCustomizationUuid);\r
+                       System.out.println("getVfcListByVf() - VFC list is "+vfcListByVf);\r
+                       vfcListByVf.forEach(z -> {\r
+                               List<NodeTemplate> nodeTemplateBySdcType = sdcCsarHelper.getNodeTemplateBySdcType(z, SdcTypes.CP);\r
+                               System.out.println("getNodeTemplateBySdcType() - CP children node templates of this VFC are "+nodeTemplateBySdcType);\r
+                               Map<String, Map<String, Object>> cpPropertiesFromVfcAsObject = sdcCsarHelper.getCpPropertiesFromVfcAsObject(z);\r
+                               System.out.println("getCpPropertiesFromVfcAsObject() - consolidated CP properties for this VFC are "+cpPropertiesFromVfcAsObject);\r
+                               boolean hasTopology = sdcCsarHelper.hasTopology(z);\r
+                               System.out.println("hasTopology() - this VFC is "+(hasTopology ? "nested" : "not nested"));\r
+                       });                     \r
+               });\r
+               \r
+       }\r
+\r
        private static void generateReport(String time, String name, String currentCsarDir, List<String> criticalsReport, String type)\r
                        throws IOException {\r
                FileWriter fw;\r