From 17f0679b8acee7565adbc7a461d8d280826fed18 Mon Sep 17 00:00:00 2001
From: Marri Devender Rao <devenrao@in.ibm.com>
Date: Tue, 20 Mar 2018 03:15:10 -0500
Subject: Seperate write interface method file for reuse

Seperated out write interfaces to a new method so that
it can be used for writing temperature sensor data.

Change-Id: I6b44d1dc2623230c3ec726e1ad18790a93ad7497
Signed-off-by: Marri Devender Rao <devenrao@in.ibm.com>
---
 gen_ipmi_sensor.pl | 50 +++++++++++++++++++++++++++-----------------------
 1 file changed, 27 insertions(+), 23 deletions(-)

diff --git a/gen_ipmi_sensor.pl b/gen_ipmi_sensor.pl
index 84b00c8..74c95da 100755
--- a/gen_ipmi_sensor.pl
+++ b/gen_ipmi_sensor.pl
@@ -1,7 +1,6 @@
 #! /usr/bin/perl
 use strict;
 use warnings;
-
 use mrw::Targets;
 use mrw::Inventory;
 use mrw::Util;
@@ -130,10 +129,34 @@ foreach my $target (sort keys %{$targetObj->getAllTargets()})
 }
 close $fh;
 
+#Write the interfaces data into the output file
+sub writeInterfaces
+{
+    my ($interfaces, $fh) = @_;
+    print $fh "  interfaces:"."\n";
+    #Walk over all the interfces as it needs to be written
+    while (my ($interface,$properties) = each %{$interfaces}) {
+        print $fh "    ".$interface.":\n";
+        #walk over all the properties as it needs to be written
+        while (my ($dbusProperty,$dbusPropertyValue) = each %{$properties}) {
+            #will write property named "Property" first then
+            #other properties.
+            print $fh "      ".$dbusProperty.":\n";
+            while (my ($condition,$offsets) = each %{$dbusPropertyValue}) {
+                print $fh "          $condition:\n";
+                while (my ($offset,$values) = each %{$offsets}) {
+                    print $fh "            $offset:\n";
+                    while (my ($key,$value) = each %{$values})  {
+                        print $fh "              $key: ". $value."\n";
+                    }
+                }
+            }
+        }
+    }
+}
 
 #Get the metadata for the incoming sensortype from the loaded config file.
 #Write the sensor data into the output file
-
 sub writeToFile
 {
     my ($sensorName,$sensorType,$sensorReadingType,$path,$serviceInterface,
@@ -149,31 +172,12 @@ sub writeToFile
     print $fh "  serviceInterface: ".$serviceInterface."\n";
     print $fh "  readingType: ".$readingType."\n";
     print $fh "  sensorNamePattern: ".$sensorNamePattern."\n";
-    print $fh "  interfaces:"."\n";
 
     my $interfaces = $sensorTypeConfig->{$sensorName}->{"interfaces"};
-    #Walk over all the interfces as it needs to be written
-    while (my ($interface,$properties) = each %{$interfaces}) {
-        print $fh "    ".$interface.":\n";
-        #walk over all the properties as it needs to be written
-        while (my ($dbusProperty,$dbusPropertyValue) = each %{$properties}) {
-                    #will write property named "Property" first then
-                    #other properties.
-            print $fh "      ".$dbusProperty.":\n";
-            while (my ($condition,$offsets) = each %{$dbusPropertyValue}) {
-                print $fh "          $condition:\n";
-                while (my ($offset,$values) = each %{$offsets}) {
-                    print $fh "            $offset:\n";
-                    while (my ($key,$value) = each %{$values})  {
-                        print $fh "              $key: ". $value."\n";
-                    }
-                }
-            }
-        }
-    }
+    writeInterfaces($interfaces, $fh);
 }
 
-# Convert MRW OCC inventory path to application d-bus path
+#Convert MRW OCC inventory path to application d-bus path
 sub checkOccPathFixup
 {
     my ($path) = @_;
-- 
cgit v1.2.1