Skip to content

Conversation

@dalebremner
Copy link
Contributor

@dalebremner dalebremner commented Feb 9, 2017

Merge master to feature branch

nucklehead and others added 30 commits June 16, 2016 14:05
Conflicts:
	lib/jobs/install-os.js

Merge branch 'master' of https://github.com/RackHD/on-http

Conflicts:
	data/templates/esx-ks
	accepted origin/master code

Conflicts:
	data/templates/centos-ks

Merge branch 'master' of https://github.com/RackHD/on-taskgraph

Conflicts:
	lib/graphs/install-esx-graph.js
    accepted origin/master code
… interfaces is passed.

Updated Esx-ks to dowload callback script in %post and run in %firstboot
add swagger python-client deb build back
add the identifier property to the node schema
that json encoding escapes on and renders incorrectly.
This removes those characters and allows correct encoding.

Signed-off-by: Ethan Kaley <ethan.kaley@emc.com>
Fixed typos
Further explained the issue and need for fix
Cisco Version Header string contains extra escape characters
…esx-kickstart-update

Conflicts:
	data/templates/esx-ks
- Set bmc credentials used to get user count of enabled bmc users
  It should get the toal nb of bmc users
- Remove users fails the user list command; Added logic to get the open channel nb
- Migrate set bms credentials from discovery graph to Discovery-sku-graph
  in discovery graph, group label is set in bootstrap
  and it overides the tasks properties
geoff-reid and others added 12 commits February 6, 2017 12:58
'Allowing for systems with more than 26 drives'
 * There is problem with PATCH method schema which require url
   attribute. Also there are typos and style problems.
 * Separate schemas are created for POST/PATCH method to solve schema
   problem. Typos are also fixed.
Bugfix for set bmc credentials
prevent render error if networkDevices is not defined
Update Redfish schemas to 2016.3
Add Deprecation Warning Header to 1.1 northbound/southbound router
Conflicts:
	static/monorail-2.0.yaml
	static/schemas/2.0/node.2.0.json

var path = helper.injector.get('path');
return validator.addNamespace(path.resolve(__dirname, '../../../static/DSP8010_1.0.0/json-schema'),
return validator.addNamespace(path.resolve(__dirname, '../../../static/DSP8010_2016.3/json-schema'),

Choose a reason for hiding this comment

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

Line is too long.

_,
Errors
) {
var logger = Logger.initialize(hookApiServiceFactory);

Choose a reason for hiding this comment

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

'logger' is defined but never used.

@JenkinsRHD
Copy link
Contributor

BUILD on-http #3232 : FAILURE

BUILD unit-tests #11582 Error Logs ▼Test Name: 2.0 Http.Api.Nodes GET /nodes/:identifier/ssh should return a list of the node's ssh settings Error Details: Cannot read property 'findAllByNode' of undefined Stack Trace: TypeError: Cannot read property 'findAllByNode' of undefined at Context.<anonymous> (spec/lib/api/2.0/nodes-spec.js:383:27)

Test Name: 2.0 Http.Api.Nodes GET /nodes/:identifier/ssh should return a 404 if the node has no ssh settings
Error Details: Cannot read property 'findAllByNode' of undefined
Stack Trace: TypeError: Cannot read property 'findAllByNode' of undefined
at Context.<anonymous> (spec/lib/api/2.0/nodes-spec.js:400:27)

Test Name: 2.0 Http.Api.Nodes POST /nodes/:identifier/ssh should replace existing settings with a new set of ssh settings
Error Details: Cannot read property 'upsertByNode' of undefined
Stack Trace: TypeError: Cannot read property 'upsertByNode' of undefined
at Context.<anonymous> (spec/lib/api/2.0/nodes-spec.js:436:27)

Test Name: 2.0 Http.Api.Nodes POST /nodes/:identifier/ssh should add a new set of ssh settings if none exist
Error Details: Cannot read property 'upsertByNode' of undefined
Stack Trace: TypeError: Cannot read property 'upsertByNode' of undefined
at Context.<anonymous> (spec/lib/api/2.0/nodes-spec.js:449:27)

Test Name: Http.Api.Ibms /api/2.0/ibms should return a list of IBM instances
Error Details: Should wrap property of object
Stack Trace: TypeError: Should wrap property of object
at Object.wrapMethod (node_modules/sinon/lib/sinon/util/core.js:67:23)
at Object.stub (node_modules/sinon/lib/sinon/stub.js:61:26)
at Context.<anonymous> (spec/lib/api/2.0/ibms-spec.js:106:26)

Test Name: Http.Api.Ibms /api/2.0/ibms should put an IBM instance
Error Details: Should wrap property of object
Stack Trace: TypeError: Should wrap property of object
at Object.wrapMethod (node_modules/sinon/lib/sinon/util/core.js:67:23)
at Object.stub (node_modules/sinon/lib/sinon/stub.js:61:26)
at Context.<anonymous> (spec/lib/api/2.0/ibms-spec.js:121:26)

Test Name: Http.Api.Ibms /api/2.0/ibms should 400 when put with unloaded schema
Error Details: Should wrap property of object
Stack Trace: TypeError: Should wrap property of object
at Object.wrapMethod (node_modules/sinon/lib/sinon/util/core.js:67:23)
at Object.stub (node_modules/sinon/lib/sinon/stub.js:61:26)
at Context.<anonymous> (spec/lib/api/2.0/ibms-spec.js:133:26)

Test Name: Http.Api.Ibms /api/2.0/ibms should 400 when put with missing field
Error Details: Should wrap property of object
Stack Trace: TypeError: Should wrap property of object
at Object.wrapMethod (node_modules/sinon/lib/sinon/util/core.js:67:23)
at Object.stub (node_modules/sinon/lib/sinon/stub.js:61:26)
at Context.<anonymous> (spec/lib/api/2.0/ibms-spec.js:145:26)

Test Name: Http.Api.Ibms /api/2.0/ibms/:id "before each" hook for "should get an IBM instance"
Error Details: Should wrap property of object
Stack Trace: TypeError: Should wrap property of object
at Object.wrapMethod (node_modules/sinon/lib/sinon/util/core.js:67:23)
at Object.stub (node_modules/sinon/lib/sinon/stub.js:61:26)
at Context.<anonymous> (spec/lib/api/2.0/ibms-spec.js:160:19)

Test Name: Http.Api.Ibms /api/2.0/ibms/:id "after each" hook for "should get an IBM instance"
Error Details: Cannot read property 'needByIdentifier' of undefined
Stack Trace: TypeError: Cannot read property 'needByIdentifier' of undefined
at Context.<anonymous> (spec/lib/api/2.0/ibms-spec.js:166:27)

@yyscamper
Copy link
Contributor

@dalebremner : please rebase your branch, as I see a lot code shouldn't belong to your PR.

@brianparry
Copy link
Contributor

@yyscamper This PR is just to merge master into the feature branch to resolve conflicts. It's not even really intended for review. The code shown is here is code in master that wasn't previously in the feature branch which is appropriate for what we're doing. Since the feature branch is public, it is unsafe to rebase because of the effect it could have on downstream developers (see: https://git-scm.com/docs/git-rebase#_recovering_from_upstream_rebase). The real PR for review is the one up against master #570

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.