Skip to content

Revert "VEY-186: Add LLDP to discovery image and node catalog" #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
benbp merged 1 commit into from
Oct 9, 2015
Merged

Revert "VEY-186: Add LLDP to discovery image and node catalog" #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 0 additions & 17 deletions lib/task-data/tasks/catalog-lldp.js
View file
Open in desktop

This file was deleted.

37 changes: 1 addition & 36 deletions lib/utils/job-utils/command-parser.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,7 @@ function commandParserFactory(Logger, Promise, _) {
testEsesQ = 'sudo test_eses -q std --xml',
amiBios = 'cd /opt/ami; sudo ./afulnx_64 /S',
flashupdt = 'sudo /opt/intel/flashupdt -i',
smart = 'sudo bash get_smart.sh',
lldp = 'sudo /usr/sbin/lldpcli show neighbor -f keyvalue';
smart = 'sudo bash get_smart.sh';

var matchParsers = {};
matchParsers.ipmiUserList = {
Expand Down Expand Up @@ -944,40 +943,6 @@ function commandParserFactory(Logger, Promise, _) {
return deferred;
};

CommandParser.prototype[lldp] = function(data) {
if (data.error) {
return Promise.resolve({ source: 'lldp', error: data.error });
} else if (!data.stdout) {
return Promise.resolve({ source: 'lldp', error: new Error("No data") });
}
try {
var lines = data.stdout.split('\n');
var parsed = {};
_.forEach(lines, function(line) {
var keys = line.split("=")[0].split(".");
var value = line.split("=")[1];
if( keys[0] === "lldp" ) {
var index = 0,
length = keys.length,
lastIndex = length - 1,
nested = parsed;
while( nested != null && ++index < length ) {
var key = keys[index];
if( index == lastIndex) {
nested[key] = value;
} else if (nested[key] == null) {
nested[key] = {};
}
nested = nested[key];
}
}
});
return Promise.resolve({ data: parsed, source: 'lldp', store: true });
} catch (e) {
return Promise.resolve({ source: 'lldp', error: e });
}
};

CommandParser.prototype.parseUnknownTasks = function(tasks) {
return Promise.all(_.map(tasks, function(data) {
var out;
Expand Down
17 changes: 0 additions & 17 deletions spec/lib/task-data/tasks/catalog-lldp-spec.js
View file
Open in desktop

This file was deleted.

32 changes: 0 additions & 32 deletions spec/lib/utils/job-utils/command-parser-spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1092,35 +1092,3 @@ describe("Task Parser", function () {
});
});
});

describe("LLDP Parsers", function () {
it("should parse lldpcli output", function (done) {
var lldpCmd = 'sudo /usr/sbin/lldpcli show neighbor -f keyvalue';

var tasks = [
{
cmd: lldpCmd,
stdout: stdoutMocks.lldpOutput,
stderr: '',
error: null
}
];

taskParser.parseTasks(tasks)
.spread(function (result) {
expect(result.error).to.be.undefined;
expect(result.store).to.be.true;
expect(result.data.p20p2.port.descr).to.equal('Not received');
expect(result.data.p20p2.port.ifname).to.equal('Ethernet50');
expect(result.data.p20p2.chassis.mac).to.equal('00:1c:73:ac:94:89');
expect(result.data.p20p2.chassis.name).to.equal('mgmt01');
expect(result.data.p20p2.chassis.mgmt-ip).to.equal('10.240.19.102');
expect(result.data.p20p2.chassis.Bridge.enabled).to.equal('on');
expect(result.data.p20p2.chassis.Router.enabled).to.equal('off');
done();
})
.catch(function (err) {
done(err);
});
});
});
11 changes: 0 additions & 11 deletions spec/lib/utils/job-utils/samplefiles/lldp.txt
View file
Open in desktop

This file was deleted.

4 changes: 0 additions & 4 deletions spec/lib/utils/job-utils/stdout-helper.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3665,7 +3665,3 @@ module.exports.flashupdtdecode = fs
module.exports.snmp = fs
.readFileSync(__dirname+"/samplefiles/snmp.txt")
.toString();

module.exports.lldpOutput = fs
.readFileSync(__dirname+"/samplefiles/lldp.txt")
.toString();