Merge pull request #523 from gavin-scott/ipmi-user-list

Fix ipmi-user-list catalog data
RackHD · Apr 12, 2018 · 32f2bea · 32f2bea
2 parents af45537 + 9630872
commit 32f2bea
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 7 deletions.
diff --git a/lib/utils/job-utils/command-parser.js b/lib/utils/job-utils/command-parser.js
@@ -114,7 +114,7 @@ function commandParserFactory(Logger, Promise, _) {
                     }
                 });
                 var parsed = {},
-                    header = lines.shift().split(','),
+                    header = ['ID', 'Name', 'Callin', 'Link Auth', 'IPMI Msg', 'Channel Priv Limit'],
                     columns = _.map(lines, function (line) {
                         return line.split(',');
                     });

diff --git a/spec/lib/utils/job-utils/command-parser-spec.js b/spec/lib/utils/job-utils/command-parser-spec.js
@@ -847,14 +847,14 @@ describe("Task Parser", function () {
                 expect(result.data[1].Name).to.equal('');
                 expect(result.data[1].Callin).to.equal('true');
                 expect(result.data[1]['Link Auth']).to.equal('false');
-                expect(result.data[1]['IPMI Msg Channel']).to.equal('true');
-                expect(result.data[1]['Priv Limit']).to.equal('ADMINISTRATOR');
+                expect(result.data[1]['IPMI Msg']).to.equal('true');
+                expect(result.data[1]['Channel Priv Limit']).to.equal('ADMINISTRATOR');
                 expect(result.data[2].ID).to.equal('2');
                 expect(result.data[2].Name).to.equal('root');
                 expect(result.data[2].Callin).to.equal('false');
                 expect(result.data[2]['Link Auth']).to.equal('true');
-                expect(result.data[2]['IPMI Msg Channel']).to.equal('true');
-                expect(result.data[2]['Priv Limit']).to.equal('ADMINISTRATOR');
+                expect(result.data[2]['IPMI Msg']).to.equal('true');
+                expect(result.data[2]['Channel Priv Limit']).to.equal('ADMINISTRATOR');
             });
         });
 

diff --git a/spec/lib/utils/job-utils/stdout-helper.js b/spec/lib/utils/job-utils/stdout-helper.js
@@ -1,3 +1,5 @@
+// Copyright 2015-2018, Dell EMC, Inc.
+
 module.exports.amiOutput = '+---------------------------------------------------------------------------+\n' +
                            '|                *** ******** ****** *******  ********                      |\n' +
                            '|      ********* ******* ******** ********** **** *** ****** *********      |\n' +
@@ -3477,8 +3479,7 @@ module.exports.ipmiSelOutput = '1,05/27/2014,21:20:43,Event Logging Disabled #0x
                                    '8,05/27/2014,21:23:25,Power Unit #0x02,Non-Redundant: Sufficient from Redundant,Asserted';
 
 
-module.exports.ipmiUserListOutput = 'ID,Name,Callin,Link Auth,IPMI Msg Channel,Priv Limit\n' +
-                                    '1,,true,false,true,ADMINISTRATOR\n' +
+module.exports.ipmiUserListOutput = '1,,true,false,true,ADMINISTRATOR\n' +
                                     '2,root,false,true,true,ADMINISTRATOR\n';
 
 module.exports.ipmiUserSummaryOutput = 'Maximum IDs	    : 15\n' +