Merge "Move and rename functional tests"

functionaltests/engine/config.conf

@@ -1,8 +0,0 @@
-[murano]
-auth_url = http://127.0.0.1:5000/v2.0/
-user = admin
-password = admin
-tenant = admin
-murano_url = http://127.0.0.1:8082/v1/
-linux_image = default_linux
-windows_image = default_windows

functionaltests/post_test_hook.sh

@@ -21,4 +21,4 @@ RETVAL=$?
 # Copy tempest log files to be published among other logs upon job completion
 sudo cp /opt/stack/new/murano/functionaltests/tempest.log /opt/stack/logs
 
-exit $RETVAL
+exit $RETVAL

functionaltests/run_tests.sh

@@ -28,4 +28,4 @@ TEMPEST_DIR=${TEMPEST_DIR:-/opt/stack/new/tempest}
 # Add tempest source tree to PYTHONPATH
 export PYTHONPATH=$PYTHONPATH:$TEMPEST_DIR
 
-nosetests -sv api/v1
+nosetests -sv ../murano/tests/functional/api/v1

murano/tests/functional/api/v1/test_envs.py

@@ -15,7 +15,7 @@
 from tempest import exceptions
 from tempest.test import attr
 
-from functionaltests.api import base
+from murano.tests.functional.api import base
 
 
 class TestEnvironments(base.TestCase):

murano/tests/functional/api/v1/test_repository.py

@@ -21,7 +21,7 @@ from tempest.test import attr
 
 from tempest import exceptions
 
-from functionaltests.api import base
+from murano.tests.functional.api import base
 
 
 class TestCaseRepository(base.TestCase):

murano/tests/functional/api/v1/test_services.py

@@ -17,7 +17,7 @@ import testtools
 from tempest import exceptions
 from tempest.test import attr
 
-from functionaltests.api import base
+from murano.tests.functional.api import base
 
 
 class TestServices(base.TestCase):

murano/tests/functional/api/v1/test_sessions.py

@@ -15,7 +15,7 @@
 from tempest import exceptions
 from tempest.test import attr
 
-from functionaltests.api import base
+from murano.tests.functional.api import base
 
 
 class TestSessions(base.TestCase):

murano/tests/functional/engine/base.py

@@ -24,7 +24,7 @@ import uuid
 from heatclient import client as heatclient
 from keystoneclient.v2_0 import client as ksclient
 
-import functionaltests.engine.config as cfg
+import murano.tests.functional.engine.config as cfg
 
 
 CONF = cfg.cfg.CONF
@@ -149,6 +149,7 @@ class MuranoBase(testtools.TestCase, testtools.testcase.WithAttributes,
         cls.packages_path = '/'.join(cls.location.split('/')[:-1:])
 
         def upload_package(package_name, body, app):
+            #TODO(efedorova): Use muranoclient to upload packages
             files = {'%s' % package_name: open(
                 os.path.join(cls.packages_path, app), 'rb')}
 

murano/tests/functional/engine/config.conf

@@ -0,0 +1,8 @@
+[murano]
+auth_url = http://172.16.116.5:5000/v2.0/
+user = kate
+password = swordfish
+tenant = kate
+murano_url = http://localhost:8082/v1/
+linux_image = default_linux
+windows_image = default_windows

murano/tests/unit/api/base.py

@@ -23,8 +23,8 @@ from murano.api.v1 import request_statistics
 from murano.common import rpc
 from murano.openstack.common import timeutils
 from murano.openstack.common import wsgi
-from murano.tests import base
-from murano.tests import utils
+from murano.tests.unit import base
+from murano.tests.unit import utils
 
 TEST_DEFAULT_LOGLEVELS = {'migrate': logging.WARN, 'sqlalchemy': logging.WARN}
 

murano/tests/unit/api/v1/test_catalog.py

@@ -19,7 +19,7 @@ from murano.api.v1 import catalog
 from murano.common import policy
 from murano.db.catalog import api as db_catalog_api
 from murano.packages import load_utils
-import murano.tests.api.base as test_base
+import murano.tests.unit.api.base as test_base
 import os
 
 

murano/tests/unit/api/v1/test_environments.py

@@ -21,8 +21,8 @@ from murano.api.v1 import environments
 from murano.common import policy
 from murano.db import models
 from murano.openstack.common import timeutils
-import murano.tests.api.base as tb
-import murano.tests.utils as test_utils
+import murano.tests.unit.api.base as tb
+import murano.tests.unit.utils as test_utils
 
 
 @mock.patch.object(policy, 'check')

murano/tests/unit/common/helpers/token_sanitizer_tests.py

@@ -13,7 +13,7 @@
 #    under the License.
 
 from murano.common.helpers import token_sanitizer
-from murano.tests import base
+from murano.tests.unit import base
 
 
 class TokenSanitizerTests(base.MuranoTestCase):

murano/tests/unit/common/is_different_tests.py

@@ -13,7 +13,7 @@
 #    under the License.
 
 from murano.common import utils
-from murano.tests import base
+from murano.tests.unit import base
 
 
 class IsDifferentTests(base.MuranoTestCase):

murano/tests/unit/common/traverse_helper_tests.py

@@ -13,7 +13,7 @@
 #    under the License.
 
 from murano.common import utils
-from murano.tests import base
+from murano.tests.unit import base
 
 
 class TraverseHelperTests(base.MuranoTestCase):

murano/tests/unit/core_library/instance/test_destroy/test_destroy.py

@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from murano.tests.dsl.foundation import object_model as om
-from murano.tests.dsl.foundation import test_case
+from murano.tests.unit.dsl.foundation import object_model as om
+from murano.tests.unit.dsl.foundation import test_case
 
 
 TEMPLATE = {

murano/tests/unit/db/migration/test_migrations.py

@@ -20,7 +20,7 @@ from sqlalchemy import exc
 from murano.db.migration import migration
 from murano.db import models  # noqa
 from murano.openstack.common.db.sqlalchemy import utils as db_utils
-from murano.tests.db.migration import test_migrations_base as base
+from murano.tests.unit.db.migration import test_migrations_base as base
 
 CONF = cfg.CONF
 

murano/tests/unit/db/test_catalog.py

@@ -17,8 +17,8 @@ from webob import exc
 
 from murano.db.catalog import api
 from murano.openstack.common.db import exception as db_exception
-from murano.tests import base
-from murano.tests import utils
+from murano.tests.unit import base
+from murano.tests.unit import utils
 
 
 class CatalogDBTestCase(base.MuranoWithDBTestCase):

murano/tests/unit/db/test_models.py

@@ -15,7 +15,7 @@
 
 from murano.db import models
 from murano.db import session
-from murano.tests import base
+from murano.tests.unit import base
 
 
 class TestModels(base.MuranoWithDBTestCase):

murano/tests/unit/dsl/foundation/runner.py

@@ -21,7 +21,7 @@ from murano.dsl import executor
 from murano.dsl import murano_object
 from murano.dsl import results_serializer
 from murano.engine import environment
-from murano.tests.dsl.foundation import object_model
+from murano.tests.unit.dsl.foundation import object_model
 
 
 class Runner(object):

murano/tests/unit/dsl/foundation/test_case.py

@@ -18,9 +18,9 @@ import os.path
 
 import eventlet.debug
 
-from murano.tests import base
-from murano.tests.dsl.foundation import runner
-from murano.tests.dsl.foundation import test_class_loader
+from murano.tests.unit import base
+from murano.tests.unit.dsl.foundation import runner
+from murano.tests.unit.dsl.foundation import test_class_loader
 
 
 class DslTestCase(base.MuranoTestCase):
@@ -29,7 +29,7 @@ class DslTestCase(base.MuranoTestCase):
         directory = os.path.join(os.path.dirname(
             inspect.getfile(self.__class__)), 'meta')
         root_meta_directory = os.path.join(
-            os.path.dirname(__file__), '../../../../meta')
+            os.path.dirname(__file__), '../../../../../meta')
         sys_class_loader = test_class_loader.TestClassLoader(
             os.path.join(root_meta_directory, 'io.murano/Classes'),
             'murano.io')

murano/tests/unit/dsl/test_assignments.py

@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from murano.tests.dsl.foundation import object_model as om
-from murano.tests.dsl.foundation import test_case
+from murano.tests.unit.dsl.foundation import object_model as om
+from murano.tests.unit.dsl.foundation import test_case
 
 
 class TestAssignments(test_case.DslTestCase):

murano/tests/unit/dsl/test_contracts.py

@@ -16,8 +16,8 @@ import types
 
 from murano.dsl import exceptions
 from murano.dsl import murano_object
-from murano.tests.dsl.foundation import object_model as om
-from murano.tests.dsl.foundation import test_case
+from murano.tests.unit.dsl.foundation import object_model as om
+from murano.tests.unit.dsl.foundation import test_case
 
 
 class TestContracts(test_case.DslTestCase):

murano/tests/unit/dsl/test_engine_yaql_functions.py

@@ -17,8 +17,8 @@ import types
 from testtools import matchers
 import yaql.exceptions as yaql_exc
 
-from murano.tests.dsl.foundation import object_model as om
-from murano.tests.dsl.foundation import test_case
+from murano.tests.unit.dsl.foundation import object_model as om
+from murano.tests.unit.dsl.foundation import test_case
 
 
 class TestEngineYaqlFunctions(test_case.DslTestCase):

murano/tests/unit/dsl/test_exceptions.py

@@ -19,8 +19,8 @@ import re
 from testtools import matchers
 
 from murano.dsl import dsl_exception
-from murano.tests.dsl.foundation import object_model as om
-from murano.tests.dsl.foundation import test_case
+from murano.tests.unit.dsl.foundation import object_model as om
+from murano.tests.unit.dsl.foundation import test_case
 
 
 class TestExceptions(test_case.DslTestCase):

murano/tests/unit/dsl/test_execution.py

@@ -14,8 +14,8 @@
 
 from murano.dsl import dsl_exception
 from murano.dsl import exceptions
-from murano.tests.dsl.foundation import object_model as om
-from murano.tests.dsl.foundation import test_case
+from murano.tests.unit.dsl.foundation import object_model as om
+from murano.tests.unit.dsl.foundation import test_case
 
 
 class TestExecution(test_case.DslTestCase):

murano/tests/unit/dsl/test_macros.py

@@ -17,8 +17,8 @@ from testtools import matchers
 
 from murano.dsl import exceptions
 
-from murano.tests.dsl.foundation import object_model as om
-from murano.tests.dsl.foundation import test_case
+from murano.tests.unit.dsl.foundation import object_model as om
+from murano.tests.unit.dsl.foundation import test_case
 
 
 class TestMacros(test_case.DslTestCase):

murano/tests/unit/dsl/test_multiple_inheritance.py

@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from murano.tests.dsl.foundation import object_model as om
-from murano.tests.dsl.foundation import test_case
+from murano.tests.unit.dsl.foundation import object_model as om
+from murano.tests.unit.dsl.foundation import test_case
 
 
 class TestMultipleInheritance(test_case.DslTestCase):

murano/tests/unit/dsl/test_property_access.py

@@ -13,8 +13,8 @@
 #    under the License.
 
 from murano.dsl import exceptions
-from murano.tests.dsl.foundation import object_model as om
-from murano.tests.dsl.foundation import test_case
+from murano.tests.unit.dsl.foundation import object_model as om
+from murano.tests.unit.dsl.foundation import test_case
 
 
 class TestPropertyAccess(test_case.DslTestCase):

murano/tests/unit/dsl/test_single_inheritance.py

@@ -12,8 +12,8 @@
 #    License for the specific language governing permissions and limitations
 #    under the License.
 
-from murano.tests.dsl.foundation import object_model as om
-from murano.tests.dsl.foundation import test_case
+from murano.tests.unit.dsl.foundation import object_model as om
+from murano.tests.unit.dsl.foundation import test_case
 
 
 class TestSingleInheritance(test_case.DslTestCase):

murano/tests/unit/packages/versions/test_hot_v1.py

@@ -13,8 +13,8 @@
 
 import imghdr
 import murano.packages.load_utils as load_utils
-import murano.tests.base as test_base
-import murano.tests.utils as test_utils
+import murano.tests.unit.base as test_base
+import murano.tests.unit.utils as test_utils
 import os
 from oslo.config import cfg
 

murano/tests/unit/packages/versions/test_mpl_v1.py

@@ -13,8 +13,8 @@
 
 import imghdr
 import murano.packages.load_utils as load_utils
-import murano.tests.base as test_base
-import murano.tests.utils as test_utils
+import murano.tests.unit.base as test_base
+import murano.tests.unit.utils as test_utils
 import os
 from oslo.config import cfg