fix chsut.sh and src/forge_cfg.py -T

.gitignore

@@ -1,5 +1,6 @@
-*.py[co]
-init_all.py
+*.pyc
+*.pyo
+/init_all.py
 
 # Packages
 *.egg

chsut.sh

@@ -2,7 +2,7 @@
 
 #Author: Maciek Fijalkowski
 
-path=$(pwd)
+script_path=$(cd "$(dirname "${0}")" && pwd)
 
 if [ "$1" == --help -o "$1" == -h ]; then
     printf "This is a help message. This script can change SOFTWARE_UNDER_TEST
@@ -15,10 +15,10 @@ Usage: ./chsut
        ./chsut -h
        --------  prints this message.\n\n"
 elif [ $# -eq 0 ]; then
-    grep "^SOFTWARE_UNDER_TEST*" $path/features/init_all.py
+    grep "^SOFTWARE_UNDER_TEST*" "${script_path}/init_all.py"
 else
     printf "Changing SOFTWARE_UNDER_TEST variable to %s...\n" $1
-    sed -i "s/^SOFTWARE_UNDER_TEST\ =\ \".*\",/SOFTWARE_UNDER_TEST\ =\ \"$1\",/" \
-         $path/features/init_all.py
+    sed -i "s/^SOFTWARE_UNDER_TEST = .*,/SOFTWARE_UNDER_TEST = ('${1}'),/" \
+         "${script_path}/init_all.py"
     printf "Done.\n"
 fi

doc/coding-guidelines.md

@@ -68,8 +68,8 @@ Writing new tests
 -----------------
 
 Since forge moved from lettuce to pytest, writing new tests is just python programming.
-Functions available in `tests/srv_control.py` are used to operate remote DHCP/DNS servers.
-Functions available in `tests/srv_msg.py` are used to generate and parse traffic. Don't forget
+Functions available in `src/srv_control.py` are used to operate remote DHCP/DNS servers.
+Functions available in `src/srv_msg.py` are used to generate and parse traffic. Don't forget
 to write test description for new tests.
 
 Additional info

doc/example.md

@@ -203,7 +203,6 @@ Now you need to apply new configuration.
 sudo netplan apply
 ```
 
-
 ### 4. Clone Forge from Git Repository
 You can use git clone to download Forge from repository.
 
@@ -234,13 +233,12 @@ source ./venv/bin/activate
 You need to copy default config file as a working one:
 
 ```shell
-+cp tests/init_all.py_default tests/init_all.py
++cp ./init_all.py_default ./init_all.py
 ```
 
-
 And now edit this file:
 ```shell
-nano tests/init_all.py
+nano ./init_all.py
 ```
 
 Parameters that need to be set or uncommented, some of them will be empty:

init_all.py_default

@@ -88,7 +88,7 @@ SERVER2_IFACE = ''
 
 # If you want to build tests history in history.html set HISTORY to True if not,
 # to False but for more detailed information about tests, use --with_xunit option
-# when starting forge_cfg.py
+# when starting src/forge_cfg.py
 # HISTORY = True
 
 # Save log file in tests result folder

src/forge_cfg.py

@@ -1,3 +1,5 @@
+#!/usr/bin/env python3
+
 # Copyright (C) 2013-2022 Internet Systems Consortium, Inc. ("ISC")
 #
 # This Source Code Form is subject to the terms of the Mozilla Public
@@ -166,12 +168,12 @@ def gethwaddr(self, ifname):
 
     def basic_validation(self):
         if self.software_install_path == "":
-            print ("Configuration failure, software_install_path empty. "
-                   "Please use ./forge_cfg.py -T to validate configuration.")
+            print ("Configuration failure, software_install_path is empty. "
+                   "Please use ./src/forge_cfg.py -T to validate configuration.")
             sys.exit(-1)
         if self.mgmt_address == "":
-            print("Configuration failure, mgmt_address empty." \
-                  " Please use ./forge_cfg.py -T to validate configuration.")
+            print("Configuration failure, mgmt_address is empty. "
+                  "Please use ./src/forge_cfg.py -T to validate configuration.")
             sys.exit(-1)
 
     def set_env_val(self, env_name, env_val):

src/init_all.py

@@ -0,0 +1 @@
+../init_all.py