Skip to content

Commit

Permalink
Various: Use nmstate/Nmstate as the uniform name
Browse files Browse the repository at this point in the history
Signed-off-by: Till Maas <opensource@till.name>
  • Loading branch information
tyll committed Feb 26, 2019
1 parent a08f7dc commit d6f4ddc
Show file tree
Hide file tree
Showing 6 changed files with 14 additions and 14 deletions.
4 changes: 2 additions & 2 deletions README.developer.md
@@ -1,6 +1,6 @@
# NMState Coding Guidelines
# Nmstate Coding Guidelines

- NMState is written primarily in Python, and its coding style should follow
- Nmstate is written primarily in Python, and its coding style should follow
the best practices of Python coding unless otherwise declared.
- PEP8 is holy.
- Tests are holy.
Expand Down
10 changes: 5 additions & 5 deletions README.md
@@ -1,4 +1,4 @@
# We are nmstate!
# We are Nmstate!
A declarative network manager API for hosts.

[![Unit Test Status](https://travis-ci.org/nmstate/nmstate.png?branch=master)](https://travis-ci.org/nmstate/nmstate)
Expand All @@ -11,18 +11,18 @@ Copr build status:
* Fedora GIT master: [![Fedora GIT master Copr build status](https://copr.fedorainfracloud.org/coprs/nmstate/nmstate-git-fedora/package/nmstate/status_image/last_build.png)](https://copr.fedorainfracloud.org/coprs/nmstate/nmstate-git-fedora/package/nmstate/)

## What is it?
NMState is a library with an accompanying command line tool that manages
Nmstate is a library with an accompanying command line tool that manages
host networking settings in a declarative manner.
The networking state is described by a pre-defined schema.
Reporting of current state and changes to it (desired state) both conform to
the schema.

NMState is aimed to satisfy enterprise needs to manage host networking through
Nmstate is aimed to satisfy enterprise needs to manage host networking through
a northbound declarative API and multi provider support on the southbound.
NetworkManager acts as the main (and currently the only) provider supported.

## Contact
*nmstate* uses the [NetworkManager mailing
*Nmstate* uses the [NetworkManager mailing
list](https://mail.gnome.org/mailman/listinfo/networkmanager-list)
([Archives](https://mail.gnome.org/archives/networkmanager-list/)) for
discussions. Emails about nmstate should be tagged with `[nmstate]` in the
Expand All @@ -36,7 +36,7 @@ IRC](https://freenode.net/kb/answer/chat).

## Development Environment

nmstate uses `tox` to run unit tests and linters. Since nmstate uses the binary
Nmstate uses `tox` to run unit tests and linters. Since Nmstate uses the binary
module PyGObject it also requires the build dependencies for it.

### RHEL 7.6
Expand Down
4 changes: 2 additions & 2 deletions automation/README.md
@@ -1,5 +1,5 @@
# Automation Environment
The automation env is serving the integration tests of nmstate.
The automation env is serving the integration tests of Nmstate.
It may be used both locally and through CI.

## Components
Expand All @@ -9,7 +9,7 @@ It may be used both locally and through CI.
The image can be found at:
https://hub.docker.com/r/nmstate/centos7-nmstate-dev/

- Dockerfile.fedora: Defines a Fedora based container image for nmstate test
- Dockerfile.fedora: Defines a Fedora based container image for Nmstate test
purpose.

The image can be found at:
Expand Down
4 changes: 2 additions & 2 deletions packaging/nmstate.py2.spec
Expand Up @@ -15,7 +15,7 @@ Requires: python2-setuptools
Requires: python2-%{libname} = %{?epoch:%{epoch}:}%{version}-%{release}

%description
NMState is a library with an accompanying command line tool that manages host
Nmstate is a library with an accompanying command line tool that manages host
networking settings in a declarative manner and aimed to satisfy enterprise
needs to manage host networking through a northbound declarative API and multi
provider support on the southbound.
Expand All @@ -30,7 +30,7 @@ Requires: python-jsonschema
Requires: python2-pyyaml

%description -n python2-%{libname}
This package contains the Python 2 library for nmstate.
This package contains the Python 2 library for Nmstate.

%prep
%setup -q
Expand Down
4 changes: 2 additions & 2 deletions packaging/nmstate.py3.spec
Expand Up @@ -15,7 +15,7 @@ BuildRequires: python3-setuptools
Requires: python3-%{libname} = %{?epoch:%{epoch}:}%{version}-%{release}

%description
NMState is a library with an accompanying command line tool that manages host
Nmstate is a library with an accompanying command line tool that manages host
networking settings in a declarative manner and aimed to satisfy enterprise
needs to manage host networking through a northbound declarative API and multi
provider support on the southbound.
Expand All @@ -32,7 +32,7 @@ Suggests: NetworkManager-ovs


%description -n python3-%{libname}
This package contains the Python 3 library for nmstate.
This package contains the Python 3 library for Nmstate.

%prep
%setup -q
Expand Down
2 changes: 1 addition & 1 deletion tests/integration/conftest.py
Expand Up @@ -59,7 +59,7 @@ def _set_eth_admin_state(ifname, state):
desired_state = {INTERFACES: [{'name': iface_current_state['name'],
'type': iface_current_state['type'],
'state': state}]}
# FIXME: On most systems, IPv6 cannot be disabled by NMState/NM.
# FIXME: On most systems, IPv6 cannot be disabled by Nmstate/NM.
if state == 'up':
desired_state[INTERFACES][0].update({'ipv6': {'enabled': True}})
netapplier.apply(desired_state)

0 comments on commit d6f4ddc

Please sign in to comment.