From 974ff054d3ded01fbefde5c555332faa25419942 Mon Sep 17 00:00:00 2001 From: Pim van Pelt Date: Sun, 13 Mar 2022 20:59:20 +0000 Subject: [PATCH] Add BUILD instructions. Add LICENSE --- LICENSE | 23 ++++++++++++++++++ README.md | 68 +++++++++++++++++++++++++++++++++++++++++++++++++++++ vppcfg.spec | 40 +++++++++++++++++++++++++++++++ 3 files changed, 131 insertions(+) create mode 100644 LICENSE create mode 100644 vppcfg.spec diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..cfdc2a0 --- /dev/null +++ b/LICENSE @@ -0,0 +1,23 @@ +Copyright (c) 2013, Rayed A Alrashed +Copyright (c) 2021, Pim van Pelt +All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are met: + +1. Redistributions of source code must retain the above copyright notice, this + list of conditions and the following disclaimer. +2. Redistributions in binary form must reproduce the above copyright notice, + this list of conditions and the following disclaimer in the documentation + and/or other materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR +ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. diff --git a/README.md b/README.md index 42f810a..ecd665f 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,42 @@ +# A VPP Configuration Utility + +This tool reads a configuration file, checks it for syntax and semantic correctness, and then +reconciles a running [VPP](https://fd.io/) daemon with its configuration. It is meant to be +re-entrant and stateless. The tool connects to the VPP API and creates/removes all of the +configuration in a minimally intrusive way. + +## Building + +This program expects Python3 and PIP to be installed. It's known to work on OpenBSD and Debian. + +``` +sudo pip3 install argparse +sudo pip3 install yamale +sudo pip3 install pyyaml +sudo pip3 install pyinstaller + +## Ensure all unittests pass. +./tests.py -t unittest/*.yaml + +## Build the tool +pyinstaller vppcfg --onefile +``` + +## Running + +``` +dist/vppcfg -h +usage: vppcfg [-h] -c CONFIG [-s SCHEMA] [-d] + +optional arguments: + -h, --help show this help message and exit + -c CONFIG, --config CONFIG + YAML configuration file for VPP + -s SCHEMA, --schema SCHEMA + YAML schema validation file + -d, --debug Enable debug, default False +``` + ## Design ### YAML Configuration @@ -36,3 +75,32 @@ checks to perform -- runtime validators ensure that the configuration elements s network devices (ie. `HundredGigabitEthernet12/0/0` or plugin `lcpng` are present on the system. It does this by connecting to VPP and querying the runtime state to ensure that what is modeled in the configuration file is able to be committed. + +## Unit Tests + +It is incredibly important that changes to this codebase, particularly the validators, are well +tested. Unit tests are provided in the `unittests/` directory with a Python test runner in +`tests.py`. A test is a two-document YAML file, the first document describes the unit test +and the second document is a candidate configuration file to test. + +The format of the unit test is as follows: +``` +test: + description: str() + errors: + expected: list(str()) + count: int() +--- + +``` + +Fields: +* ***description***: A string describing the behavior that is being tested against. Any failure + of the unittest will print this description in the error logs. +* ***errors.expected***: A list of regular expressions, that will be expected to be in the error + log of the validator. This field can be empty or omitted, in which case no errors will be + expected. +* ***errors.count***: An integer of the total amount of errors that is to be expected. Sometimes + an error is repeated N times, and it's good practice to precisely establish how many errors + should be expected. That said, this field can be empty or omitted. + diff --git a/vppcfg.spec b/vppcfg.spec new file mode 100644 index 0000000..824a1f9 --- /dev/null +++ b/vppcfg.spec @@ -0,0 +1,40 @@ +# -*- mode: python ; coding: utf-8 -*- + + +block_cipher = None + + +a = Analysis(['vppcfg'], + pathex=['/home/pim/src/vppcfg'], + binaries=[], + datas=[], + hiddenimports=[], + hookspath=[], + hooksconfig={}, + runtime_hooks=[], + excludes=[], + win_no_prefer_redirects=False, + win_private_assemblies=False, + cipher=block_cipher, + noarchive=False) +pyz = PYZ(a.pure, a.zipped_data, + cipher=block_cipher) + +exe = EXE(pyz, + a.scripts, + a.binaries, + a.zipfiles, + a.datas, + [], + name='vppcfg', + debug=False, + bootloader_ignore_signals=False, + strip=False, + upx=True, + upx_exclude=[], + runtime_tmpdir=None, + console=True, + disable_windowed_traceback=False, + target_arch=None, + codesign_identity=None, + entitlements_file=None )