Menu
▾
▴
[Audit-test-developer] [PATCH 06/14] network: remove incorrect/useless getaddress functionality
|
From: Jiri J. <jja...@re...> - 2013-12-04 14:28:56
|
This feature was useful back when the suite was hard-locked to using only the first NIC as lblnet. This limitation has been lifted and the interface is now selectable by the user (using LOCAL_* variables), which means that "getaddress" can no longer automatically guess what interface or addresses are going to be used (by design). The current behavior is to just echo what the user provided in LOCAL_IPV* variables. Furthermore, the Makefile target depends on install_check, which makes the user set LBLNET_SVR_IPV* as well. In conclusion, the getaddress is now simply useless as it prints out already known information, entered by the user. Its usage, as recommended by README.run, is also invalid as it fails on LBLNET_SVR_IPV4 being unset at that time. Signed-off-by: Jiri Jaburek <jja...@re...> --- audit-test/README.run | 4 ---- audit-test/network/system/Makefile | 7 +------ 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/audit-test/README.run b/audit-test/README.run index fe4e607..e8f1493 100644 --- a/audit-test/README.run +++ b/audit-test/README.run @@ -163,10 +163,6 @@ Confirm that the the network test server contains both the IPv4 and IPv6 addresses of the test machine. -NOTE: If you need to determine the test machine's IP addresses to add to the -client_list.txt file, run the following commands on the test machine: -# make -C network/system getaddress - Configure the KVM tests ----------------------- diff --git a/audit-test/network/system/Makefile b/audit-test/network/system/Makefile index 7ce3f63..8fa0627 100644 --- a/audit-test/network/system/Makefile +++ b/audit-test/network/system/Makefile @@ -20,7 +20,7 @@ include $(TOPDIR)/rules.mk # XXX - all this stuff for the config files is a kludge and needs cleanup -.PHONY: install getaddress \ +.PHONY: install \ install_client install_server \ install_check install_setrans install_netlabel \ install_ipsec_client install_ipsec_server @@ -28,11 +28,6 @@ include $(TOPDIR)/rules.mk # perform the client install by default install: install_client -# helper target to get local addresses -getaddress: install_check - @echo "Local IPv4 address -> %LOCAL_IPV4%" | ./addr_filter.bash - @echo "Local IPv6 address -> %LOCAL_IPV6%" | ./addr_filter.bash - install_client: install_setrans install_ipsec_client install_netlabel cat rc.local.client | ./addr_filter.bash > rc.local install -o root -g root -m 755 rc.local /etc/rc.d -- 1.8.3.1 |
