Inventory: Implementing the association of objects.

This script will look at the associated types in the config file
and make the association.

Change-Id: I25bafb1308bbcb1febc2c24d8154643a1f154cdb
Signed-off-by: Ratan Gupta <ratagupt@in.ibm.com>

2 files changed, 66 insertions, 43 deletions

diff --git a/Util.pm b/Util.pm
index aa98b56..c6245a4 100644
--- a/Util.pm
+++ b/Util.pm
@@ -61,6 +61,29 @@ sub getObmcName
     return undef;
 }
 
+#Returns the array of all the device paths based on the type.
+# param[in] \@inventory = reference to array of inventory items.
+# param[in] $targetObj = The Targets object.
+# param[in] $type = The target type.
+sub getDevicePath
+{
+    my ($inventory_ref, $targetObj, $type) = @_;
+    my @inventory = @{ $inventory_ref };
+    my $fruType = "";
+    my @devices;
+    for my $item (@inventory)
+    {
+        if (!$targetObj->isBadAttribute($item->{TARGET}, "TYPE")) {
+            $fruType = $targetObj->getAttribute($item->{TARGET}, "TYPE");
+            if ($fruType eq $type) {
+                push(@devices,$item->{OBMC_NAME});
+            }
+        }
+    }
+    return @devices;
+}
+
+
 1;
 
 =head1 NAME
@@ -90,6 +113,9 @@ and are children (any level) of target C<ChipTarget>.
 Returns an OBMC name corresponding to a Target name. Returns
 undef if the Target name is not found.
 
+=item getDevicePath(C<InventoryItems>, C<TargetsObj>, C<TargetType>)
+#Returns the array of all the device path based on the C<TargetType>.
+
 =back
 
 =cut
diff --git a/gen_ipmi_fru.pl b/gen_ipmi_fru.pl
index 5465d84..16252bf 100755..100644
--- a/gen_ipmi_fru.pl
+++ b/gen_ipmi_fru.pl
@@ -7,7 +7,6 @@ use mrw::Inventory;
 use mrw::Util;
 use Getopt::Long; # For parsing command line arguments
 use YAML::Tiny qw(LoadFile);
-
 # Globals
 my $serverwizFile  = "";
 my $debug           = 0;
@@ -43,6 +42,10 @@ my @interestedTypes = keys %{$fruTypeConfig};
 my %types;
 @types{@interestedTypes} = ();
 
+my @allAssoTypes = getAllAssociatedTypes($fruTypeConfig);
+my %allAssoTypesHash;
+@allAssoTypesHash{@allAssoTypes} = ();
+
 my @inventory = Inventory::getInventory($targetObj);
 for my $item (@inventory) {
     my $isFru = 0, my $fruID = 0, my $fruType = "";
@@ -56,8 +59,12 @@ for my $item (@inventory) {
         $fruType = $targetObj->getAttribute($item->{TARGET}, "TYPE");
     }
 
-    #Skip if we're not interested
-    next if (not $isFru or not exists $types{$fruType});
+    #Skip if any one is true
+    #1) If not fru
+    #2) if the fru type is not there in the config file.
+    #3) if the fru type is in associated types.
+
+    next if (not $isFru or not exists $types{$fruType} or exists $allAssoTypesHash{$fruType});
 
     printDebug ("FRUID => $fruID, FRUType => $fruType, ObjectPath => $item->{OBMC_NAME}");
 
@@ -66,55 +73,44 @@ for my $item (@inventory) {
 
     writeToFile($fruType,$item->{OBMC_NAME},$fruTypeConfig,$fh);
 
-    # Fetch all the children for this inventory target,It might happen the child is fru or non fru
-    # Following condition to be true for fetching the associated non fru devices.
-    # -it should be non fru.
-    # -type of the fru is in the interested types.
-    # - the parent of the child should be same as inventory target.
-
-    foreach my $child ($targetObj->getAllTargetChildren($item->{TARGET})) {
-        $fruType = $targetObj->getAttribute($child, "TYPE");
-
-        if (!$targetObj->isBadAttribute($child, "FRU_ID")) {
-            #i.e this child is a fru,we are interrested in non fru devices
-            next;
-        }
-
-        #Fetch the Fru Type
-        if (!$targetObj->isBadAttribute($child, "TYPE")) {
-            $fruType = $targetObj->getAttribute($child, "TYPE");
-        }
-
-        # check whether this fru type is in interested fru types.
-        if (not exists $types{$fruType}) {
-            next;
-        }
+    #if the key(AssociatedTypes) exists and  it is defined
+    #then make the association.
 
-        # find the parent fru of this child.
-        my $parent = $targetObj->getTargetParent($child);
-        while ($parent ne ($item->{TARGET})) {
-            $parent = $targetObj->getTargetParent($parent);
-            if (!$targetObj->isBadAttribute($parent, "FRU_ID")) {
-                last;
-            }
+    if (!defined $fruTypeConfig->{$fruType}->{'AssociatedTypes'}) {
+        next;
+    }
 
-        }
-        #if parent of the child is not equal to the item->target
-        #i.e some other fru is parent of this child.
-        if ( $parent ne ($item->{TARGET}) ){
-            next;
+    my $assoTypes = $fruTypeConfig->{$fruType}->{'AssociatedTypes'};
+    for my $type (@$assoTypes) {
+        my @devices = Util::getDevicePath(\@inventory,$targetObj,$type);
+        for my $device (@devices) {
+            writeToFile($type,$device,$fruTypeConfig,$fh);
         }
 
-        printDebug("     ".$child);
-        printDebug("     Type:".$fruType );
-        my $childObmcName = Util::getObmcName(\@inventory, $child);
-        writeToFile($fruType, $childObmcName, $fruTypeConfig, $fh);
     }
+
 }
 close $fh;
 
 #------------------------------------END OF MAIN-----------------------
 
+# Get all the associated types
+sub getAllAssociatedTypes
+{
+   my $fruTypeConfig = $_[0];
+   my @assoTypes;
+   while (my($key, $value) = each %$fruTypeConfig) {
+        #if the key exist and value is also there
+        if (defined $value->{'AssociatedTypes'}) {
+            my $assoTypes = $value->{'AssociatedTypes'};
+            for my $type (@$assoTypes) {
+                push(@assoTypes,$type);
+            }
+        }
+   }
+   return @assoTypes;
+}
+
 #Get the metdata for the incoming frutype from the loaded config file.
 #Write the FRU data into the output file
 
@@ -127,7 +123,7 @@ sub writeToFile
     #walk over all the fru types and match for the incoming type
     print $fh "  ".$instancePath.":";
     print $fh "\n";
-    my $interfaces = $fruTypeConfig->{$fruType};
+    my $interfaces = $fruTypeConfig->{$fruType}->{'Interfaces'};
     #Walk over all the interfaces as it needs to be written
     while ( my ($interface,$properties) = each %{$interfaces}) {
         print $fh "    ".$interface.":";
@@ -163,3 +159,4 @@ sub printDebug
     my $str = shift;
     print "DEBUG: ", $str, "\n" if $debug;
 }
+