Ticket #1147: rename nodeset-address-space-utils with underscores

Rename into nodeset_address_space_utils.

The dashes '-' prevent from importing the module from another module,
especially in tests.

samples/ClientServer/data/address_space/README.md

-How to generate `s2opc.xml` and `s2opc_nano.xml`: the 2 files are generated from `s2opc_base_nodeset_origin.xml` and `s2opc_demo_data_origin.xml` using `nodeset-address-space-utils.py` tool
+How to generate `s2opc.xml` and `s2opc_nano.xml`: the 2 files are generated from `s2opc_base_nodeset_origin.xml` and `s2opc_demo_data_origin.xml` using `nodeset_address_space_utils.py` tool
 
 s2opc.xml: merge OPCUA base nodeset and demo application nodeset and generate reciprocal references
-`<S2OPC_root>/scripts/nodeset-address-space-utils.py --output s2opc.xml s2opc_base_nodeset_origin.xml s2opc_demo_data_origin.xml s2opc_demo_data_perfs.xml`
+`<S2OPC_root>/scripts/nodeset_address_space_utils.py --output s2opc.xml s2opc_base_nodeset_origin.xml s2opc_demo_data_origin.xml s2opc_demo_data_perfs.xml`
 
 `s2opc_nano.xml`: merge OPCUA base nodeset and demo application nodeset, generate reciprocal references and remove nodes that shall not be present for Nano profile
-`<S2OPC_root>/scripts/nodeset-address-space-utils.py --output s2opc_nano.xml --remove-max-monitored-items --remove-methods --remove-max-node-management s2opc_base_nodeset_origin.xml s2opc_demo_data_origin.xml  s2opc_demo_data_perfs.xml`
+`<S2OPC_root>/scripts/nodeset_address_space_utils.py --output s2opc_nano.xml --remove-max-monitored-items --remove-methods --remove-max-node-management s2opc_base_nodeset_origin.xml s2opc_demo_data_origin.xml  s2opc_demo_data_perfs.xml`
 
 `s2opc_no_base_info.xml`: merge OPCUA base nodeset and demo application nodeset, generate reciprocal references and remove nodes for an address space with limited NS0 base info data:
-`<S2OPC_root>/scripts/nodeset-address-space-utils.py --output s2opc_no_base_info.xml --remove-node-ids-greater-than 3000 --remove-methods s2opc_base_nodeset_origin.xml s2opc_demo_data_origin.xml`
+`<S2OPC_root>/scripts/nodeset_address_space_utils.py --output s2opc_no_base_info.xml --remove-node-ids-greater-than 3000 --remove-methods s2opc_base_nodeset_origin.xml s2opc_demo_data_origin.xml`

samples/ClientServer/data/address_space/generate_demo_nodesets.sh

@@ -20,28 +20,28 @@
 set -euo pipefail
 
 # Generate demo NodeSet for Micro profile + node management
-../../../../scripts/nodeset-address-space-utils.py --output s2opc_node_mgt.xml.tmp s2opc_base_nodeset_origin.xml s2opc_demo_data_origin.xml s2opc_demo_data_perfs.xml
+../../../../scripts/nodeset_address_space_utils.py --output s2opc_node_mgt.xml.tmp s2opc_base_nodeset_origin.xml s2opc_demo_data_origin.xml s2opc_demo_data_perfs.xml
 cat licence.xml > s2opc_node_mgt.xml
 sed '1d' s2opc_node_mgt.xml.tmp >> s2opc_node_mgt.xml
 echo '' >> s2opc_node_mgt.xml
 rm s2opc_node_mgt.xml.tmp
 
 # Generate demo NodeSet for Micro profile
-../../../../scripts/nodeset-address-space-utils.py --output s2opc.xml.tmp --remove-max-node-management s2opc_base_nodeset_origin.xml s2opc_demo_data_origin.xml s2opc_demo_data_perfs.xml
+../../../../scripts/nodeset_address_space_utils.py --output s2opc.xml.tmp --remove-max-node-management s2opc_base_nodeset_origin.xml s2opc_demo_data_origin.xml s2opc_demo_data_perfs.xml
 cat licence.xml > s2opc.xml
 sed '1d' s2opc.xml.tmp >> s2opc.xml
 echo '' >> s2opc.xml
 rm s2opc.xml.tmp
 
 # Generate demo NodeSet for Nano profile
-../../../../scripts/nodeset-address-space-utils.py --output s2opc_nano.xml.tmp --remove-max-monitored-items --remove-methods --remove-max-node-management s2opc_base_nodeset_origin.xml s2opc_demo_data_origin.xml s2opc_demo_data_perfs.xml
+../../../../scripts/nodeset_address_space_utils.py --output s2opc_nano.xml.tmp --remove-max-monitored-items --remove-methods --remove-max-node-management s2opc_base_nodeset_origin.xml s2opc_demo_data_origin.xml s2opc_demo_data_perfs.xml
 cat licence.xml > s2opc_nano.xml
 sed '1d' s2opc_nano.xml.tmp >> s2opc_nano.xml
 echo '' >> s2opc_nano.xml
 rm s2opc_nano.xml.tmp
 
 # Generate demo NodeSet with limited base info data
-../../../../scripts/nodeset-address-space-utils.py --output s2opc_no_base_info.xml.tmp --remove-node-ids-greater-than 3000 --remove-methods s2opc_base_nodeset_origin.xml s2opc_demo_data_origin.xml
+../../../../scripts/nodeset_address_space_utils.py --output s2opc_no_base_info.xml.tmp --remove-node-ids-greater-than 3000 --remove-methods s2opc_base_nodeset_origin.xml s2opc_demo_data_origin.xml
 cat licence.xml > s2opc_no_base_info.xml
 sed '1d' s2opc_no_base_info.xml.tmp >> s2opc_no_base_info.xml
 echo '' >> s2opc_no_base_info.xml

scripts/README.md

@@ -2,7 +2,7 @@ Directory content:
   - `gen_build_info_file.sh`: automatically run during Linux compilation to generate `src/ClientServer/configuration/sopc_toolkit_build_info.h` containing build information
   - `generate-embedded-base-type-info.py`: manually run to generate `src/Common/opcua_types/sopc_embedded_nodeset2.h` from OPC UA foundation `Opc.Ua.NodeSet2.xml` file
   - `generate-s2opc-address-space.py`: manually run on an address space XML file compliant with `UANodeSet.xsd` schema to generate a C source file defining an address space that can be loaded using `src/ClientServer/loaders/address_space_loaders/embedded loader`
-  - `gen-reciprocal-refs-address-space.xslt`: manually run on an address space XML file compliant with `UANodeSet.xsd` schema to generate all reciprocal references in the address space (all reciprocal references shall be defined to be used as address space configuration). Note: nodeset-address-space-utils.py already generate reciprocal references in addition to merge several NodeSets.
+  - `gen-reciprocal-refs-address-space.xslt`: manually run on an address space XML file compliant with `UANodeSet.xsd` schema to generate all reciprocal references in the address space (all reciprocal references shall be defined to be used as address space configuration). Note: nodeset_address_space_utils.py already generate reciprocal references in addition to merge several NodeSets.
   - `gen-sopc-types.py`: manually run to generate `src/Common/opcua_types/sopc_types[.h|.c]` from OPC UA foundation `Opc.Ua.Types.bsd` file
-  - `nodeset-address-space-utils.py`: manually run to merge several OPC UA node sets and generate reciprocal references. It is used to merge a base info nodeset (namespace 0) and a custom application nodesets (namespace 1). It is also possible to remove node not necessary for a nano scope server using options.
+  - `nodeset_address_space_utils.py`: manually run to merge several OPC UA node sets and generate reciprocal references. It is used to merge a base info nodeset (namespace 0) and a custom application nodesets (namespace 1). It is also possible to remove node not necessary for a nano scope server using options.
    - `generate-hash-from-password.py`: manually run to generate a hash (PBKDF2 with HMACH SHA256) from an interactive password, the output hash is useful to prepare the XML user configuration file for the server. To be run in test docker (RUN_INTERACTIVELY=yes ./.test-in-docker.sh "./scripts/generate-hash-from-password.py --help")

src/CMakeLists.txt

@@ -51,6 +51,6 @@ install(FILES
   ${S2OPC_ROOT_PATH}/scripts/generate-s2opc-address-space.py
   ${S2OPC_ROOT_PATH}/scripts/generate-s2opc_pubsub-static-config.py
   ${S2OPC_ROOT_PATH}/scripts/gen-reciprocal-refs-address-space.xslt
-  ${S2OPC_ROOT_PATH}/scripts/nodeset-address-space-utils.py
+  ${S2OPC_ROOT_PATH}/scripts/nodeset_address_space_utils.py
   DESTINATION bin
   )