diff options
author | Steve McIntyre <steve.mcintyre@linaro.org> | 2018-02-02 17:08:04 +0000 |
---|---|---|
committer | Steve McIntyre <steve.mcintyre@linaro.org> | 2018-02-02 17:08:04 +0000 |
commit | 53787d2f62557558a50f59c98c5db90b0eceae94 (patch) | |
tree | 938c07af05228cc22adb0d145745e9ea71f8e8ed | |
parent | a6b485d55a1a9023950c71dbb06b44705d556e5c (diff) |
Renamed the admin program from "admin.py" to "vland-admin"
This will make packaging easier
Change-Id: I840aa8e73911bcb4b02903a0202178005e2c58b3
-rw-r--r-- | Changelog | 2 | ||||
-rw-r--r-- | README | 6 | ||||
-rwxr-xr-x | test/test-common | 2 | ||||
-rwxr-xr-x | vland-admin (renamed from admin.py) | 4 | ||||
-rwxr-xr-x | vland.py | 2 | ||||
-rw-r--r-- | vland.service | 2 |
6 files changed, 10 insertions, 8 deletions
@@ -1,6 +1,8 @@ vland 0.7 * Added new driver to support the Mellanox SN2100 switch, using MLNX-OS + * Renamed the admin program from "admin.py" to "vland-admin" to make + packaging easier * Minor changes to the database code: + Automatic schema updates at vland startup + Add extra lock_reason field in the port table, and code to match @@ -84,9 +84,9 @@ permissions in the database for that user. The core VLANd code is simple to configure - see vland.cfg for an example config file. Once your copy of VLANd is running, use the -administration utility admin.py to control what it does. For now, this -is single-threaded and has *no* security. This *will* change in the -future, but for very early development has not been a priority. +administration utility "vland-admin" to control what it does. For now, +this is single-threaded and has *no* security. This *will* change in +the future, but for very early development has not been a priority. The visualisation interface has very few configuration options as yet - again, see the default vland.cfg. diff --git a/test/test-common b/test/test-common index ddc7986..cdc50d3 100755 --- a/test/test-common +++ b/test/test-common @@ -70,7 +70,7 @@ vvlog () { # Run a vland admin command, and optionally log both the full text of # the command and its output run_admin_command () { - ADMIN="python $TOPDIR/admin.py" + ADMIN="python $TOPDIR/vland-admin" vlog "Running \"$ADMIN $@\"" LAST_COMMAND="$@" RESULT=$($ADMIN $@) @@ -31,7 +31,7 @@ from errors import InputError, SocketError, NotFoundError, Error from config.config import VlanConfig from ipc.ipc import VlanIpc -prog = "admin" +prog = "vland-admin" version = "0.7" banner = "Linaro VLANd admin interface, version %s" % version exitcode = Error.OK @@ -79,7 +79,7 @@ def dump_trunk(trunk): def call_vland(msgtype, msg): ipc = VlanIpc() ipc.client_connect('localhost', config.vland.port) - msg['client_name'] = 'admin.py' + msg['client_name'] = 'vland-admin' msg['type'] = msgtype ipc.client_send(msg) ret = ipc.client_recv_and_close() @@ -101,7 +101,7 @@ if len(switches) != len(state.config.switches): print 'You have configured access details for %d switch(es), ' % len(state.config.switches) print 'but have %d switch(es) registered in your database.' % len(switches) print 'You must fix this difference for VLANd to work sensibly.' - print 'HINT: Running admin.py auto_import_switch --name <switch_name>' + print 'HINT: Running vland-admin auto_import_switch --name <switch_name>' print 'for each of your switches may help!' print diff --git a/vland.service b/vland.service index 7609743..83397c9 100644 --- a/vland.service +++ b/vland.service @@ -7,7 +7,7 @@ Requires=postgresql.service [Service] Type=simple ExecStart=/home/vland/vland/vland.py -ExecStop=/home/vland/vland/admin.py shutdown +ExecStop=/home/vland/vland/vland-admin shutdown WorkingDirectory=/home/vland/vland User=vland |