diff --git a/api-ref/source/valence-api-v1-system.inc b/api-ref/source/valence-api-v1-system.inc index fc8616e..c13fb8b 100644 --- a/api-ref/source/valence-api-v1-system.inc +++ b/api-ref/source/valence-api-v1-system.inc @@ -69,6 +69,7 @@ Response - description: node_description - name: system_name - power_state: system_power_state + - health: system_health - chassis_id : system_chassis_id - assettag: system_assettag - url_id : system_url_id diff --git a/ui/src/js/components/home/DetailDisplay.js b/ui/src/js/components/home/DetailDisplay.js index 4526898..131d9a5 100644 --- a/ui/src/js/components/home/DetailDisplay.js +++ b/ui/src/js/components/home/DetailDisplay.js @@ -55,11 +55,14 @@ const DetailDisplay = React.createClass({

Name: {data.Name}

Description: {data.Description}

-

State: {data.Status.State}

-

Health: {data.Status.Health}

-

Processor Count: {data.ProcessorSummary.Count}

-

Processor Model: {data.ProcessorSummary.Model}

-

Total Memory: {data.MemorySummary.TotalSystemMemoryGiB} GiB

+

ID: {data.id}

+

Health: {data.health}

+

System Storage: {data.storage}

+

Processor Count: {data.cpu.cores}

+

Processor Model: {data.cpu.model}

+

Total Memory: {data.ram} GiB

+

Network Interfaces: {data.network}

+

System Location: {data.location}

this.props.onHideDetail()} value="Return" /> diff --git a/ui/src/js/util.js b/ui/src/js/util.js index db307dd..eded853 100644 --- a/ui/src/js/util.js +++ b/ui/src/js/util.js @@ -21,8 +21,6 @@ exports.getPods = function(callback) { $.ajax({ url: url, type: 'GET', - dataType: 'json', - cache: false, success: function(resp) { var chassis = this.listItems(resp['Members']); var pods = this.filterChassis(chassis, 'Pod'); @@ -39,8 +37,6 @@ exports.getRacks = function(callback) { $.ajax({ url: url, type: 'GET', - dataType: 'json', - cache: false, success: function(resp) { var chassis = this.listItems(resp['Members']); var racks = this.filterChassis(chassis, 'Rack'); @@ -53,15 +49,12 @@ exports.getRacks = function(callback) { }; exports.getSystems = function(callback) { - var url = config.url + '/Systems'; + var url = config.url + '/v1/systems'; $.ajax({ url: url, type: 'GET', - dataType: 'json', - cache: false, success: function(resp) { - var systems = this.listItems(resp['Members']); - callback(systems); + callback(resp); }.bind(this), error: function(xhr, status, err) { console.error(url, status, err.toString()); @@ -74,8 +67,6 @@ exports.getNodes = function(callback) { $.ajax({ url: url, type: 'GET', - dataType: 'json', - cache: false, success: function(resp) { var nodes = this.listItems(resp['Members']); callback(nodes); diff --git a/valence/redfish/redfish.py b/valence/redfish/redfish.py index 501204d..5eb27d5 100644 --- a/valence/redfish/redfish.py +++ b/valence/redfish/redfish.py @@ -189,17 +189,21 @@ def systems_list(filters={}): if not filterPassed: continue - systemid = lnk.split("/")[-1] - systemuuid = system['UUID'] - systemlocation = podmtree.getPath(lnk) + system_id = lnk.split("/")[-1] + system_uuid = system['UUID'] + system_name = system['Name'] + system_description = system['Description'] + system_health = system['Status']['Health'] + system_location = podmtree.getPath(lnk) cpu = system_cpu_details(lnk) ram = system_ram_details(lnk) - nw = system_network_details(lnk) + network = system_network_details(lnk) storage = system_storage_details(lnk) - system = {"id": systemid, "cpu": cpu, - "ram": ram, "storage": storage, - "nw": nw, "location": systemlocation, - "uuid": systemuuid} + system = {"Name": system_name, "id": system_id, + "Description": system_description, + "cpu": cpu, "ram": ram, "storage": storage, + "network": network, "location": system_location, + "uuid": system_uuid, "health": system_health} # filter based on RAM, CPU, NETWORK..etc if 'ram' in filters: @@ -210,7 +214,7 @@ def systems_list(filters={}): # filter based on RAM, CPU, NETWORK..etc if 'nw' in filters: filterPassed = (True - if int(nw) >= int(filters['nw']) + if int(network) >= int(filters['network']) else False) # filter based on RAM, CPU, NETWORK..etc