8. Development
This section only needs to be read by developers of the zhmcclient package. People that want to make a fix or develop some extension, and people that want to test the project are also considered developers for the purpose of this section.
8.1. Code of Conduct
Help us keep zhmcclient open and inclusive. Please read and follow our Code of Conduct.
8.2. Repository
The repository for zhmcclient is on GitHub:
8.3. Setting up the development environment
The development environment is pretty easy to set up.
Besides having a supported operating system with a supported Python version (see Supported environments), it is recommended that you set up a virtual Python environment.
Then, with a virtual Python environment active, clone the Git repo of this
project and prepare the development environment with make develop
:
$ git clone git@github.com:zhmcclient/python-zhmcclient.git
$ cd python-zhmcclient
$ make develop
This will install all prerequisites the package needs to run, as well as all prerequisites that you need for development.
Generally, this project uses Make to do things in the currently active
Python environment. The command make help
(or just make
) displays a
list of valid Make targets and a short description of what each target does.
8.4. Building the documentation
The ReadTheDocs (RTD) site is used to publish the documentation for the zhmcclient package at http://python-zhmcclient.readthedocs.io/
This page automatically gets updated whenever the master
branch of the
Git repo for this package changes.
In order to build the documentation locally from the Git work directory, issue:
$ make builddoc
The top-level document to open with a web browser will be
build_doc/html/docs/index.html
.
8.5. Testing
The zhmcclient project supports the following kinds of tests:
unit tests against a mocked HMC, using
pytest
end2end tests against a real or mocked HMC, using
pytest
install tests (Linux and MacOS only)
8.5.1. Running unit tests
To run the unit tests in the currently active Python environment, issue:
$ make test
By default, all unit tests are run. The TESTCASES
environment variable can
be used to limit the testcases that are run. Its value is passed to the -k
option of the pytest
command.
For example:
$ TESTCASES=test_resource.py make test # Run only this test source file
$ TESTCASES=test_func1 make test # Run only this test function or test class
$ TESTCASES="test_func1 or test_func2" make test # Run both of these test functions or classes
Additional options for the pytest
command can be specified with the
TESTOPTS
environment variable.
For example:
$ TESTOPTS='-x' make test # Stop after first test case failure
$ TESTOPTS='--pdb' make test # Invoke debugger on each test case failure
Invoke pytest --help
for details on its options including the syntax of the
-k
option, or see
pytest options.
To run the unit tests and some more commands that verify the project is in good
shape in all supported Python environments, use Tox.
The positional arguments of the tox
command are passed to pytest
using
its -k
option.
For example:
$ tox # Run all tests on all supported Python versions
$ tox -e py27 # Run all tests on Python 2.7
$ tox -e py27 test_resource.py # Run only this test source file on Python 2.7
$ tox -e py27 TestInit # Run only this test class on Python 2.7
$ tox -e py27 TestInit or TestSet # pytest -k expressions are possible
8.5.2. Running end2end tests
Prepare an HMC inventory file that defines real and/or mocked HMCs the tests should be run against, and an HMC vault file with credentials for the real HMCs.
There are examples for these files, that describe their format in the comment header:
To run the end2end tests in the currently active Python environment, issue:
$ make end2end
By default, the HMC inventory file named .zhmc_inventory.yaml
in
the home directory of the current user is used. A different path name can
be specified with the TESTINVENTORY
environment variable.
By default, the HMC vault file named .zhmc_vault.yaml
in
the home directory of the current user is used. A different path name can
be specified with the TESTVAULT
environment variable.
By default, the tests are run against the group name or HMC nickname
default
defined in the HMC inventory file. A different group name or
HMC nickname can be specified with the TESTHMC
environment variable.
Examples:
Run against group or HMC nickname ‘default’ using the specified HMC inventory and vault files:
$ TESTINVENTORY=`./hmc_inventory.yaml` TESTVAULT=`./hmc_vault.yaml` make end2end
Run against group or HMC nickname ‘HMC1’ using the default HMC inventory and vault files:
$ TESTHMC=`HMC1` make end2end
8.5.3. Running end2end tests against example mocked environments
The examples
directory contains example mocked environments defined in the
following YAML files:
examples/example_mocked_z16_classic.yaml
- HMC with a z16 in classic modeexamples/example_mocked_z16_dpm.yaml
- HMC with a z16 in DPM mode
It also contains an inventory and vault file for these mocked environments. The inventory file defines its default group to use these mocked environments:
examples/example_hmc_inventory.yaml
examples/example_hmc_vault.yaml
These mock environments can be used to run the end2end tests against, by executing:
$ make end2end_mocked
8.5.4. Enabling logging during end2end tests
TODO: At this point, the `setup_logging()` function that enables the logging described in this section is not used in the end2end tests
The end2end tests have the ability to log the API calls to the zhmcclient library and the interactions with the (real or mocked) HMC.
By default, logging is set up such that the zhmcclient library logs messages with a log level of “warning” or higher, to stderr.
The log level and the components to be logged can be set using the ZHMC_LOG
environment variable:
$ export ZHMC_LOG=COMP=LEVEL[,COMP=LEVEL[,...]]
Where:
COMP
is one of:all
,api
,hmc
.LEVEL
is one of:error
,warning
,info
,debug
.
For example, to enable logging of the zhmcclient API calls and the interactions with the HMC, use:
$ export ZHMC_LOG=api=debug,hmc=debug
or, shorter:
$ export ZHMC_LOG=all=debug
8.5.5. HMC inventory file
The HMC inventory file specifies HMCs and/or groups of HMCs to be used for any
code that uses the zhmcclient.testutils
module, such as the end2end tests,
the example scripts, other zhmcclient projects, or even projects by users of
the zhmcclient library.
The HMCs and HMC groups defined in the HMC inventory file have nicknames and
the nickname to be used for end2end tests and the example scripts can be
specified using the TESTHMC
environment variable, for example:
$ TESTHMC=HMC1 make end2end # run end2end tests against nickname "HMC1"
$ TESTHMC=HMC1 examples/list_cpcs.py # run this example script against nickname "HMC1"
If no nickname is specified using the TESTHMC
environment variable, the
nickname “default” is used, for example:
$ make end2end # run end2end tests against nickname "default""
$ examples/list_cpcs.py # run this example script against nickname "default""
By default, the HMC inventory file ~/.zhmc_inventory.yaml
is used.
A different path name can be specified with the TESTINVENTORY
environment
variable.
The following describes the structure of the HMC inventory file:
all: # Nickname of the top-level HMC group; must be 'all'.
hosts: # Definition of all HMCs, each with an item as follows:
<hmc_nick>: # Nickname of an HMC; may be a DNS hostname, IP address,
# or arbitrary string.
description: <string> # Optional: One line description of the HMC.
contact: <string> # Optional: Informal reference to a contact for the HMC.
access_via: <string> # Optional: Reminder on network setup needed for access.
ansible_host: <host> # If real HMC: DNS hostname or IP address of HMC, if
# arbitrary string was used as HMC nickname.
mock_file: <path_name> # If mocked HMC: Relative path name of HMC mock file.
cpcs: # CPCs to test against. Can be a subset or all CPCs
# managed by the HMC.
<cpc_name>: # CPC name.
dpm_enabled: <bool> # Whether the CPC is in DPM mode (true) or classic mode
# (false). This is used to include the CPC in pytest
# fixtures that select CPCs based on their mode.
<prop_name>: <prop_value> # Optional: Additional expected CPC properties, for
# use by test functions.
<var_name>: <var_value> # Optional: Additional variables for this HMC, for use
# by test functions.
vars: # Optional: Additional variables for all HMCs, for use
# by test functions.
<var_name>: <var_value>
children: # Optional: HMC groups.
<group_nick>: # Nickname of this HMC group.
hosts: # The HMCs in this group.
<hmc_nick>: # Reference to an HMC in this group via its nickname.
... # Optional: Additional variables to override the ones
# inherited from the parent HMC definition. Not
# normally needed.
vars: # Optional: Additional variables for the HMCs in this
# group.
<var_name>: <var_value>
children: # Optional: Grand child groups. Only ever needed when
... # using variable inheritance for some reason.
# Can be further nested.
Here is the example HMC inventory file examples/example_hmc_inventory.yaml:
---
# HMC inventory file for zhmcclient projects
#
# This file defines real HMCs and mocked HMCs (using the zhmcclient mock
# support) for use by the zhmcclient projects. Their credentials are defined
# in a corresponding HMC vault file.
#
# The format of HMC inventory files is described in
# https://python-zhmcclient.readthedocs.io/en/latest/development.html#hmc-inventory-file
all:
hosts:
HMC1:
description: "my dev systems"
contact: "John Doe"
access_via: "VPN to dev network"
ansible_host: "10.11.12.13"
cpcs:
XYZ1:
machine_type: "2964"
dpm_enabled: true
XYZ2:
machine_type: "3906"
dpm_enabled: true
MOCKED_Z16_CLASSIC:
description: "Example mocked HMC with a z16 in classic mode"
mock_file: "example_mocked_z16_classic.yaml"
cpcs:
CPC1:
machine_type: "3906"
dpm_enabled: false
MOCKED_Z16_DPM:
description: "Example mocked HMC with a z16 in DPM mode"
mock_file: "example_mocked_z16_dpm.yaml"
cpcs:
CPC1:
machine_type: "3906"
dpm_enabled: true
children:
default:
hosts:
MOCKED_Z16_CLASSIC:
MOCKED_Z16_DPM:
dev:
hosts:
HMC1:
In that example HMC inventory file, the following nicknames of single HMCs are defined:
HMC1 - The HMC at 10.11.12.13.
MOCKED_Z16_CLASSIC - The mocked HMC defined in mock file examples/example_mocked_z16_classic.yaml.
MOCKED_Z16_DPM - The mocked HMC defined in mock file examples/example_mocked_z16_dpm.yaml.
The following nicknames of HMC groups are defined:
all - All HMCs, i.e. HMC1, MOCKED_Z16_CLASSIC, and MOCKED_Z16_DPM.
default - The HMCs with nicknames MOCKED_Z16_CLASSIC and MOCKED_Z16_DPM.
dev - The HMC with nickname HMC1.
The tests that use CPCs or resources within CPCs will be run against
only the subset of CPCs that are defined in the cpcs
variables of the HMC
entries. In that example HMC inventory file, those are:
For HMC1: Only the CPCs XYZ1 and XYZ2.
For MOCKED_Z16_CLASSIC: Only the CPC CPC1.
For MOCKED_Z16_DPM: Only the CPC CPC1.
Any variables defined for the HMCs are available to the test functions via an
HMCDefinition
object. See pytest fixture
hmc_session()
for details.
The format of HMC inventory files is compatible with the format of Ansible inventory files in YAML format, with the following extensions:
Certain variables in the definition of HMC hosts have a defined meaning. See the format description above for details.
and the following limitations:
DNS host names or IP addresses with ranges (e.g.
myhost[0:9].xyz.com
) are not supported.
For more details on the format of Ansible inventory files, see Ansible: How to build your inventory.
8.5.6. HMC vault file
The HMC vault file specifies credentials for real HMCs to be used for any
code that uses the zhmcclient.testutils
module, such as the end2end tests,
the example scripts, other zhmcclient projects, or even projects by users of
the zhmcclient library.
It is required to have the HMC credentials in the HMC vault file; they cannot be specified in the HMC inventory file.
By default, the HMC vault file ~/.zhmc_vault.yaml
is used.
A different path name can be specified with the TESTVAULT
environment
variable.
The data items for HMCs in the HMC vault file are looked up using the HMC names from the HMC inventory file, so they must match.
The following describes the structure of the HMC vault file:
hmc_auth:
<hmc_nick>: # Nickname of an HMC defined in the inventory file
userid: <string> # HMC userid
password: <string> # HMC password
verify: <bool> # Indicates whether the server certificate returned
# by the HMC should be validated.
ca_certs: <ca_certs> # Used for verify_cert init parm of zhmcclient.Session
<var_name>: <var_value> # Any other variables are allowed but will be ignored
For details about <ca_certs>
, see the description of the verify_cert
init parameter of the zhmcclient.Session
class.
Here is the example HMC vault file examples/example_hmc_vault.yaml:
---
# HMC vault file for zhmcclient projects
#
# This file defines the credentials for real HMCs for use by the zhmcclient
# projects. Their HMC definitions are specified in a corresponding HMC inventory
# file.
#
# The format of HMC vault files is described in
# https://python-zhmcclient.readthedocs.io/en/latest/development.html#hmc-vault-file
hmc_auth:
HMC1:
userid: ensadmin
password: password
verify: false
MOCKED_Z16_CLASSIC:
userid: dummy
password: dummy
MOCKED_Z16_DPM:
userid: dummy
password: dummy
The format of HMC vault files is compatible with the format of Ansible vault files in YAML format, with the following limitations:
In the current release, HMC vault files cannot be encrypted. To mitigate that, set restrictive file permissions on the HMC vault files.
8.6. Developing tests
The zhmcclient.testutils
module provides support for developing tests
that run against real HMCs or mocked HMCs defined with the Mock support.
These HMCs are defined in an HMC inventory file, and their credentials are defined in an HMC vault file.
8.6.1. zhmcclient.testutils module
zhmcclient.testutils - Utilities for testing against real or mocked HMCs.
This module defines pytest fixtures for use by the test functions and encapsulates the access to the HMC inventory and vault files.
Look at the existing test functions in https://github.com/zhmcclient/python-zhmcclient/tree/master/tests for real-life examples.
8.6.2. Pytest fixtures
Pytest fixtures are used as parameters of test functions. When used, they are specified just with their name. Pytest resolves the parameters of test functions to its known fixtures, based upon the parameter name. For more details on pytest fixtures in general, see pytest fixtures.
The zhmcclient.testutils
module provides the following pytest fixtures:
- zhmcclient.testutils.hmc_definition(request)[source]
Pytest fixture representing the set of HMC definitions to use for a test.
A test function parameter with the name of this fixture resolves to the
HMCDefinition
object of each HMC to test against.The test function is called once for each HMC, if the targeted HMC is a group.
- zhmcclient.testutils.hmc_session(request, hmc_definition)[source]
Pytest fixture representing the set of HMC sessions to run a test against.
A test function parameter with the name of this fixture resolves to the
zhmcclient.Session
orzhmcclient_mock.FakedSession
object for each HMC to test against.The session is already logged on to the HMC.
The session object has an additional property named
hmc_definition
that is theHMCDefinition
object for the corresponding HMC definition in the HMC inventory file.Because the hmc_definition parameter of this fixture is again a fixture, the
zhmcclient.testutils.hmc_definition()
function needs to be imported as well when this fixture is used.Upon fixture teardown, the session is automatically logged off from the HMC.
- zhmcclient.testutils.all_cpcs(request, hmc_session)[source]
Pytest fixture representing the set of all CPCs to test against, regardless of their operational mode.
The CPCs to test against are defined in the
cpcs
variable for the HMC entry in the HMC inventory file.A test function parameter with the name of this fixture resolves to a list of
zhmcclient.Cpc
objects representing that set of CPCs. These objects have the “short” set of properties fromzhmcclient.Cpc.list()
.The test function is invoked just once with the list of CPCs, and the test function needs to loop through the CPCs (or a subset).
Because the hmc_session parameter of this fixture is again a fixture, the
zhmcclient.testutils.hmc_session()
function needs to be imported as well when this fixture is used.
- zhmcclient.testutils.dpm_mode_cpcs(request, hmc_session)[source]
Pytest fixture representing the set of CPCs in DPM mode to test against.
The CPCs to test against are defined in the
cpcs
variable in the HMC entry in the HMC inventory file and have theirdpm_enabled
property set totrue
.A test function parameter with the name of this fixture resolves to a list of
zhmcclient.Cpc
objects representing that set of CPCs. These objects have the “short” set of properties fromzhmcclient.Cpc.list()
.The test function is invoked just once with the list of CPCs, and the test function needs to loop through the CPCs (or a subset).
Because the hmc_session parameter of this fixture is again a fixture, the
zhmcclient.testutils.hmc_session()
function needs to be imported as well when this fixture is used.
- zhmcclient.testutils.classic_mode_cpcs(request, hmc_session)[source]
Pytest fixture representing the set of CPCs in classic mode to test against.
The CPCs to test against are defined in the
cpcs
variable in the HMC entry in the HMC inventory file and have theirdpm_enabled
property set tofalse
.A test function parameter with the name of this fixture resolves to a list of
zhmcclient.Cpc
objects representing that set of CPCs. These objects have the “short” set of properties fromzhmcclient.Cpc.list()
.The test function is invoked just once with the list of CPCs, and the test function needs to loop through the CPCs (or a subset).
Because the hmc_session parameter of this fixture is again a fixture, the
zhmcclient.testutils.hmc_session()
function needs to be imported as well when this fixture is used.
8.6.3. Encapsulation of HMC inventory file
The zhmcclient.testutils
module provides the following elements to
encapsulate access to the HMC inventory file, e.g. by test functions:
- zhmcclient.testutils.hmc_definitions(load=True)[source]
Return the list of HMC definitions to be used for testing.
- Parameters
load (bool) – Load the HMC inventory and vault files. Otherwise, these files are not loaded. This is used to avoid a dependency on these files for normal zhmcclient users. If None, the ‘TESTEND2END_LOAD’ environment variable is used.
- Returns
- zhmcclient.testutils.print_hmc_definitions()[source]
Print all available HMC definitions in the HMC inventory and vault files.
- class zhmcclient.testutils.HMCDefinitions(inventory_file=None, vault_file=None, testhmc=None, load=None)[source]
The HMC definitions in the HMC inventory file and their credentials in the HMC vault file.
- Parameters
inventory_file (string) – Path name of HMC inventory file`. If None, the file specified in the ‘TESTINVENTORY’ environment variable or if not set, the default file
~/.zhmc_inventory.yaml
is used.vault_file (string) – Path name of HMC vault file. If None, the file specified in the ‘TESTVAULT’ environment variable or if not set, the default file
~/.zhmc_vault.yaml
is used.testhmc (string) – Group nickname or HMC nickname in HMC inventory file to test against. If None, the nickname specified in the ‘TESTHMC’ environment variable or if not set, the nickname “default” is used.
load (bool) – Load the HMC inventory and vault files. Otherwise, these files are not loaded. This is used to avoid a dependency on these files for normal zhmcclient users. If None, the ‘TESTEND2END_LOAD’ environment variable is used.
- Raises
Methods:
__repr__
()Return repr(self).
list_hmcs
([name])Return a list of
HMCDefinition
objects in the HMC inventory file, for the specified HMC group or single HMC nickname.List all HMCs in the HMC inventory file.
List all group names in the HMC inventory file.
Attributes:
Path name of HMC inventory file.
Path name of HMC vault file.
HMC group or single HMC nickname to be tested.
The names of the HMC groups in the HMC inventory file.
- property inventory_file
Path name of HMC inventory file.
- Type
string
- property vault_file
Path name of HMC vault file.
- Type
string
- property testhmc
HMC group or single HMC nickname to be tested.
- Type
string
- list_hmcs(name=None)[source]
Return a list of
HMCDefinition
objects in the HMC inventory file, for the specified HMC group or single HMC nickname.The path names in the
HMCDefinition.mock_file
property are absolute path names, whereby any relative path names in the HMC inventory file have been interpreted relative to the directory of the HMC inventory file.- Parameters
name (string) – Name of an HMC group or nickname of a single HMC in the HMC inventory file. If None, the default group or nickname defined in
HMCDefinitions.testhmc
is used.- Returns
- The specified HMCs in the HMC
inventory file.
- Return type
list of
HMCDefinition
- Raises
zhmcclient.testutils.HMCNotFound – HMC group or nickname not found.
- list_all_hmcs()[source]
List all HMCs in the HMC inventory file.
- Returns
All HMCs in the HMC inventory file.
- Return type
list of
HMCDefinition
- class zhmcclient.testutils.HMCDefinition(nickname, description='', contact='', access_via='', mock_file=None, host=None, userid=None, password=None, verify=True, ca_certs=None, cpcs=None, add_vars=None)[source]
A single HMC definition.
An HMC definition contains information needed to use the WS API of a real HMC or to setup and use a mocked HMC, some organizational information about the HMC, and some information about the CPCs managed by the HMC that are to be tested. It can also contain arbitrary additional variables.
- Parameters
nickname (string) – Nickname of the HMC (DNS name, IP address, or host alias).
description (string) – Short description of the HMC.
contact (string) – Name of the technical contact of the HMC.
access_via (string) – Networking preconditions for reaching the HMC.
mock_file (string) – Path name of HMC mock file, or None. This argument is used to detect whether the HMC is a real or mocked HMC: If None, it is a real HMC. Otherwise, it is a mocked HMC and the path name is stored as provided.
host (string) – IP address or DNS hostname of the real HMC. Required for real HMCs, must not be None. Optional for mocked HMCs.
userid (string) – Userid (username) for authenticating with the HMC. Required, must not be None.
password (string) – Password for authenticating with the HMC. Required, must not be None.
verify (bool) – Verify the HMC certificate as specified in ca_certs. Optional, defaults to True.
ca_certs (string) – Path name of certificate file or certificate directory to be used for verifying the HMC certificate, or None. If None, the path name in the ‘REQUESTS_CA_BUNDLE’ environment variable, or the path name in the ‘CURL_CA_BUNDLE’ environment variable, or the certificates in the Mozilla CA Certificate List provided by the ‘certifi’ Python package are used. Optional, defaults to None.
cpcs (dict) –
CPCs managed by the HMC that are to be tested. If None, no CPCs are tested.
key: CPC name.
value: dict of expected CPC properties, using underscored property names. Used for basic classification of the CPC, e.g. ‘dpm-mode’, ‘machine-type’, ‘machine-model’.
add_vars (dict) – Additional variables. The variable values can have arbitrary types.
Methods:
__repr__
()Return repr(self).
Attributes:
Nickname of the HMC (exists only in this encapsulation class, not known by the HMC itself).
Short description of the HMC.
Name of the technical contact of the HMC.
Networking preconditions for reaching the HMC.
Path name of HMC mock file, or None.
IP address or DNS hostname of the HMC.
Userid (username) for authenticating with the HMC.
Password for authenticating with the HMC.
Verify the HMC certificate as specified in
ca_certs
.Path name of certificate file or certificate directory to be used for verifying the HMC certificate, or None.
A combination of
verify
andca_certs
for direct use as the verify_cert parameter ofzhmcclient.Session
.CPCs managed by the HMC that are to be tested.
Additional variables for the HMC definition.
- property nickname
Nickname of the HMC (exists only in this encapsulation class, not known by the HMC itself).
- Type
string
- property description
Short description of the HMC.
- Type
string
- property contact
Name of the technical contact of the HMC.
- Type
string
- property access_via
Networking preconditions for reaching the HMC.
For example, Boundary firewall or VPN connection.
- Type
string
- property mock_file
Path name of HMC mock file, or None.
An HMC mock file defines a mocked HMC based on the zhmcclient_mock support.
This property indicates whether the HMC is a real or mocked HMC: If None, it is a real HMC, otherwise it is a mocked HMC.
- Type
string
- property host
IP address or DNS hostname of the HMC.
This is a settable property.
- Type
string
- property userid
Userid (username) for authenticating with the HMC.
- Type
string
- property password
Password for authenticating with the HMC.
- Type
string
- property ca_certs
Path name of certificate file or certificate directory to be used for verifying the HMC certificate, or None.
If None, the path name in the ‘REQUESTS_CA_BUNDLE’ environment variable, or the path name in the ‘CURL_CA_BUNDLE’ environment variable, or the certificates in the Mozilla CA Certificate List provided by the ‘certifi’ Python package are used.
- Type
string
- property verify_cert
A combination of
verify
andca_certs
for direct use as the verify_cert parameter ofzhmcclient.Session
.- Type
bool or string
- property cpcs
CPCs managed by the HMC that are to be tested.
Each dict item represents one CPC:
key (string): CPC name.
value (dict): Dict with expected CPC properties (with underscores).
- Type
- class zhmcclient.testutils.HMCInventoryFile(filepath)[source]
Encapsulation of an HMC inventory file in YAML format.
Attributes:
Path name of the HMC inventory file.
Content of the HMC inventory file, as nested
OrderedDict
andlist
objects.- property filepath
Path name of the HMC inventory file.
- Type
string
- property data
Content of the HMC inventory file, as nested
OrderedDict
andlist
objects.- Type
8.6.4. Encapsulation of HMC vault file
The zhmcclient.testutils
module provides the following elements to
encapsulate access to the HMC vault file, e.g. by test functions:
- class zhmcclient.testutils.HMCVaultFile(filepath)[source]
Encapsulation of an HMC vault file in YAML format.
Attributes:
Path name of the HMC vault file.
Content of the HMC vault file, as nested
OrderedDict
andlist
objects.- property filepath
Path name of the HMC vault file.
- Type
string
- property data
Content of the HMC vault file, as nested
OrderedDict
andlist
objects.- Type
8.6.5. Exceptions
The zhmcclient.testutils
module may raise the following exceptions:
- class zhmcclient.testutils.HMCInventoryFileError[source]
An error in the HMC inventory file.
- class zhmcclient.testutils.HMCVaultFileError[source]
An error in the HMC vault file.
- class zhmcclient.testutils.HMCNoVaultError[source]
The HMC vault file does not have a corresponding entry for the HMC.
- class zhmcclient.testutils.HMCNotFound[source]
The HMC group or nickname was not found in the HMC inventory file.
8.7. Contributing
Third party contributions to this project are welcome!
In order to contribute, create a Git pull request, considering this:
Test is required.
Each commit should only contain one “logical” change.
A “logical” change should be put into one commit, and not split over multiple commits.
Large new features should be split into stages.
The commit message should not only summarize what you have done, but explain why the change is useful.
The commit message must follow the format explained below.
What comprises a “logical” change is subject to sound judgement. Sometimes, it makes sense to produce a set of commits for a feature (even if not large). For example, a first commit may introduce a (presumably) compatible API change without exploitation of that feature. With only this commit applied, it should be demonstrable that everything is still working as before. The next commit may be the exploitation of the feature in other components.
For further discussion of good and bad practices regarding commits, see:
8.8. Format of commit messages
A commit message must start with a short summary line, followed by a blank line.
Optionally, the summary line may start with an identifier that helps identifying the type of change or the component that is affected, followed by a colon.
It can include a more detailed description after the summary line. This is where you explain why the change was done, and summarize what was done.
It must end with the DCO (Developer Certificate of Origin) sign-off line in the format shown in the example below, using your name and a valid email address of yours. The DCO sign-off line certifies that you followed the rules stated in DCO 1.1. In short, you certify that you wrote the patch or otherwise have the right to pass it on as an open-source patch.
We use GitCop during creation of a pull request to check whether the commit messages in the pull request comply to this format. If the commit messages do not comply, GitCop will add a comment to the pull request with a description of what was wrong.
Example commit message:
cookies: Add support for delivering cookies
Cookies are important for many people. This change adds a pluggable API for
delivering cookies to the user, and provides a default implementation.
Signed-off-by: Random J Developer <random@developer.org>
Use git commit --amend
to edit the commit message, if you need to.
Use the --signoff
(-s
) option of git commit
to append a sign-off
line to the commit message with your name and email as known by Git.
If you like filling out the commit message in an editor instead of using
the -m
option of git commit
, you can automate the presence of the
sign-off line by using a commit template file:
Create a file outside of the repo (say,
~/.git-signoff.template
) that contains, for example:<one-line subject> <detailed description> Signed-off-by: Random J Developer <random@developer.org>
Configure Git to use that file as a commit template for your repo:
git config commit.template ~/.git-signoff.template
8.9. Releasing a version
This section shows the steps for releasing a version to PyPI.
It covers all variants of versions that can be released:
Releasing a new major version (Mnew.0.0) based on the master branch
Releasing a new minor version (M.Nnew.0) based on the master branch
Releasing a new update version (M.N.Unew) based on the stable branch of its minor version
This description assumes that you are authorized to push to the remote repo
at https://github.com/zhmcclient/python-zhmcclient and that the remote repo
has the remote name origin
in your local clone.
Any commands in the following steps are executed in the main directory of your local clone of the python-zhmcclient Git repo.
On GitHub, verify open items in milestone
M.N.U
.Verify that milestone
M.N.U
has no open issues or PRs anymore. If there are open PRs or open issues, make a decision for each of those whether or not it should go into versionM.N.U
you are about to release.If there are open issues or PRs that should go into this version, abandon the release process.
If none of the open issues or PRs should go into this version, change their milestones to a future version, and proceed with the release process. You may need to create the milestone for the future version.
Set shell variables for the version that is being released and the branch it is based on:
MNU
- Full version M.N.U that is being releasedMN
- Major and minor version M.N of that full versionBRANCH
- Name of the branch the version that is being released is based on
When releasing a new major version (e.g.
1.0.0
) based on the master branch:MNU=1.0.0 MN=1.0 BRANCH=master
When releasing a new minor version (e.g.
0.9.0
) based on the master branch:MNU=0.9.0 MN=0.9 BRANCH=master
When releasing a new update version (e.g.
0.8.1
) based on the stable branch of its minor version:MNU=0.8.1 MN=0.8 BRANCH=stable_${MN}
Create a topic branch for the version that is being released:
git checkout ${BRANCH} git pull git checkout -b release_${MNU}
Edit the version file:
vi zhmcclient/_version.py
and set the
__version__
variable to the version that is being released:__version__ = 'M.N.U'
Edit the change log:
vi docs/changes.rst
and make the following changes in the section of the version that is being released:
Finalize the version.
Change the release date to today’s date.
Make sure that all changes are described.
Make sure the items shown in the change log are relevant for and understandable by users.
In the “Known issues” list item, remove the link to the issue tracker and add text for any known issues you want users to know about.
Remove all empty list items.
Commit your changes and push the topic branch to the remote repo:
git commit -asm "Release ${MNU}" git push --set-upstream origin release_${MNU}
On GitHub, create a Pull Request for branch
release_M.N.U
.Important: When creating Pull Requests, GitHub by default targets the
master
branch. When releasing based on a stable branch, you need to change the target branch of the Pull Request tostable_M.N
.Set the milestone of that PR to version
M.N.U
.This PR should normally be set to be reviewed by at least one of the maintainers.
The PR creation will cause the “test” workflow to run. That workflow runs tests for all defined environments, since it discovers by the branch name that this is a PR for a release.
On GitHub, once the checks for that Pull Request have succeeded, merge the Pull Request (no review is needed). This automatically deletes the branch on GitHub.
If the PR did not succeed, fix the issues.
On GitHub, close milestone
M.N.U
.Verify that the milestone has no open items anymore. If it does have open items, investigate why and fix. If the milestone does not have open items anymore, close the milestone.
Publish the package
git checkout ${BRANCH} git pull git branch -D release_${MNU} git branch -D -r origin/release_${MNU} git tag -f ${MNU} git push -f --tags
Pushing the new tag will cause the “publish” workflow to run. That workflow builds the package, publishes it on PyPI, creates a release for it on Github, and finally creates a new stable branch on Github if the master branch was released.
Verify the publishing
Wait for the “publish” workflow for the new release to have completed: https://github.com/zhmcclient/python-zhmcclient/actions/workflows/publish.yml
Then, perform the following verifications:
Verify that the new version is available on PyPI at https://pypi.python.org/pypi/zhmcclient/
Verify that the new version has a release on Github at https://github.com/zhmcclient/python-zhmcclient/releases
Verify that the new version has documentation on ReadTheDocs at https://python-zhmcclient.readthedocs.io/en/latest/changes.html
The new version
M.N.U
should be automatically active on ReadTheDocs, causing the documentation for the new version to be automatically built and published.If you cannot see the new version after some minutes, log in to https://readthedocs.org/projects/python-zhmcclient/versions/ and activate the new version.
8.10. Starting a new version
This section shows the steps for starting development of a new version.
This section covers all variants of new versions:
Starting a new major version (Mnew.0.0) based on the master branch
Starting a new minor version (M.Nnew.0) based on the master branch
Starting a new update version (M.N.Unew) based on the stable branch of its minor version
This description assumes that you are authorized to push to the remote repo
at https://github.com/zhmcclient/python-zhmcclient and that the remote repo
has the remote name origin
in your local clone.
Any commands in the following steps are executed in the main directory of your local clone of the python-zhmcclient Git repo.
Set shell variables for the version that is being started and the branch it is based on:
MNU
- Full version M.N.U that is being startedMN
- Major and minor version M.N of that full versionBRANCH
- Name of the branch the version that is being started is based on
When starting a new major version (e.g.
1.0.0
) based on the master branch:MNU=1.0.0 MN=1.0 BRANCH=master
When starting a new minor version (e.g.
0.9.0
) based on the master branch:MNU=0.9.0 MN=0.9 BRANCH=master
When starting a new minor version (e.g.
0.8.1
) based on the stable branch of its minor version:MNU=0.8.1 MN=0.8 BRANCH=stable_${MN}
Create a topic branch for the version that is being started:
git fetch origin git checkout ${BRANCH} git pull git checkout -b start_${MNU}
Edit the version file:
vi zhmcclient/_version.py
and update the version to a draft version of the version that is being started:
__version__ = 'M.N.U.dev1'
Edit the change log:
vi docs/changes.rst
and insert the following section before the top-most section:
Version M.N.U.dev1 ^^^^^^^^^^^^^^^^^^ This version contains all fixes up to version M.N-1.x. Released: not yet **Incompatible changes:** **Deprecations:** **Bug fixes:** **Enhancements:** **Cleanup:** **Known issues:** * See `list of open issues`_. .. _`list of open issues`: https://github.com/zhmcclient/python-zhmcclient/issues
Commit your changes and push them to the remote repo:
git commit -asm "Start ${MNU}" git push --set-upstream origin start_${MNU}
On GitHub, create a milestone for the new version
M.N.U
.You can create a milestone in GitHub via Issues -> Milestones -> New Milestone.
On GitHub, create a Pull Request for branch
start_M.N.U
.Important: When creating Pull Requests, GitHub by default targets the
master
branch. When starting a version based on a stable branch, you need to change the target branch of the Pull Request tostable_M.N
.No review is needed for this PR.
Set the milestone of that PR to the new version
M.N.U
.On GitHub, go through all open issues and pull requests that still have milestones for previous releases set, and either set them to the new milestone, or to have no milestone.
Note that when the release process has been performed as described, there should not be any such issues or pull requests anymore. So this step here is just an additional safeguard.
On GitHub, once the checks for the Pull Request for branch
start_M.N.U
have succeeded, merge the Pull Request (no review is needed). This automatically deletes the branch on GitHub.Update and clean up the local repo:
git checkout ${BRANCH} git pull git branch -D start_${MNU} git branch -D -r origin/start_${MNU}