Skip to content

RAC-6167: ServiceRoot changes for JsonShcemas #778

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
jimturnquist merged 2 commits into from
Sep 22, 2017
Merged

RAC-6167: ServiceRoot changes for JsonShcemas #778

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
716482c
ServiceRoot changes for JsonShcemas
larry-dean Sep 15, 2017
95406d1
RAC-6167
jimturnquist Sep 21, 2017
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
4 changes: 2 additions & 2 deletions data/views/redfish-1.0/redfish.1.0.0.jsonschemafilecollection.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,9 @@
"Members": [
<% schemas.forEach(function(schema, i, arr) { %>
{
"@odata.id": "<%= basepath %>/Schemas/<%= schema %>"
"@odata.id": "<%= basepath %>/JsonSchemas/<%= schema %>"
}
<%= ( arr.length > 0 && i < arr.length-1 ) ? ',': '' %>
<% }); %>
]
}
}
3 changes: 3 additions & 0 deletions data/views/redfish-1.0/redfish.1.0.0.serviceroot.1.0.0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,5 +40,8 @@
},
"Registries": {
"@odata.id": "<%=basepath%>/Registries"
},
"JsonSchemas": {
"@odata.id": "<%=basepath%>/JsonSchemas"
}
}
10 changes: 5 additions & 5 deletions spec/lib/api/redfish-1.0/schemas-spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ describe('Redfish Schemas', function () {

it('should return valid schemas', function () {

return helper.request().get('/redfish/v1/Schemas')
return helper.request().get('/redfish/v1/JsonSchemas')
.expect('Content-Type', /^application\/json/)
.expect(200)
.expect(function(res) {
Expand All @@ -45,7 +45,7 @@ describe('Redfish Schemas', function () {

it('should return valid AccountService schema information ', function () {

return helper.request().get('/redfish/v1/Schemas/AccountService.v1_1_0')
return helper.request().get('/redfish/v1/JsonSchemas/AccountService.v1_1_0')
.expect('Content-Type', /^application\/json/)
.expect(200)
.expect(function(res) {
Expand All @@ -64,7 +64,7 @@ describe('Redfish Schemas', function () {
return fs.readFileAsync(fromRoot + '/static/DSP8010_2016.3/metadata/Bios_v1.xml', 'utf8');
})
.then(function(fileContent){
return helper.request().get('/redfish/v1/Schemas/Bios_v1.xml')
return helper.request().get('/redfish/v1/JsonSchemas/Bios_v1.xml')
.expect('Content-Type', "application/xml; charset=utf-8")
.expect(200)
.expect(function(res) {
Expand All @@ -77,7 +77,7 @@ describe('Redfish Schemas', function () {
it('should return invalid xml schema information ', function () {
return Promise.resolve()
.then(function(){
return helper.request().get('/redfish/v1/Schemas/invallid.xml');
return helper.request().get('/redfish/v1/JsonSchemas/invallid.xml');
})
.then(function(done){
done(new Error('should have Failed!'));
Expand All @@ -91,7 +91,7 @@ describe('Redfish Schemas', function () {

it('should return 404 on invalid schema information ', function () {

return helper.request().get('/redfish/v1/Schemas/AccountService.1.0.01')
return helper.request().get('/redfish/v1/JsonSchemas/AccountService.1.0.01')
.expect('Content-Type', /^application\/json/)
.expect(404);
});
Expand Down
4 changes: 2 additions & 2 deletions static/redfish.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2120,7 +2120,7 @@ paths:
description: Error
schema:
$ref: "#/definitions/ErrorResponse"
/Schemas:
/JsonSchemas:
x-swagger-router-controller: schemas
get:
x-privileges: [ 'Login' ]
Expand All @@ -2141,7 +2141,7 @@ paths:
description: Error
schema:
$ref: "#/definitions/ErrorResponse"
/Schemas/{identifier}:
/JsonSchemas/{identifier}:
x-swagger-router-controller: schemas
get:
x-privileges: [ 'Login' ]
Expand Down
88 changes: 44 additions & 44 deletions static/redfishMetadata.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,163 +1,163 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Copyright 2014-2016 Distributed Management Task Force, Inc. (DMTF). All rights reserved.-->
<edmx:Edmx xmlns:edmx="http://docs.oasis-open.org/odata/ns/edmx" Version="4.0">
<edmx:Reference Uri="/redfish/v1/Schemas/ServiceRoot_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/ServiceRoot_v1.xml">
<edmx:Include Namespace="ServiceRoot"/>
<edmx:Include Namespace="ServiceRoot.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/AccountService_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/AccountService_v1.xml">
<edmx:Include Namespace="AccountService"/>
<edmx:Include Namespace="AccountService.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/Chassis_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/Chassis_v1.xml">
<edmx:Include Namespace="Chassis"/>
<edmx:Include Namespace="Chassis.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/ChassisCollection_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/ChassisCollection_v1.xml">
<edmx:Include Namespace="ChassisCollection"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/ComputerSystem_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/ComputerSystem_v1.xml">
<edmx:Include Namespace="ComputerSystem"/>
<edmx:Include Namespace="ComputerSystem.v1_0_0"/>
<edmx:Include Namespace="ComputerSystem.v1_1_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/ComputerSystemCollection_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/ComputerSystemCollection_v1.xml">
<edmx:Include Namespace="ComputerSystemCollection"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/EthernetInterface_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/EthernetInterface_v1.xml">
<edmx:Include Namespace="EthernetInterface"/>
<edmx:Include Namespace="EthernetInterface.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/EthernetInterfaceCollection_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/EthernetInterfaceCollection_v1.xml">
<edmx:Include Namespace="EthernetInterfaceCollection"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/EventService_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/EventService_v1.xml">
<edmx:Include Namespace="EventService"/>
<edmx:Include Namespace="EventService.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/JsonSchemaFile_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/JsonSchemaFile_v1.xml">
<edmx:Include Namespace="JsonSchemaFile"/>
<edmx:Include Namespace="JsonSchemaFile.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/JsonSchemaFileCollection_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/JsonSchemaFileCollection_v1.xml">
<edmx:Include Namespace="JsonSchemaFileCollection" />
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/EventDestination_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/EventDestination_v1.xml">
<edmx:Include Namespace="EventDestination" />
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/EventDestinationCollection_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/EventDestinationCollection_v1.xml">
<edmx:Include Namespace="EventDestinationCollection"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/LogEntry_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/LogEntry_v1.xml">
<edmx:Include Namespace="LogEntry"/>
<edmx:Include Namespace="LogEntry.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/LogEntryCollection_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/LogEntryCollection_v1.xml">
<edmx:Include Namespace="LogEntryCollection"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/Role_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/Role_v1.xml">
<edmx:Include Namespace="Role"/>
<edmx:Include Namespace="Role.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/RoleCollection_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/RoleCollection_v1.xml">
<edmx:Include Namespace="RoleCollection"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/LogService_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/LogService_v1.xml">
<edmx:Include Namespace="LogService"/>
<edmx:Include Namespace="LogService.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/LogServiceCollection_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/LogServiceCollection_v1.xml">
<edmx:Include Namespace="LogServiceCollection"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/Manager_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/Manager_v1.xml">
<edmx:Include Namespace="Manager"/>
<edmx:Include Namespace="Manager.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/ManagerCollection_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/ManagerCollection_v1.xml">
<edmx:Include Namespace="ManagerCollection"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/ManagerAccount_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/ManagerAccount_v1.xml">
<edmx:Include Namespace="ManagerAccount"/>
<edmx:Include Namespace="ManagerAccount.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/ManagerAccountCollection_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/ManagerAccountCollection_v1.xml">
<edmx:Include Namespace="ManagerAccountCollection" />
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/ManagerNetworkProtocol_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/ManagerNetworkProtocol_v1.xml">
<edmx:Include Namespace="ManagerNetworkProtocol" />
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/Message_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/Message_v1.xml">
<edmx:Include Namespace="Message"/>
<edmx:Include Namespace="Message.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/MessageRegistry_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/MessageRegistry_v1.xml">
<edmx:Include Namespace="MessageRegistry"/>
<edmx:Include Namespace="MessageRegistry.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/MessageRegistryCollection_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/MessageRegistryCollection_v1.xml">
<edmx:Include Namespace="MessageRegistryCollection" />
<edmx:Include Namespace="MessageRegistryCollection.v1_0_0" />
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/MessageRegistryFile_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/MessageRegistryFile_v1.xml">
<edmx:Include Namespace="MessageRegistryFile"/>
<edmx:Include Namespace="MessageRegistryFile.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/MessageRegistryFileCollection_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/MessageRegistryFileCollection_v1.xml">
<edmx:Include Namespace="MessageRegistryFileCollection"/>
<edmx:Include Namespace="MessageRegistryFileCollection.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/Power_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/Power_v1.xml">
<edmx:Include Namespace="Power"/>
<edmx:Include Namespace="Power.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/Processor_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/Processor_v1.xml">
<edmx:Include Namespace="Processor"/>
<edmx:Include Namespace="Processor.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/ProcessorCollection_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/ProcessorCollection_v1.xml">
<edmx:Include Namespace="ProcessorCollection"/>
<edmx:Include Namespace="ProcessorCollection.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/SerialInterfaceCollection_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/SerialInterfaceCollection_v1.xml">
<edmx:Include Namespace="SerialInterfaceCollection"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/SerialInterface_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/SerialInterface_v1.xml">
<edmx:Include Namespace="SerialInterface"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/Session_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/Session_v1.xml">
<edmx:Include Namespace="Session"/>
<edmx:Include Namespace="Session.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/SessionCollection_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/SessionCollection_v1.xml">
<edmx:Include Namespace="SessionCollection"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/SessionService_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/SessionService_v1.xml">
<edmx:Include Namespace="SessionService"/>
<edmx:Include Namespace="SessionService.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/SimpleStorage_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/SimpleStorage_v1.xml">
<edmx:Include Namespace="SimpleStorage"/>
<edmx:Include Namespace="SimpleStorage.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/SimpleStorageCollection_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/SimpleStorageCollection_v1.xml">
<edmx:Include Namespace="SimpleStorageCollection"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/Task_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/Task_v1.xml">
<edmx:Include Namespace="Task"/>
<edmx:Include Namespace="Task.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/TaskCollection_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/TaskCollection_v1.xml">
<edmx:Include Namespace="TaskCollection"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/TaskService_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/TaskService_v1.xml">
<edmx:Include Namespace="TaskService"/>
<edmx:Include Namespace="TaskService.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/Thermal_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/Thermal_v1.xml">
<edmx:Include Namespace="Thermal"/>
<edmx:Include Namespace="Thermal.v1_0_0"/>
</edmx:Reference>
<edmx:Reference Uri="/redfish/v1/Schemas/UpdateService_v1.xml">
<edmx:Reference Uri="/redfish/v1/JsonSchemas/UpdateService_v1.xml">
<edmx:Include Namespace="UpdateService"/>
<edmx:Include Namespace="UpdateService.v1_0_1"/>
<edmx:Include Namespace="UpdateService.v1_1_0"/>
Expand Down