From 7b02954da81b6fd2f6986508046fb95a15d093f0 Mon Sep 17 00:00:00 2001 From: Jarrod Johnson Date: Fri, 29 May 2015 11:17:44 -0400 Subject: [PATCH] Reorder core resource list in alphabetical order Clean up ordering to be in (roughly) alphabetical order so it's a tad easier to follow. --- confluent_server/confluent/core.py | 32 +++++++++++++++--------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/confluent_server/confluent/core.py b/confluent_server/confluent/core.py index 8c27e360..82d0f0cd 100644 --- a/confluent_server/confluent/core.py +++ b/confluent_server/confluent/core.py @@ -108,6 +108,16 @@ class PluginCollection(object): # _ prefix indicates internal use (e.g. special console scheme) and should not # be enumerated in any collection noderesources = { + 'attributes': { + 'all': PluginRoute({'handler': 'attributes'}), + 'current': PluginRoute({'handler': 'attributes'}), + }, + 'boot': { + 'nextdevice': PluginRoute({ + 'pluginattrs': ['hardwaremanagement.method'], + 'default': 'ipmi', + }), + }, '_console': { 'session': PluginRoute({ 'pluginattrs': ['console.method'], @@ -125,12 +135,6 @@ noderesources = { }) } }, - 'power': { - 'state': PluginRoute({ - 'pluginattrs': ['hardwaremanagement.method'], - 'default': 'ipmi', - }), - }, 'health': { 'hardware': PluginRoute({ 'pluginattrs': ['hardwaremanagement.method'], @@ -141,16 +145,6 @@ noderesources = { 'pluginattrs': ['hardwaremanagement.method'], 'default': 'ipmi', }), - 'boot': { - 'nextdevice': PluginRoute({ - 'pluginattrs': ['hardwaremanagement.method'], - 'default': 'ipmi', - }), - }, - 'attributes': { - 'all': PluginRoute({'handler': 'attributes'}), - 'current': PluginRoute({'handler': 'attributes'}), - }, 'inventory': { 'hardware': { 'all': PluginCollection({ @@ -159,6 +153,12 @@ noderesources = { }), }, }, + 'power': { + 'state': PluginRoute({ + 'pluginattrs': ['hardwaremanagement.method'], + 'default': 'ipmi', + }), + }, 'sensors': { 'hardware': { 'all': PluginCollection({