Rebranding

Signed-off-by: Stanislav Bogatyrev <s.bogatyrev@yadro.com>
This commit is contained in:
Stanislav Bogatyrev 2022-12-22 16:28:24 +03:00
parent 688bbdaac3
commit eae2dc3158
10 changed files with 42 additions and 39 deletions

2
.github/CODEOWNERS vendored
View file

@ -1 +1 @@
* @alexvanin @carpawell @fyrchik @cthulhu-rider @realloc * @alexvanin @realloc @fyrchik @anatoly-bogatyrev

View file

@ -1,5 +1,10 @@
# Changelog # Changelog
Changelog for NeoFS LOCODE database Changelog for FrostFS LOCODE database
## 0.3.1 - 2022-12-22
### Changed
- Rebranding to FrostFS
## 0.3.0 - 2022-10-28 ## 0.3.0 - 2022-10-28

View file

@ -1,7 +1,7 @@
#!/usr/bin/make -f #!/usr/bin/make -f
VERSION ?= "$(shell git describe --tags --match "v*" --dirty --always --abbrev=8 2>/dev/null || cat VERSION 2>/dev/null || echo "develop")" VERSION ?= "$(shell git describe --tags --match "v*" --dirty --always --abbrev=8 2>/dev/null || cat VERSION 2>/dev/null || echo "develop")"
NEOFSCLI ?= neofs-cli FROST ?= frost
.PHONY: all clean version help unlocode debpackage .PHONY: all clean version help unlocode debpackage
@ -35,7 +35,7 @@ unlocode:
unzip -u tmp/loc221csv.zip -d in/ unzip -u tmp/loc221csv.zip -d in/
locode_db: unlocode in/continents.geojson in/airports.dat in/countries.dat locode_db: unlocode in/continents.geojson in/airports.dat in/countries.dat
$(NEOFSCLI) util locode generate \ $(FROST) util locode generate \
--airports in/airports.dat \ --airports in/airports.dat \
--continents in/continents.geojson \ --continents in/continents.geojson \
--countries in/countries.dat \ --countries in/countries.dat \
@ -66,7 +66,7 @@ clean:
# Package for Debian # Package for Debian
debpackage: debpackage:
dch --package neofs-locode-db \ dch --package frostfs-locode-db \
--controlmaint \ --controlmaint \
--newversion $(PKG_VERSION) \ --newversion $(PKG_VERSION) \
--force-bad-version \ --force-bad-version \

View file

@ -2,27 +2,25 @@
<img src="./.github/logo.svg" width="500px" alt="NeoFS"> <img src="./.github/logo.svg" width="500px" alt="NeoFS">
</p> </p>
<p align="center"> <p align="center">
UN/LOCODE database for <a href="https://fs.neo.org">NeoFS</a> UN/LOCODE database for <a href="https://frostfs.info">ForstFS</a>
</p> </p>
--- ---
![GitHub release](https://img.shields.io/github/release/nspcc-dev/neofs-locode-db.svg) ![GitHub release](https://img.shields.io/github/release/TrueCloudLab/frostfs-locode-db.svg)
![GitHub license](https://img.shields.io/github/license/nspcc-dev/neofs-locode-db.svg?style=popout) ![GitHub license](https://img.shields.io/github/license/TrueCloudLab/frostfs-locode-db.svg?style=popout)
# Overview # Overview
This repository contains instructions to generate UN/LOCODE database for NeoFS This repository contains instructions to generate UN/LOCODE database for FrostFS
and raw representation of it. NeoFS uses UN/LOCODE in storage node attributes and raw representation of it. FrostFS uses UN/LOCODE in storage node attributes
and storage policies. Inner ring nodes converts UN/LOCODE into human-readable and storage policies. Inner ring nodes converts UN/LOCODE into human-readable
set of attributes such as continent, country name, etc. You can find out set of attributes such as continent, country name, etc.
more in [NeoFS Specification](https://github.com/nspcc-dev/neofs-spec).
# Build # Build
## Prerequisites ## Prerequisites
- Latest [neofs-cli](https://github.com/nspcc-dev/neofs-node) - Latest [frost] tool(https://github.com/TrueCloudLab/frostfs-node)
- [UN/LOCODE](https://unece.org/trade/cefact/UNLOCODE-Download) - [UN/LOCODE](https://unece.org/trade/cefact/UNLOCODE-Download)
database in CSV format database in CSV format
- [OpenFlight Airports](https://raw.githubusercontent.com/jpatokal/openflights/master/data/airports.dat) - [OpenFlight Airports](https://raw.githubusercontent.com/jpatokal/openflights/master/data/airports.dat)
@ -32,7 +30,7 @@ more in [NeoFS Specification](https://github.com/nspcc-dev/neofs-spec).
## Quick start ## Quick start
Just run `make` to generate `locode_db` file for use with NeoFS InnerRing nodes. Just run `make` to generate `locode_db` file for use with FrostFS InnerRing nodes.
``` shell ``` shell
$ make $ make
@ -47,13 +45,13 @@ First unzip file with GeoJSON continents from this repository.
$ gunzip continents.geojson $ gunzip continents.geojson
``` ```
Then run neofs-cli command to generate boltDB file. Then run frost command to generate boltDB file.
``` ```
$ neofs-cli util locode generate --help $ frost util locode generate --help
generate UN/LOCODE database for NeoFS generate UN/LOCODE database for FrostFS
Usage: Usage:
neofs-cli util locode generate [flags] frost util locode generate [flags]
Flags: Flags:
--airports string Path to OpenFlights airport database (csv) --airports string Path to OpenFlights airport database (csv)
@ -64,7 +62,7 @@ Flags:
--out string Target path for generated database --out string Target path for generated database
--subdiv string Path to UN/LOCODE subdivision database (csv) --subdiv string Path to UN/LOCODE subdivision database (csv)
$ ./neofs-cli util locode generate \ $ ./frost util locode generate \
--airports airports.dat \ --airports airports.dat \
--continents continents.geojson \ --continents continents.geojson \
--countries countries.dat \ --countries countries.dat \
@ -75,9 +73,9 @@ $ ./neofs-cli util locode generate \
**Database generation might take some time!** **Database generation might take some time!**
You can test generated database with neofs-cli. You can test generated database with `frost`.
``` ```
$ neofs-cli util locode info --db locode_db --locode 'RU LED' $ frost util locode info --db locode_db --locode 'RU LED'
Country: Russia Country: Russia
Location: Saint Petersburg (ex Leningrad) Location: Saint Petersburg (ex Leningrad)
Continent: Europe Continent: Europe

View file

@ -1 +1 @@
v0.3.0 v0.3.1

5
debian/changelog vendored
View file

@ -1,6 +1,5 @@
neofs-locode-db (0.3.0) stable; urgency=medium frostfs-locode-db (0.3.0) stable; urgency=medium
* Initial change. * Initial change.
-- NeoSPCC <tech@nspcc.ru> Wed, 19 Oct 2022 12:33:04 +0300 -- TrueCloudLab <tech@frostfs.info> Wed, 19 Oct 2022 12:33:04 +0300

18
debian/control vendored
View file

@ -1,17 +1,17 @@
Source: neofs-locode-db Source: frostfs-locode-db
Section: misc Section: misc
Priority: optional Priority: optional
Maintainer: NeoSPCC <tech@nspcc.ru> Maintainer: NeoSPCC <tech@frostfs.info>
Build-Depends: debhelper-compat (= 13), git, devscripts, wget, neofs-cli Build-Depends: debhelper-compat (= 13), git, devscripts, wget, frost
Standards-Version: 4.5.1 Standards-Version: 4.5.1
Homepage: https://fs.neo.org/ Homepage: https://frostfs.info/
Vcs-Git: https://github.com/nspcc-dev/neofs-locode-db.git Vcs-Git: https://github.com/TrueCloudLab/frostfs-locode-db.git
Vcs-Browser: https://github.com/nspcc-dev/neofs-locode-db Vcs-Browser: https://github.com/TrueCloudLab/frostfs-locode-db
Package: neofs-locode-db Package: frostfs-locode-db
Architecture: any Architecture: any
Depends: ${misc:Depends} Depends: ${misc:Depends}
Description: Compiled UN/LOCODE database for NeoFS Description: Compiled UN/LOCODE database for FrostFS
NeoFS uses UN/LOCODE in storage node attributes and storage policies. Frostfs uses UN/LOCODE in storage node attributes and storage policies.
Inner ring nodes converts UN/LOCODE into human-readable set of attributes Inner ring nodes converts UN/LOCODE into human-readable set of attributes
such as continent, country name, etc. such as continent, country name, etc.

7
debian/copyright vendored
View file

@ -1,9 +1,10 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: neofs-locode-db Upstream-Name: frostfs-locode-db
Upstream-Contact: tech@nspcc.ru Upstream-Contact: tech@frostfs.info
Source: https://github.com/nspcc-dev/neofs-locode-db Source: https://github.com/TrueCloudLab/frostfs-locode-db
Files: * Files: *
Copyright: 2022 TrueCloudLab (@TrueCloudLab)
Copyright: 2018-2022 NeoSPCC (@nspcc-dev) Copyright: 2018-2022 NeoSPCC (@nspcc-dev)
License: CC-BY-SA-4.0 License: CC-BY-SA-4.0

1
debian/frostfs-locode-db.install vendored Normal file
View file

@ -0,0 +1 @@
locode_db var/lib/frostfs/ir

View file

@ -1 +0,0 @@
locode_db var/lib/neofs/ir