Nova-all: Replace basestring by six for python3 compatability

The builtin basestring abstract type was removed in python3,
use str instead, we need to using six.string_types to replace
the basestring for py3 compatibility.

Partial Implements bp: basestring-py3-compatible

Change-Id: I17e87e49e7ebf3cc9c391e9beace8c45d2d2b689

nova/cmd/baremetal_manage.py

@@ -57,6 +57,7 @@ import os
 import sys
 
 from oslo.config import cfg
+import six
 
 from nova import config
 from nova.openstack.common import cliutils
@@ -186,7 +187,7 @@ def main():
         v = getattr(CONF.category, 'action_kwarg_' + k)
         if v is None:
             continue
-        if isinstance(v, basestring):
+        if isinstance(v, six.string_types):
             v = v.decode('utf-8')
         fn_kwargs[k] = v
 

nova/cmd/manage.py

@@ -60,6 +60,7 @@ import sys
 
 import netaddr
 from oslo.config import cfg
+import six
 
 from nova.api.ec2 import ec2utils
 from nova import availability_zones
@@ -1357,7 +1358,7 @@ def main():
         v = getattr(CONF.category, 'action_kwarg_' + k)
         if v is None:
             continue
-        if isinstance(v, basestring):
+        if isinstance(v, six.string_types):
             v = v.decode('utf-8')
         fn_kwargs[k] = v