Merge "Create Pre Building Block validator"

[so.git] / asdc-controller / src / main / java / org / onap / so / asdc / util / ASDCNotificationLogging.java

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 24304ba..de28ca2 100644 (file)
--- 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.toscaparser.api.NodeTemplate;
 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.db.catalog.beans.NetworkResourceCustomization;
 
 public class ASDCNotificationLogging {
 
@@ -313,6 +314,16 @@ public class ASDCNotificationLogging {
                        buffer.append("Description:");
                        buffer.append(testNull(toscaResourceStructure.getSdcCsarHelper().getMetadataPropertyValue(vfMetadata, SdcPropertyNames.PROPERTY_NAME_DESCRIPTION)));
                        buffer.append(System.lineSeparator());
+                       
+                       List<NodeTemplate> groupMembers = toscaResourceStructure.getSdcCsarHelper().getMembersOfVfModule(vfNodeTemplate, group); 
+                       
+                       for(NodeTemplate node : groupMembers){  
+                       buffer.append("Member Name:");
+                       buffer.append(testNull(node.getName()));
+                       buffer.append(System.lineSeparator());
+                       }
+                       
+                       
                }
                
                List<NodeTemplate> cvfcList = toscaResourceStructure.getSdcCsarHelper().getNodeTemplateBySdcType(vfNodeTemplate, SdcTypes.CVFC);
@@ -341,6 +352,9 @@ public class ASDCNotificationLogging {
                        buffer.append("Description:");
                        buffer.append(testNull(cvfcTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION)));
                        buffer.append(System.lineSeparator()); 
+                       buffer.append("Template Name:");
+                       buffer.append(testNull(cvfcTemplate.getName()));
+                       buffer.append(System.lineSeparator()); 
                        
                        
                        List<NodeTemplate> vfcList = toscaResourceStructure.getSdcCsarHelper().getNodeTemplateBySdcType(cvfcTemplate, SdcTypes.VFC);
@@ -368,6 +382,9 @@ public class ASDCNotificationLogging {
                        buffer.append("Description:");
                        buffer.append(testNull(vfcTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION)));
                        buffer.append(System.lineSeparator()); 
+                       buffer.append("Sub Category:");
+                       buffer.append(testNull(vfcTemplate.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_SUBCATEGORY)));
+                       buffer.append(System.lineSeparator());
                                
                        }               
                        
@@ -410,7 +427,27 @@ public class ASDCNotificationLogging {
                        buffer.append(System.lineSeparator());  
                                buffer.append("Description:");
                        buffer.append(testNull(vlNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_DESCRIPTION)));
-                       buffer.append(System.lineSeparator());  
+                       buffer.append(System.lineSeparator()); 
+ 
+                       
+                       buffer.append(System.lineSeparator());
+                       buffer.append("NETWORK Customization Properties:");
+                       buffer.append(System.lineSeparator());
+                               buffer.append("CustomizationUUID:");
+                       buffer.append(vlNode.getMetaData().getValue(SdcPropertyNames.PROPERTY_NAME_CUSTOMIZATIONUUID));
+                       buffer.append(System.lineSeparator()); 
+                               buffer.append("Network Technology:");
+                       buffer.append(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(vlNode, SdcPropertyNames.PROPERTY_NAME_NETWORKTECHNOLOGY));
+                       buffer.append(System.lineSeparator()); 
+                       buffer.append("Network Type:");
+                       buffer.append(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(vlNode, SdcPropertyNames.PROPERTY_NAME_NETWORKTYPE));
+                       buffer.append(System.lineSeparator()); 
+                       buffer.append("Network Role:");
+                       buffer.append(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(vlNode, SdcPropertyNames.PROPERTY_NAME_NETWORKROLE));
+                       buffer.append(System.lineSeparator()); 
+                       buffer.append("Network Scope:");
+                       buffer.append(toscaResourceStructure.getSdcCsarHelper().getNodeTemplatePropertyLeafValue(vlNode, SdcPropertyNames.PROPERTY_NAME_NETWORKSCOPE));
+                       buffer.append(System.lineSeparator());                          
                
                }