diff --git a/.stestr.conf b/.stestr.conf index 33e15e5..2d03286 100644 --- a/.stestr.conf +++ b/.stestr.conf @@ -1,3 +1,3 @@ [DEFAULT] -test_path=./sushy_oem_dellemc/tests +test_path=./sushy_oem_idrac/tests top_dir=. diff --git a/README.md b/README.md index 828e66f..7fbc91d 100644 --- a/README.md +++ b/README.md @@ -11,7 +11,7 @@ introduce their own features with the common Redfish framework. At the same time, `sushy` supports extending its data model by loading extensions found within its "oem" namespace. -The `sushy-oem-dellemc` package is a sushy extension package that aims at +The `sushy-oem-idrac` package is a sushy extension package that aims at adding high-level hardware management abstractions, that are specific to Dell EMC BMC (which is known under the name of iDRAC), to the tree of sushy Redfish resources. @@ -37,4 +37,4 @@ oem_manager.set_virtual_boot_device( ``` See full example of virtual media boot setup in the -[functional test suite](https://github.com/etingof/sushy-oem-dellemc/blob/master/sushy_oem_dellemc/tests/functional/vmedia_boot.py). +[functional test suite](https://github.com/etingof/sushy-oem-idrac/blob/master/sushy_oem_idrac/tests/functional/vmedia_boot.py). diff --git a/setup.cfg b/setup.cfg index abb88d7..5ce2609 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] -name = sushy-oem-dellemc -summary = Dell EMC OEM extension package for the sushy library +name = sushy-oem-idrac +summary = Dell EMC iDRAC OEM extension package for the sushy library description-file = README.md author = OpenStack @@ -21,11 +21,11 @@ classifier = [files] packages = - sushy_oem_dellemc + sushy_oem_idrac [entry_points] sushy.resources.manager.oems = - dell = sushy_oem_dellemc.resources.manager.manager:get_extension + dell = sushy_oem_idrac.resources.manager.manager:get_extension [build_sphinx] @@ -38,18 +38,18 @@ warning-is-error = 1 upload-dir = doc/build/html [compile_catalog] -directory = sushy_oem_dellemc/locale -domain = sushy_oem_dellemc +directory = sushy_oem_idrac/locale +domain = sushy_oem_idrac [update_catalog] -domain = sushy_oem_dellemc -output_dir = sushy_oem_dellemc/locale -input_file = sushy_oem_dellemc/locale/sushy_oem_dellemc.pot +domain = sushy_oem_idrac +output_dir = sushy_oem_idrac/locale +input_file = sushy_oem_idrac/locale/sushy_oem_idrac.pot [extract_messages] keywords = _ gettext ngettext l_ lazy_gettext mapping_file = babel.cfg -output_file = sushy_oem_dellemc/locale/sushy_oem_dellemc.pot +output_file = sushy_oem_idrac/locale/sushy_oem_idrac.pot [build_releasenotes] all_files = 1 @@ -60,4 +60,4 @@ source-dir = releasenotes/source autodoc_index_modules = True api_doc_dir = reference/api autodoc_exclude_modules = - sushy_oem_dellemc.tests.* + sushy_oem_idrac.tests.* diff --git a/sushy_oem_dellemc/__init__.py b/sushy_oem_idrac/__init__.py similarity index 100% rename from sushy_oem_dellemc/__init__.py rename to sushy_oem_idrac/__init__.py diff --git a/sushy_oem_dellemc/asynchronous.py b/sushy_oem_idrac/asynchronous.py similarity index 100% rename from sushy_oem_dellemc/asynchronous.py rename to sushy_oem_idrac/asynchronous.py diff --git a/sushy_oem_dellemc/constants.py b/sushy_oem_idrac/constants.py similarity index 93% rename from sushy_oem_dellemc/constants.py rename to sushy_oem_idrac/constants.py index fc3a852..6723d02 100644 --- a/sushy_oem_dellemc/constants.py +++ b/sushy_oem_idrac/constants.py @@ -11,4 +11,4 @@ # under the License. IDRAC_CONFIG_PENDING = 'IDRAC.1.6.LC068' -IDRAC_JOB_RUNNING = 'IDRAC.1.6.RAC0679' \ No newline at end of file +IDRAC_JOB_RUNNING = 'IDRAC.1.6.RAC0679' diff --git a/sushy_oem_dellemc/resources/__init__.py b/sushy_oem_idrac/resources/__init__.py similarity index 100% rename from sushy_oem_dellemc/resources/__init__.py rename to sushy_oem_idrac/resources/__init__.py diff --git a/sushy_oem_dellemc/resources/manager/__init__.py b/sushy_oem_idrac/resources/manager/__init__.py similarity index 100% rename from sushy_oem_dellemc/resources/manager/__init__.py rename to sushy_oem_idrac/resources/manager/__init__.py diff --git a/sushy_oem_dellemc/resources/manager/manager.py b/sushy_oem_idrac/resources/manager/manager.py similarity index 96% rename from sushy_oem_dellemc/resources/manager/manager.py rename to sushy_oem_idrac/resources/manager/manager.py index 2c3fb00..74a8ee1 100644 --- a/sushy_oem_dellemc/resources/manager/manager.py +++ b/sushy_oem_idrac/resources/manager/manager.py @@ -18,9 +18,9 @@ from sushy.resources import base from sushy.resources import common from sushy.resources.oem import base as oem_base -from sushy_oem_dellemc import asynchronous -from sushy_oem_dellemc import constants -from sushy_oem_dellemc import utils +from sushy_oem_idrac import asynchronous +from sushy_oem_idrac import constants +from sushy_oem_idrac import utils LOG = logging.getLogger(__name__) @@ -108,7 +108,7 @@ VFDD\ action_data = dict(self.ACTION_DATA, ImportBuffer=idrac_media) - # TODO (etingof): figure out if on-time or persistent boot can at + # TODO(etingof): figure out if on-time or persistent boot can at # all be implemented via this OEM call attempts = 10 diff --git a/sushy_oem_dellemc/tests/__init__.py b/sushy_oem_idrac/tests/__init__.py similarity index 100% rename from sushy_oem_dellemc/tests/__init__.py rename to sushy_oem_idrac/tests/__init__.py diff --git a/sushy_oem_dellemc/tests/functional/__init__.py b/sushy_oem_idrac/tests/functional/__init__.py similarity index 100% rename from sushy_oem_dellemc/tests/functional/__init__.py rename to sushy_oem_idrac/tests/functional/__init__.py diff --git a/sushy_oem_dellemc/tests/functional/vmedia_boot.py b/sushy_oem_idrac/tests/functional/vmedia_boot.py similarity index 90% rename from sushy_oem_dellemc/tests/functional/vmedia_boot.py rename to sushy_oem_idrac/tests/functional/vmedia_boot.py index 6dee8c8..09854cf 100644 --- a/sushy_oem_dellemc/tests/functional/vmedia_boot.py +++ b/sushy_oem_idrac/tests/functional/vmedia_boot.py @@ -15,23 +15,19 @@ import sys import sushy -from sushy_oem_dellemc import utils +from sushy_oem_idrac import utils USERNAME = 'root' PASSWORD = 'calvin' SERVICE_ROOT = 'http://demo.snmplabs.com:80/redfish/v1' -SERVICE_ROOT = 'https://r640-u11-drac.dev1.kni.lab.eng.bos.redhat.com:443/redfish/v1' SYSTEM_ID = '437XR1138R2' -SYSTEM_ID = 'System.Embedded.1' BOOT_DEVICE = sushy.VIRTUAL_MEDIA_CD -#BOOT_MODE = sushy.BOOT_SOURCE_MODE_UEFI BOOT_MODE = sushy.BOOT_SOURCE_MODE_BIOS BOOT_IMAGE = 'http://demo.snmplabs.com/mini.iso' -BOOT_IMAGE = 'http://10.40.205.36/mini.iso' LOG = logging.getLogger(__name__) @@ -63,7 +59,8 @@ def main(): if BOOT_DEVICE not in v_media.media_types: continue - LOG.info('device %s is present at %s', BOOT_DEVICE, manager.identity) + LOG.info( + 'device %s is present at %s', BOOT_DEVICE, manager.identity) try: manager_oem = manager.get_oem_extension('Dell') diff --git a/sushy_oem_dellemc/tests/unit/__init__.py b/sushy_oem_idrac/tests/unit/__init__.py similarity index 100% rename from sushy_oem_dellemc/tests/unit/__init__.py rename to sushy_oem_idrac/tests/unit/__init__.py diff --git a/sushy_oem_dellemc/tests/unit/base.py b/sushy_oem_idrac/tests/unit/base.py similarity index 100% rename from sushy_oem_dellemc/tests/unit/base.py rename to sushy_oem_idrac/tests/unit/base.py diff --git a/sushy_oem_dellemc/tests/unit/json_samples/manager.json b/sushy_oem_idrac/tests/unit/json_samples/manager.json similarity index 100% rename from sushy_oem_dellemc/tests/unit/json_samples/manager.json rename to sushy_oem_idrac/tests/unit/json_samples/manager.json diff --git a/sushy_oem_dellemc/tests/unit/json_samples/manager_collection.json b/sushy_oem_idrac/tests/unit/json_samples/manager_collection.json similarity index 100% rename from sushy_oem_dellemc/tests/unit/json_samples/manager_collection.json rename to sushy_oem_idrac/tests/unit/json_samples/manager_collection.json diff --git a/sushy_oem_dellemc/tests/unit/json_samples/root.json b/sushy_oem_idrac/tests/unit/json_samples/root.json similarity index 100% rename from sushy_oem_dellemc/tests/unit/json_samples/root.json rename to sushy_oem_idrac/tests/unit/json_samples/root.json diff --git a/sushy_oem_dellemc/tests/unit/test_manager.py b/sushy_oem_idrac/tests/unit/test_manager.py similarity index 94% rename from sushy_oem_dellemc/tests/unit/test_manager.py rename to sushy_oem_idrac/tests/unit/test_manager.py index cc66141..7dbcbc6 100644 --- a/sushy_oem_dellemc/tests/unit/test_manager.py +++ b/sushy_oem_idrac/tests/unit/test_manager.py @@ -26,9 +26,9 @@ class ManagerTestCase(BaseTestCase): def setUp(self): super(ManagerTestCase, self).setUp() self.conn = mock.Mock() - with open('sushy_oem_dellemc/tests/unit/json_samples/' + with open('sushy_oem_idrac/tests/unit/json_samples/' 'manager.json') as f: - mock_response = self.conn.get.return_value; + mock_response = self.conn.get.return_value mock_response.json.return_value = json.load(f) mock_response.status_code = 200 diff --git a/sushy_oem_dellemc/tests/unit/test_root.py b/sushy_oem_idrac/tests/unit/test_root.py similarity index 95% rename from sushy_oem_dellemc/tests/unit/test_root.py rename to sushy_oem_idrac/tests/unit/test_root.py index a79d316..dca1d1b 100644 --- a/sushy_oem_dellemc/tests/unit/test_root.py +++ b/sushy_oem_idrac/tests/unit/test_root.py @@ -33,7 +33,7 @@ class RootTestCase(BaseTestCase): self.sess_serv.create_session.return_value = (None, None) mock_session_service.return_value = self.sess_serv mock_connector.return_value = self.conn - with open('sushy_oem_dellemc/tests/unit/json_samples/root.json') as f: + with open('sushy_oem_idrac/tests/unit/json_samples/root.json') as f: self.conn.get.return_value.json.return_value = json.load(f) self.root = main.Sushy('http://foo.bar:1234', verify=True, auth=mock_auth) diff --git a/sushy_oem_dellemc/utils.py b/sushy_oem_idrac/utils.py similarity index 100% rename from sushy_oem_dellemc/utils.py rename to sushy_oem_idrac/utils.py diff --git a/tox.ini b/tox.ini index 3b3fa83..0903a6d 100644 --- a/tox.ini +++ b/tox.ini @@ -28,7 +28,7 @@ basepython = python3 setenv = {[testenv]setenv} PYTHON=coverage run --parallel-mode -# After running this target, visit sushy_oem_dellemc/cover/index.html +# After running this target, visit sushy_oem_idrac/cover/index.html # in your browser, to see a nicer presentation report with annotated # HTML listings detailing missed lines. commands = coverage erase @@ -49,7 +49,7 @@ commands = [testenv:debug] basepython = python3 -commands = oslo_debug_helper -t sushy_oem_dellemc/tests {posargs} +commands = oslo_debug_helper -t sushy_oem_idrac/tests {posargs} [flake8] # E123, E125 skipped as they are invalid PEP-8.