Merge pull request #1269 from kernelkit/rename

Author: troglobit

doc/testing.md

@@ -93,14 +93,14 @@ Each test case is a separate executable, which can be run without
 arguments:
 
 ```
-11:42:53 infamy0:test # ./case/infix_dhcp/dhcp_basic.py
+11:42:53 infamy0:test # ./case/dhcp/dhcp_basic.py
 ```
 
 To run a suite of tests, e.g., only the DHCP client tests, pass the
 suite as an argument to [9PM][]:
 
 ```
-11:42:53 infamy0:test # ./9pm/9pm.py case/infix_dhcp/infix_dhcp.yaml
+11:42:53 infamy0:test # ./9pm/9pm.py case/dhcp/dhcp.yaml
 ```
 
 To run the suite of all tests:
@@ -234,12 +234,12 @@ your test and run it as normal. Once Python executes the call, it will
 drop you into the Python debugger:
 
 ```
-11:42:58 infamy0:test # ./case/infix_dhcp/dhcp_basic.py
+11:42:58 infamy0:test # ./case/dhcp/dhcp_basic.py
 # Starting (2024-02-10 11:42:59)
 # Probing dut1 on port d1a for IPv6LL mgmt address ...
 # Connecting to mgmt IP fe80::ff:fe00:0%d1a:830 ...
 ok 1 - Initialize
-> /home/jocke/src/infix/test/case/infix_dhcp/dhcp_basic.py(44)<module>()
+> /home/jocke/src/infix/test/case/dhcp/dhcp_basic.py(44)<module>()
 (Pdb)
 ```
 
@@ -252,7 +252,7 @@ want to setup breakpoints without modifying the source, or simply step
 through the code:
 
 ```
-11:42:58 infamy0:test # python -m pdb case/infix_dhcp/dhcp_basic.py
+11:42:58 infamy0:test # python -m pdb case/dhcp/dhcp_basic.py
 ```
 
 ### Deterministic Topology Mappings
@@ -296,7 +296,7 @@ This is useful because this value can then be used to rerun a test (or
 the whole suite) with identical topology mappings:
 
 ```
-$ make PYTHONHASHSEED=3773822171 TESTS=case/ietf_system/hostname.py test
+$ make PYTHONHASHSEED=3773822171 TESTS=case/system/hostname.py test
 ```
 
 ### Deterministic Transport Protocol
@@ -307,14 +307,14 @@ you get the same protocol used for that hash.  But if you want to choose
 the protocol, add extra arguments to Infamy:
 
 ```
-$ make INFAMY_EXTRA_ARGS="--transport=restconf" TESTS=case/ietf_system/hostname.py test
+$ make INFAMY_EXTRA_ARGS="--transport=restconf" TESTS=case/system/hostname.py test
 ```
 
 or, when running interactively:
 
 ```
 $ make test-sh
-09:08:17 infamy0:test # ./9pm/9pm.py -o"--transport=restconf" case/ietf_system/hostname.py
+09:08:17 infamy0:test # ./9pm/9pm.py -o"--transport=restconf" case/system/hostname.py
 ```
 
 ### Test specification
@@ -360,7 +360,7 @@ to start by reviewing an existing test case.
 
 All tests are located in the `infix/test/case` repository and are
 grouped by the features they verify. For example,
-`infix/test/case/infix_services` contains tests for various Infix
+`infix/test/case/services` contains tests for various Infix
 services, such as LLDP and mDNS.
 
 While test grouping is flexible, each test should be placed in a
@@ -372,28 +372,28 @@ suite](#running-subsets-of-tests):
 
 ```
 - name:  infix-services
-  suite: infix_services/infix_services.yaml
+  suite: services/services.yaml
 ```
 
 A new test (e.g., lldp_enable_disable) should be added to the
 corresponding test group .yaml file, such as
-`infix/test/cases/infix_services.yaml`:
+`infix/test/cases/services.yaml`:
 
 ```
 - name: lldp_enable_disable
   case: lldp_enable_disable/test.py
 ```
 
 It is necessary to include the test in
-`infix/test/case/infix_services/Readme.adoc` to ensure proper test
+`infix/test/case/services/Readme.adoc` to ensure proper test
 specification generation:
 
 ```
 include::lldp_enable_disable/Readme.adoc[]
 ```
 
 Each test case should have its own directory under,
-`infix/test/case/infix_services`, containing:
+`infix/test/case/services`, containing:
 
 - `test.py` - the test script
 - `topology.dot` - the logical topology definition.

src/confd/src/Makefile.am

@@ -26,36 +26,36 @@ confd_plugin_la_SOURCES =			\
 	base64.c		base64.h	\
 	core.c			core.h		\
 	dagger.c		dagger.h	\
-	ietf-interfaces.c ietf-interfaces.h	\
+	interfaces.c interfaces.h		\
 	  ieee802-ethernet-interface.c		\
-	  ietf-ip.c				\
-	  infix-if-bridge.c			\
-	  infix-if-lag.c			\
-	  infix-if-bridge-mcd.c			\
-	  infix-if-bridge-port.c		\
-	  infix-if-veth.c			\
-	  infix-if-vlan.c			\
-	  infix-if-gre.c			\
-	  infix-if-vxlan.c			\
-	  infix-if-wifi.c			\
-	ietf-keystore.c				\
-	ietf-system.c				\
-	ietf-syslog.c				\
-	ietf-factory-default.c			\
-	ietf-routing.c				\
-	infix-dhcp-common.c			\
-	infix-dhcp-client.c			\
-	infix-dhcpv6-client.c			\
-	infix-dhcp-server.c			\
-	infix-factory.c				\
-	infix-firewall.c			\
-	infix-meta.c				\
-	infix-services.c			\
-	infix-system-software.c 		\
-	ietf-hardware.c
+	  ip.c					\
+	  if-bridge.c				\
+	  if-lag.c				\
+	  if-bridge-mcd.c			\
+	  if-bridge-port.c			\
+	  if-veth.c				\
+	  if-vlan.c				\
+	  if-gre.c				\
+	  if-vxlan.c				\
+	  if-wifi.c				\
+	keystore.c				\
+	system.c				\
+	syslog.c				\
+	factory-default.c			\
+	routing.c				\
+	dhcp-common.c				\
+	dhcp-client.c				\
+	dhcpv6-client.c				\
+	dhcp-server.c				\
+	factory.c				\
+	firewall.c				\
+	meta.c					\
+	services.c				\
+	system-software.c 			\
+	hardware.c
 
 if CONTAINERS
-confd_plugin_la_SOURCES += infix-containers.c cni.c cni.h
+confd_plugin_la_SOURCES += containers.c cni.c cni.h
 endif
 
 rauc_installer_sources = 			\

src/confd/src/cni.c

@@ -6,7 +6,7 @@
 
 #include "core.h"
 #include "cni.h"
-#include "ietf-interfaces.h"
+#include "interfaces.h"
 
 #define CNI_NAME "/etc/cni/net.d/%s.conflist"
 

src/confd/src/infix-containers.c src/confd/src/containers.csrc/confd/src/infix-containers.c renamed to src/confd/src/containers.c

@@ -349,7 +349,7 @@ static int del(const char *name)
 	return SR_ERR_OK;
 }
 
-int infix_containers_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd)
+int containers_change(sr_session_ctx_t *session, struct lyd_node *config, struct lyd_node *diff, sr_event_t event, struct confd *confd)
 {
 	struct lyd_node *cifs, *difs, *cif, *dif;
 	sr_error_t       err = 0;
@@ -465,7 +465,7 @@ static int oci_load(sr_session_ctx_t *session, uint32_t sub_id, const char *xpat
 	return SR_ERR_OK;
 }
 
-int infix_containers_rpc_init(struct confd *confd)
+int containers_rpc_init(struct confd *confd)
 {
 	int rc;
 

src/confd/src/core.c

@@ -191,57 +191,57 @@ static int change_cb(sr_session_ctx_t *session, uint32_t sub_id, const char *mod
 	}
 
 	/* ietf-interfaces */
-	if ((rc = ietf_interfaces_change(session, config, diff, event, confd)))
+	if ((rc = interfaces_change(session, config, diff, event, confd)))
 		goto free_diff;
 
 	/* infix-dhcp-client*/
-	if ((rc = infix_dhcp_client_change(session, config, diff, event, confd)))
+	if ((rc = dhcp_client_change(session, config, diff, event, confd)))
 		goto free_diff;
 
 	/* infix-dhcpv6-client*/
-	if ((rc = infix_dhcpv6_client_change(session, config, diff, event, confd)))
+	if ((rc = dhcpv6_client_change(session, config, diff, event, confd)))
 		goto free_diff;
 
 	/* ietf-keystore */
-	if ((rc = ietf_keystore_change(session, config, diff, event, confd)))
+	if ((rc = keystore_change(session, config, diff, event, confd)))
 		goto free_diff;
 
 	/* infix-services */
-	if ((rc = infix_services_change(session, config, diff, event, confd)))
+	if ((rc = services_change(session, config, diff, event, confd)))
 		goto free_diff;
 
 	/* ietf-syslog*/
-	if ((rc = ietf_syslog_change(session, config, diff, event, confd)))
+	if ((rc = syslog_change(session, config, diff, event, confd)))
 		goto free_diff;
 
 	/* ietf-system */
-	if ((rc = ietf_system_change(session, config, diff, event, confd)))
+	if ((rc = system_change(session, config, diff, event, confd)))
 		goto free_diff;
 
 	/* infix-containers */
 #ifdef CONTAINERS
-	if ((rc = infix_containers_change(session, config, diff, event, confd)))
+	if ((rc = containers_change(session, config, diff, event, confd)))
 		goto free_diff;
 #endif
 
 	/* ietf-hardware */
-	if ((rc = ietf_hardware_change(session, config, diff, event, confd)))
+	if ((rc = hardware_change(session, config, diff, event, confd)))
 		goto free_diff;
 
 	/* ietf-routing */
-	if ((rc = ietf_routing_change(session, config, diff, event, confd)))
+	if ((rc = routing_change(session, config, diff, event, confd)))
 		goto free_diff;
 
 	/* infix-dhcp-server */
-	if ((rc = infix_dhcp_server_change(session, config, diff, event, confd)))
+	if ((rc = dhcp_server_change(session, config, diff, event, confd)))
 		goto free_diff;
 
 	/* infix-firewall */
-	if ((rc = infix_firewall_change(session, config, diff, event, confd)))
+	if ((rc = firewall_change(session, config, diff, event, confd)))
 		goto free_diff;
 
 	/* infix-meta */
-	if ((rc = infix_meta_change_cb(session, config, diff, event, confd)))
+	if ((rc = meta_change_cb(session, config, diff, event, confd)))
 		goto free_diff;
 
 	if (cfg)
@@ -390,48 +390,48 @@ int sr_plugin_init_cb(sr_session_ctx_t *session, void **priv)
 		goto err;
 	}
 
-	rc = ietf_system_rpc_init(&confd);
+	rc = system_rpc_init(&confd);
 	if (rc)
 		goto err;
 #ifdef CONTAINERS
-	rc = infix_containers_rpc_init(&confd);
+	rc = containers_rpc_init(&confd);
 	if (rc)
 		goto err;
 #endif
-	rc = infix_dhcp_server_rpc_init(&confd);
+	rc = dhcp_server_rpc_init(&confd);
 	if (rc)
 		goto err;
 
-	rc = infix_factory_rpc_init(&confd);
+	rc = factory_rpc_init(&confd);
 	if (rc)
 		goto err;
 
-	rc = ietf_factory_default_rpc_init(&confd);
+	rc = factory_default_rpc_init(&confd);
 	if (rc)
 		goto err;
 
-	rc = infix_firewall_rpc_init(&confd);
+	rc = firewall_rpc_init(&confd);
 	if (rc)
 		goto err;
 
-	rc = infix_system_sw_rpc_init(&confd);
+	rc = system_sw_rpc_init(&confd);
 	if (rc)
 		goto err;
 
 	/* Candidate infer configurations */
-	rc = ietf_interfaces_cand_init(&confd);
+	rc = interfaces_cand_init(&confd);
 	if (rc)
 		goto err;
 
-	rc = ietf_hardware_candidate_init(&confd);
+	rc = hardware_candidate_init(&confd);
 	if (rc)
 		goto err;
 
-	rc = infix_firewall_candidate_init(&confd);
+	rc = firewall_candidate_init(&confd);
 	if (rc)
 		goto err;
 
-	rc = infix_dhcp_server_candidate_init(&confd);
+	rc = dhcp_server_candidate_init(&confd);
 	if (rc)
 		goto err;
 	/* YOUR_INIT GOES HERE */