Remove six murano/engine
Depends-On: https://review.opendev.org/#/c/720860/ Change-Id: Ib10d9e191ec93e55a0982d29de9a62a7b5d1894f
This commit is contained in:
parent
f3f2a4019a
commit
aa5f945088
|
@ -30,9 +30,9 @@ from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
from oslo_log import versionutils
|
from oslo_log import versionutils
|
||||||
from oslo_utils import fileutils
|
from oslo_utils import fileutils
|
||||||
import six
|
|
||||||
|
|
||||||
from murano.common import auth_utils
|
from murano.common import auth_utils
|
||||||
|
from murano.common import utils
|
||||||
from murano.dsl import constants
|
from murano.dsl import constants
|
||||||
from murano.dsl import exceptions
|
from murano.dsl import exceptions
|
||||||
from murano.dsl import helpers
|
from murano.dsl import helpers
|
||||||
|
@ -133,9 +133,9 @@ class ApiPackageLoader(package_loader.MuranoPackageLoader):
|
||||||
self._lock_usage(package_definition)
|
self._lock_usage(package_definition)
|
||||||
except LookupError:
|
except LookupError:
|
||||||
exc_info = sys.exc_info()
|
exc_info = sys.exc_info()
|
||||||
six.reraise(exceptions.NoPackageForClassFound,
|
utils.reraise(exceptions.NoPackageForClassFound,
|
||||||
exceptions.NoPackageForClassFound(class_name),
|
exceptions.NoPackageForClassFound(class_name),
|
||||||
exc_info[2])
|
exc_info[2])
|
||||||
return self._to_dsl_package(
|
return self._to_dsl_package(
|
||||||
self._get_package_by_definition(package_definition))
|
self._get_package_by_definition(package_definition))
|
||||||
|
|
||||||
|
@ -159,9 +159,9 @@ class ApiPackageLoader(package_loader.MuranoPackageLoader):
|
||||||
self._lock_usage(package_definition)
|
self._lock_usage(package_definition)
|
||||||
except LookupError:
|
except LookupError:
|
||||||
exc_info = sys.exc_info()
|
exc_info = sys.exc_info()
|
||||||
six.reraise(exceptions.NoPackageFound,
|
utils.reraise(exceptions.NoPackageFound,
|
||||||
exceptions.NoPackageFound(package_name),
|
exceptions.NoPackageFound(package_name),
|
||||||
exc_info[2])
|
exc_info[2])
|
||||||
else:
|
else:
|
||||||
package = self._get_package_by_definition(package_definition)
|
package = self._get_package_by_definition(package_definition)
|
||||||
self._fixations[package_name].add(package.version)
|
self._fixations[package_name].add(package.version)
|
||||||
|
@ -269,9 +269,9 @@ class ApiPackageLoader(package_loader.MuranoPackageLoader):
|
||||||
package_id, str(e)
|
package_id, str(e)
|
||||||
)
|
)
|
||||||
exc_info = sys.exc_info()
|
exc_info = sys.exc_info()
|
||||||
six.reraise(pkg_exc.PackageLoadError,
|
utils.reraise(pkg_exc.PackageLoadError,
|
||||||
pkg_exc.PackageLoadError(msg),
|
pkg_exc.PackageLoadError(msg),
|
||||||
exc_info[2])
|
exc_info[2])
|
||||||
package_file = None
|
package_file = None
|
||||||
try:
|
try:
|
||||||
with tempfile.NamedTemporaryFile(delete=False) as package_file:
|
with tempfile.NamedTemporaryFile(delete=False) as package_file:
|
||||||
|
@ -294,9 +294,9 @@ class ApiPackageLoader(package_loader.MuranoPackageLoader):
|
||||||
except IOError:
|
except IOError:
|
||||||
msg = 'Unable to extract package data for %s' % package_id
|
msg = 'Unable to extract package data for %s' % package_id
|
||||||
exc_info = sys.exc_info()
|
exc_info = sys.exc_info()
|
||||||
six.reraise(pkg_exc.PackageLoadError,
|
utils.reraise(pkg_exc.PackageLoadError,
|
||||||
pkg_exc.PackageLoadError(msg),
|
pkg_exc.PackageLoadError(msg),
|
||||||
exc_info[2])
|
exc_info[2])
|
||||||
finally:
|
finally:
|
||||||
try:
|
try:
|
||||||
if package_file:
|
if package_file:
|
||||||
|
|
|
@ -18,6 +18,7 @@ import datetime
|
||||||
import os
|
import os
|
||||||
import os.path
|
import os.path
|
||||||
import time
|
import time
|
||||||
|
import urllib
|
||||||
import uuid
|
import uuid
|
||||||
|
|
||||||
from cryptography.hazmat.backends import default_backend
|
from cryptography.hazmat.backends import default_backend
|
||||||
|
@ -28,7 +29,6 @@ import eventlet.event
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
from oslo_serialization import base64
|
from oslo_serialization import base64
|
||||||
import six
|
|
||||||
from yaql import specs
|
from yaql import specs
|
||||||
|
|
||||||
import murano.common.exceptions as exceptions
|
import murano.common.exceptions as exceptions
|
||||||
|
@ -306,7 +306,7 @@ class Agent(object):
|
||||||
|
|
||||||
def _is_url(self, file):
|
def _is_url(self, file):
|
||||||
file = self._get_url(file)
|
file = self._get_url(file)
|
||||||
parts = six.moves.urllib.parse.urlsplit(file)
|
parts = urllib.parse.urlsplit(file)
|
||||||
if not parts.scheme or not parts.netloc:
|
if not parts.scheme or not parts.netloc:
|
||||||
return False
|
return False
|
||||||
else:
|
else:
|
||||||
|
|
|
@ -19,7 +19,6 @@ import socket
|
||||||
from oslo_config import cfg
|
from oslo_config import cfg
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
import oslo_messaging as messaging
|
import oslo_messaging as messaging
|
||||||
import six
|
|
||||||
|
|
||||||
from murano.common import uuidutils
|
from murano.common import uuidutils
|
||||||
from murano.dsl import dsl
|
from murano.dsl import dsl
|
||||||
|
@ -40,7 +39,7 @@ class StatusReporter(object):
|
||||||
StatusReporter.transport,
|
StatusReporter.transport,
|
||||||
publisher_id=uuidutils.generate_uuid(),
|
publisher_id=uuidutils.generate_uuid(),
|
||||||
topics=['murano'])
|
topics=['murano'])
|
||||||
if isinstance(environment, six.string_types):
|
if isinstance(environment, str):
|
||||||
self._environment_id = environment
|
self._environment_id = environment
|
||||||
else:
|
else:
|
||||||
self._environment_id = environment.id
|
self._environment_id = environment.id
|
||||||
|
|
|
@ -24,7 +24,6 @@ import jsonpointer
|
||||||
from oslo_config import cfg as oslo_cfg
|
from oslo_config import cfg as oslo_cfg
|
||||||
from oslo_log import log as logging
|
from oslo_log import log as logging
|
||||||
from oslo_serialization import base64
|
from oslo_serialization import base64
|
||||||
import six
|
|
||||||
from yaql.language import specs
|
from yaql.language import specs
|
||||||
from yaql.language import utils
|
from yaql.language import utils
|
||||||
from yaql.language import yaqltypes
|
from yaql.language import yaqltypes
|
||||||
|
@ -67,7 +66,7 @@ def pselect(collection, composer):
|
||||||
@specs.parameter('mappings', collections.Mapping)
|
@specs.parameter('mappings', collections.Mapping)
|
||||||
@specs.extension_method
|
@specs.extension_method
|
||||||
def bind(obj, mappings):
|
def bind(obj, mappings):
|
||||||
if isinstance(obj, six.string_types) and obj.startswith('$'):
|
if isinstance(obj, str) and obj.startswith('$'):
|
||||||
value = _convert_macro_parameter(obj[1:], mappings)
|
value = _convert_macro_parameter(obj[1:], mappings)
|
||||||
if value is not None:
|
if value is not None:
|
||||||
return value
|
return value
|
||||||
|
@ -78,7 +77,7 @@ def bind(obj, mappings):
|
||||||
for key, value in obj.items():
|
for key, value in obj.items():
|
||||||
result[bind(key, mappings)] = bind(value, mappings)
|
result[bind(key, mappings)] = bind(value, mappings)
|
||||||
return result
|
return result
|
||||||
elif isinstance(obj, six.string_types) and obj.startswith('$'):
|
elif isinstance(obj, str) and obj.startswith('$'):
|
||||||
value = _convert_macro_parameter(obj[1:], mappings)
|
value = _convert_macro_parameter(obj[1:], mappings)
|
||||||
if value is not None:
|
if value is not None:
|
||||||
return value
|
return value
|
||||||
|
@ -90,7 +89,7 @@ def _convert_macro_parameter(macro, mappings):
|
||||||
|
|
||||||
def replace(match):
|
def replace(match):
|
||||||
replaced[0] = True
|
replaced[0] = True
|
||||||
return six.text_type(mappings.get(match.group(1)))
|
return str(mappings.get(match.group(1)))
|
||||||
|
|
||||||
result = re.sub('{(\\w+?)}', replace, macro)
|
result = re.sub('{(\\w+?)}', replace, macro)
|
||||||
if replaced[0]:
|
if replaced[0]:
|
||||||
|
|
|
@ -11,7 +11,6 @@
|
||||||
# under the License.
|
# under the License.
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
import six
|
|
||||||
from yaql import contexts
|
from yaql import contexts
|
||||||
from yaql import specs
|
from yaql import specs
|
||||||
|
|
||||||
|
@ -51,7 +50,7 @@ class TestMockContextManager(mock_context_manager.MockContextManager):
|
||||||
|
|
||||||
class MockRunner(runner.Runner):
|
class MockRunner(runner.Runner):
|
||||||
def __init__(self, model, package_loader, functions):
|
def __init__(self, model, package_loader, functions):
|
||||||
if isinstance(model, six.string_types):
|
if isinstance(model, str):
|
||||||
model = om.Object(model)
|
model = om.Object(model)
|
||||||
model = om.build_model(model)
|
model = om.build_model(model)
|
||||||
if 'Objects' not in model:
|
if 'Objects' not in model:
|
||||||
|
|
|
@ -17,7 +17,6 @@ import re
|
||||||
|
|
||||||
import mock
|
import mock
|
||||||
import semantic_version
|
import semantic_version
|
||||||
import six
|
|
||||||
import yaql
|
import yaql
|
||||||
from yaql.language import exceptions
|
from yaql.language import exceptions
|
||||||
from yaql.language import utils
|
from yaql.language import utils
|
||||||
|
@ -100,7 +99,7 @@ class TestHelperFunctions(base.MuranoTestCase):
|
||||||
yaql_value = mock.Mock(yaql_expression.YaqlExpression,
|
yaql_value = mock.Mock(yaql_expression.YaqlExpression,
|
||||||
return_value='atom')
|
return_value='atom')
|
||||||
complex_value = {yaql_value: ['some', (1, yaql_value), 'hi!'],
|
complex_value = {yaql_value: ['some', (1, yaql_value), 'hi!'],
|
||||||
'sample': [yaql_value, six.moves.range(5)]}
|
'sample': [yaql_value, range(5)]}
|
||||||
complex_literal = utils.FrozenDict({
|
complex_literal = utils.FrozenDict({
|
||||||
'atom': ('some', (1, 'atom'), 'hi!'),
|
'atom': ('some', (1, 'atom'), 'hi!'),
|
||||||
'sample': ('atom', (0, 1, 2, 3, 4))
|
'sample': ('atom', (0, 1, 2, 3, 4))
|
||||||
|
|
Loading…
Reference in New Issue