Fix get_position_in_parent in fan and thermal

Author: Jostar Yang

device/accton/x86_64-accton_as4630_54pe-r0/sonic_platform/fan.py

@@ -271,7 +271,7 @@ def get_position_in_parent(self):
             integer: The 1-based relative physical position in parent device
             or -1 if cannot determine the position
         """
-        return (self.fan_tray_index+1) \
+        return (self.fan_index+1) \
             if not self.is_psu_fan else (self.psu_index+1)
 
     def is_replaceable(self):

device/accton/x86_64-accton_as4630_54pe-r0/sonic_platform/thermal.py

@@ -225,7 +225,7 @@ def get_position_in_parent(self):
         Returns:
             integer: The 1-based relative physical position in parent device or -1 if cannot determine the position
         """
-        return -1
+        return self.index+1
 
     def is_replaceable(self):
         """