Serverwiz2: Updated VPD_REC_NUM numbering

Change-Id: Ib5656de1eb076b956315c31e957e66c17aa3bfc1
RTC: 118373
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/16442
Tested-by: Jenkins Server
Reviewed-by: A. Patrick Williams III <iawillia@us.ibm.com>

2 files changed, 21 insertions, 3 deletions

diff --git a/src/usr/targeting/common/Targets.pm b/src/usr/targeting/common/Targets.pm
index ea5ffde70..5c1a23e6c 100644
--- a/src/usr/targeting/common/Targets.pm
+++ b/src/usr/targeting/common/Targets.pm
@@ -48,6 +48,7 @@ sub new
         TOP_LEVEL    => "sys-0",
         TOPOLOGY     => undef,
         report_log   => "",
+        vpd_num      => 0,
         DMI_FSI_MAP  => {
             '0' => '3',
             '1' => '2',
@@ -590,8 +591,6 @@ sub processMcs
             $parent_affinity . "/mcs-$mcs/membuf-$membufnum");
         $self->setAttribute($membuf, "PHYS_PATH",
             $node_phys . "/membuf-$membufnum");
-        $self->setAttribute($membuf, "VPD_REC_NUM",
-            $self->getAttribute($membuf, "POSITION"));
 
         ## copy DMI bus attributes to membuf
         $self->setAttribute($unit, "EI_BUS_TX_LANE_INVERT",
@@ -875,11 +874,14 @@ sub findConnections
                 my $dest_parent = $self->getTargetParent($dest_target);
                 my $type        = $self->getMrwType($dest_parent);
                 my $dest_type   = $self->getType($dest_parent);
+                my $dest_class  = $self->getAttribute($dest_parent,"CLASS");
                 if ($type eq "NA")
                 {
                     $type = $dest_type;
                 }
-
+                if ($type eq "NA") {
+                    $type = $dest_class;
+                }
                 if ($type eq $end_type || $end_type eq "")
                 {
                     $connections{CONN}[$num]{SOURCE}=$child;
diff --git a/src/usr/targeting/common/processMrw.pl b/src/usr/targeting/common/processMrw.pl
index 71335341d..0469779eb 100644
--- a/src/usr/targeting/common/processMrw.pl
+++ b/src/usr/targeting/common/processMrw.pl
@@ -977,8 +977,24 @@ sub processMembufVpdAssociation
                                 $membuf_assoc->{BUS_NUM}, "ISDIMM_MBVPD_INDEX");
                 $targetObj->setAttribute(
                             $membuf_target,"ISDIMM_MBVPD_INDEX",$index);
+                $targetObj->setAttribute($membuf_target,
+                            "VPD_REC_NUM",$targetObj->{vpd_num});
             }
         }
+        my $node_assocs=$targetObj->findConnections($vpd->{DEST_PARENT},
+                          "LOGICAL_ASSOCIATION","CARD");
+
+        if ($node_assocs ne "") {
+            foreach my $node_assoc (@{$node_assocs->{CONN}}) {
+                my $mb_target = $node_assoc->{DEST_PARENT};
+                my $node_target = $targetObj->getTargetParent($mb_target);
+                setEepromAttributes($targetObj,
+                       "EEPROM_VPD_PRIMARY_INFO",$node_target,$vpd);
+                $targetObj->setAttribute($node_target,
+                            "VPD_REC_NUM",$targetObj->{vpd_num});
+            }
+        }
+        $targetObj->{vpd_num}++;
     }
 }