Refactor Onboarding Translator code

1. Fixed sonar violations
2. Fixed static analysis issues
2. Refactored methods for code smells

Change-Id: I0d33c93156ddfaa43769a98f086e269b43c24cd2
Issue-ID: SDC-1331
Signed-off-by: ojasdubey <ojas.dubey@amdocs.com>

1 files changed, 46 insertions, 37 deletions

diff --git a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/services/HeatConstants.java b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/services/HeatConstants.java
index bc91b7d882..618418a59e 100644
--- a/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/services/HeatConstants.java
+++ b/openecomp-be/lib/openecomp-heat-lib/src/main/java/org/openecomp/sdc/heat/services/HeatConstants.java
@@ -17,44 +17,53 @@
 package org.openecomp.sdc.heat.services;
 
 public class HeatConstants {
-  public static final String GET_ATTR_FROM_RESOURCE_GROUP_PREFIX = "resource.";
-  public static final String RESOURCE_GROUP_INDEX_VAR_DEFAULT_VALUE = "%index%";
+    public static final String GET_ATTR_FROM_RESOURCE_GROUP_PREFIX = "resource.";
+    public static final String RESOURCE_GROUP_INDEX_VAR_DEFAULT_VALUE = "%index%";
 
-  public static final String INDEX_PROPERTY_NAME = "index_var";
-  public static final String SERVICE_SCALING_PROPERTY_NAME = "service_scaling";
-  public static final String INSTANCE_UUID_PROPERTY_NAME = "instance_uuid";
-  public static final String RESOURCE_DEF_PROPERTY_NAME = "resource_def";
-  public static final String RESOURCE_DEF_PROPERTIES = "properties";
-  public static final String RESOURCE_DEF_TYPE_PROPERTY_NAME = "type";
-  public static final String SCALE_OUT_PROPERTY_NAME = "scale_out";
-  public static final String INTERFACE_LIST_PROPERTY_NAME = "interface_list";
-  public static final String VIRTUAL_NETWORK_PROPERTY_NAME = "virtual_network";
-  public static final String VMI_SUB_INTERFACE_VLAN_TAG_PROPERTY_NAME
-      = "virtual_machine_interface_properties_sub_interface_vlan_tag";
-  public static final String VMI_PROPERTIES_PROPERTY_NAME = "virtual_machine_interface_properties";
-  public static final String VMI_REFS_PROPERTY_NAME = "virtual_machine_interface_refs";
-  public static final String VMI_MAC_ADDRESSES = "virtual_machine_interface_mac_addresses";
-  public static final String VMI_MAC_ADDRESSES_MAC_ADDRESSES =
-      "virtual_machine_interface_mac_addresses#virtual_machine_interface_mac_addresses_mac_address";
-  public static final String VIRTUAL_NETWORK_REFS_PROPERTY_NAME = "virtual_network_refs";
-  public static final String READ_ONLY_PROPERTY_NAME = "read_only";
-  public static final String VOL_ID_PROPERTY_NAME = "volume_id";
-  public static final String CONFIG_DRIVE_PROPERTY_NAME = "config_drive";
-  public static final String AVAILABILITY_ZONE_ENABLE_PROPERTY_NAME = "availability_zone_enable";
-  public static final String ORDERED_INTERFACES_PROPERTY_NAME = "ordered_interfaces";
-  public static final String SHARED_IP_LIST_PROPERTY_NAME = "shared_ip_list";
-  public static final String STATIC_ROUTES_LIST_PROPERTY_NAME = "static_routes_list";
-  public static final String SERVICE_INTERFCAE_TYPE_LIST_PROPERTY_NAME =
-      "service_interface_type_list";
-  public static final String PORT_SECURITY_ENABLED_PROPERTY_NAME = "port_security_enabled";
-  public static final String SHARED_PROPERTY_NAME = "shared";
-  public static final String ADMIN_STATE_UP_PROPERTY_NAME = "admin_state_up";
-  public static final String CONTRAIL_RESOURCE_PREFIX = "OS::Contrail::";
-  public static final String CONTRAIL_V2_RESOURCE_PREFIX = "OS::ContrailV2::";
-  public static final int DEFAULT_NESTED_HEAT_RESOURCE_COUNT = 1;
+    public static final String INDEX_PROPERTY_NAME = "index_var";
+    public static final String SERVICE_SCALING_PROPERTY_NAME = "service_scaling";
+    public static final String INSTANCE_UUID_PROPERTY_NAME = "instance_uuid";
+    public static final String RESOURCE_DEF_PROPERTY_NAME = "resource_def";
+    public static final String RESOURCE_DEF_PROPERTIES = "properties";
+    public static final String RESOURCE_DEF_TYPE_PROPERTY_NAME = "type";
+    public static final String SCALE_OUT_PROPERTY_NAME = "scale_out";
+    public static final String INTERFACE_LIST_PROPERTY_NAME = "interface_list";
+    public static final String VIRTUAL_NETWORK_PROPERTY_NAME = "virtual_network";
+    public static final String BLOCK_DEVICE_MAPPING = "block_device_mapping";
+    public static final String BLOCK_DEVICE_MAPPING_V2 = "block_device_mapping_v2";
+    public static final String VMI_SUB_INTERFACE_VLAN_TAG_PROPERTY_NAME
+            = "virtual_machine_interface_properties_sub_interface_vlan_tag";
+    public static final String VMI_PROPERTIES_PROPERTY_NAME = "virtual_machine_interface_properties";
+    public static final String VMI_REFS_PROPERTY_NAME = "virtual_machine_interface_refs";
+    public static final String VMI_MAC_ADDRESSES = "virtual_machine_interface_mac_addresses";
+    public static final String VMI_MAC_ADDRESSES_MAC_ADDRESSES =
+            "virtual_machine_interface_mac_addresses#virtual_machine_interface_mac_addresses_mac_address";
+    public static final String VIRTUAL_NETWORK_REFS_PROPERTY_NAME = "virtual_network_refs";
+    public static final String READ_ONLY_PROPERTY_NAME = "read_only";
+    public static final String VOL_ID_PROPERTY_NAME = "volume_id";
+    public static final String SNAPSHOT_ID_PROPERTY_NAME = "snapshot_id";
+    public static final String CONFIG_DRIVE_PROPERTY_NAME = "config_drive";
+    public static final String AVAILABILITY_ZONE_ENABLE_PROPERTY_NAME = "availability_zone_enable";
+    public static final String ORDERED_INTERFACES_PROPERTY_NAME = "ordered_interfaces";
+    public static final String SHARED_IP_LIST_PROPERTY_NAME = "shared_ip_list";
+    public static final String STATIC_ROUTES_LIST_PROPERTY_NAME = "static_routes_list";
+    public static final String SERVICE_INTERFCAE_TYPE_LIST_PROPERTY_NAME =
+            "service_interface_type_list";
+    public static final String PORT_SECURITY_ENABLED_PROPERTY_NAME = "port_security_enabled";
+    public static final String SHARED_PROPERTY_NAME = "shared";
+    public static final String ADMIN_STATE_UP_PROPERTY_NAME = "admin_state_up";
+    public static final String CONTRAIL_RESOURCE_PREFIX = "OS::Contrail::";
+    public static final String CONTRAIL_V2_RESOURCE_PREFIX = "OS::ContrailV2::";
+    public static final int DEFAULT_NESTED_HEAT_RESOURCE_COUNT = 1;
+    public static final String PORT_TUPLE_REFS = "port_tuple_refs";
+    public static final String SERVER_GROUP_POLICIES_PROPERTY_NAME = "policies";
+    public static final String NETWORK_ID_PROPERTY_NAME = "network_id";
+    public static final String NETWORK_PROPERTY_NAME = "network";
+    public static final String SUBNETS_PROPERTY_NAME = "subnets";
+    public static final String ENABLE_DHCP_PROPERTY_NAME = "enable_dhcp";
 
-  private HeatConstants() {
-    //Hide the implicit constructor
-  }
+    private HeatConstants() {
+        //Hide the implicit constructor
+    }
 
 }