Merge "Fix h305 python import order issue"

HACKING.rst

@@ -1,4 +1,8 @@
-plasma Style Commandments
+Valence Style Commandments
-===============================================
+===========================
 
-Read the OpenStack Style Commandments http://docs.openstack.org/developer/hacking/
+Read the OpenStack Style Commandments
+http://docs.openstack.org/developer/hacking/
+
+- [H305] Organize your imports according to 'Import order template' mentioned
+  in http://docs.openstack.org/developer/hacking/#import-order-template

valence/api/app.py

@@ -10,9 +10,11 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-from flask import Flask
 import logging
 from logging.handlers import RotatingFileHandler
+
+from flask import Flask
+
 from valence import config as cfg
 
 _app = None

valence/api/link.py

@@ -14,6 +14,7 @@
 
 
 from flask import request
+
 from valence.api import base
 from valence.api import types
 

valence/api/root.py

@@ -12,11 +12,13 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import json
+
 from flask import abort
 from flask import request
 from flask import Response
 from flask_restful import Resource
-import json
+
 from valence.api import base
 from valence.api import link
 from valence.api import types

valence/api/route.py

@@ -14,6 +14,7 @@
 
 from flask_cors import CORS
 from flask_restful import Api
+
 from valence.api import app as flaskapp
 from valence.api.root import PODMProxy
 from valence.api.root import Root

valence/api/types.py

@@ -11,6 +11,7 @@
 #    under the License.
 
 import logging
+
 import six
 
 LOG = logging.getLogger(__name__)

valence/api/v1/flavor.py

@@ -12,9 +12,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import logging
+
 from flask import request
 from flask_restful import Resource
-import logging
+
 from valence.flavor import flavor
 
 LOG = logging.getLogger(__name__)

valence/api/v1/nodes.py

@@ -12,11 +12,12 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import logging
 
 from flask import request
 from flask_restful import abort
 from flask_restful import Resource
-import logging
+
 from valence.redfish import redfish as rfs
 
 LOG = logging.getLogger(__name__)

valence/api/v1/storages.py

@@ -12,9 +12,10 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import logging
+
 from flask_restful import abort
 from flask_restful import Resource
-import logging
 
 LOG = logging.getLogger(__name__)
 

valence/api/v1/systems.py

@@ -12,10 +12,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import logging
 
 from flask import request
 from flask_restful import Resource
-import logging
+
 from valence.redfish import redfish as rfs
 
 LOG = logging.getLogger(__name__)

valence/api/v1/version.py

@@ -12,10 +12,11 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
+import json
 
 from flask import request
 from flask_restful import Resource
-import json
+
 from valence.api import base
 from valence.api import link
 from valence.api import types

valence/flavor/flavor.py

@@ -15,6 +15,7 @@
 from importlib import import_module
 import logging
 import os
+
 from valence.redfish import redfish as rfs
 
 FLAVOR_PLUGIN_PATH = os.path.dirname(os.path.abspath(__file__)) + '/plugins'

valence/redfish/redfish.py

@@ -16,8 +16,10 @@
 import json
 import logging
 import os
+
 import requests
 from requests.auth import HTTPBasicAuth
+
 from valence import config as cfg
 from valence.redfish import tree