068831ccd8
With this change MuranoPackage becomes first-class DSL citizen. Packages have version, runtime_version (that is specified in Format attribute of the manifest file) and a list of classes. Previously engine used to have package loader which had most of "load" functionality and class loader that mostly acted as an adapter from package loader to interface that DSL used to get classes. Now class loader is gone and is replaced with package loader at the DSL level. Package loader is responsible for loading packages by either package or class name (as it was before) plus semantic_version spec (for example ">=1.2,<2.0"). Package loader can now keep track of several versions of the same package. Also packages now have requirements with version specs. All class names that are encountered in application code are looked up within requirements only. As a consequence packages that use other packages without referencing them explicitly will become broken. An exception from this rule is core library which is referenced automatically. Partially implements: blueprint murano-versioning Change-Id: I8789ba45b6210e71bf4977a766f82b66d2a2d270
73 lines
2.8 KiB
Python
73 lines
2.8 KiB
Python
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
import os
|
|
|
|
import mock
|
|
from oslo_config import cfg
|
|
import semantic_version
|
|
|
|
from murano.dsl import murano_package as dsl_package
|
|
from murano.engine import package_loader
|
|
from murano.tests.unit import base
|
|
|
|
CONF = cfg.CONF
|
|
|
|
|
|
class TestCombinedPackageLoader(base.MuranoTestCase):
|
|
@classmethod
|
|
def setUpClass(cls):
|
|
super(TestCombinedPackageLoader, cls).setUpClass()
|
|
|
|
location = os.path.dirname(__file__)
|
|
CONF.set_override('load_packages_from', [location], 'engine')
|
|
cls.murano_client_factory = mock.MagicMock()
|
|
cls.loader = package_loader.CombinedPackageLoader(
|
|
cls.murano_client_factory, 'test_tenant_id')
|
|
cls.api_loader = mock.MagicMock()
|
|
cls.loader.api_loader = cls.api_loader
|
|
|
|
cls.local_pkg_name = 'io.murano.test.MyTest'
|
|
cls.api_pkg_name = 'test.mpl.v1.app.Thing'
|
|
|
|
def test_loaders_initialized(self):
|
|
self.assertEqual(1, len(self.loader.directory_loaders),
|
|
'One directory class loader should be initialized'
|
|
' since there is one valid murano pl package in the'
|
|
' provided directory in config.')
|
|
self.assertIsInstance(self.loader.directory_loaders[0],
|
|
package_loader.DirectoryPackageLoader)
|
|
|
|
def test_get_package_by_class_directory_loader(self):
|
|
spec = semantic_version.Spec('*')
|
|
result = self.loader.load_class_package(self.local_pkg_name, spec)
|
|
self.assertIsInstance(result, dsl_package.MuranoPackage)
|
|
|
|
def test_get_package_by_name_directory_loader(self):
|
|
spec = semantic_version.Spec('*')
|
|
result = self.loader.load_package(self.local_pkg_name, spec)
|
|
self.assertIsInstance(result, dsl_package.MuranoPackage)
|
|
|
|
def test_get_package_by_class_api_loader(self):
|
|
spec = semantic_version.Spec('*')
|
|
self.loader.load_package(self.api_pkg_name, spec)
|
|
|
|
self.api_loader.load_package.assert_called_with(
|
|
self.api_pkg_name, spec)
|
|
|
|
def test_get_package_api_loader(self):
|
|
spec = semantic_version.Spec('*')
|
|
self.loader.load_class_package(self.api_pkg_name, spec)
|
|
|
|
self.api_loader.load_class_package.assert_called_with(
|
|
self.api_pkg_name, spec)
|