diff options
| -rw-r--r-- | AUTHORS | 1 | ||||
| -rw-r--r-- | COPYING | 27 | ||||
| -rw-r--r-- | Makefile.am | 12 | ||||
| -rw-r--r-- | NEWS | 1 | ||||
| -rw-r--r-- | README | 3 | ||||
| -rw-r--r-- | configure.ac | 32 | ||||
| -rw-r--r-- | debian/README | 8 | ||||
| -rwxr-xr-x | debian/autogen.sh | 37 | ||||
| -rw-r--r-- | debian/changelog | 5 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 18 | ||||
| -rw-r--r-- | debian/copyright | 35 | ||||
| -rw-r--r-- | debian/docs | 2 | ||||
| -rw-r--r-- | debian/linda | 1 | ||||
| -rw-r--r-- | debian/lintian | 2 | ||||
| -rwxr-xr-x | debian/rules | 102 | ||||
| -rwxr-xr-x | scripts/vyatta-show-queue | 30 | ||||
| -rw-r--r-- | templates/show/interfaces/ethernet/node.tag/queue/class/node.def | 2 | ||||
| -rw-r--r-- | templates/show/interfaces/ethernet/node.tag/queue/filter/node.def | 2 | ||||
| -rw-r--r-- | templates/show/interfaces/ethernet/node.tag/queue/node.def | 2 |
20 files changed, 323 insertions, 0 deletions
@@ -0,0 +1 @@ +eng@vyatta.com @@ -0,0 +1,27 @@ +/* + * Package: vyatt-op-qos + * + * **** License **** + * Version: VPL 1.0 + * + * The contents of this file are subject to the Vyatta Public License + * Version 1.0 ("License"); you may not use this file except in + * compliance with the License. You may obtain a copy of the License at + * http://www.vyatta.com/vpl + * + * Software distributed under the License is distributed on an "AS IS" + * basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See + * the License for the specific language governing rights and limitations + * under the License. + * + * This code was originally developed by Vyatta, Inc. + * Portions created by Vyatta are Copyright (C) "YEAR" Vyatta, Inc. + * All Rights Reserved. + * + * Author: Stephen Hemminger + * Date: 2008 + * Description: Vyatta operational command completion and base templates + * + * **** End License **** + * + */ diff --git a/Makefile.am b/Makefile.am new file mode 100644 index 0000000..d29d7ae --- /dev/null +++ b/Makefile.am @@ -0,0 +1,12 @@ +opdir = $(datadir)/vyatta-op/templates + +bin_SCRIPTS = scripts/vyatta-show-queue + +cpiop = find . ! -regex '\(.*~\|.*\.bak\|.*\.swp\|.*\#.*\#\)' -print0 | \ + cpio -0pd + +install-exec-hook: + mkdir -p $(DESTDIR)$(opdir) + cd templates; $(cpiop) $(DESTDIR)$(opdir) + + @@ -0,0 +1 @@ +see http://www.vyatta.com/news/ @@ -0,0 +1,3 @@ +This package has the Vyatta operational command completion script and +base template tree for QoS. The default root of this tree is: + /opt/vyatta/share/vyatta-op/templates diff --git a/configure.ac b/configure.ac new file mode 100644 index 0000000..b60b8c0 --- /dev/null +++ b/configure.ac @@ -0,0 +1,32 @@ +# Process this file with autoconf to produce a configure script. +AC_PREREQ(2.59) + +m4_define([VERSION_ID], [m4_esyscmd([ + if test -f .version ; then + head -n 1 .version | tr -d \\n + else + echo -n 2.4 + fi])]) +AC_INIT([vyatta-op-qos], VERSION_ID, [vyatta-support@vyatta.com]) + +test -n "$VYATTA_VERSION" || VYATTA_VERSION=$PACKAGE_VERSION + +AC_CONFIG_AUX_DIR([config]) +AM_INIT_AUTOMAKE([gnu no-dist-gzip dist-bzip2 subdir-objects]) +AC_PREFIX_DEFAULT([/opt/vyatta]) + +XSLDIR=/opt/vyatta/share/xsl/ + +AC_ARG_ENABLE([nostrip], + AC_HELP_STRING([--enable-nostrip], + [include -nostrip option during packaging]), + [NOSTRIP=-nostrip], [NOSTRIP=]) + +AC_CONFIG_FILES( + [Makefile]) + +AC_SUBST(NOSTRIP) +AC_SUBST(XSLDIR) + +AC_OUTPUT + diff --git a/debian/README b/debian/README new file mode 100644 index 0000000..02192c8 --- /dev/null +++ b/debian/README @@ -0,0 +1,8 @@ +The Debian Package vyatta-op-qos +------------------------------------- + +This package has the CLI template for the "show interfaces ethernet ethX queue" +command + + + -- Stephen Hemminger <stephen.hemminger@vyatta.com> Fri 28 Dec 2007 diff --git a/debian/autogen.sh b/debian/autogen.sh new file mode 100755 index 0000000..ff125d1 --- /dev/null +++ b/debian/autogen.sh @@ -0,0 +1,37 @@ +#!/bin/sh + + +if [ -d .git ] ; then +# generate GNU/Debian format ChangeLog from git log + + rm -f ChangeLog + + if which git2cl >/dev/null ; then + git-log --pretty --numstat --summary | git2cl >> ChangeLog + else + git-log --pretty=short >> ChangeLog + fi + +# append repository reference + + url=` git repo-config --get remote.origin.url` + test "x$url" = "x" && url=`pwd` + + branch=`git-branch --no-color | sed '/^\* /!d; s/^\* //'` + test "x$branch" = "x" && branch=master + + sha=`git log --pretty=oneline --no-color -n 1 | cut -c-8` + test "x$sha" = "x" && sha=00000000 + + echo "$url#$branch-$sha" >> ChangeLog + +fi + +rm -rf config +rm -f aclocal.m4 config.guess config.statusconfig.sub configure INSTALL + +autoreconf --force --install + +rm -f config.sub config.guess +ln -s /usr/share/misc/config.sub . +ln -s /usr/share/misc/config.guess . diff --git a/debian/changelog b/debian/changelog new file mode 100644 index 0000000..b39e514 --- /dev/null +++ b/debian/changelog @@ -0,0 +1,5 @@ +vyatta-op-qos (0.1) unstable; urgency=low + + * Initial Release. + + -- Stephen Hemminger <stephen.hemminger@vyatta.com> Wed, 30 Jan 2008 14:43:18 -0700 diff --git a/debian/compat b/debian/compat new file mode 100644 index 0000000..7ed6ff8 --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +5 diff --git a/debian/control b/debian/control new file mode 100644 index 0000000..6212358 --- /dev/null +++ b/debian/control @@ -0,0 +1,18 @@ +Source: vyatta-op-qos +Section: contrib/net +Priority: extra +Maintainer: Stephen Hemminger <stephen.hemminger@vyatta.com> +Build-Depends: debhelper (>= 5), autotools-dev +Standards-Version: 3.7.2 + +Package: vyatta-op-qos +Architecture: all +Depends: bash (>= 3.1), + vyatta-op +Suggests: util-linux (>= 2.13-5), + net-tools, + ethtool, + ncurses-bin (>= 5.5-5), + ntpdate +Description: Vyatta operational commands for qos. + Vyatta operational commands for qos. diff --git a/debian/copyright b/debian/copyright new file mode 100644 index 0000000..372ac2b --- /dev/null +++ b/debian/copyright @@ -0,0 +1,35 @@ +This package was debianized by Bob Gilligan <gilligan@vyatta.com> on +Wed Dec 12 15:31:43 PST 2007 + + +It's original content from the GIT repository <http://vyatt.com/git/> + +Upstream Author: + + <eng@vyatta.com> + +Copyright: + + Copyright (C) 2007 Vyatta, Inc. + All Rights Reserved. + +License: + + The contents of this package are subject to the Vyatta Public License + Version 1.0 ("License"); you may not use this file except in + compliance with the License. You may obtain a copy of the License at + http://www.vyatta.com/vpl + + Software distributed under the License is distributed on an "AS IS" + basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See + the License for the specific language governing rights and limitations + under the License. + + This code was originally developed by Vyatta, Inc. + Portions created by Vyatta are Copyright (C) 2007 Vyatta, Inc. + +On Debian systems, the complete text of the GNU General +Public License can be found in `/usr/share/common-licenses/GPL'. + +The Debian packaging is (C) 2007, Vyatta, Inc., and +is licensed under the GPL, see above. diff --git a/debian/docs b/debian/docs new file mode 100644 index 0000000..50bd824 --- /dev/null +++ b/debian/docs @@ -0,0 +1,2 @@ +NEWS +README diff --git a/debian/linda b/debian/linda new file mode 100644 index 0000000..0381d9d --- /dev/null +++ b/debian/linda @@ -0,0 +1 @@ +Tag: file-in-opt diff --git a/debian/lintian b/debian/lintian new file mode 100644 index 0000000..671ca19 --- /dev/null +++ b/debian/lintian @@ -0,0 +1,2 @@ +vyatta-op-qos: file-in-unusual-dir +vyatta-op-qos: dir-or-file-in-opt diff --git a/debian/rules b/debian/rules new file mode 100755 index 0000000..ae31b6c --- /dev/null +++ b/debian/rules @@ -0,0 +1,102 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) +PACKAGE=vyatta-op-qos +PKGDIR=$(CURDIR)/debian/$(PACKAGE) + +CFLAGS = -Wall -g + +configure = ./configure +configure += --host=$(DEB_HOST_GNU_TYPE) +configure += --build=$(DEB_BUILD_GNU_TYPE) +configure += --prefix=/opt/vyatta +configure += --mandir=\$${prefix}/share/man +configure += --infodir=\$${prefix}/share/info +configure += CFLAGS="$(CFLAGS)" +configure += LDFLAGS="-Wl,-z,defs" + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif + +configure: configure.ac Makefile.am + chmod +x debian/autogen.sh + debian/autogen.sh + +config.status: configure + dh_testdir + rm -f config.cache + $(configure) + +build: build-stamp + +build-stamp: config.status + dh_testdir + $(MAKE) + touch $@ + +clean: clean-patched + +# Clean everything up, including everything auto-generated +# at build time that needs not to be kept around in the Debian diff +clean-patched: + dh_testdir + dh_testroot + if test -f Makefile ; then $(MAKE) clean distclean ; fi + rm -f build-stamp + rm -f config.status config.sub config.guess config.log + rm -f aclocal.m4 configure Makefile.in Makefile INSTALL + rm -f etc/default/vyatta + rm -rf config + dh_clean + +install: build + dh_testdir + dh_testroot + dh_clean -k + dh_installdirs + + $(MAKE) DESTDIR=$(PKGDIR) install + + install -D --mode=0644 debian/lintian $(PKGDIR)/usr/share/lintian/overrides/$(PACKAGE) + install -D --mode=0644 debian/linda $(PKGDIR)/usr/share/linda/overrides/$(PACKAGE) + +# Build architecture-independent files here. +binary-indep: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_install + dh_installdebconf + dh_link + dh_strip + dh_compress + dh_fixperms + dh_installdeb + dh_gencontrol + dh_md5sums + dh_builddeb + +# Build architecture-dependent files here. +binary-arch: build install +# This is an architecture independent package +# so; we have nothing to do by default. + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install diff --git a/scripts/vyatta-show-queue b/scripts/vyatta-show-queue new file mode 100755 index 0000000..e45ae18 --- /dev/null +++ b/scripts/vyatta-show-queue @@ -0,0 +1,30 @@ +#! /bin/bash + +declare progname=${0##*/} + +_usage () +{ + cat <<-EOF + Usage: $progname INTERFACE + $progname INTERFACE filter + $progname INTERFACE class + EOF +} + +if [[ $# -lt 1 ]]; then + _usage + exit 1 +fi + +if [[ $# -eq 1 ]]; then + tc -s -d qdisc show dev $1 +else + case $2 in + filter ) + tc filter show dev $1 ;; + class ) + tc -s -d class show dev $1 ;; + *) + _usage; exit 1;; + esac +fi diff --git a/templates/show/interfaces/ethernet/node.tag/queue/class/node.def b/templates/show/interfaces/ethernet/node.tag/queue/class/node.def new file mode 100644 index 0000000..16dbfd5 --- /dev/null +++ b/templates/show/interfaces/ethernet/node.tag/queue/class/node.def @@ -0,0 +1,2 @@ +help: Show queue classes for a device +run: ${vyatta_bindir}/vyatta-show-queue $4 class diff --git a/templates/show/interfaces/ethernet/node.tag/queue/filter/node.def b/templates/show/interfaces/ethernet/node.tag/queue/filter/node.def new file mode 100644 index 0000000..fe28b5b --- /dev/null +++ b/templates/show/interfaces/ethernet/node.tag/queue/filter/node.def @@ -0,0 +1,2 @@ +help: Show queue filters for a device +run: ${vyatta_bindir}/vyatta-show-queue $4 filter diff --git a/templates/show/interfaces/ethernet/node.tag/queue/node.def b/templates/show/interfaces/ethernet/node.tag/queue/node.def new file mode 100644 index 0000000..69c6437 --- /dev/null +++ b/templates/show/interfaces/ethernet/node.tag/queue/node.def @@ -0,0 +1,2 @@ +help: Show ethernet queue information +run: ${vyatta_bindir}/vyatta-show-queue $4 |