IS-12 support

Development/cmake/NmosCppLibraries.cmake

@@ -686,6 +686,80 @@ target_include_directories(nmos_is09_schemas PUBLIC
 list(APPEND NMOS_CPP_TARGETS nmos_is09_schemas)
 add_library(nmos-cpp::nmos_is09_schemas ALIAS nmos_is09_schemas)
 
+# nmos_is12_schemas library
+
+set(NMOS_IS12_SCHEMAS_HEADERS
+    nmos/is12_schemas/is12_schemas.h
+    )
+
+set(NMOS_IS12_V1_0_TAG v1.0.x)
+
+set(NMOS_IS12_V1_0_SCHEMAS_JSON
+    third_party/is-12/${NMOS_IS12_V1_0_TAG}/APIs/schemas/base-message.json
+    third_party/is-12/${NMOS_IS12_V1_0_TAG}/APIs/schemas/command-message.json
+    third_party/is-12/${NMOS_IS12_V1_0_TAG}/APIs/schemas/command-response-message.json
+    third_party/is-12/${NMOS_IS12_V1_0_TAG}/APIs/schemas/error-message.json
+    third_party/is-12/${NMOS_IS12_V1_0_TAG}/APIs/schemas/event-data.json
+    third_party/is-12/${NMOS_IS12_V1_0_TAG}/APIs/schemas/notification-message.json
+    third_party/is-12/${NMOS_IS12_V1_0_TAG}/APIs/schemas/property-changed-event-data.json
+    third_party/is-12/${NMOS_IS12_V1_0_TAG}/APIs/schemas/subscription-message.json
+    third_party/is-12/${NMOS_IS12_V1_0_TAG}/APIs/schemas/subscription-response-message.json
+    )
+
+set(NMOS_IS12_SCHEMAS_JSON_MATCH "third_party/is-12/([^/]+)/APIs/schemas/([^;]+)\\.json")
+set(NMOS_IS12_SCHEMAS_SOURCE_REPLACE "${CMAKE_CURRENT_BINARY_DIR_REPLACE}/nmos/is12_schemas/\\1/\\2.cpp")
+string(REGEX REPLACE "${NMOS_IS12_SCHEMAS_JSON_MATCH}(;|$)" "${NMOS_IS12_SCHEMAS_SOURCE_REPLACE}\\3" NMOS_IS12_V1_0_SCHEMAS_SOURCES "${NMOS_IS12_V1_0_SCHEMAS_JSON}")
+
+foreach(JSON ${NMOS_IS12_V1_0_SCHEMAS_JSON})
+    string(REGEX REPLACE "${NMOS_IS12_SCHEMAS_JSON_MATCH}" "${NMOS_IS12_SCHEMAS_SOURCE_REPLACE}" SOURCE "${JSON}")
+    string(REGEX REPLACE "${NMOS_IS12_SCHEMAS_JSON_MATCH}" "\\1" NS "${JSON}")
+    string(REGEX REPLACE "${NMOS_IS12_SCHEMAS_JSON_MATCH}" "\\2" VAR "${JSON}")
+    string(MAKE_C_IDENTIFIER "${NS}" NS)
+    string(MAKE_C_IDENTIFIER "${VAR}" VAR)
+
+    file(WRITE "${SOURCE}.in" "\
+// Auto-generated from: ${JSON}\n\
+\n\
+namespace nmos\n\
+{\n\
+    namespace is12_schemas\n\
+    {\n\
+        namespace ${NS}\n\
+        {\n\
+            const char* ${VAR} = R\"-auto-generated-(")
+
+    file(READ "${JSON}" RAW)
+    file(APPEND "${SOURCE}.in" "${RAW}")
+
+    file(APPEND "${SOURCE}.in" ")-auto-generated-\";\n\
+        }\n\
+    }\n\
+}\n")
+
+    configure_file("${SOURCE}.in" "${SOURCE}" COPYONLY)
+endforeach()
+
+add_library(
+    nmos_is12_schemas STATIC
+    ${NMOS_IS12_SCHEMAS_HEADERS}
+    ${NMOS_IS12_V1_0_SCHEMAS_SOURCES}
+    )
+
+source_group("nmos\\is12_schemas\\Header Files" FILES ${NMOS_IS12_SCHEMAS_HEADERS})
+source_group("nmos\\is12_schemas\\${NMOS_IS12_V1_0_TAG}\\Source Files" FILES ${NMOS_IS12_V1_0_SCHEMAS_SOURCES})
+
+target_link_libraries(
+    nmos_is12_schemas PRIVATE
+    nmos-cpp::compile-settings
+    )
+target_include_directories(nmos_is12_schemas PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<INSTALL_INTERFACE:${NMOS_CPP_INSTALL_INCLUDEDIR}>
+    )
+
+list(APPEND NMOS_CPP_TARGETS nmos_is12_schemas)
+add_library(nmos-cpp::nmos_is12_schemas ALIAS nmos_is12_schemas)
+
 # nmos-cpp library
 
 set(NMOS_CPP_BST_SOURCES
@@ -757,6 +831,8 @@ set(NMOS_CPP_NMOS_SOURCES
     nmos/connection_api.cpp
     nmos/connection_events_activation.cpp
     nmos/connection_resources.cpp
+    nmos/control_protocol_resources.cpp
+    nmos/control_protocol_ws_api.cpp
     nmos/did_sdid.cpp
     nmos/events_api.cpp
     nmos/events_resources.cpp
@@ -829,6 +905,8 @@ set(NMOS_CPP_NMOS_HEADERS
     nmos/connection_api.h
     nmos/connection_events_activation.h
     nmos/connection_resources.h
+    nmos/control_protocol_resources.h
+    nmos/control_protocol_ws_api.h
     nmos/device_type.h
     nmos/did_sdid.h
     nmos/event_type.h
@@ -847,6 +925,7 @@ set(NMOS_CPP_NMOS_HEADERS
     nmos/is07_versions.h
     nmos/is08_versions.h
     nmos/is09_versions.h
+    nmos/is12_versions.h
     nmos/json_fields.h
     nmos/json_schema.h
     nmos/lldp_handler.h
@@ -985,6 +1064,7 @@ target_link_libraries(
     nmos-cpp::nmos_is05_schemas
     nmos-cpp::nmos_is08_schemas
     nmos-cpp::nmos_is09_schemas
+    nmos-cpp::nmos_is12_schemas
     nmos-cpp::mdns
     nmos-cpp::slog
     nmos-cpp::OpenSSL

Development/nmos-cpp-node/config.json

@@ -134,6 +134,7 @@
     //"channelmapping_port": 3215,
     // system_port [node]: used to construct request URLs for the System API (if not discovered via DNS-SD)
     //"system_port": 10641,
+    //"control_protocol_ws_port": 3218,
 
     // listen_backlog [registry, node]: the maximum length of the queue of pending connections, or zero for the implementation default (the implementation may not honour this value)
     //"listen_backlog": 0,
@@ -282,5 +283,19 @@
     // ocsp_request_max [registry, node]: timeout for interactions with the OCSP server
     //"ocsp_request_max": 30,
 
+    // manufacturer_name [node]: the manufacturer name of the NcDeviceManager used for NMOS Control Protocol
+    // See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#ncdevicemanager
+    //"manufacturer_name": "",
+
+    // product_name/product_key/product_revision_level [node]: the product description of the NcDeviceManager used for NMOS Control Protocol
+    // See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#ncproduct
+    //"product_name": "",
+    //"product_key": "",
+    //"product_revision_level": "",
+
+    // serial_number [node]: the serial number of the NcDeviceManager used for NMOS Control Protocol
+    // See https://specs.amwa.tv/ms-05-02/branches/v1.0-dev/docs/Framework.html#ncdevicemanager
+    //"serial_number": "",
+
     "don't worry": "about trailing commas"
 }

Development/nmos-cpp-node/node_implementation.cpp

@@ -21,6 +21,7 @@
 #include "nmos/colorspace.h"
 #include "nmos/connection_resources.h"
 #include "nmos/connection_events_activation.h"
+#include "nmos/control_protocol_resources.h"
 #include "nmos/events_resources.h"
 #include "nmos/format.h"
 #include "nmos/group_hint.h"
@@ -894,6 +895,17 @@ void node_implementation_init(nmos::node_model& model, slog::base_gate& gate)
         auto channelmapping_output = nmos::make_channelmapping_output(id, name, description, source_id, channel_labels, routable_inputs);
         if (!insert_resource_after(delay_millis, model.channelmapping_resources, std::move(channelmapping_output), gate)) throw node_implementation_init_exception();
     }
+
+    // example root block
+    auto root_block = nmos::make_root_block();
+    // example device manager
+    auto device_manager = nmos::make_device_manager(2, root_block, model.settings);
+    if (!insert_resource_after(delay_millis, model.control_protocol_resources, std::move(device_manager), gate)) throw node_implementation_init_exception();
+    // example class manager
+    auto class_manager = nmos::make_class_manager(3, root_block);
+    if (!insert_resource_after(delay_millis, model.control_protocol_resources, std::move(class_manager), gate)) throw node_implementation_init_exception();
+    // insert root block to model
+    if (!insert_resource_after(delay_millis, model.control_protocol_resources, std::move(root_block), gate)) throw node_implementation_init_exception();
 }
 
 void node_implementation_run(nmos::node_model& model, slog::base_gate& gate)