Removed unused code

*Deleted commented code

Change-Id: I03ebfab9d66f2a9e51233ec6312698af7ed91584
Issue-ID: CCSDK-151
Signed-off-by: SRINIVAS V <srinivasa.mohan@huawei.com>

diff --git a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java
index 36a3392..a876ec5 100644 (file)
--- a/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java
+++ b/ueb-listener/src/main/java/org/onap/ccsdk/sli/northbound/uebclient/SdncUebCallback.java
@@ -576,7 +576,6 @@ public class SdncUebCallback implements INotificationCallback {
                }
 
                // Ingest Network (VL) Data - 1707
-               //List<NodeTemplate> vlNodeTemplatesList = sdcCsarHelper.getServiceNodeTemplatesByType("VL");
                List<NodeTemplate> vlNodeTemplatesList = sdcCsarHelper.getServiceVlList();
 
                for (NodeTemplate nodeTemplate :  vlNodeTemplatesList) {
@@ -613,7 +612,6 @@ public class SdncUebCallback implements INotificationCallback {
                }
 
                // Ingest Network (VF) Data - 1707
-               //List<NodeTemplate> nodeTemplatesList = sdcCsarHelper.getServiceNodeTemplatesByType("VF");
                List<NodeTemplate> vfNodeTemplatesList = sdcCsarHelper.getServiceVfList();
 
                for (NodeTemplate nodeTemplate :  vfNodeTemplatesList) {
@@ -641,7 +639,6 @@ public class SdncUebCallback implements INotificationCallback {
                                }
 
                                // For each VF Module, get the VFC list, insert VF_MODULE_TO_VFC_MAPPING data
-                               // List<NodeTemplate> groupMembers = sdcCsarHelper.getMembersOfGroup(group); - old version
                                // For each vfcNode (group member) in the groupMembers list, extract vm_type and vm_count.
                                // Insert vf_module.customizationUUID, vfcNode.customizationUUID and vm_type and vm_count into VF_MODULE_TO_VFC_MAPPING
                                List<NodeTemplate> groupMembers = sdcCsarHelper.getMembersOfVfModule(nodeTemplate, group); // not yet available
@@ -706,12 +703,11 @@ public class SdncUebCallback implements INotificationCallback {
 
                                        // extract values from the left "CP" Node
                                        SdncBaseModel.addParameter("ipv4_use_dhcp", SdncBaseModel.extractBooleanValue(sdcCsarHelper, match.getLeft(), SdcPropertyNames.PROPERTY_NAME_NETWORKASSIGNMENTS_IPV4SUBNETDEFAULTASSIGNMENTS_DHCPENABLED), mappingParams);
-                                       //SdncBaseModel.addParameter("ipv4_ip_version", SdncBaseModel.extractValue(sdcCsarHelper, match.getLeft(), SdcPropertyNames.PROPERTY_NAME_NETWORKASSIGNMENTS_IPV4SUBNETDEFAULTASSIGNMENTS_IPVERSION), mappingParams);
+
                                        SdncBaseModel.addParameter("ipv4_ip_version", "dummy_ipv4_vers", mappingParams);
                                        SdncBaseModel.addParameter("ipv6_use_dhcp", SdncBaseModel.extractBooleanValue(sdcCsarHelper, match.getLeft(), SdcPropertyNames.PROPERTY_NAME_NETWORKASSIGNMENTS_IPV6SUBNETDEFAULTASSIGNMENTS_DHCPENABLED), mappingParams);
-                                       //SdncBaseModel.addParameter("ipv6_ip_version", SdncBaseModel.extractValue(sdcCsarHelper, match.getLeft(), SdcPropertyNames.PROPERTY_NAME_NETWORKASSIGNMENTS_IPV6SUBNETDEFAULTASSIGNMENTS_IPVERSION), mappingParams);
+
                                        SdncBaseModel.addParameter("ipv6_ip_version", "dummy_ipv6_vers", mappingParams);
-                                       //String extcp_subnetpool_id = "\"" + SdncBaseModel.extractValue(sdcCsarHelper, match.getLeft(), SdcPropertyNames.PROPERTY_NAME_SUBNETPOOLID) + "\""; // need path to subnetpoolid
 
                                        // extract values from the right "VFC" Node
                                        String vfcCustomizationUuid = "\"" + SdncBaseModel.extractValue(sdcCsarHelper, match.getRight().getMetaData(), "customization_uuid") + "\"";
@@ -816,7 +812,7 @@ public class SdncUebCallback implements INotificationCallback {
 
         if (artifactType != ArtifactTypeEnum.YANG_XML) {
             LOG.error("Unexpected artifact type - expecting YANG_XML, got "+artifactType);
-                       return (null);
+                       return null;
         }
 
         // Examine outer tag
@@ -1025,7 +1021,7 @@ public class SdncUebCallback implements INotificationCallback {
         conn.setDoOutput(true);
         conn.setUseCaches(false);
 
-               return(conn);
+               return conn;
 
     }
 
@@ -1046,7 +1042,7 @@ public class SdncUebCallback implements INotificationCallback {
                        LOG.error("Caught exception posting to ODL tier", e);
         }
 
-               return(response);
+               return response;
 
     }
 
@@ -1090,7 +1086,7 @@ public class SdncUebCallback implements INotificationCallback {
         // After transformations, parse transformed XML
 
 
-               return(outFile);
+               return outFile;
     }
 
     private String escapeFilename(String str) {
@@ -1107,7 +1103,7 @@ public class SdncUebCallback implements INotificationCallback {
             }
         }
 
-               return(retval.toString());
+               return retval.toString();
 
     }