From 25d55b0492aac8d70c4ce230227b1d62cbd96712 Mon Sep 17 00:00:00 2001 From: Scott Hussey Date: Thu, 25 May 2017 08:48:27 -0500 Subject: [PATCH] Rename helm_drydock to drydock_provisioner --- README.md | 4 +-- .../__init__.py | 0 .../config.py | 6 ++-- .../control/__init__.py | 0 .../control/api.py | 4 +-- .../control/base.py | 2 +- .../control/designs.py | 4 +-- .../control/middleware.py | 2 +- .../control/readme.md | 0 .../control/tasks.py | 2 +- .../drivers/__init__.py | 8 ++--- .../drivers/node/__init__.py | 6 ++-- .../drivers/node/maasdriver/__init__.py | 0 .../drivers/node/maasdriver/api_client.py | 0 .../drivers/node/maasdriver/driver.py | 18 +++++------ .../node/maasdriver/models/__init__.py | 0 .../drivers/node/maasdriver/models/base.py | 2 +- .../drivers/node/maasdriver/models/fabric.py | 4 +-- .../drivers/node/maasdriver/models/subnet.py | 2 +- .../drivers/node/maasdriver/models/vlan.py | 4 +-- .../drivers/node/maasdriver/readme.md | 0 .../drivers/oob/__init__.py | 6 ++-- .../drivers/oob/pyghmi_driver/__init__.py | 12 +++---- .../drivers/readme.md | 0 .../drydock.py | 12 +++---- .../error.py | 0 .../ingester/__init__.py | 16 +++++----- .../ingester/plugins/__init__.py | 0 .../ingester/plugins/yaml.py | 8 ++--- .../ingester/readme.md | 2 +- .../introspection/readme.md | 0 .../objects/__init__.py | 12 +++---- .../objects/base.py | 6 ++-- .../objects/fields.py | 0 .../objects/hostprofile.py | 6 ++-- .../objects/hwprofile.py | 6 ++-- .../objects/network.py | 8 ++--- .../objects/node.py | 12 +++---- .../objects/readme.md | 0 .../objects/site.py | 8 ++--- .../objects/task.py | 4 +-- .../orchestrator/__init__.py | 8 ++--- .../orchestrator/readme.md | 0 .../statemgmt/__init__.py | 6 ++-- .../statemgmt/readme.md | 0 examples/designparts_v1.0.yaml | 4 +-- setup.py | 32 +++++++++---------- tests/integration/test_maasdriver_client.py | 4 +-- tests/integration/test_maasdriver_network.py | 8 ++--- tests/integration/test_orch_node_networks.py | 26 +++++++-------- tests/unit/test_design_inheritance.py | 12 +++---- tests/unit/test_ingester.py | 12 +++---- tests/unit/test_ingester_yaml.py | 2 +- tests/unit/test_models.py | 12 +++---- tests/unit/test_orch_generic.py | 10 +++--- tests/unit/test_orch_oob.py | 20 ++++++------ tests/unit/test_statemgmt.py | 4 +-- 57 files changed, 173 insertions(+), 173 deletions(-) rename {helm_drydock => drydock_provisioner}/__init__.py (100%) rename {helm_drydock => drydock_provisioner}/config.py (81%) rename {helm_drydock => drydock_provisioner}/control/__init__.py (100%) rename {helm_drydock => drydock_provisioner}/control/api.py (90%) rename {helm_drydock => drydock_provisioner}/control/base.py (98%) rename {helm_drydock => drydock_provisioner}/control/designs.py (98%) rename {helm_drydock => drydock_provisioner}/control/middleware.py (98%) rename {helm_drydock => drydock_provisioner}/control/readme.md (100%) rename {helm_drydock => drydock_provisioner}/control/tasks.py (98%) rename {helm_drydock => drydock_provisioner}/drivers/__init__.py (94%) rename {helm_drydock => drydock_provisioner}/drivers/node/__init__.py (93%) rename {helm_drydock => drydock_provisioner}/drivers/node/maasdriver/__init__.py (100%) rename {helm_drydock => drydock_provisioner}/drivers/node/maasdriver/api_client.py (100%) rename {helm_drydock => drydock_provisioner}/drivers/node/maasdriver/driver.py (95%) rename {helm_drydock => drydock_provisioner}/drivers/node/maasdriver/models/__init__.py (100%) rename {helm_drydock => drydock_provisioner}/drivers/node/maasdriver/models/base.py (99%) rename {helm_drydock => drydock_provisioner}/drivers/node/maasdriver/models/fabric.py (88%) rename {helm_drydock => drydock_provisioner}/drivers/node/maasdriver/models/subnet.py (96%) rename {helm_drydock => drydock_provisioner}/drivers/node/maasdriver/models/vlan.py (95%) rename {helm_drydock => drydock_provisioner}/drivers/node/maasdriver/readme.md (100%) rename {helm_drydock => drydock_provisioner}/drivers/oob/__init__.py (91%) rename {helm_drydock => drydock_provisioner}/drivers/oob/pyghmi_driver/__init__.py (97%) rename {helm_drydock => drydock_provisioner}/drivers/readme.md (100%) rename {helm_drydock => drydock_provisioner}/drydock.py (86%) rename {helm_drydock => drydock_provisioner}/error.py (100%) rename {helm_drydock => drydock_provisioner}/ingester/__init__.py (90%) rename {helm_drydock => drydock_provisioner}/ingester/plugins/__init__.py (100%) rename {helm_drydock => drydock_provisioner}/ingester/plugins/yaml.py (98%) rename {helm_drydock => drydock_provisioner}/ingester/readme.md (84%) rename {helm_drydock => drydock_provisioner}/introspection/readme.md (100%) rename {helm_drydock => drydock_provisioner}/objects/__init__.py (93%) rename {helm_drydock => drydock_provisioner}/objects/base.py (95%) rename {helm_drydock => drydock_provisioner}/objects/fields.py (100%) rename {helm_drydock => drydock_provisioner}/objects/hostprofile.py (98%) rename {helm_drydock => drydock_provisioner}/objects/hwprofile.py (96%) rename {helm_drydock => drydock_provisioner}/objects/network.py (94%) rename {helm_drydock => drydock_provisioner}/objects/node.py (92%) rename {helm_drydock => drydock_provisioner}/objects/readme.md (100%) rename {helm_drydock => drydock_provisioner}/objects/site.py (97%) rename {helm_drydock => drydock_provisioner}/objects/task.py (96%) rename {helm_drydock => drydock_provisioner}/orchestrator/__init__.py (98%) rename {helm_drydock => drydock_provisioner}/orchestrator/readme.md (100%) rename {helm_drydock => drydock_provisioner}/statemgmt/__init__.py (97%) rename {helm_drydock => drydock_provisioner}/statemgmt/readme.md (100%) diff --git a/README.md b/README.md index d94c3f9f..8e2f0347 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# helm_drydock +# drydock_provisioner A python REST orchestrator to translate a YAML host topology to a provisioned set of hosts and provide a set of cloud-init post-provisioning instructions. To run: @@ -6,7 +6,7 @@ To run: $ virtualenv -p python3 /var/tmp/drydock $ . /var/tmp/drydock/bin/activate $ python setup.py install - $ uwsgi --http :9000 -w helm_drydock.drydock --callable drydock --enable-threads -L + $ uwsgi --http :9000 -w drydock_provisioner.drydock --callable drydock --enable-threads -L ## Modular service diff --git a/helm_drydock/__init__.py b/drydock_provisioner/__init__.py similarity index 100% rename from helm_drydock/__init__.py rename to drydock_provisioner/__init__.py diff --git a/helm_drydock/config.py b/drydock_provisioner/config.py similarity index 81% rename from helm_drydock/config.py rename to drydock_provisioner/config.py index b07a9b9e..a8c501e1 100644 --- a/helm_drydock/config.py +++ b/drydock_provisioner/config.py @@ -33,12 +33,12 @@ class DrydockConfig(object): } ingester_config = { - 'plugins': ['helm_drydock.ingester.plugins.yaml.YamlIngester'], + 'plugins': ['drydock_provisioner.ingester.plugins.yaml.YamlIngester'], } orchestrator_config = { 'drivers': { - 'oob': 'helm_drydock.drivers.oob.pyghmi_driver.PyghmiDriver', - 'node': 'helm_drydock.drivers.node.maasdriver.driver.MaasNodeDriver', + 'oob': 'drydock_provisioner.drivers.oob.pyghmi_driver.PyghmiDriver', + 'node': 'drydock_provisioner.drivers.node.maasdriver.driver.MaasNodeDriver', } } \ No newline at end of file diff --git a/helm_drydock/control/__init__.py b/drydock_provisioner/control/__init__.py similarity index 100% rename from helm_drydock/control/__init__.py rename to drydock_provisioner/control/__init__.py diff --git a/helm_drydock/control/api.py b/drydock_provisioner/control/api.py similarity index 90% rename from helm_drydock/control/api.py rename to drydock_provisioner/control/api.py index 7f32110c..7766cf7f 100644 --- a/helm_drydock/control/api.py +++ b/drydock_provisioner/control/api.py @@ -23,9 +23,9 @@ def start_api(state_manager=None, ingester=None, orchestrator=None): """ Start the Drydock API service - :param state_manager: Instance of helm_drydock.statemgmt.manager.DesignState for accessing + :param state_manager: Instance of drydock_provisioner.statemgmt.manager.DesignState for accessing state persistence - :param ingester: Instance of helm_drydock.ingester.ingester.Ingester for handling design + :param ingester: Instance of drydock_provisioner.ingester.ingester.Ingester for handling design part input """ control_api = falcon.API(request_type=DrydockRequest, diff --git a/helm_drydock/control/base.py b/drydock_provisioner/control/base.py similarity index 98% rename from helm_drydock/control/base.py rename to drydock_provisioner/control/base.py index 289b6161..ac1e787a 100644 --- a/helm_drydock/control/base.py +++ b/drydock_provisioner/control/base.py @@ -16,7 +16,7 @@ import uuid import json import logging -import helm_drydock.error as errors +import drydock_provisioner.error as errors class BaseResource(object): diff --git a/helm_drydock/control/designs.py b/drydock_provisioner/control/designs.py similarity index 98% rename from helm_drydock/control/designs.py rename to drydock_provisioner/control/designs.py index 402b23ad..23afc457 100644 --- a/helm_drydock/control/designs.py +++ b/drydock_provisioner/control/designs.py @@ -16,8 +16,8 @@ import json import uuid import logging -import helm_drydock.objects as hd_objects -import helm_drydock.error as errors +import drydock_provisioner.objects as hd_objects +import drydock_provisioner.error as errors from .base import StatefulResource diff --git a/helm_drydock/control/middleware.py b/drydock_provisioner/control/middleware.py similarity index 98% rename from helm_drydock/control/middleware.py rename to drydock_provisioner/control/middleware.py index da877b36..7a25acd4 100644 --- a/helm_drydock/control/middleware.py +++ b/drydock_provisioner/control/middleware.py @@ -16,7 +16,7 @@ import falcon import logging import uuid -import helm_drydock.config as config +import drydock_provisioner.config as config class AuthMiddleware(object): diff --git a/helm_drydock/control/readme.md b/drydock_provisioner/control/readme.md similarity index 100% rename from helm_drydock/control/readme.md rename to drydock_provisioner/control/readme.md diff --git a/helm_drydock/control/tasks.py b/drydock_provisioner/control/tasks.py similarity index 98% rename from helm_drydock/control/tasks.py rename to drydock_provisioner/control/tasks.py index bf35861f..a4a49da9 100644 --- a/helm_drydock/control/tasks.py +++ b/drydock_provisioner/control/tasks.py @@ -16,7 +16,7 @@ import json import threading import traceback -import helm_drydock.objects.task as obj_task +import drydock_provisioner.objects.task as obj_task from .base import StatefulResource class TasksResource(StatefulResource): diff --git a/helm_drydock/drivers/__init__.py b/drydock_provisioner/drivers/__init__.py similarity index 94% rename from helm_drydock/drivers/__init__.py rename to drydock_provisioner/drivers/__init__.py index 2ced9f00..c3868af1 100644 --- a/helm_drydock/drivers/__init__.py +++ b/drydock_provisioner/drivers/__init__.py @@ -15,10 +15,10 @@ from threading import Thread, Lock import uuid import time -import helm_drydock.objects.fields as hd_fields -import helm_drydock.statemgmt as statemgmt -import helm_drydock.objects.task as tasks -import helm_drydock.error as errors +import drydock_provisioner.objects.fields as hd_fields +import drydock_provisioner.statemgmt as statemgmt +import drydock_provisioner.objects.task as tasks +import drydock_provisioner.error as errors # This is the interface for the orchestrator to access a driver # TODO Need to have each driver spin up a seperate thread to manage diff --git a/helm_drydock/drivers/node/__init__.py b/drydock_provisioner/drivers/node/__init__.py similarity index 93% rename from helm_drydock/drivers/node/__init__.py rename to drydock_provisioner/drivers/node/__init__.py index 87ea3046..48802905 100644 --- a/helm_drydock/drivers/node/__init__.py +++ b/drydock_provisioner/drivers/node/__init__.py @@ -13,10 +13,10 @@ # limitations under the License. # -import helm_drydock.objects.fields as hd_fields -import helm_drydock.error as errors +import drydock_provisioner.objects.fields as hd_fields +import drydock_provisioner.error as errors -from helm_drydock.drivers import ProviderDriver +from drydock_provisioner.drivers import ProviderDriver class NodeDriver(ProviderDriver): diff --git a/helm_drydock/drivers/node/maasdriver/__init__.py b/drydock_provisioner/drivers/node/maasdriver/__init__.py similarity index 100% rename from helm_drydock/drivers/node/maasdriver/__init__.py rename to drydock_provisioner/drivers/node/maasdriver/__init__.py diff --git a/helm_drydock/drivers/node/maasdriver/api_client.py b/drydock_provisioner/drivers/node/maasdriver/api_client.py similarity index 100% rename from helm_drydock/drivers/node/maasdriver/api_client.py rename to drydock_provisioner/drivers/node/maasdriver/api_client.py diff --git a/helm_drydock/drivers/node/maasdriver/driver.py b/drydock_provisioner/drivers/node/maasdriver/driver.py similarity index 95% rename from helm_drydock/drivers/node/maasdriver/driver.py rename to drydock_provisioner/drivers/node/maasdriver/driver.py index ef26b456..b22d89ff 100644 --- a/helm_drydock/drivers/node/maasdriver/driver.py +++ b/drydock_provisioner/drivers/node/maasdriver/driver.py @@ -11,17 +11,17 @@ # 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 helm_drydock.error as errors -import helm_drydock.config as config -import helm_drydock.drivers as drivers -import helm_drydock.objects.fields as hd_fields -import helm_drydock.objects.task as task_model +import drydock_provisioner.error as errors +import drydock_provisioner.config as config +import drydock_provisioner.drivers as drivers +import drydock_provisioner.objects.fields as hd_fields +import drydock_provisioner.objects.task as task_model -from helm_drydock.drivers.node import NodeDriver +from drydock_provisioner.drivers.node import NodeDriver from .api_client import MaasRequestFactory -import helm_drydock.drivers.node.maasdriver.models.fabric as maas_fabric -import helm_drydock.drivers.node.maasdriver.models.vlan as maas_vlan -import helm_drydock.drivers.node.maasdriver.models.subnet as maas_subnet +import drydock_provisioner.drivers.node.maasdriver.models.fabric as maas_fabric +import drydock_provisioner.drivers.node.maasdriver.models.vlan as maas_vlan +import drydock_provisioner.drivers.node.maasdriver.models.subnet as maas_subnet class MaasNodeDriver(NodeDriver): diff --git a/helm_drydock/drivers/node/maasdriver/models/__init__.py b/drydock_provisioner/drivers/node/maasdriver/models/__init__.py similarity index 100% rename from helm_drydock/drivers/node/maasdriver/models/__init__.py rename to drydock_provisioner/drivers/node/maasdriver/models/__init__.py diff --git a/helm_drydock/drivers/node/maasdriver/models/base.py b/drydock_provisioner/drivers/node/maasdriver/models/base.py similarity index 99% rename from helm_drydock/drivers/node/maasdriver/models/base.py rename to drydock_provisioner/drivers/node/maasdriver/models/base.py index c64257f3..fb033eec 100644 --- a/helm_drydock/drivers/node/maasdriver/models/base.py +++ b/drydock_provisioner/drivers/node/maasdriver/models/base.py @@ -14,7 +14,7 @@ import json import re -import helm_drydock.error as errors +import drydock_provisioner.error as errors """ A representation of a MaaS REST resource. Should be subclassed for different resources and augmented with operations specific diff --git a/helm_drydock/drivers/node/maasdriver/models/fabric.py b/drydock_provisioner/drivers/node/maasdriver/models/fabric.py similarity index 88% rename from helm_drydock/drivers/node/maasdriver/models/fabric.py rename to drydock_provisioner/drivers/node/maasdriver/models/fabric.py index a105f354..90e954af 100644 --- a/helm_drydock/drivers/node/maasdriver/models/fabric.py +++ b/drydock_provisioner/drivers/node/maasdriver/models/fabric.py @@ -13,8 +13,8 @@ # limitations under the License. import json -import helm_drydock.drivers.node.maasdriver.models.base as model_base -import helm_drydock.drivers.node.maasdriver.models.vlan as model_vlan +import drydock_provisioner.drivers.node.maasdriver.models.base as model_base +import drydock_provisioner.drivers.node.maasdriver.models.vlan as model_vlan class Fabric(model_base.ResourceBase): diff --git a/helm_drydock/drivers/node/maasdriver/models/subnet.py b/drydock_provisioner/drivers/node/maasdriver/models/subnet.py similarity index 96% rename from helm_drydock/drivers/node/maasdriver/models/subnet.py rename to drydock_provisioner/drivers/node/maasdriver/models/subnet.py index ccf677c2..8aec521e 100644 --- a/helm_drydock/drivers/node/maasdriver/models/subnet.py +++ b/drydock_provisioner/drivers/node/maasdriver/models/subnet.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -import helm_drydock.drivers.node.maasdriver.models.base as model_base +import drydock_provisioner.drivers.node.maasdriver.models.base as model_base class Subnet(model_base.ResourceBase): diff --git a/helm_drydock/drivers/node/maasdriver/models/vlan.py b/drydock_provisioner/drivers/node/maasdriver/models/vlan.py similarity index 95% rename from helm_drydock/drivers/node/maasdriver/models/vlan.py rename to drydock_provisioner/drivers/node/maasdriver/models/vlan.py index f4f506ef..36acceac 100644 --- a/helm_drydock/drivers/node/maasdriver/models/vlan.py +++ b/drydock_provisioner/drivers/node/maasdriver/models/vlan.py @@ -13,8 +13,8 @@ # limitations under the License. import json -import helm_drydock.error as errors -import helm_drydock.drivers.node.maasdriver.models.base as model_base +import drydock_provisioner.error as errors +import drydock_provisioner.drivers.node.maasdriver.models.base as model_base class Vlan(model_base.ResourceBase): diff --git a/helm_drydock/drivers/node/maasdriver/readme.md b/drydock_provisioner/drivers/node/maasdriver/readme.md similarity index 100% rename from helm_drydock/drivers/node/maasdriver/readme.md rename to drydock_provisioner/drivers/node/maasdriver/readme.md diff --git a/helm_drydock/drivers/oob/__init__.py b/drydock_provisioner/drivers/oob/__init__.py similarity index 91% rename from helm_drydock/drivers/oob/__init__.py rename to drydock_provisioner/drivers/oob/__init__.py index 18fc0c75..8e7a9c26 100644 --- a/helm_drydock/drivers/oob/__init__.py +++ b/drydock_provisioner/drivers/oob/__init__.py @@ -12,10 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -import helm_drydock.objects.fields as hd_fields -import helm_drydock.error as errors +import drydock_provisioner.objects.fields as hd_fields +import drydock_provisioner.error as errors -from helm_drydock.drivers import ProviderDriver +from drydock_provisioner.drivers import ProviderDriver class OobDriver(ProviderDriver): diff --git a/helm_drydock/drivers/oob/pyghmi_driver/__init__.py b/drydock_provisioner/drivers/oob/pyghmi_driver/__init__.py similarity index 97% rename from helm_drydock/drivers/oob/pyghmi_driver/__init__.py rename to drydock_provisioner/drivers/oob/pyghmi_driver/__init__.py index 0da3af70..a4378369 100644 --- a/helm_drydock/drivers/oob/pyghmi_driver/__init__.py +++ b/drydock_provisioner/drivers/oob/pyghmi_driver/__init__.py @@ -15,14 +15,14 @@ import time from pyghmi.ipmi.command import Command -import helm_drydock.error as errors -import helm_drydock.config as config +import drydock_provisioner.error as errors +import drydock_provisioner.config as config -import helm_drydock.objects.fields as hd_fields -import helm_drydock.objects.task as task_model +import drydock_provisioner.objects.fields as hd_fields +import drydock_provisioner.objects.task as task_model -import helm_drydock.drivers.oob as oob -import helm_drydock.drivers as drivers +import drydock_provisioner.drivers.oob as oob +import drydock_provisioner.drivers as drivers class PyghmiDriver(oob.OobDriver): diff --git a/helm_drydock/drivers/readme.md b/drydock_provisioner/drivers/readme.md similarity index 100% rename from helm_drydock/drivers/readme.md rename to drydock_provisioner/drivers/readme.md diff --git a/helm_drydock/drydock.py b/drydock_provisioner/drydock.py similarity index 86% rename from helm_drydock/drydock.py rename to drydock_provisioner/drydock.py index 4be2340e..93e91982 100644 --- a/helm_drydock/drydock.py +++ b/drydock_provisioner/drydock.py @@ -13,12 +13,12 @@ # limitations under the License. import logging -import helm_drydock.config as config -import helm_drydock.objects as objects -import helm_drydock.ingester as ingester -import helm_drydock.statemgmt as statemgmt -import helm_drydock.orchestrator as orch -import helm_drydock.control.api as api +import drydock_provisioner.config as config +import drydock_provisioner.objects as objects +import drydock_provisioner.ingester as ingester +import drydock_provisioner.statemgmt as statemgmt +import drydock_provisioner.orchestrator as orch +import drydock_provisioner.control.api as api def start_drydock(): objects.register_all() diff --git a/helm_drydock/error.py b/drydock_provisioner/error.py similarity index 100% rename from helm_drydock/error.py rename to drydock_provisioner/error.py diff --git a/helm_drydock/ingester/__init__.py b/drydock_provisioner/ingester/__init__.py similarity index 90% rename from helm_drydock/ingester/__init__.py rename to drydock_provisioner/ingester/__init__.py index 07862605..0938f710 100644 --- a/helm_drydock/ingester/__init__.py +++ b/drydock_provisioner/ingester/__init__.py @@ -20,14 +20,14 @@ import yaml import uuid import importlib -import helm_drydock.objects as objects -import helm_drydock.objects.site as site -import helm_drydock.objects.network as network -import helm_drydock.objects.hwprofile as hwprofile -import helm_drydock.objects.node as node -import helm_drydock.objects.hostprofile as hostprofile +import drydock_provisioner.objects as objects +import drydock_provisioner.objects.site as site +import drydock_provisioner.objects.network as network +import drydock_provisioner.objects.hwprofile as hwprofile +import drydock_provisioner.objects.node as node +import drydock_provisioner.objects.hostprofile as hostprofile -from helm_drydock.statemgmt import DesignState +from drydock_provisioner.statemgmt import DesignState class Ingester(object): @@ -42,7 +42,7 @@ class Ingester(object): :params plugins: - A list of strings naming class objects denoting the ingester plugins to be enabled Enable plugins that can be used for ingest_data calls. Each plugin should use - helm_drydock.ingester.plugins.IngesterPlugin as its base class. As long as one + drydock_provisioner.ingester.plugins.IngesterPlugin as its base class. As long as one enabled plugin successfully initializes, the call is considered successful. Otherwise it will throw an exception """ diff --git a/helm_drydock/ingester/plugins/__init__.py b/drydock_provisioner/ingester/plugins/__init__.py similarity index 100% rename from helm_drydock/ingester/plugins/__init__.py rename to drydock_provisioner/ingester/plugins/__init__.py diff --git a/helm_drydock/ingester/plugins/yaml.py b/drydock_provisioner/ingester/plugins/yaml.py similarity index 98% rename from helm_drydock/ingester/plugins/yaml.py rename to drydock_provisioner/ingester/plugins/yaml.py index 26160481..37e1ad06 100644 --- a/helm_drydock/ingester/plugins/yaml.py +++ b/drydock_provisioner/ingester/plugins/yaml.py @@ -19,10 +19,10 @@ import yaml import logging -import helm_drydock.objects.fields as hd_fields +import drydock_provisioner.objects.fields as hd_fields -from helm_drydock import objects -from helm_drydock.ingester.plugins import IngesterPlugin +from drydock_provisioner import objects +from drydock_provisioner.ingester.plugins import IngesterPlugin class YamlIngester(IngesterPlugin): @@ -38,7 +38,7 @@ class YamlIngester(IngesterPlugin): filenames - Array of absolute path to the YAML files to ingest - returns an array of objects from helm_drydock.model + returns an array of objects from drydock_provisioner.model """ def ingest_data(self, **kwargs): diff --git a/helm_drydock/ingester/readme.md b/drydock_provisioner/ingester/readme.md similarity index 84% rename from helm_drydock/ingester/readme.md rename to drydock_provisioner/ingester/readme.md index 1437c216..16352970 100644 --- a/helm_drydock/ingester/readme.md +++ b/drydock_provisioner/ingester/readme.md @@ -6,7 +6,7 @@ different sources. Each ingester plugin should be able source data based on user-provided parameters and parse that data -into the Drydock internal model (helm_drydock.model). +into the Drydock internal model (drydock_provisioner.model). Each plugin does not need to support every type of design data as a single site design may be federated from multiple diff --git a/helm_drydock/introspection/readme.md b/drydock_provisioner/introspection/readme.md similarity index 100% rename from helm_drydock/introspection/readme.md rename to drydock_provisioner/introspection/readme.md diff --git a/helm_drydock/objects/__init__.py b/drydock_provisioner/objects/__init__.py similarity index 93% rename from helm_drydock/objects/__init__.py rename to drydock_provisioner/objects/__init__.py index b88365d2..be295cf6 100644 --- a/helm_drydock/objects/__init__.py +++ b/drydock_provisioner/objects/__init__.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# Models for helm_drydock +# Models for drydock_provisioner # import logging @@ -23,11 +23,11 @@ def register_all(): # NOTE(sh8121att) - Import all versioned objects so # they are available via RPC. Any new object definitions # need to be added here. - __import__('helm_drydock.objects.network') - __import__('helm_drydock.objects.node') - __import__('helm_drydock.objects.hostprofile') - __import__('helm_drydock.objects.hwprofile') - __import__('helm_drydock.objects.site') + __import__('drydock_provisioner.objects.network') + __import__('drydock_provisioner.objects.node') + __import__('drydock_provisioner.objects.hostprofile') + __import__('drydock_provisioner.objects.hwprofile') + __import__('drydock_provisioner.objects.site') # Utility class for calculating inheritance diff --git a/helm_drydock/objects/base.py b/drydock_provisioner/objects/base.py similarity index 95% rename from helm_drydock/objects/base.py rename to drydock_provisioner/objects/base.py index 5164a8ca..3bf2c027 100644 --- a/helm_drydock/objects/base.py +++ b/drydock_provisioner/objects/base.py @@ -16,12 +16,12 @@ import datetime from oslo_versionedobjects import base from oslo_versionedobjects import fields as obj_fields -import helm_drydock.objects as objects +import drydock_provisioner.objects as objects class DrydockObjectRegistry(base.VersionedObjectRegistry): # Steal this from Cinder to bring all registered objects - # into the helm_drydock.objects namespace + # into the drydock_provisioner.objects namespace def registration_hook(self, cls, index): setattr(objects, cls.obj_name(), cls) @@ -30,7 +30,7 @@ class DrydockObject(base.VersionedObject): VERSION = '1.0' - OBJ_PROJECT_NAMESPACE = 'helm_drydock.objects' + OBJ_PROJECT_NAMESPACE = 'drydock_provisioner.objects' # Return None for undefined attributes def obj_load_attr(self, attrname): diff --git a/helm_drydock/objects/fields.py b/drydock_provisioner/objects/fields.py similarity index 100% rename from helm_drydock/objects/fields.py rename to drydock_provisioner/objects/fields.py diff --git a/helm_drydock/objects/hostprofile.py b/drydock_provisioner/objects/hostprofile.py similarity index 98% rename from helm_drydock/objects/hostprofile.py rename to drydock_provisioner/objects/hostprofile.py index 5a416dde..36aad003 100644 --- a/helm_drydock/objects/hostprofile.py +++ b/drydock_provisioner/objects/hostprofile.py @@ -16,9 +16,9 @@ from copy import deepcopy import oslo_versionedobjects.fields as obj_fields -import helm_drydock.objects as objects -import helm_drydock.objects.base as base -import helm_drydock.objects.fields as hd_fields +import drydock_provisioner.objects as objects +import drydock_provisioner.objects.base as base +import drydock_provisioner.objects.fields as hd_fields @base.DrydockObjectRegistry.register diff --git a/helm_drydock/objects/hwprofile.py b/drydock_provisioner/objects/hwprofile.py similarity index 96% rename from helm_drydock/objects/hwprofile.py rename to drydock_provisioner/objects/hwprofile.py index 3ff5afbe..bda20183 100644 --- a/helm_drydock/objects/hwprofile.py +++ b/drydock_provisioner/objects/hwprofile.py @@ -16,9 +16,9 @@ from copy import deepcopy from oslo_versionedobjects import fields as ovo_fields -import helm_drydock.objects as objects -import helm_drydock.objects.base as base -import helm_drydock.objects.fields as hd_fields +import drydock_provisioner.objects as objects +import drydock_provisioner.objects.base as base +import drydock_provisioner.objects.fields as hd_fields @base.DrydockObjectRegistry.register class HardwareProfile(base.DrydockPersistentObject, base.DrydockObject): diff --git a/helm_drydock/objects/network.py b/drydock_provisioner/objects/network.py similarity index 94% rename from helm_drydock/objects/network.py rename to drydock_provisioner/objects/network.py index e1ccc693..028161da 100644 --- a/helm_drydock/objects/network.py +++ b/drydock_provisioner/objects/network.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# Models for helm_drydock +# Models for drydock_provisioner # import logging @@ -20,9 +20,9 @@ from copy import deepcopy import oslo_versionedobjects.fields as ovo_fields -import helm_drydock.objects as objects -import helm_drydock.objects.base as base -import helm_drydock.objects.fields as hd_fields +import drydock_provisioner.objects as objects +import drydock_provisioner.objects.base as base +import drydock_provisioner.objects.fields as hd_fields @base.DrydockObjectRegistry.register class NetworkLink(base.DrydockPersistentObject, base.DrydockObject): diff --git a/helm_drydock/objects/node.py b/drydock_provisioner/objects/node.py similarity index 92% rename from helm_drydock/objects/node.py rename to drydock_provisioner/objects/node.py index 1d353576..7854b346 100644 --- a/helm_drydock/objects/node.py +++ b/drydock_provisioner/objects/node.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# Models for helm_drydock +# Models for drydock_provisioner # import logging @@ -20,13 +20,13 @@ from copy import deepcopy from oslo_versionedobjects import fields as ovo_fields -import helm_drydock.objects as objects -import helm_drydock.objects.hostprofile -import helm_drydock.objects.base as base -import helm_drydock.objects.fields as hd_fields +import drydock_provisioner.objects as objects +import drydock_provisioner.objects.hostprofile +import drydock_provisioner.objects.base as base +import drydock_provisioner.objects.fields as hd_fields @base.DrydockObjectRegistry.register -class BaremetalNode(helm_drydock.objects.hostprofile.HostProfile): +class BaremetalNode(drydock_provisioner.objects.hostprofile.HostProfile): VERSION = '1.0' diff --git a/helm_drydock/objects/readme.md b/drydock_provisioner/objects/readme.md similarity index 100% rename from helm_drydock/objects/readme.md rename to drydock_provisioner/objects/readme.md diff --git a/helm_drydock/objects/site.py b/drydock_provisioner/objects/site.py similarity index 97% rename from helm_drydock/objects/site.py rename to drydock_provisioner/objects/site.py index afa853b7..c86a9184 100644 --- a/helm_drydock/objects/site.py +++ b/drydock_provisioner/objects/site.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# Models for helm_drydock +# Models for drydock_provisioner # from copy import deepcopy import uuid @@ -20,9 +20,9 @@ import datetime import oslo_versionedobjects.fields as ovo_fields -import helm_drydock.objects as objects -import helm_drydock.objects.base as base -import helm_drydock.objects.fields as hd_fields +import drydock_provisioner.objects as objects +import drydock_provisioner.objects.base as base +import drydock_provisioner.objects.fields as hd_fields @base.DrydockObjectRegistry.register diff --git a/helm_drydock/objects/task.py b/drydock_provisioner/objects/task.py similarity index 96% rename from helm_drydock/objects/task.py rename to drydock_provisioner/objects/task.py index 0405cd32..6da718c8 100644 --- a/helm_drydock/objects/task.py +++ b/drydock_provisioner/objects/task.py @@ -15,9 +15,9 @@ import uuid from threading import Lock -import helm_drydock.error as errors +import drydock_provisioner.error as errors -import helm_drydock.objects.fields as hd_fields +import drydock_provisioner.objects.fields as hd_fields class Task(object): diff --git a/helm_drydock/orchestrator/__init__.py b/drydock_provisioner/orchestrator/__init__.py similarity index 98% rename from helm_drydock/orchestrator/__init__.py rename to drydock_provisioner/orchestrator/__init__.py index fba338ba..3736faa2 100644 --- a/helm_drydock/orchestrator/__init__.py +++ b/drydock_provisioner/orchestrator/__init__.py @@ -19,10 +19,10 @@ import importlib from copy import deepcopy -import helm_drydock.drivers as drivers -import helm_drydock.objects.task as tasks -import helm_drydock.error as errors -import helm_drydock.objects.fields as hd_fields +import drydock_provisioner.drivers as drivers +import drydock_provisioner.objects.task as tasks +import drydock_provisioner.error as errors +import drydock_provisioner.objects.fields as hd_fields class Orchestrator(object): diff --git a/helm_drydock/orchestrator/readme.md b/drydock_provisioner/orchestrator/readme.md similarity index 100% rename from helm_drydock/orchestrator/readme.md rename to drydock_provisioner/orchestrator/readme.md diff --git a/helm_drydock/statemgmt/__init__.py b/drydock_provisioner/statemgmt/__init__.py similarity index 97% rename from helm_drydock/statemgmt/__init__.py rename to drydock_provisioner/statemgmt/__init__.py index 8936649e..a6be0d0c 100644 --- a/helm_drydock/statemgmt/__init__.py +++ b/drydock_provisioner/statemgmt/__init__.py @@ -18,10 +18,10 @@ from threading import Lock import uuid -import helm_drydock.objects as objects -import helm_drydock.objects.task as tasks +import drydock_provisioner.objects as objects +import drydock_provisioner.objects.task as tasks -from helm_drydock.error import DesignError, StateError +from drydock_provisioner.error import DesignError, StateError class DesignState(object): diff --git a/helm_drydock/statemgmt/readme.md b/drydock_provisioner/statemgmt/readme.md similarity index 100% rename from helm_drydock/statemgmt/readme.md rename to drydock_provisioner/statemgmt/readme.md diff --git a/examples/designparts_v1.0.yaml b/examples/designparts_v1.0.yaml index 530efbc0..1f669fab 100644 --- a/examples/designparts_v1.0.yaml +++ b/examples/designparts_v1.0.yaml @@ -153,7 +153,7 @@ metadata: description: Describe server configuration attributes. Not a specific server, but profile adopted by a server definition spec: # The HostProfile this profile adopts initial state from. No default. - # See helm_drydock/objects/readme.md for information on how HostProfile and BaremetalNode inheritance works + # See drydock_provisioner/objects/readme.md for information on how HostProfile and BaremetalNode inheritance works host_profile: 'defaults' # The HardwareProfile describing the node hardware. No default. hardware_profile: 'DellR720v1' @@ -242,7 +242,7 @@ metadata: description: Specify a physical server. spec: # The HostProfile this server adopts initial state from. No default. - # See helm_drydock/objects/readme.md for information on how HostProfile and BaremetalNode inheritance works + # See drydock_provisioner/objects/readme.md for information on how HostProfile and BaremetalNode inheritance works host_profile: 'defaults' # The HardwareProfile describing the node hardware. No default. hardware_profile: 'DellR720v1' diff --git a/setup.py b/setup.py index 4436a8f1..dc97cc33 100644 --- a/setup.py +++ b/setup.py @@ -12,7 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# helm_drydock - A tool to consume a host topology and orchestrate +# drydock_provisioner - A tool to consume a host topology and orchestrate # and monitor the provisioning of those hosts and execution of bootstrap # scripts # @@ -32,27 +32,27 @@ from setuptools import setup -setup(name='helm_drydock', +setup(name='drydock_provisioner', version='0.1a1', description='Bootstrapper for Kubernetes infrastructure', url='http://github.com/att-comdev/drydock', author='Scott Hussey - AT&T', author_email='sh8121@att.com', license='Apache 2.0', - packages=['helm_drydock', - 'helm_drydock.objects', - 'helm_drydock.ingester', - 'helm_drydock.ingester.plugins', - 'helm_drydock.statemgmt', - 'helm_drydock.orchestrator', - 'helm_drydock.control', - 'helm_drydock.drivers', - 'helm_drydock.drivers.oob', - 'helm_drydock.drivers.oob.pyghmi_driver', - 'helm_drydock.drivers.node', - 'helm_drydock.drivers.node.maasdriver', - 'helm_drydock.drivers.node.maasdriver.models', - 'helm_drydock.control'], + packages=['drydock_provisioner', + 'drydock_provisioner.objects', + 'drydock_provisioner.ingester', + 'drydock_provisioner.ingester.plugins', + 'drydock_provisioner.statemgmt', + 'drydock_provisioner.orchestrator', + 'drydock_provisioner.control', + 'drydock_provisioner.drivers', + 'drydock_provisioner.drivers.oob', + 'drydock_provisioner.drivers.oob.pyghmi_driver', + 'drydock_provisioner.drivers.node', + 'drydock_provisioner.drivers.node.maasdriver', + 'drydock_provisioner.drivers.node.maasdriver.models', + 'drydock_provisioner.control'], install_requires=[ 'PyYAML', 'pyghmi>=1.0.18', diff --git a/tests/integration/test_maasdriver_client.py b/tests/integration/test_maasdriver_client.py index 88b86e95..3c174018 100644 --- a/tests/integration/test_maasdriver_client.py +++ b/tests/integration/test_maasdriver_client.py @@ -13,8 +13,8 @@ # limitations under the License. import json -import helm_drydock.config as config -import helm_drydock.drivers.node.maasdriver.api_client as client +import drydock_provisioner.config as config +import drydock_provisioner.drivers.node.maasdriver.api_client as client class TestClass(object): diff --git a/tests/integration/test_maasdriver_network.py b/tests/integration/test_maasdriver_network.py index 36c8b324..ba5f5114 100644 --- a/tests/integration/test_maasdriver_network.py +++ b/tests/integration/test_maasdriver_network.py @@ -14,10 +14,10 @@ import json import uuid -import helm_drydock.config as config -import helm_drydock.drivers.node.maasdriver.api_client as client -import helm_drydock.drivers.node.maasdriver.models.fabric as maas_fabric -import helm_drydock.drivers.node.maasdriver.models.subnet as maas_subnet +import drydock_provisioner.config as config +import drydock_provisioner.drivers.node.maasdriver.api_client as client +import drydock_provisioner.drivers.node.maasdriver.models.fabric as maas_fabric +import drydock_provisioner.drivers.node.maasdriver.models.subnet as maas_subnet class TestClass(object): diff --git a/tests/integration/test_orch_node_networks.py b/tests/integration/test_orch_node_networks.py index 85619a30..15c2f811 100644 --- a/tests/integration/test_orch_node_networks.py +++ b/tests/integration/test_orch_node_networks.py @@ -17,23 +17,23 @@ import shutil import os import uuid -import helm_drydock.config as config -import helm_drydock.drivers.node.maasdriver.api_client as client -import helm_drydock.ingester.plugins.yaml -import helm_drydock.statemgmt as statemgmt -import helm_drydock.objects as objects -import helm_drydock.orchestrator as orch -import helm_drydock.objects.fields as hd_fields -import helm_drydock.objects.task as task -import helm_drydock.drivers as drivers -from helm_drydock.ingester import Ingester +import drydock_provisioner.config as config +import drydock_provisioner.drivers.node.maasdriver.api_client as client +import drydock_provisioner.ingester.plugins.yaml +import drydock_provisioner.statemgmt as statemgmt +import drydock_provisioner.objects as objects +import drydock_provisioner.orchestrator as orch +import drydock_provisioner.objects.fields as hd_fields +import drydock_provisioner.objects.task as task +import drydock_provisioner.drivers as drivers +from drydock_provisioner.ingester import Ingester class TestClass(object): def test_client_verify(self): design_state = statemgmt.DesignState() orchestrator = orch.Orchestrator(state_manager=design_state, - enabled_drivers={'node': 'helm_drydock.drivers.node.maasdriver.driver.MaasNodeDriver'}) + enabled_drivers={'node': 'drydock_provisioner.drivers.node.maasdriver.driver.MaasNodeDriver'}) orch_task = orchestrator.create_task(task.OrchestratorTask, site='sitename', @@ -57,14 +57,14 @@ class TestClass(object): design_state.post_design(design_data) ingester = Ingester() - ingester.enable_plugins([helm_drydock.ingester.plugins.yaml.YamlIngester]) + ingester.enable_plugins([drydock_provisioner.ingester.plugins.yaml.YamlIngester]) ingester.ingest_data(plugin_name='yaml', design_state=design_state, filenames=[str(input_file)], design_id=design_id) design_data = design_state.get_design(design_id) orchestrator = orch.Orchestrator(state_manager=design_state, - enabled_drivers={'node': 'helm_drydock.drivers.node.maasdriver.driver.MaasNodeDriver'}) + enabled_drivers={'node': 'drydock_provisioner.drivers.node.maasdriver.driver.MaasNodeDriver'}) orch_task = orchestrator.create_task(task.OrchestratorTask, site='sitename', diff --git a/tests/unit/test_design_inheritance.py b/tests/unit/test_design_inheritance.py index e5c57ce8..dad63a0f 100644 --- a/tests/unit/test_design_inheritance.py +++ b/tests/unit/test_design_inheritance.py @@ -12,16 +12,16 @@ # See the License for the specific language governing permissions and # limitations under the License. -from helm_drydock.ingester import Ingester -from helm_drydock.statemgmt import DesignState -from helm_drydock.orchestrator import Orchestrator +from drydock_provisioner.ingester import Ingester +from drydock_provisioner.statemgmt import DesignState +from drydock_provisioner.orchestrator import Orchestrator from copy import deepcopy import pytest import shutil import os -import helm_drydock.ingester.plugins.yaml +import drydock_provisioner.ingester.plugins.yaml import yaml class TestClass(object): @@ -32,7 +32,7 @@ class TestClass(object): def test_design_inheritance(self, loaded_design): orchestrator = Orchestrator(state_manager=loaded_design, - enabled_drivers={'oob': 'helm_drydock.drivers.oob.pyghmi_driver.PyghmiDriver'}) + enabled_drivers={'oob': 'drydock_provisioner.drivers.oob.pyghmi_driver.PyghmiDriver'}) design_data = orchestrator.load_design_data("sitename") @@ -63,7 +63,7 @@ class TestClass(object): design_state.post_design_base(design_data) ingester = Ingester() - ingester.enable_plugins([helm_drydock.ingester.plugins.yaml.YamlIngester]) + ingester.enable_plugins([drydock_provisioner.ingester.plugins.yaml.YamlIngester]) ingester.ingest_data(plugin_name='yaml', design_state=design_state, filenames=[str(input_file)]) return design_state diff --git a/tests/unit/test_ingester.py b/tests/unit/test_ingester.py index a719ad6c..9b083322 100644 --- a/tests/unit/test_ingester.py +++ b/tests/unit/test_ingester.py @@ -12,14 +12,14 @@ # See the License for the specific language governing permissions and # limitations under the License. -from helm_drydock.ingester import Ingester -from helm_drydock.statemgmt import DesignState -import helm_drydock.objects as objects +from drydock_provisioner.ingester import Ingester +from drydock_provisioner.statemgmt import DesignState +import drydock_provisioner.objects as objects import pytest import shutil import os -import helm_drydock.ingester.plugins.yaml +import drydock_provisioner.ingester.plugins.yaml class TestClass(object): @@ -37,7 +37,7 @@ class TestClass(object): design_state.post_design(design_data) ingester = Ingester() - ingester.enable_plugins([helm_drydock.ingester.plugins.yaml.YamlIngester]) + ingester.enable_plugins([drydock_provisioner.ingester.plugins.yaml.YamlIngester]) ingester.ingest_data(plugin_name='yaml', design_state=design_state, filenames=[str(input_file)], design_id=design_id) @@ -59,7 +59,7 @@ class TestClass(object): design_state.post_design(design_data) ingester = Ingester() - ingester.enable_plugins([helm_drydock.ingester.plugins.yaml.YamlIngester]) + ingester.enable_plugins([drydock_provisioner.ingester.plugins.yaml.YamlIngester]) ingester.ingest_data(plugin_name='yaml', design_state=design_state, design_id=design_id, filenames=[str(profiles_file), str(networks_file), str(nodes_file)]) diff --git a/tests/unit/test_ingester_yaml.py b/tests/unit/test_ingester_yaml.py index 3be5db08..c078401f 100644 --- a/tests/unit/test_ingester_yaml.py +++ b/tests/unit/test_ingester_yaml.py @@ -16,7 +16,7 @@ import shutil import os import uuid -from helm_drydock.ingester.plugins.yaml import YamlIngester +from drydock_provisioner.ingester.plugins.yaml import YamlIngester class TestClass(object): diff --git a/tests/unit/test_models.py b/tests/unit/test_models.py index e5014444..25c5128a 100644 --- a/tests/unit/test_models.py +++ b/tests/unit/test_models.py @@ -14,8 +14,8 @@ import pytest -import helm_drydock.objects as objects -from helm_drydock.objects import fields +import drydock_provisioner.objects as objects +from drydock_provisioner.objects import fields class TestClass(object): @@ -23,7 +23,7 @@ class TestClass(object): objects.register_all() model_attr = { - 'versioned_object.namespace': 'helm_drydock.objects', + 'versioned_object.namespace': 'drydock_provisioner.objects', 'versioned_object.name': 'HardwareProfile', 'versioned_object.version': '1.0', 'versioned_object.data': { @@ -38,13 +38,13 @@ class TestClass(object): 'bootstrap_protocol': 'pxe', 'pxe_interface': '0', 'devices': { - 'versioned_object.namespace': 'helm_drydock.objects', + 'versioned_object.namespace': 'drydock_provisioner.objects', 'versioned_object.name': 'HardwareDeviceAliasList', 'versioned_object.version': '1.0', 'versioned_object.data': { 'objects': [ { - 'versioned_object.namespace': 'helm_drydock.objects', + 'versioned_object.namespace': 'drydock_provisioner.objects', 'versioned_object.name': 'HardwareDeviceAlias', 'versioned_object.version': '1.0', 'versioned_object.data': { @@ -56,7 +56,7 @@ class TestClass(object): } }, { - 'versioned_object.namespace': 'helm_drydock.objects', + 'versioned_object.namespace': 'drydock_provisioner.objects', 'versioned_object.name': 'HardwareDeviceAlias', 'versioned_object.version': '1.0', 'versioned_object.data': { diff --git a/tests/unit/test_orch_generic.py b/tests/unit/test_orch_generic.py index 86739965..82940686 100644 --- a/tests/unit/test_orch_generic.py +++ b/tests/unit/test_orch_generic.py @@ -18,11 +18,11 @@ import threading import time -import helm_drydock.orchestrator as orch -import helm_drydock.objects.fields as hd_fields -import helm_drydock.statemgmt as statemgmt -import helm_drydock.objects.task as task -import helm_drydock.drivers as drivers +import drydock_provisioner.orchestrator as orch +import drydock_provisioner.objects.fields as hd_fields +import drydock_provisioner.statemgmt as statemgmt +import drydock_provisioner.objects.task as task +import drydock_provisioner.drivers as drivers class TestClass(object): diff --git a/tests/unit/test_orch_oob.py b/tests/unit/test_orch_oob.py index 6c10d8f1..b510b935 100644 --- a/tests/unit/test_orch_oob.py +++ b/tests/unit/test_orch_oob.py @@ -23,15 +23,15 @@ import os import shutil import uuid -from helm_drydock.ingester import Ingester +from drydock_provisioner.ingester import Ingester -import helm_drydock.orchestrator as orch -import helm_drydock.objects.fields as hd_fields -import helm_drydock.statemgmt as statemgmt -import helm_drydock.objects as objects -import helm_drydock.objects.task as task -import helm_drydock.drivers as drivers -import helm_drydock.ingester.plugins.yaml as yaml_ingester +import drydock_provisioner.orchestrator as orch +import drydock_provisioner.objects.fields as hd_fields +import drydock_provisioner.statemgmt as statemgmt +import drydock_provisioner.objects as objects +import drydock_provisioner.objects.task as task +import drydock_provisioner.drivers as drivers +import drydock_provisioner.ingester.plugins.yaml as yaml_ingester class TestClass(object): @@ -44,7 +44,7 @@ class TestClass(object): #mocker.patch.object('pyghmi.ipmi.command.Command','get_asset_tag') orchestrator = orch.Orchestrator(state_manager=loaded_design, - enabled_drivers={'oob': 'helm_drydock.drivers.oob.pyghmi_driver.PyghmiDriver'}) + enabled_drivers={'oob': 'drydock_provisioner.drivers.oob.pyghmi_driver.PyghmiDriver'}) orch_task = orchestrator.create_task(task.OrchestratorTask, site='sitename', @@ -63,7 +63,7 @@ class TestClass(object): #mocker.patch.object('pyghmi.ipmi.command.Command','set_bootdev') orchestrator = orch.Orchestrator(state_manager=loaded_design, - enabled_drivers={'oob': 'helm_drydock.drivers.oob.pyghmi_driver.PyghmiDriver'}) + enabled_drivers={'oob': 'drydock_provisioner.drivers.oob.pyghmi_driver.PyghmiDriver'}) orch_task = orchestrator.create_task(task.OrchestratorTask, site='sitename', diff --git a/tests/unit/test_statemgmt.py b/tests/unit/test_statemgmt.py index edb82764..17c90899 100644 --- a/tests/unit/test_statemgmt.py +++ b/tests/unit/test_statemgmt.py @@ -15,8 +15,8 @@ import pytest import shutil -import helm_drydock.objects as objects -import helm_drydock.statemgmt as statemgmt +import drydock_provisioner.objects as objects +import drydock_provisioner.statemgmt as statemgmt class TestClass(object):