VPD records/keywords added and removed for P9

Adding records VRML, VER0, and VMSC
Removing records LRP6 to LRPE and LWP6 to LWPE
Adding keywords PM, PZ, 20, 21, 30, and 31
Removing keywords FO, OC, MC, MK, ST, #P, #2, and #3

Reenable mvpd testcases after new mvpd available

Change-Id: I7025fe3673abb306c8af15f1d4abf42f0b0d8620
RTC:127213
Reviewed-on: http://gfw160.aus.stglabs.ibm.com:8080/gerrit/22824
Tested-by: Jenkins Server
Reviewed-by: Daniel M. Crowell <dcrowell@us.ibm.com>

2 files changed, 84 insertions, 117 deletions

diff --git a/src/include/usr/hwpf/fapi/fapiMvpdAccess.H b/src/include/usr/hwpf/fapi/fapiMvpdAccess.H
index 9a5de398d..3d12666bc 100644
--- a/src/include/usr/hwpf/fapi/fapiMvpdAccess.H
+++ b/src/include/usr/hwpf/fapi/fapiMvpdAccess.H
@@ -60,32 +60,17 @@ namespace fapi
         MVPD_RECORD_LRP3 = 0x06,
         MVPD_RECORD_LRP4 = 0x07,
         MVPD_RECORD_LRP5 = 0x08,
-        MVPD_RECORD_LRP6 = 0x09,
-        MVPD_RECORD_LRP7 = 0x0a,
-        MVPD_RECORD_LRP8 = 0x0b,
-        MVPD_RECORD_LRP9 = 0x0c,
-        MVPD_RECORD_LRPA = 0x0d,
-        MVPD_RECORD_LRPB = 0x0e,
-        MVPD_RECORD_LRPC = 0x0f,
-        MVPD_RECORD_LRPD = 0x10,
-        MVPD_RECORD_LRPE = 0x11,
-        MVPD_RECORD_LWP0 = 0x12,
-        MVPD_RECORD_LWP1 = 0x13,
-        MVPD_RECORD_LWP2 = 0x14,
-        MVPD_RECORD_LWP3 = 0x15,
-        MVPD_RECORD_LWP4 = 0x16,
-        MVPD_RECORD_LWP5 = 0x17,
-        MVPD_RECORD_LWP6 = 0x18,
-        MVPD_RECORD_LWP7 = 0x19,
-        MVPD_RECORD_LWP8 = 0x1a,
-        MVPD_RECORD_LWP9 = 0x1b,
-        MVPD_RECORD_LWPA = 0x1c,
-        MVPD_RECORD_LWPB = 0x1d,
-        MVPD_RECORD_LWPC = 0x1e,
-        MVPD_RECORD_LWPD = 0x1f,
-        MVPD_RECORD_LWPE = 0x20,
-        MVPD_RECORD_VWML = 0x21,
-        MVPD_RECORD_MER0 = 0x22,
+        MVPD_RECORD_LWP0 = 0x09,
+        MVPD_RECORD_LWP1 = 0x0a,
+        MVPD_RECORD_LWP2 = 0x0b,
+        MVPD_RECORD_LWP3 = 0x0c,
+        MVPD_RECORD_LWP4 = 0x0d,
+        MVPD_RECORD_LWP5 = 0x0e,
+        MVPD_RECORD_VRML = 0x0f,
+        MVPD_RECORD_VWML = 0x10,
+        MVPD_RECORD_VER0 = 0x11,
+        MVPD_RECORD_MER0 = 0x12,
+        MVPD_RECORD_VMSC = 0x13,
     };
 
     enum MvpdKeyword
@@ -94,38 +79,37 @@ namespace fapi
         MVPD_KEYWORD_ED  = 0x01,
         MVPD_KEYWORD_TE  = 0x02,
         MVPD_KEYWORD_DD  = 0x03,
-        MVPD_KEYWORD_PDP = 0x04,
-        MVPD_KEYWORD_ST  = 0x05,
-        MVPD_KEYWORD_DN  = 0x06,
-        MVPD_KEYWORD_PG  = 0x07,
-        MVPD_KEYWORD_PK  = 0x08,
-        MVPD_KEYWORD_PDR = 0x09,
-        MVPD_KEYWORD_PDV = 0x0a,
-        MVPD_KEYWORD_PDH = 0x0b,
-        MVPD_KEYWORD_SB  = 0x0c,
-        MVPD_KEYWORD_DR  = 0x0d,
-        MVPD_KEYWORD_VZ  = 0x0e,
-        MVPD_KEYWORD_CC  = 0x0f,
-        MVPD_KEYWORD_CE  = 0x10,
-        MVPD_KEYWORD_FN  = 0x11,
-        MVPD_KEYWORD_PN  = 0x12,
-        MVPD_KEYWORD_SN  = 0x13,
-        MVPD_KEYWORD_PR  = 0x14,
-        MVPD_KEYWORD_HE  = 0x15,
-        MVPD_KEYWORD_CT  = 0x16,
-        MVPD_KEYWORD_HW  = 0x17,
-        MVPD_KEYWORD_PDM = 0x18,
-        MVPD_KEYWORD_IN  = 0x19,
-        MVPD_KEYWORD_PD2 = 0x1a,
-        MVPD_KEYWORD_PD3 = 0x1b,
-        MVPD_KEYWORD_OC  = 0x1c,
-        MVPD_KEYWORD_FO  = 0x1d,
-        MVPD_KEYWORD_PDI = 0x1e,
-        MVPD_KEYWORD_PDG = 0x1f,
-        MVPD_KEYWORD_MK  = 0x20,
-        MVPD_KEYWORD_PB  = 0x21,
-        MVPD_KEYWORD_CH  = 0x22,
-        MVPD_KEYWORD_IQ  = 0x23,
+        MVPD_KEYWORD_DN  = 0x04,
+        MVPD_KEYWORD_PG  = 0x05,
+        MVPD_KEYWORD_PK  = 0x06,
+        MVPD_KEYWORD_PDR = 0x07,
+        MVPD_KEYWORD_PDV = 0x08,
+        MVPD_KEYWORD_PDH = 0x09,
+        MVPD_KEYWORD_SB  = 0x0a,
+        MVPD_KEYWORD_DR  = 0x0b,
+        MVPD_KEYWORD_VZ  = 0x0c,
+        MVPD_KEYWORD_CC  = 0x0d,
+        MVPD_KEYWORD_CE  = 0x0e,
+        MVPD_KEYWORD_FN  = 0x0f,
+        MVPD_KEYWORD_PN  = 0x10,
+        MVPD_KEYWORD_SN  = 0x11,
+        MVPD_KEYWORD_PR  = 0x12,
+        MVPD_KEYWORD_HE  = 0x13,
+        MVPD_KEYWORD_CT  = 0x14,
+        MVPD_KEYWORD_HW  = 0x15,
+        MVPD_KEYWORD_PDM = 0x16,
+        MVPD_KEYWORD_IN  = 0x17,
+        MVPD_KEYWORD_PDI = 0x18,
+        MVPD_KEYWORD_PDG = 0x19,
+        MVPD_KEYWORD_PB  = 0x1a,
+        MVPD_KEYWORD_CH  = 0x1b,
+        MVPD_KEYWORD_IQ  = 0x1c,
+        MVPD_KEYWORD_PM  = 0x1d,
+        MVPD_KEYWORD_PZ  = 0x1e,
+        MVPD_KEYWORD_N20 = 0x1f,
+        MVPD_KEYWORD_N21 = 0x20,
+        MVPD_KEYWORD_N30 = 0x21,
+        MVPD_KEYWORD_N31 = 0x22,
     };
 
     typedef struct voltageBucketData
diff --git a/src/include/usr/vpd/mvpdenums.H b/src/include/usr/vpd/mvpdenums.H
index 7e977c4d1..fd6371a4b 100644
--- a/src/include/usr/vpd/mvpdenums.H
+++ b/src/include/usr/vpd/mvpdenums.H
@@ -53,33 +53,17 @@ enum mvpdRecord
     LRP3        = 0x06,
     LRP4        = 0x07,
     LRP5        = 0x08,
-    LRP6        = 0x09,
-    LRP7        = 0x0a,
-    LRP8        = 0x0b,
-    LRP9        = 0x0c,
-    LRPA        = 0x0d,
-    LRPB        = 0x0e,
-    LRPC        = 0x0f,
-    LRPD        = 0x10,
-    LRPE        = 0x11,
-    LWP0        = 0x12,
-    LWP1        = 0x13,
-    LWP2        = 0x14,
-    LWP3        = 0x15,
-    LWP4        = 0x16,
-    LWP5        = 0x17,
-    LWP6        = 0x18,
-    LWP7        = 0x19,
-    LWP8        = 0x1a,
-    LWP9        = 0x1b,
-    LWPA        = 0x1c,
-    LWPB        = 0x1d,
-    LWPC        = 0x1e,
-    LWPD        = 0x1f,
-    LWPE        = 0x20,
-    VWML        = 0x21,
-    MER0        = 0x22,
-    VRML        = 0x23,
+    LWP0        = 0x09,
+    LWP1        = 0x0a,
+    LWP2        = 0x0b,
+    LWP3        = 0x0c,
+    LWP4        = 0x0d,
+    LWP5        = 0x0e,
+    VRML        = 0x0f,
+    VWML        = 0x10,
+    VER0        = 0x11,
+    MER0        = 0x12,
+    VMSC        = 0x13,
 
     // Last Record
     MVPD_LAST_RECORD,
@@ -100,38 +84,37 @@ enum mvpdKeyword
     ED          = 0x01,
     TE          = 0x02,
     DD          = 0x03,
-    pdP         = 0x04,
-    ST          = 0x05,
-    DN          = 0x06,
-    PG          = 0x07,
-    PK          = 0x08,
-    pdR         = 0x09,
-    pdV         = 0x0a,
-    pdH         = 0x0b,
-    SB          = 0x0c,
-    DR          = 0x0d,
-    VZ          = 0x0e,
-    CC          = 0x0f,
-    CE          = 0x10,
-    FN          = 0x11,
-    PN          = 0x12,
-    SN          = 0x13,
-    PR          = 0x14,
-    HE          = 0x15,
-    CT          = 0x16,
-    HW          = 0x17,
-    pdM         = 0x18,
-    IN          = 0x19,
-    pd2         = 0x1a,
-    pd3         = 0x1b,
-    OC          = 0x1c,
-    FO          = 0x1d,
-    pdI         = 0x1e,
-    pdG         = 0x1f,
-    MK          = 0x20,
-    PB          = 0x21,
-    CH          = 0x22,
-    IQ          = 0x23,
+    DN          = 0x04,
+    PG          = 0x05,
+    PK          = 0x06,
+    pdR         = 0x07,
+    pdV         = 0x08,
+    pdH         = 0x09,
+    SB          = 0x0a,
+    DR          = 0x0b,
+    VZ          = 0x0c,
+    CC          = 0x0d,
+    CE          = 0x0e,
+    FN          = 0x0f,
+    PN          = 0x10,
+    SN          = 0x11,
+    PR          = 0x12,
+    HE          = 0x13,
+    CT          = 0x14,
+    HW          = 0x15,
+    pdM         = 0x16,
+    IN          = 0x17,
+    pdI         = 0x18,
+    pdG         = 0x19,
+    PB          = 0x1a,
+    CH          = 0x1b,
+    IQ          = 0x1c,
+    PM          = 0x1d,
+    PZ          = 0x1e,
+    n20         = 0x1f,
+    n21         = 0x20,
+    n30         = 0x21,
+    n31         = 0x22,
 
     // Last Keyword
     MVPD_LAST_KEYWORD,