Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 3 additions & 3 deletions lib/api/2.0/nodes.js
Original file line number Diff line number Diff line change
Expand Up @@ -145,9 +145,9 @@ var nodesGetRelations = controller(function(req) {
return nodes.getNodeRelations(req.swagger.params.identifier.value);
});

var nodesGetObmsByNodeId = controller(function(req) {
/*var nodesGetObmsByNodeId = controller(function(req) {
return nodes.getObmsByNodeId(req.swagger.params.identifier.value);
});
});*/

var nodesPutObmsByNodeId = controller({success: 201}, function(req) {
return nodes.putObmsByNodeId(req.swagger.params.identifier.value, req.body);
Expand All @@ -174,6 +174,6 @@ module.exports = {
nodesDelRelations: nodesDelRelations,
nodesAddRelations: nodesAddRelations,
nodesGetRelations: nodesGetRelations,
nodesGetObmsByNodeId: nodesGetObmsByNodeId,
//nodesGetObmsByNodeId: nodesGetObmsByNodeId,
nodesPutObmsByNodeId: nodesPutObmsByNodeId
};
4 changes: 2 additions & 2 deletions lib/services/nodes-api-service.js
Original file line number Diff line number Diff line change
Expand Up @@ -711,7 +711,7 @@ function nodeApiServiceFactory(
* @param {String} id
* @return {Promise} Resolves to an array of OBMs
*/
NodeApiService.prototype.getObmsByNodeId = function(id) {
/*NodeApiService.prototype.getObmsByNodeId = function(id) {
return waterline.nodes.getNodeById(id)
.then(function (node){
if (!node) {
Expand All @@ -721,7 +721,7 @@ function nodeApiServiceFactory(
}
return waterline.obms.findAllByNode(id, false);
});
};
};*/

/**
* Create an OBM for the specified Node id
Expand Down
4 changes: 2 additions & 2 deletions spec/lib/api/2.0/nodes-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -829,7 +829,7 @@ describe('2.0 Http.Api.Nodes', function () {
});
});

describe('OBM support', function() {
/*describe('OBM support', function() {

var obm = {
service: 'ipmi-obm-service',
Expand Down Expand Up @@ -871,6 +871,6 @@ describe('2.0 Http.Api.Nodes', function () {
expect(nodesApi.putObmsByNodeId).to.have.been.calledWith('123',obm);
});
});
});
});*/

});
4 changes: 2 additions & 2 deletions spec/lib/services/nodes-api-service-spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -1222,7 +1222,7 @@ describe("Http.Services.Api.Nodes", function () {
});
});

describe('Obms', function() {
/*describe('Obms', function() {

var node = {
id: '1234abcd1234abcd1234abcd',
Expand Down Expand Up @@ -1297,5 +1297,5 @@ describe("Http.Services.Api.Nodes", function () {
.to.be.rejectedWith(Errors.NotFoundError);
});

});
});*/
});
69 changes: 0 additions & 69 deletions static/monorail-2.0.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -1627,75 +1627,6 @@ paths:
- Read
- catalogsRead
x-swagger-router-controller: nodes
/nodes/{identifier}/obm:
get:
description: Get all the OBM settings for the specified node.
operationId: nodesGetObmsByNodeId
parameters:
- description: The Node identifier
in: path
name: identifier
required: true
type: string
responses:
200:
description: Successfully retrieved the specified OBM service
schema:
type: array
items:
$ref: '#/definitions/obm'
default:
description: Unexpected error
schema:
$ref: '#/definitions/Error'
summary: Get all OBM services
tags:
- /api/2.0
x-authentication-type:
- jwt
x-privileges:
- Read
- obmsRead
x-view: obm.2.0.json
put:
description: Create or update the specified OBM service with the associated Node ID
operationId: nodesPutObmsByNodeId
parameters:
- description: The Node identifier
in: path
name: identifier
required: true
type: string
- description: The OBM settings information to create
in: body
name: body
required: true
schema:
$ref: '#/definitions/nodes_post_obm_by_id'
responses:
201:
description: Successfully put the OBM service
schema:
type: object
500:
description: OBM service creation failed
schema:
$ref: '#/definitions/Error'
default:
description: Unexpected error
schema:
$ref: '#/definitions/Error'
summary: Put an OBM service
tags:
- /api/2.0
x-authentication-type:
- jwt
x-privileges:
- Write
- obmsWrite
x-swagger-schema: obm
x-view: obm.2.0.json
x-swagger-router-controller: nodes
/nodes/{identifier}/pollers:
get:
description: Get a list of all of the pollers for the specified node.
Expand Down