Adding a new module 'kernel' that holds sources common to both Cibyl …

…and TripleO (#532)

* Creating 'kernel' module

* Adding module to build scripts.

* Moving 'tree' to kernel.

* Moving 'git' and 'github' to kernel.

* Moving tripleo utils to kernel tools.

* Moving cibyl utils to kernel

* Small change.

* Fixing mistake.

Dockerfile

@@ -25,8 +25,9 @@ COPY $CIBYL_ROOT/setup.py .
 COPY $CIBYL_ROOT/setup.cfg .
 COPY $CIBYL_ROOT/requirements.txt .
 
-COPY $CIBYL_ROOT/cibyl ./cibyl
+COPY $CIBYL_ROOT/kernel ./kernel
 COPY $CIBYL_ROOT/tripleo ./tripleo
+COPY $CIBYL_ROOT/cibyl ./cibyl
 
 RUN python3 -m pip install .
 

cibyl/cli/query.py

@@ -16,7 +16,7 @@
 from enum import IntFlag, auto
 from typing import Optional
 
-from cibyl.utils.dicts import subset
+from kernel.tools.dicts import subset
 
 
 class QueryType(IntFlag):

cibyl/config.py

@@ -28,10 +28,10 @@
 from cibyl.exceptions.config import SchemaError
 from cibyl.models.ci.system_factory import SystemType
 from cibyl.utils import yaml
-from cibyl.utils.files import get_first_available_file, is_file_available
-from cibyl.utils.fs import File, cd_context_manager
-from cibyl.utils.json import Draft7ValidatorFactory
-from cibyl.utils.net import DownloadError, download_file
+from kernel.tools.files import get_first_available_file, is_file_available
+from kernel.tools.fs import File, cd_context_manager
+from kernel.tools.json import Draft7ValidatorFactory
+from kernel.tools.net import DownloadError, download_file
 
 LOG = logging.getLogger(__name__)
 
@@ -246,7 +246,7 @@ def from_url(
         host. The definition is accessed and downloaded into the provided path.
 
         Supported protocols are defined by
-        :func:`cibyl.utils.net.download_file`.
+        :func:`kernel.tools.net.download_file`.
 
         Warnings
         -------

cibyl/features/__init__.py

@@ -29,8 +29,8 @@
                                   select_source_method,
                                   source_information_from_method)
 from cibyl.utils.colors import Colors
-from cibyl.utils.files import FileSearch
-from cibyl.utils.reflection import get_classes_in, load_module
+from kernel.tools.files import FileSearch
+from kernel.tools.reflection import get_classes_in, load_module
 
 LOG = logging.getLogger(__name__)
 

cibyl/models/ci/zuul/job.py

@@ -19,7 +19,7 @@
 from cibyl.models.attribute import AttributeDictValue, AttributeListValue
 from cibyl.models.ci.base.job import Job as BaseJob
 from cibyl.models.model import Model
-from cibyl.utils.dicts import subset
+from kernel.tools.dicts import subset
 
 
 class Job(BaseJob):

cibyl/orchestrator.py

@@ -43,10 +43,10 @@
                                   select_source_method,
                                   source_information_from_method)
 from cibyl.sources.source_factory import SourceFactory
-from cibyl.utils.dicts import intersect_models
-from cibyl.utils.fs import File
-from cibyl.utils.paths import resolve_home
 from cibyl.utils.status_bar import StatusBar
+from kernel.tools.dicts import intersect_models
+from kernel.tools.fs import File
+from kernel.tools.paths import resolve_home
 
 LOG = logging.getLogger(__name__)
 

cibyl/outputs/cli/ci/env/impl/colored.py

@@ -28,7 +28,7 @@
 from cibyl.outputs.cli.ci.system.impls.zuul.colored import \
     ColoredZuulSystemPrinter
 from cibyl.outputs.cli.printer import ColoredPrinter
-from cibyl.utils.strings import IndentedTextBuilder
+from kernel.tools.text import IndentedTextBuilder
 
 LOG = logging.getLogger(__name__)
 

cibyl/outputs/cli/ci/system/common/builds.py

@@ -16,8 +16,8 @@
 from cibyl.models.ci.base.build import Build
 from cibyl.outputs.cli.ci.system.common.status import get_status_colored
 from cibyl.utils.colors import ColorPalette
-from cibyl.utils.strings import IndentedTextBuilder
 from cibyl.utils.time import as_minutes
+from kernel.tools.text import IndentedTextBuilder
 
 
 def has_status_section(build: Build) -> bool:

cibyl/outputs/cli/ci/system/common/models.py

@@ -21,7 +21,7 @@
                                     AttributeValue)
 from cibyl.models.model import Model
 from cibyl.outputs.cli.printer import JSON, ColoredPrinter, SerializedPrinter
-from cibyl.utils.strings import IndentedTextBuilder
+from kernel.tools.text import IndentedTextBuilder
 
 LOG = logging.getLogger(__name__)
 

cibyl/outputs/cli/ci/system/common/stages.py

@@ -16,8 +16,8 @@
 from cibyl.models.ci.base.stage import Stage
 from cibyl.outputs.cli.ci.system.common.status import get_status_colored
 from cibyl.utils.colors import ColorPalette
-from cibyl.utils.strings import IndentedTextBuilder
 from cibyl.utils.time import as_minutes
+from kernel.tools.text import IndentedTextBuilder
 
 
 def print_stage(stage: Stage, palette: ColorPalette,

cibyl/outputs/cli/ci/system/impls/base/colored.py

@@ -26,8 +26,8 @@
 from cibyl.outputs.cli.ci.system.utils.sorting.jobs import SortJobsByName
 from cibyl.outputs.cli.printer import ColoredPrinter
 from cibyl.utils.colors import ColorPalette, DefaultPalette
-from cibyl.utils.sorting import BubbleSortAlgorithm, SortingAlgorithm
-from cibyl.utils.strings import IndentedTextBuilder
+from kernel.tools.sorting import BubbleSortAlgorithm, SortingAlgorithm
+from kernel.tools.text import IndentedTextBuilder
 
 LOG = logging.getLogger(__name__)
 

cibyl/outputs/cli/ci/system/impls/jobs/colored.py

@@ -29,9 +29,9 @@
 from cibyl.outputs.cli.ci.system.common.stages import print_stage
 from cibyl.outputs.cli.ci.system.impls.base.colored import \
     ColoredBaseSystemPrinter
-from cibyl.utils.sorting import nsort, sort
-from cibyl.utils.strings import IndentedTextBuilder
 from cibyl.utils.time import as_minutes
+from kernel.tools.sorting import nsort, sort
+from kernel.tools.text import IndentedTextBuilder
 
 
 class ColoredJobsSystemPrinter(ColoredBaseSystemPrinter):

cibyl/outputs/cli/ci/system/impls/zuul/colored/__init__.py

@@ -33,8 +33,8 @@
     ProjectCascade
 from cibyl.outputs.cli.ci.system.impls.zuul.colored.trees.factory import \
     HierarchicalTreeFactory
-from cibyl.utils.sorting import sort
-from cibyl.utils.strings import IndentedTextBuilder
+from kernel.tools.sorting import sort
+from kernel.tools.text import IndentedTextBuilder
 
 LOG = logging.getLogger(__name__)
 

cibyl/outputs/cli/ci/system/impls/zuul/colored/cascades/hierarchy.py

@@ -17,8 +17,8 @@
 
 from cibyl.models.ci.zuul.job import Job
 from cibyl.outputs.cli.printer import ColoredPrinter
-from cibyl.utils.strings import IndentedTextBuilder
-from cibyl.utils.tree import Tree
+from kernel.tools.text import IndentedTextBuilder
+from kernel.tools.tree import Tree
 
 
 class HierarchyCascade(ColoredPrinter):

cibyl/outputs/cli/ci/system/impls/zuul/colored/cascades/job.py

@@ -25,8 +25,8 @@
 from cibyl.outputs.cli.ci.system.common.models import (get_plugin_section,
                                                        has_plugin_section)
 from cibyl.outputs.cli.printer import ColoredPrinter
-from cibyl.utils.strings import IndentedTextBuilder
 from cibyl.utils.time import as_minutes
+from kernel.tools.text import IndentedTextBuilder
 
 
 class JobCascade(ColoredPrinter):

cibyl/outputs/cli/ci/system/impls/zuul/colored/cascades/project.py

@@ -22,7 +22,7 @@
 from cibyl.outputs.cli.ci.system.common.builds import get_status_section
 from cibyl.outputs.cli.printer import ColoredPrinter
 from cibyl.utils.filtering import apply_filters
-from cibyl.utils.strings import IndentedTextBuilder
+from kernel.tools.text import IndentedTextBuilder
 
 
 class ProjectCascade(ColoredPrinter):

cibyl/outputs/cli/ci/system/impls/zuul/colored/trees/factory.py

@@ -20,7 +20,7 @@
 from overrides import overrides
 
 from cibyl.models.ci.zuul.job import Job
-from cibyl.utils.tree import Leaf, Tree
+from kernel.tools.tree import Leaf, Tree
 
 LOG = logging.getLogger(__name__)
 

cibyl/outputs/cli/ci/system/utils/sorting/builds.py

@@ -14,7 +14,7 @@
 #    under the License.
 """
 from cibyl.models.ci.base.build import Build
-from cibyl.utils.sorting import Comparator
+from kernel.tools.sorting import Comparator
 
 
 class SortBuildsByUUID(Comparator):

cibyl/outputs/cli/ci/system/utils/sorting/jobs.py

@@ -14,7 +14,7 @@
 #    under the License.
 """
 from cibyl.models.ci.base.job import Job
-from cibyl.utils.sorting import Comparator
+from kernel.tools.sorting import Comparator
 
 
 class SortJobsByName(Comparator):

cibyl/plugins/__init__.py

@@ -23,9 +23,9 @@
 from cibyl.outputs.cli.printer import JSON, ColoredPrinter, SerializedPrinter
 from cibyl.sources.plugins import SourceExtension
 from cibyl.sources.source_factory import SourceFactory
-from cibyl.utils.files import FileSearch
 from cibyl.utils.filtering import apply_filters
-from cibyl.utils.reflection import get_classes_in, load_module
+from kernel.tools.files import FileSearch
+from kernel.tools.reflection import get_classes_in, load_module
 
 LOG = logging.getLogger(__name__)
 

cibyl/plugins/openstack/__init__.py

@@ -23,7 +23,7 @@
 from cibyl.plugins import PluginTemplate
 from cibyl.plugins.openstack.deployment import Deployment
 from cibyl.plugins.openstack.printers.router import PrinterRouter
-from cibyl.utils.dicts import subset
+from kernel.tools.dicts import subset
 
 PLUGIN_ARGUMENTS = ('release', 'spec', 'infra_type', 'nodes', 'controllers',
                     'computes', 'node_name', 'role', 'containers',

cibyl/plugins/openstack/printers/colored.py

@@ -19,7 +19,7 @@
 from cibyl.plugins.openstack.network import Network
 from cibyl.plugins.openstack.printers import OSPrinter
 from cibyl.plugins.openstack.storage import Storage
-from cibyl.utils.strings import IndentedTextBuilder
+from kernel.tools.text import IndentedTextBuilder
 
 
 class OSColoredPrinter(ColoredPrinter, OSPrinter):

cibyl/plugins/openstack/sources/elasticsearch.py

@@ -23,8 +23,8 @@
 from cibyl.plugins.openstack.test_collection import TestCollection
 from cibyl.sources.plugins import SourceExtension
 from cibyl.sources.source import speed_index
-from cibyl.utils.dicts import chunk_dictionary_into_lists
 from cibyl.utils.filtering import IP_PATTERN
+from kernel.tools.dicts import chunk_dictionary_into_lists
 
 
 class ElasticSearch(SourceExtension):

cibyl/plugins/openstack/sources/jenkins.py

@@ -38,15 +38,15 @@
 from cibyl.sources.jenkins import LOG, detect_job_info_regex, filter_jobs
 from cibyl.sources.plugins import SourceExtension
 from cibyl.sources.source import speed_index
-from cibyl.utils.dicts import subset
-from cibyl.utils.files import get_file_name_from_path
 from cibyl.utils.filtering import (DEPLOYMENT_PATTERN, DVR_PATTERN_NAME,
                                    IP_PATTERN, NETWORK_BACKEND_PATTERN,
                                    RELEASE_PATTERN, SERVICES_PATTERN,
                                    TOPOLOGY_PATTERN, apply_filters,
                                    filter_topology,
                                    satisfy_case_insensitive_match,
                                    satisfy_exact_match, satisfy_regex_match)
+from kernel.tools.dicts import subset
+from kernel.tools.files import get_file_name_from_path
 
 # shorthand for the type that will hold the job information obtained from the
 # Jenkins API response

cibyl/publisher.py

@@ -23,7 +23,7 @@
 from cibyl.cli.query import QueryType
 from cibyl.models.ci.base.environment import Environment
 from cibyl.outputs.cli.ci.env.factory import CIPrinterFactory
-from cibyl.utils.fs import File
+from kernel.tools.fs import File
 
 LOG = logging.getLogger(__name__)
 

cibyl/sources/elasticsearch/api.py

@@ -32,10 +32,10 @@
 from cibyl.sources.elasticsearch.client import ElasticSearchClient
 from cibyl.sources.server import ServerSource
 from cibyl.sources.source import speed_index
-from cibyl.utils.dicts import chunk_dictionary_into_lists
 from cibyl.utils.filtering import (apply_filters, matches_regex,
                                    satisfy_exact_match, satisfy_regex_match)
 from cibyl.utils.models import has_builds_job, has_tests_job
+from kernel.tools.dicts import chunk_dictionary_into_lists
 
 LOG = logging.getLogger(__name__)
 

cibyl/sources/source.py

@@ -22,7 +22,7 @@
 
 from cibyl.cli.argument import Argument
 from cibyl.exceptions.source import NoSupportedSourcesFound, NoValidSources
-from cibyl.utils.attrdict import AttrDict
+from kernel.tools.attrdict import AttrDict
 
 LOG = logging.getLogger(__name__)
 

cibyl/sources/zuul/apis/__init__.py

@@ -23,7 +23,7 @@
 from cibyl.sources.zuul.apis.providers import JobsProvider, PipelinesProvider
 from cibyl.sources.zuul.utils.artifacts import Artifact, ArtifactKind
 from cibyl.sources.zuul.utils.tests.types import TestSuite
-from cibyl.utils.io import Closeable
+from kernel.tools.io import Closeable
 
 
 class ZuulAPIError(SourceException):

cibyl/sources/zuul/apis/http.py

@@ -21,7 +21,7 @@
 from requests import HTTPError, Session
 
 from cibyl.sources.zuul.apis import ZuulAPIError, ZuulBuildAPI
-from cibyl.utils.io import Closeable
+from kernel.tools.io import Closeable
 
 
 class ZuulSession(Closeable):

cibyl/sources/zuul/source.py

@@ -29,7 +29,7 @@
 from cibyl.sources.zuul.queries.composition.factory import \
     AggregatedQueryFactory
 from cibyl.sources.zuul.queries.modifiers.factory import QueryModifierFactory
-from cibyl.utils.dicts import subset
+from kernel.tools.dicts import subset
 
 
 class Zuul(ServerSource):

cibyl/sources/zuul/transactions/__init__.py

@@ -30,7 +30,7 @@
 from cibyl.sources.zuul.utils.tests.tempest.types import TempestTest
 from cibyl.sources.zuul.utils.tests.types import Test, TestResult, TestSuite
 from cibyl.utils.filtering import apply_filters, matches_regex
-from cibyl.utils.urls import URL
+from kernel.tools.urls import URL
 
 
 class Request(ABC):

cibyl/sources/zuul/utils/artifacts/manifest.py

@@ -22,7 +22,7 @@
 from cibyl.sources.zuul.apis.http import ZuulHTTPBuildAPI as Build
 from cibyl.sources.zuul.utils.artifacts import ArtifactError
 from cibyl.utils.filtering import matches_regex
-from cibyl.utils.net import download_into_memory
+from kernel.tools.net import download_into_memory
 
 
 @dataclass

cibyl/sources/zuul/utils/builds/__init__.py

@@ -15,7 +15,7 @@
 """
 from cibyl.sources.zuul.apis import ZuulBuildAPI as Build
 from cibyl.sources.zuul.utils.artifacts.manifest import ManifestFile
-from cibyl.utils.urls import URL
+from kernel.tools.urls import URL
 
 
 def get_url_to_build_file(build: Build, file: ManifestFile) -> URL:

cibyl/sources/zuul/utils/tests/tempest/parser.py

@@ -24,8 +24,8 @@
 from cibyl.sources.zuul.utils.builds import get_url_to_build_file
 from cibyl.sources.zuul.utils.tests.tempest.types import TempestTest
 from cibyl.sources.zuul.utils.tests.types import TestResult, TestSuite
-from cibyl.utils.net import download_into_memory
-from tripleo.utils.urls import URL
+from kernel.tools.net import download_into_memory
+from kernel.tools.urls import URL
 
 
 @dataclass