Skip to content
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.

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

Changing redfish identifiers for redfish discovered devices to match RackHD ID #796

Merged
merged 2 commits into from Oct 23, 2017

Conversation

BrentHiggins
Copy link

No description provided.

@BrentHiggins
Copy link
Author

@larry-dean @jimturnquist

@JenkinsRHD
Copy link
Contributor

BUILD on-http #623 : FAILURE

BUILD on-http #623 Error Logs ▼Test Name: should return valid chassis and related targets Error Details: expected 200 "OK", got 400 "Bad Request" Response body: { message: 'Cannot read property &#39;then&#39; of undefined', status: '400', UUID: '9b00d866-648d-4ad6-89fc-f5a152bf8c64' } Error: expected 200 "OK", got 400 "Bad Request" at Test._assertStatus (/RackHD/on-http/node_modules/supertest/lib/test.js:232:12) at Test._assertFunction (/RackHD/on-http/node_modules/supertest/lib/test.js:247:11) at Test.assert (/RackHD/on-http/node_modules/supertest/lib/test.js:148:18) at assert (/RackHD/on-http/node_modules/supertest/lib/test.js:127:12) at /RackHD/on-http/node_modules/supertest/lib/test.js:124:5 at Test.Request.callback (/RackHD/on-http/node_modules/supertest/node_modules/superagent/lib/node/index.js:703:3) at IncomingMessage.<anonymous> (/RackHD/on-http/node_modules/supertest/node_modules/superagent/lib/node/index.js:922:12) at emitNone (events.js:72:20) at IncomingMessage.emit (events.js:166:7) at endReadableNT (_stream_readable.js:923:12) at nextTickCallbackWith2Args (node.js:511:9) at process._tickDomainCallback (node.js:466:17) Stack Trace: Error: expected 200 "OK", got 400 "Bad Request" at Test._assertStatus (node_modules/supertest/lib/test.js:232:12) at Test._assertFunction (node_modules/supertest/lib/test.js:247:11) at Test.assert (node_modules/supertest/lib/test.js:148:18) at assert (node_modules/supertest/lib/test.js:127:12) at node_modules/supertest/lib/test.js:124:5 at Test.Request.callback (node_modules/supertest/node_modules/superagent/lib/node/index.js:703:3) at IncomingMessage.<anonymous> (node_modules/supertest/node_modules/superagent/lib/node/index.js:922:12) at endReadableNT (_stream_readable.js:923:12)

Test Name: should 404 an invalid chassis object
Error Details: expected 404 "Not Found", got 400 "Bad Request" Response body: { message: 'Cannot read property &#39;then&#39; of undefined', status: '400', UUID: '0a8d9776-1473-44d4-ad6d-54a1e1010c10' } Error: expected 404 "Not Found", got 400 "Bad Request" at Test._assertStatus (/RackHD/on-http/node_modules/supertest/lib/test.js:232:12) at Test._assertFunction (/RackHD/on-http/node_modules/supertest/lib/test.js:247:11) at Test.assert (/RackHD/on-http/node_modules/supertest/lib/test.js:148:18) at assert (/RackHD/on-http/node_modules/supertest/lib/test.js:127:12) at /RackHD/on-http/node_modules/supertest/lib/test.js:124:5 at Test.Request.callback (/RackHD/on-http/node_modules/supertest/node_modules/superagent/lib/node/index.js:703:3) at IncomingMessage.<anonymous> (/RackHD/on-http/node_modules/supertest/node_modules/superagent/lib/node/index.js:922:12) at emitNone (events.js:72:20) at IncomingMessage.emit (events.js:166:7) at endReadableNT (_stream_readable.js:923:12) at nextTickCallbackWith2Args (node.js:511:9) at process._tickDomainCallback (node.js:466:17)
Stack Trace: Error: expected 404 "Not Found", got 400 "Bad Request"
at Test._assertStatus (node_modules/supertest/lib/test.js:232:12)
at Test._assertFunction (node_modules/supertest/lib/test.js:247:11)
at Test.assert (node_modules/supertest/lib/test.js:148:18)
at assert (node_modules/supertest/lib/test.js:127:12)
at node_modules/supertest/lib/test.js:124:5
at Test.Request.callback (node_modules/supertest/node_modules/superagent/lib/node/index.js:703:3)
at IncomingMessage.<anonymous> (node_modules/supertest/node_modules/superagent/lib/node/index.js:922:12)
at endReadableNT (_stream_readable.js:923:12)

Test Name: "before each" hook: set up mocks for "/DCIMPower should return a valid power root"
Error Details: Cannot stub non-existent own property getRedfishCatalog
Stack Trace: TypeError: Cannot stub non-existent own property getRedfishCatalog
at Object.stub (node_modules/sinon/lib/sinon/collection.js:93:35)
at Context.<anonymous> (spec/lib/api/redfish-1.0/dcimpower-spec.js:57:22)

Test Name: "before each" hook: set up mocks for "/DCIMCooling should return a valid cooling root"
Error Details: Cannot stub non-existent own property getRedfishCatalog
Stack Trace: TypeError: Cannot stub non-existent own property getRedfishCatalog
at Object.stub (node_modules/sinon/lib/sinon/collection.js:93:35)
at Context.<anonymous> (spec/lib/api/redfish-1.0/dcimcooling-spec.js:57:22)

@BrentHiggins BrentHiggins force-pushed the redfish_discovery_fix branch 3 times, most recently from b78d2be to 2c6f296 Compare October 17, 2017 16:25
@JenkinsRHD
Copy link
Contributor

BUILD on-http #624 : FAILURE

BUILD on-http #624 Error Logs ▼Test Name: "before each" hook: set up mocks for "/DCIMPower should return a valid power root" Error Details: Cannot stub non-existent own property getRedfishCatalog Stack Trace: TypeError: Cannot stub non-existent own property getRedfishCatalog at Object.stub (node_modules/sinon/lib/sinon/collection.js:93:35) at Context.<anonymous> (spec/lib/api/redfish-1.0/dcimpower-spec.js:57:22)

Test Name: "before each" hook: set up mocks for "/DCIMCooling should return a valid cooling root"
Error Details: Cannot stub non-existent own property getRedfishCatalog
Stack Trace: TypeError: Cannot stub non-existent own property getRedfishCatalog
at Object.stub (node_modules/sinon/lib/sinon/collection.js:93:35)
at Context.<anonymous> (spec/lib/api/redfish-1.0/dcimcooling-spec.js:57:22)

@@ -217,7 +219,8 @@ describe('Redfish Power', function () {
waterline.nodes.needByIdentifier.resolves([powerNode]);
var domain = powerNode.identifiers[2];
var type = powerNode.identifiers[3];
redfish.getRedfishCatalog.resolves(PduCatalog);
nodeApi.getNodeById.resolves(powernode);
nodeApi.getCatalogSourceById.resolves(PduCatalog);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'nodeApi' is not defined.

@@ -217,7 +219,8 @@ describe('Redfish Power', function () {
waterline.nodes.needByIdentifier.resolves([powerNode]);
var domain = powerNode.identifiers[2];
var type = powerNode.identifiers[3];
redfish.getRedfishCatalog.resolves(PduCatalog);
nodeApi.getNodeById.resolves(powernode);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'nodeApi' is not defined.
'powernode' is not defined.

@@ -54,7 +55,8 @@ describe('Redfish Power', function () {
this.sandbox.spy(redfish, 'render');
this.sandbox.spy(redfish, 'validateSchema');
this.sandbox.spy(redfish, 'handleError');
this.sandbox.stub(redfish, 'getRedfishCatalog');
this.sandbox.stub(nodeApi, 'getCatalogSourceById');
this.sandbox.stub(nodeApi, 'getNodeById');

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'nodeApi' is not defined.

@@ -54,7 +55,8 @@ describe('Redfish Power', function () {
this.sandbox.spy(redfish, 'render');
this.sandbox.spy(redfish, 'validateSchema');
this.sandbox.spy(redfish, 'handleError');
this.sandbox.stub(redfish, 'getRedfishCatalog');
this.sandbox.stub(nodeApi, 'getCatalogSourceById');

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'nodeApi' is not defined.

@@ -45,6 +45,7 @@ describe('Redfish Power', function () {
redfish = helper.injector.get('Http.Api.Services.Redfish');
waterline = helper.injector.get('Services.Waterline');
Promise = helper.injector.get('Promise');
nodeApi = injector.get('Http.Services.Api.Nodes');

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'nodeApi' is not defined.
'injector' is not defined.

@@ -208,6 +210,8 @@ describe('Redfish Cooling', function () {
waterline.nodes.needByIdentifier.resolves([coolingNode]);
var domain = coolingNode.identifiers[2];
var type = coolingNode.identifiers[3];
nodeApi.getNodeById.resolves(coolingNode);
nodeApi.getCatalogSourceById.resolves(airHandlingUnit0Catalog);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'nodeApi' is not defined.

@@ -208,6 +210,8 @@ describe('Redfish Cooling', function () {
waterline.nodes.needByIdentifier.resolves([coolingNode]);
var domain = coolingNode.identifiers[2];
var type = coolingNode.identifiers[3];
nodeApi.getNodeById.resolves(coolingNode);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'nodeApi' is not defined.

@@ -54,7 +55,8 @@ describe('Redfish Cooling', function () {
this.sandbox.spy(redfish, 'render');
this.sandbox.spy(redfish, 'validateSchema');
this.sandbox.spy(redfish, 'handleError');
this.sandbox.stub(redfish, 'getRedfishCatalog');
this.sandbox.stub(nodeApi, 'getNodeById');
this.sandbox.stub(nodeApi, 'getCatalogSourceById');

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'nodeApi' is not defined.

@@ -54,7 +55,8 @@ describe('Redfish Cooling', function () {
this.sandbox.spy(redfish, 'render');
this.sandbox.spy(redfish, 'validateSchema');
this.sandbox.spy(redfish, 'handleError');
this.sandbox.stub(redfish, 'getRedfishCatalog');
this.sandbox.stub(nodeApi, 'getNodeById');

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'nodeApi' is not defined.

@@ -45,6 +45,7 @@ describe('Redfish Cooling', function () {
redfish = helper.injector.get('Http.Api.Services.Redfish');
waterline = helper.injector.get('Services.Waterline');
Promise = helper.injector.get('Promise');
nodeApi = injector.get('Http.Services.Api.Nodes');

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'nodeApi' is not defined.
'injector' is not defined.

@@ -217,7 +219,8 @@ describe('Redfish Power', function () {
waterline.nodes.needByIdentifier.resolves([powerNode]);
var domain = powerNode.identifiers[2];
var type = powerNode.identifiers[3];
redfish.getRedfishCatalog.resolves(PduCatalog);
nodeApi.getNodeById.resolves(powernode);
nodeApi.getCatalogSourceById.resolves(PduCatalog);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'nodeApi' is not defined.

@@ -217,7 +219,8 @@ describe('Redfish Power', function () {
waterline.nodes.needByIdentifier.resolves([powerNode]);
var domain = powerNode.identifiers[2];
var type = powerNode.identifiers[3];
redfish.getRedfishCatalog.resolves(PduCatalog);
nodeApi.getNodeById.resolves(powernode);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'nodeApi' is not defined.
'powernode' is not defined.

@@ -54,7 +55,8 @@ describe('Redfish Power', function () {
this.sandbox.spy(redfish, 'render');
this.sandbox.spy(redfish, 'validateSchema');
this.sandbox.spy(redfish, 'handleError');
this.sandbox.stub(redfish, 'getRedfishCatalog');
this.sandbox.stub(nodeApi, 'getCatalogSourceById');
this.sandbox.stub(nodeApi, 'getNodeById');

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'nodeApi' is not defined.

@@ -54,7 +55,8 @@ describe('Redfish Power', function () {
this.sandbox.spy(redfish, 'render');
this.sandbox.spy(redfish, 'validateSchema');
this.sandbox.spy(redfish, 'handleError');
this.sandbox.stub(redfish, 'getRedfishCatalog');
this.sandbox.stub(nodeApi, 'getCatalogSourceById');

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'nodeApi' is not defined.

@@ -45,6 +45,7 @@ describe('Redfish Power', function () {
redfish = helper.injector.get('Http.Api.Services.Redfish');
waterline = helper.injector.get('Services.Waterline');
Promise = helper.injector.get('Promise');
nodeApi = injector.get('Http.Services.Api.Nodes');

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'nodeApi' is not defined.
'injector' is not defined.

@@ -208,6 +210,8 @@ describe('Redfish Cooling', function () {
waterline.nodes.needByIdentifier.resolves([coolingNode]);
var domain = coolingNode.identifiers[2];
var type = coolingNode.identifiers[3];
nodeApi.getNodeById.resolves(coolingNode);
nodeApi.getCatalogSourceById.resolves(airHandlingUnit0Catalog);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'nodeApi' is not defined.

@@ -208,6 +210,8 @@ describe('Redfish Cooling', function () {
waterline.nodes.needByIdentifier.resolves([coolingNode]);
var domain = coolingNode.identifiers[2];
var type = coolingNode.identifiers[3];
nodeApi.getNodeById.resolves(coolingNode);

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'nodeApi' is not defined.

@@ -54,7 +55,8 @@ describe('Redfish Cooling', function () {
this.sandbox.spy(redfish, 'render');
this.sandbox.spy(redfish, 'validateSchema');
this.sandbox.spy(redfish, 'handleError');
this.sandbox.stub(redfish, 'getRedfishCatalog');
this.sandbox.stub(nodeApi, 'getNodeById');
this.sandbox.stub(nodeApi, 'getCatalogSourceById');

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'nodeApi' is not defined.

@@ -54,7 +55,8 @@ describe('Redfish Cooling', function () {
this.sandbox.spy(redfish, 'render');
this.sandbox.spy(redfish, 'validateSchema');
this.sandbox.spy(redfish, 'handleError');
this.sandbox.stub(redfish, 'getRedfishCatalog');
this.sandbox.stub(nodeApi, 'getNodeById');

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'nodeApi' is not defined.

@@ -45,6 +45,7 @@ describe('Redfish Cooling', function () {
redfish = helper.injector.get('Http.Api.Services.Redfish');
waterline = helper.injector.get('Services.Waterline');
Promise = helper.injector.get('Promise');
nodeApi = injector.get('Http.Services.Api.Nodes');

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'nodeApi' is not defined.
'injector' is not defined.

@BrentHiggins BrentHiggins force-pushed the redfish_discovery_fix branch 2 times, most recently from d46703b to a3474ab Compare October 17, 2017 16:56
@JenkinsRHD
Copy link
Contributor

BUILD on-http #625 : FAILURE

BUILD on-http #625 Error Logs ▼Test Name: "before each" hook: set up mocks for "/DCIMPower should return a valid power root" Error Details: Cannot stub non-existent own property getCatalogSourceById Stack Trace: TypeError: Cannot stub non-existent own property getCatalogSourceById at Object.stub (node_modules/sinon/lib/sinon/collection.js:93:35) at Context.<anonymous> (spec/lib/api/redfish-1.0/dcimpower-spec.js:59:22)

Test Name: "before each" hook: set up mocks for "/DCIMCooling should return a valid cooling root"
Error Details: Cannot stub non-existent own property getCatalogSourceById
Stack Trace: TypeError: Cannot stub non-existent own property getCatalogSourceById
at Object.stub (node_modules/sinon/lib/sinon/collection.js:93:35)
at Context.<anonymous> (spec/lib/api/redfish-1.0/dcimcooling-spec.js:60:22)

@JenkinsRHD
Copy link
Contributor

BUILD on-http #626 : FAILURE

BUILD on-http #626 Error Logs ▼Test Name: /DCIMPower/{domain}/{type} should return a valid power type Error Details: expected '/redfish/v1/DCIMPower/default/PDU/59b842950fd2170100ecd04a' to equal '/redfish/v1/DCIMPower/default/PDU/PDU0-59b842950fd2170100ecd04a' Response body: { '@odata.type': '#PDUCollection.PDUCollection', Name: 'PDU Collection', 'Members@odata.count': 1, Members: [ { '@odata.id': '/redfish/v1/DCIMPower/default/PDU/59b842950fd2170100ecd04a' } ], '@odata.context': '/redfish/v1/$metadata#PDUCollection', '@odata.id': '/redfish/v1/DCIMPower/default/PDU' } AssertionError: expected '/redfish/v1/DCIMPower/default/PDU/59b842950fd2170100ecd04a' to equal '/redfish/v1/DCIMPower/default/PDU/PDU0-59b842950fd2170100ecd04a' at /RackHD/on-http/spec/lib/api/redfish-1.0/dcimpower-spec.js:213:61 at Test._assertFunction (/RackHD/on-http/node_modules/supertest/lib/test.js:247:11) at Test.assert (/RackHD/on-http/node_modules/supertest/lib/test.js:148:18) at assert (/RackHD/on-http/node_modules/supertest/lib/test.js:127:12) at /RackHD/on-http/node_modules/supertest/lib/test.js:124:5 at Test.Request.callback (/RackHD/on-http/node_modules/supertest/node_modules/superagent/lib/node/index.js:691:12) at IncomingMessage.<anonymous> (/RackHD/on-http/node_modules/supertest/node_modules/superagent/lib/node/index.js:922:12) at emitNone (events.js:72:20) at IncomingMessage.emit (events.js:166:7) at endReadableNT (_stream_readable.js:923:12) at nextTickCallbackWith2Args (node.js:511:9) at process._tickDomainCallback (node.js:466:17) Stack Trace: AssertionError: expected '/redfish/v1/DCIMPower/default/PDU/59b842950fd2170100ecd04a' to equal '/redfish/v1/DCIMPower/default/PDU/PDU0-59b842950fd2170100ecd04a' at spec/lib/api/redfish-1.0/dcimpower-spec.js:213:61 at Test._assertFunction (node_modules/supertest/lib/test.js:247:11) at Test.assert (node_modules/supertest/lib/test.js:148:18) at assert (node_modules/supertest/lib/test.js:127:12) at node_modules/supertest/lib/test.js:124:5 at Test.Request.callback (node_modules/supertest/node_modules/superagent/lib/node/index.js:691:12) at IncomingMessage.<anonymous> (node_modules/supertest/node_modules/superagent/lib/node/index.js:922:12) at endReadableNT (_stream_readable.js:923:12)

Test Name: /DCIMCooling/{domain}/{type} should return a valid cooling type
Error Details: expected '/redfish/v1/DCIMCooling/default/AirHandlingUnit/59b842950fd2170100ecd04c' to equal '/redfish/v1/DCIMCooling/default/AirHandlingUnit/AirHandlingUnit0-59b842950fd2170100ecd04c' Response body: { '@odata.type': '#AirHandlingUnitCollection.AirHandlingUnitCollection', Name: 'AirHandlingUnit Collection', 'Members@odata.count': 1, Members: [ { '@odata.id': '/redfish/v1/DCIMCooling/default/AirHandlingUnit/59b842950fd2170100ecd04c' } ], '@odata.context': '/redfish/v1/$metadata#AirHandlingUnitCollection', '@odata.id': '/redfish/v1/DCIMCooling/default/AirHandlingUnit' } AssertionError: expected '/redfish/v1/DCIMCooling/default/AirHandlingUnit/59b842950fd2170100ecd04c' to equal '/redfish/v1/DCIMCooling/default/AirHandlingUnit/AirHandlingUnit0-59b842950fd2170100ecd04c' at /RackHD/on-http/spec/lib/api/redfish-1.0/dcimcooling-spec.js:204:61 at Test._assertFunction (/RackHD/on-http/node_modules/supertest/lib/test.js:247:11) at Test.assert (/RackHD/on-http/node_modules/supertest/lib/test.js:148:18) at assert (/RackHD/on-http/node_modules/supertest/lib/test.js:127:12) at /RackHD/on-http/node_modules/supertest/lib/test.js:124:5 at Test.Request.callback (/RackHD/on-http/node_modules/supertest/node_modules/superagent/lib/node/index.js:691:12) at IncomingMessage.<anonymous> (/RackHD/on-http/node_modules/supertest/node_modules/superagent/lib/node/index.js:922:12) at emitNone (events.js:72:20) at IncomingMessage.emit (events.js:166:7) at endReadableNT (_stream_readable.js:923:12) at nextTickCallbackWith2Args (node.js:511:9) at process._tickDomainCallback (node.js:466:17)
Stack Trace: AssertionError: expected '/redfish/v1/DCIMCooling/default/AirHandlingUnit/59b842950fd2170100ecd04c' to equal '/redfish/v1/DCIMCooling/default/AirHandlingUnit/AirHandlingUnit0-59b842950fd2170100ecd04c'
at spec/lib/api/redfish-1.0/dcimcooling-spec.js:204:61
at Test._assertFunction (node_modules/supertest/lib/test.js:247:11)
at Test.assert (node_modules/supertest/lib/test.js:148:18)
at assert (node_modules/supertest/lib/test.js:127:12)
at node_modules/supertest/lib/test.js:124:5
at Test.Request.callback (node_modules/supertest/node_modules/superagent/lib/node/index.js:691:12)
at IncomingMessage.<anonymous> (node_modules/supertest/node_modules/superagent/lib/node/index.js:922:12)
at endReadableNT (_stream_readable.js:923:12)

@JenkinsRHD
Copy link
Contributor

BUILD on-http #627 : FAILURE

@BrentHiggins
Copy link
Author

test this please

@larry-dean
Copy link
Contributor

test this please

@jimturnquist jimturnquist merged commit e4da732 into RackHD:master Oct 23, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
5 participants