Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove six[7]

Browse Source 
Since our code will only support py3. So remove six is necessary.

Change-Id: I3738118b1898421ee41e9e2902c255ead73f3915
This commit is contained in:
chenke
2020-04-21 21:22:31 +08:00
committed by chenker
parent 25f313a3ef
commit 0ef0f165cb
51 changed files with 86 additions and 172 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
watcher/decision_engine/model/base.py
View File

@@ -25,11 +25,9 @@ See: :doc:`../architecture` for more details on this component.
"""
import abc
import six
@six.add_metaclass(abc.ABCMeta)
class Model(object):
class Model(object, metaclass=abc.ABCMeta):
@abc.abstractmethod
def to_string(self):

5
watcher/decision_engine/model/collector/base.py
View File

@@ -110,7 +110,6 @@ import time
from oslo_config import cfg
from oslo_log import log
import six
from watcher.common import clients
from watcher.common.loader import loadable
@@ -120,8 +119,8 @@ LOG = log.getLogger(__name__)
CONF = cfg.CONF
@six.add_metaclass(abc.ABCMeta)
class BaseClusterDataModelCollector(loadable.LoadableSingleton):
class BaseClusterDataModelCollector(loadable.LoadableSingleton,
metaclass=abc.ABCMeta):
STALE_MODEL = model_root.ModelRoot(stale=True)

4
watcher/decision_engine/model/collector/cinder.py
View File

@@ -13,8 +13,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import six
from oslo_log import log
from watcher.common import cinder_helper
@@ -286,7 +284,7 @@ class CinderModelBuilder(base.BaseModelBuilder):
:param instance: Cinder Volume object.
:return: A volume node for the graph.
"""
attachments = [{k: v for k, v in six.iteritems(d) if k in (
attachments = [{k: v for k, v in iter(d.items()) if k in (
'server_id', 'attachment_id')} for d in volume.attachments]
volume_attributes = {

4
watcher/decision_engine/model/element/baremetal_resource.py
View File

@@ -16,14 +16,12 @@
import abc
import six
from watcher.decision_engine.model.element import base
from watcher.objects import fields as wfields
@six.add_metaclass(abc.ABCMeta)
class BaremetalResource(base.Element):
class BaremetalResource(base.Element, metaclass=abc.ABCMeta):
VERSION = '1.0'

4
watcher/decision_engine/model/element/base.py
View File

@@ -21,7 +21,6 @@ import collections
from lxml import etree
from oslo_log import log
import six
from watcher.objects import base
from watcher.objects import fields as wfields
@@ -29,9 +28,8 @@ from watcher.objects import fields as wfields
LOG = log.getLogger(__name__)
@six.add_metaclass(abc.ABCMeta)
class Element(base.WatcherObject, base.WatcherObjectDictCompat,
base.WatcherComparableObject):
base.WatcherComparableObject, metaclass=abc.ABCMeta):
# Initial version
VERSION = '1.0'

4
watcher/decision_engine/model/element/compute_resource.py
View File

@@ -16,14 +16,12 @@
import abc
import six
from watcher.decision_engine.model.element import base
from watcher.objects import fields as wfields
@six.add_metaclass(abc.ABCMeta)
class ComputeResource(base.Element):
class ComputeResource(base.Element, metaclass=abc.ABCMeta):
VERSION = '1.0'

4
watcher/decision_engine/model/element/storage_resource.py
View File

@@ -16,14 +16,12 @@
import abc
import six
from watcher.decision_engine.model.element import base
from watcher.objects import fields as wfields
@six.add_metaclass(abc.ABCMeta)
class StorageResource(base.Element):
class StorageResource(base.Element, metaclass=abc.ABCMeta):
VERSION = '1.0'

25
watcher/decision_engine/model/model_root.py
View File

@@ -21,7 +21,6 @@ from lxml import etree
import networkx as nx
from oslo_concurrency import lockutils
from oslo_log import log
import six
from watcher._i18n import _
from watcher.common import exception
@@ -93,9 +92,9 @@ class ModelRoot(nx.DiGraph, base.Model):
:param node: :py:class:`~.node.ComputeNode` object or node UUID
:type node: str or :py:class:`~.instance.Instance`
"""
if isinstance(instance, six.string_types):
if isinstance(instance, str):
instance = self.get_instance_by_uuid(instance)
if isinstance(node, six.string_types):
if isinstance(node, str):
node = self.get_node_by_uuid(node)
self.assert_node(node)
self.assert_instance(instance)
@@ -104,9 +103,9 @@ class ModelRoot(nx.DiGraph, base.Model):
@lockutils.synchronized("model_root")
def unmap_instance(self, instance, node):
if isinstance(instance, six.string_types):
if isinstance(instance, str):
instance = self.get_instance_by_uuid(instance)
if isinstance(node, six.string_types):
if isinstance(node, str):
node = self.get_node_by_uuid(node)
self.remove_edge(instance.uuid, node.uuid)
@@ -367,9 +366,9 @@ class StorageModelRoot(nx.DiGraph, base.Model):
:param pool: :py:class:`~.node.Pool` object or pool name
:param node: :py:class:`~.node.StorageNode` object or node host
"""
if isinstance(pool, six.string_types):
if isinstance(pool, str):
pool = self.get_pool_by_pool_name(pool)
if isinstance(node, six.string_types):
if isinstance(node, str):
node = self.get_node_by_name(node)
self.assert_node(node)
self.assert_pool(pool)
@@ -383,9 +382,9 @@ class StorageModelRoot(nx.DiGraph, base.Model):
:param pool: :py:class:`~.node.Pool` object or pool name
:param node: :py:class:`~.node.StorageNode` object or node name
"""
if isinstance(pool, six.string_types):
if isinstance(pool, str):
pool = self.get_pool_by_pool_name(pool)
if isinstance(node, six.string_types):
if isinstance(node, str):
node = self.get_node_by_name(node)
self.remove_edge(pool.name, node.host)
@@ -411,9 +410,9 @@ class StorageModelRoot(nx.DiGraph, base.Model):
:param volume: :py:class:`~.volume.Volume` object or volume UUID
:param pool: :py:class:`~.node.Pool` object or pool name
"""
if isinstance(volume, six.string_types):
if isinstance(volume, str):
volume = self.get_volume_by_uuid(volume)
if isinstance(pool, six.string_types):
if isinstance(pool, str):
pool = self.get_pool_by_pool_name(pool)
self.assert_pool(pool)
self.assert_volume(volume)
@@ -427,9 +426,9 @@ class StorageModelRoot(nx.DiGraph, base.Model):
:param volume: :py:class:`~.volume.Volume` object or volume UUID
:param pool: :py:class:`~.node.Pool` object or pool name
"""
if isinstance(volume, six.string_types):
if isinstance(volume, str):
volume = self.get_volume_by_uuid(volume)
if isinstance(pool, six.string_types):
if isinstance(pool, str):
pool = self.get_pool_by_pool_name(pool)
self.remove_edge(volume.uuid, pool.name)

4
watcher/decision_engine/model/notification/base.py
View File

@@ -17,11 +17,9 @@
# limitations under the License.
import abc
import six
@six.add_metaclass(abc.ABCMeta)
class NotificationEndpoint(object):
class NotificationEndpoint(object, metaclass=abc.ABCMeta):
def __init__(self, collector):
super(NotificationEndpoint, self).__init__()

4
watcher/decision_engine/model/notification/cinder.py
View File

@@ -14,8 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.
import six
from oslo_log import log
from watcher.common import cinder_helper
from watcher.common import exception
@@ -161,7 +159,7 @@ class CinderNotification(base.NotificationEndpoint):
return 'attachment_id'
attachments = [
{_keyReplace(k): v for k, v in six.iteritems(d)
{_keyReplace(k): v for k, v in iter(d.items())
if k in ('instance_uuid', 'id')}
for d in data['volume_attachment']
]

3
watcher/decision_engine/model/notification/filtering.py
View File

@@ -19,7 +19,6 @@
import re
import oslo_messaging as om
import six
class NotificationFilter(om.NotificationFilter):
@@ -81,7 +80,7 @@ class NotificationFilter(om.NotificationFilter):
elif regex is not None and data is None:
return True
elif (regex is not None and
isinstance(data, six.string_types) and
isinstance(data, str) and
not regex.match(data)):
return True