Skip to content

Commit 15c2feb

Browse files
authored
Merge pull request #533 from quadsproject/development
Merge Development Forward
2 parents 6407126 + ffb850c commit 15c2feb

13 files changed

Lines changed: 195 additions & 84 deletions

CONTRIBUTING.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ We love pull requests and welcome contributions from everyone! Please use the `
2929

3030
#### Create a new issue
3131

32-
If you spot a problem with badfish, [search if an issue already exists](https://docs.github.com/en/github/searching-for-information-on-github/searching-on-github/searching-issues-and-pull-requests#search-by-the-title-body-or-comments). If a related issue doesn't exist, you can open a new issue using a relevant [issue form](https://github.com/redhat-performance/badfish/issues/new/choose).
32+
If you spot a problem with badfish, [search if an issue already exists](https://docs.github.com/en/github/searching-for-information-on-github/searching-on-github/searching-issues-and-pull-requests#search-by-the-title-body-or-comments). If a related issue doesn't exist, you can open a new issue using a relevant [issue form](https://github.com/quadsproject/badfish/issues/new/choose).
3333

3434
#### Solve an issue
3535

36-
Scan through our [existing issues](https://github.com/redhat-performance/badfish/issues) to find one that interests you. As a general rule, we don’t assign issues to anyone. If you find an issue to work on, you are welcome to open a PR with a fix.
36+
Scan through our [existing issues](https://github.com/quadsproject/badfish/issues) to find one that interests you. As a general rule, we don’t assign issues to anyone. If you find an issue to work on, you are welcome to open a PR with a fix.
3737

3838
### Make Changes
3939

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ USER root
44

55
RUN dnf install -y git
66

7-
RUN git clone https://github.com/redhat-performance/badfish
7+
RUN git clone https://github.com/quadsproject/badfish
88

99
WORKDIR badfish
1010

Dockerfile_dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ USER root
44

55
RUN dnf install -y git
66

7-
RUN git clone https://github.com/redhat-performance/badfish
7+
RUN git clone https://github.com/quadsproject/badfish
88

99
WORKDIR badfish
1010

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<p align="center">
2-
<img src="https://raw.githubusercontent.com/redhat-performance/badfish/development/image/badfish-original-licensed.small.png" />
2+
<img src="https://raw.githubusercontent.com/quadsproject/badfish/development/image/badfish-original-licensed.small.png" />
33
</p>
44

55
<h2 align="center">The Out-of-Band Wrangler</h2>
66

77
[![Copr build status](https://copr.fedorainfracloud.org/coprs/quadsdev/badfish/package/badfish/status_image/last_build.png)](https://copr.fedorainfracloud.org/coprs/quadsdev/badfish/package/badfish/)
8-
[![Codecov](https://codecov.io/gh/redhat-performance/badfish/branch/master/graph/badge.svg?token=CNJN0CD6GN)](https://codecov.io/gh/redhat-performance/badfish)
8+
[![Codecov](https://codecov.io/gh/quadsproject/badfish/branch/master/graph/badge.svg?token=CNJN0CD6GN)](https://codecov.io/gh/quadsproject/badfish)
99
[![Container image on Quay](https://quay.io/repository/quads/badfish/status "Container image on Quay")](https://quay.io/repository/quads/badfish)
10-
[![Tox](https://github.com/redhat-performance/badfish/actions/workflows/tox.yml/badge.svg)](https://github.com/redhat-performance/badfish/actions)
11-
[![Lint](https://github.com/redhat-performance/badfish/actions/workflows/lint.yml/badge.svg)](https://github.com/redhat-performance/badfish/actions)
10+
[![Tox](https://github.com/quadsproject/badfish/actions/workflows/tox.yml/badge.svg)](https://github.com/quadsproject/badfish/actions)
11+
[![Lint](https://github.com/quadsproject/badfish/actions/workflows/lint.yml/badge.svg)](https://github.com/quadsproject/badfish/actions)
1212
[![License: GPL v3](https://img.shields.io/badge/License-GPLv3-blue.svg)](https://www.gnu.org/licenses/gpl-3.0)
1313
[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/psf/black)
1414

@@ -142,7 +142,7 @@ Active RPM releases:
142142
143143
### Badfish Standalone CLI
144144
```bash
145-
git clone https://github.com/redhat-performance/badfish && cd badfish
145+
git clone https://github.com/quadsproject/badfish && cd badfish
146146
python3 -m venv bf
147147
source bf/bin/activate
148148
python3 -m pip install --upgrade build
@@ -252,7 +252,7 @@ If you choose to install Badfish via RPM package then it'll be located in `/usr/
252252
You can always retrieve our example `idrac_interfaces.yml` file via:
253253

254254
```
255-
curl https://raw.githubusercontent.com/redhat-performance/badfish/master/config/idrac_interfaces.yml --output idrac_interfaces.yml
255+
curl https://raw.githubusercontent.com/quadsproject/badfish/master/config/idrac_interfaces.yml --output idrac_interfaces.yml
256256
```
257257

258258
## Common Operations

config/idrac_interfaces.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ uefi_7525: NIC.Integrated.1-1-1,NIC.Integrated.1-2-1,NIC.Slot.6-1-1,NIC.Slot.6-2
6060
uefi_r930: NIC.Integrated.1-2-1,HardDisk.List.1-1,NIC.Integrated.1-3-1
6161
uefi_mx750c: NIC.PxeDevice.1-1,RAID.SL.3-2
6262

63-
# To understand how custom overrides and hierarchy work please see https://github.com/redhat-performance/badfish#host-type-overrides
63+
# To understand how custom overrides and hierarchy work please see https://github.com/quadsproject/badfish#host-type-overrides
6464
# PerfLab Entries
6565
foreman_cc37_r750: NIC.Embedded.1-1-1,HardDisk.List.1-1,NIC.Slot.3-1-1
6666
director_cc37_r750: NIC.Slot.3-1-1,HardDisk.List.1-1,NIC.Embedded.1-1-1

requirements.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,4 +7,5 @@ pyyaml>=3.10
77
aiohttp>=3.10
88
setuptools>=39.0
99
async-lru>=2.0
10+
rich>=13.0
1011
build>=0.7.0

rpm/badfish.spec.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
%global project badfish
2-
%global org redhat-performance
2+
%global org quadsproject
33
%global sum Tool for managing bare-metal systems via the Redfish API
44
%global desc Badfish is a vendor-agnostic, redfish-based API tool used to consolidate \
55
management of IPMI and out-of-band interfaces for common server hardware \

setup.cfg

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ long_description_content_type = text/markdown
88
license = GPL-3.0-or-later
99
license_file = LICENSE
1010
platforms = any
11-
url = https://github.com/redhat-performance/badfish
11+
url = https://github.com/quadsproject/badfish
1212
classifiers =
1313
Development Status :: 5 - Production/Stable
1414
Programming Language :: Python :: 3
@@ -21,9 +21,9 @@ classifiers =
2121
Programming Language :: Python :: 3.14
2222
keywords = oob, management
2323
project_urls =
24-
Bug Tracker = https://github.com/redhat-performance/badfish/issues
25-
Documentation = https://github.com/redhat-performance/badfish/blob/master/README.md
26-
Source Code = https://github.com/redhat-performance/badfish
24+
Bug Tracker = https://github.com/quadsproject/badfish/issues
25+
Documentation = https://github.com/quadsproject/badfish/blob/master/README.md
26+
Source Code = https://github.com/quadsproject/badfish
2727

2828
[options]
2929
packages = find:
@@ -33,6 +33,7 @@ install_requires =
3333
aiohttp>=3.10
3434
setuptools>=39.0
3535
async-lru>=2.0
36+
rich>=13.0
3637
package_dir =
3738
= src
3839
zip_safe = True

src/badfish/helpers/progress.py

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
from contextlib import contextmanager
2+
3+
from rich.progress import BarColumn, Progress, TaskProgressColumn, TextColumn
4+
5+
6+
@contextmanager
7+
def polling_progress(console, total, prompt, disable=False):
8+
progress = Progress(
9+
TextColumn("- POLLING:"),
10+
BarColumn(bar_width=20),
11+
TaskProgressColumn(),
12+
TextColumn("- {task.fields[prompt]}: {task.fields[state]}"),
13+
console=console,
14+
transient=True,
15+
disable=disable or not console.is_terminal,
16+
)
17+
with progress:
18+
task_id = progress.add_task("", total=total, prompt=prompt, state="")
19+
yield progress, task_id

0 commit comments

Comments
 (0)