IS-11 support

.github/workflows/build-test.yml

@@ -340,9 +340,10 @@ jobs:
         set -x
         root_dir=`pwd`
 
-        # Install AMWA NMOS Testing Tool
+        # Install AMWA NMOS Testing Tool (is-11 instead of master until IS-11 tests are merged)
         git clone https://github.com/AMWA-TV/nmos-testing.git
         cd nmos-testing
+        git checkout is-11
 
         # Configure the Testing Tool so all APIs are tested with TLS
         printf "from . import Config as CONFIG\nCONFIG.ENABLE_HTTPS = True\n" > nmostesting/UserConfig.py
@@ -847,9 +848,10 @@ jobs:
         set -x
         root_dir=`pwd`
 
-        # Install AMWA NMOS Testing Tool
+        # Install AMWA NMOS Testing Tool (is-11 instead of master until IS-11 tests are merged)
         git clone https://github.com/AMWA-TV/nmos-testing.git
         cd nmos-testing
+        git checkout is-11
 
         # Configure the Testing Tool so all APIs are tested with TLS
         printf "from . import Config as CONFIG\nCONFIG.ENABLE_HTTPS = True\n" > nmostesting/UserConfig.py

.github/workflows/src/amwa-test.yml

@@ -15,9 +15,10 @@
     set -x
     root_dir=`pwd`
 
-    # Install AMWA NMOS Testing Tool
+    # Install AMWA NMOS Testing Tool (is-11 instead of master until IS-11 tests are merged)
     git clone https://github.com/AMWA-TV/nmos-testing.git
     cd nmos-testing
+    git checkout is-11
 
     # Configure the Testing Tool so all APIs are tested with TLS
     printf "from . import Config as CONFIG\nCONFIG.ENABLE_HTTPS = True\n" > nmostesting/UserConfig.py
@@ -146,7 +147,7 @@
       # nmos-cpp-node doesn't currently support advertising hostnames to Avahi
       avahi-publish -a -R nmos-api.local ${{ env.HOST_IP_ADDRESS }} &
     fi
-    
+
     ${{ env.GITHUB_WORKSPACE_BASH }}/Sandbox/run_nmos_testing.sh "$run_python" ${domain} ${root_dir}/build/nmos-cpp-node ${root_dir}/build/nmos-cpp-registry results badges $GITHUB_STEP_SUMMARY ${{ env.HOST_IP_ADDRESS }} "${{ env.GITHUB_COMMIT }}-${{ env.BUILD_NAME }}-"
 
     if [[ "${{ runner.os }}" == "Linux" ]]; then

Development/cmake/NmosCppLibraries.cmake

@@ -686,6 +686,163 @@ 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_is11_schemas library
+
+set(NMOS_IS11_SCHEMAS_HEADERS
+    nmos/is11_schemas/is11_schemas.h
+    )
+
+set(NMOS_IS11_V1_0_TAG v1.0.x)
+
+set(NMOS_IS11_V1_0_SCHEMAS_JSON
+    third_party/is-11/${NMOS_IS11_V1_0_TAG}/APIs/schemas/constraints_active.json
+    third_party/is-11/${NMOS_IS11_V1_0_TAG}/APIs/schemas/constraints-base.json
+    third_party/is-11/${NMOS_IS11_V1_0_TAG}/APIs/schemas/constraints_supported.json
+    third_party/is-11/${NMOS_IS11_V1_0_TAG}/APIs/schemas/edid.json
+    third_party/is-11/${NMOS_IS11_V1_0_TAG}/APIs/schemas/edid_timing.json
+    third_party/is-11/${NMOS_IS11_V1_0_TAG}/APIs/schemas/empty_constraints_active.json
+    third_party/is-11/${NMOS_IS11_V1_0_TAG}/APIs/schemas/error.json
+    third_party/is-11/${NMOS_IS11_V1_0_TAG}/APIs/schemas/input-edid-base.json
+    third_party/is-11/${NMOS_IS11_V1_0_TAG}/APIs/schemas/input.json
+    third_party/is-11/${NMOS_IS11_V1_0_TAG}/APIs/schemas/input-output-base.json
+    third_party/is-11/${NMOS_IS11_V1_0_TAG}/APIs/schemas/output.json
+    third_party/is-11/${NMOS_IS11_V1_0_TAG}/APIs/schemas/receiver-base.json
+    third_party/is-11/${NMOS_IS11_V1_0_TAG}/APIs/schemas/receiver-status.json
+    third_party/is-11/${NMOS_IS11_V1_0_TAG}/APIs/schemas/resource-list.json
+    third_party/is-11/${NMOS_IS11_V1_0_TAG}/APIs/schemas/sender-base.json
+    third_party/is-11/${NMOS_IS11_V1_0_TAG}/APIs/schemas/sender-status.json
+    third_party/is-11/${NMOS_IS11_V1_0_TAG}/APIs/schemas/streamcompatibility-api-base.json
+    third_party/is-11/${NMOS_IS11_V1_0_TAG}/APIs/schemas/uuid-list.json
+    )
+
+set(NMOS_IS11_SCHEMAS_JSON_MATCH "third_party/is-11/([^/]+)/APIs/schemas/([^;]+)\\.json")
+set(NMOS_IS11_SCHEMAS_SOURCE_REPLACE "${CMAKE_CURRENT_BINARY_DIR_REPLACE}/nmos/is11_schemas/\\1/\\2.cpp")
+string(REGEX REPLACE "${NMOS_IS11_SCHEMAS_JSON_MATCH}(;|$)" "${NMOS_IS11_SCHEMAS_SOURCE_REPLACE}\\3" NMOS_IS11_V1_0_SCHEMAS_SOURCES "${NMOS_IS11_V1_0_SCHEMAS_JSON}")
+
+foreach(JSON ${NMOS_IS11_V1_0_SCHEMAS_JSON})
+    string(REGEX REPLACE "${NMOS_IS11_SCHEMAS_JSON_MATCH}" "${NMOS_IS11_SCHEMAS_SOURCE_REPLACE}" SOURCE "${JSON}")
+    string(REGEX REPLACE "${NMOS_IS11_SCHEMAS_JSON_MATCH}" "\\1" NS "${JSON}")
+    string(REGEX REPLACE "${NMOS_IS11_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 is11_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_is11_schemas STATIC
+    ${NMOS_IS11_SCHEMAS_HEADERS}
+    ${NMOS_IS11_V1_0_SCHEMAS_SOURCES}
+    )
+
+source_group("nmos\\is11_schemas\\Header Files" FILES ${NMOS_IS11_SCHEMAS_HEADERS})
+source_group("nmos\\is11_schemas\\${NMOS_IS11_V1_0_TAG}\\Source Files" FILES ${NMOS_IS11_V1_0_SCHEMAS_SOURCES})
+
+target_link_libraries(
+    nmos_is11_schemas PRIVATE
+    nmos-cpp::compile-settings
+    )
+target_include_directories(nmos_is11_schemas PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<INSTALL_INTERFACE:${NMOS_CPP_INSTALL_INCLUDEDIR}>
+    )
+
+list(APPEND NMOS_CPP_TARGETS nmos_is11_schemas)
+add_library(nmos-cpp::nmos_is11_schemas ALIAS nmos_is11_schemas)
+
+# nmos_bcp00401_schemas library
+
+set(NMOS_BCP00401_SCHEMAS_HEADERS
+    nmos/bcp00401_schemas/bcp00401_schemas.h
+    )
+
+set(NMOS_BCP00401_V1_0_TAG v1.0.x)
+
+set(NMOS_BCP00401_V1_0_SCHEMAS_JSON
+    third_party/bcp-004-01/${NMOS_BCP00401_V1_0_TAG}/APIs/schemas/constraint_set.json
+    third_party/bcp-004-01/${NMOS_BCP00401_V1_0_TAG}/APIs/schemas/constraint_sets.json
+    third_party/bcp-004-01/${NMOS_BCP00401_V1_0_TAG}/APIs/schemas/param_constraint_boolean.json
+    third_party/bcp-004-01/${NMOS_BCP00401_V1_0_TAG}/APIs/schemas/param_constraint_integer.json
+    third_party/bcp-004-01/${NMOS_BCP00401_V1_0_TAG}/APIs/schemas/param_constraint.json
+    third_party/bcp-004-01/${NMOS_BCP00401_V1_0_TAG}/APIs/schemas/param_constraint_number.json
+    third_party/bcp-004-01/${NMOS_BCP00401_V1_0_TAG}/APIs/schemas/param_constraint_rational.json
+    third_party/bcp-004-01/${NMOS_BCP00401_V1_0_TAG}/APIs/schemas/param_constraint_string.json
+    third_party/bcp-004-01/${NMOS_BCP00401_V1_0_TAG}/APIs/schemas/receiver_constraint_sets.json
+    )
+
+set(NMOS_BCP00401_SCHEMAS_JSON_MATCH "third_party/bcp-004-01/([^/]+)/APIs/schemas/([^;]+)\\.json")
+set(NMOS_BCP00401_SCHEMAS_SOURCE_REPLACE "${CMAKE_CURRENT_BINARY_DIR_REPLACE}/nmos/bcp00401_schemas/\\1/\\2.cpp")
+string(REGEX REPLACE "${NMOS_BCP00401_SCHEMAS_JSON_MATCH}(;|$)" "${NMOS_BCP00401_SCHEMAS_SOURCE_REPLACE}\\3" NMOS_BCP00401_V1_0_SCHEMAS_SOURCES "${NMOS_BCP00401_V1_0_SCHEMAS_JSON}")
+
+foreach(JSON ${NMOS_BCP00401_V1_0_SCHEMAS_JSON})
+    string(REGEX REPLACE "${NMOS_BCP00401_SCHEMAS_JSON_MATCH}" "${NMOS_BCP00401_SCHEMAS_SOURCE_REPLACE}" SOURCE "${JSON}")
+    string(REGEX REPLACE "${NMOS_BCP00401_SCHEMAS_JSON_MATCH}" "\\1" NS "${JSON}")
+    string(REGEX REPLACE "${NMOS_BCP00401_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 bcp00401_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_bcp00401_schemas STATIC
+    ${NMOS_BCP00401_SCHEMAS_HEADERS}
+    ${NMOS_BCP00401_V1_0_SCHEMAS_SOURCES}
+    )
+
+source_group("nmos\\bcp00401_schemas\\Header Files" FILES ${NMOS_BCP00401_SCHEMAS_HEADERS})
+source_group("nmos\\bcp00401_schemas\\${NMOS_BCP00401_V1_0_TAG}\\Source Files" FILES ${NMOS_BCP00401_V1_0_SCHEMAS_SOURCES})
+
+target_link_libraries(
+    nmos_bcp00401_schemas PRIVATE
+    nmos-cpp::compile-settings
+    )
+target_include_directories(nmos_bcp00401_schemas PUBLIC
+    $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>
+    $<INSTALL_INTERFACE:${NMOS_CPP_INSTALL_INCLUDEDIR}>
+    )
+
+list(APPEND NMOS_CPP_TARGETS nmos_bcp00401_schemas)
+add_library(nmos-cpp::nmos_bcp00401_schemas ALIAS nmos_bcp00401_schemas)
+
 # nmos-cpp library
 
 set(NMOS_CPP_BST_SOURCES
@@ -757,12 +914,18 @@ set(NMOS_CPP_NMOS_SOURCES
     nmos/connection_api.cpp
     nmos/connection_events_activation.cpp
     nmos/connection_resources.cpp
+    nmos/streamcompatibility_validation.cpp
+    nmos/constraints.cpp
     nmos/did_sdid.cpp
     nmos/events_api.cpp
     nmos/events_resources.cpp
     nmos/events_ws_api.cpp
     nmos/events_ws_client.cpp
     nmos/filesystem_route.cpp
+    nmos/streamcompatibility_api.cpp
+    nmos/streamcompatibility_behaviour.cpp
+    nmos/streamcompatibility_resources.cpp
+    nmos/streamcompatibility_utils.cpp
     nmos/group_hint.cpp
     nmos/id.cpp
     nmos/lldp_handler.cpp
@@ -828,6 +991,8 @@ set(NMOS_CPP_NMOS_HEADERS
     nmos/connection_api.h
     nmos/connection_events_activation.h
     nmos/connection_resources.h
+    nmos/streamcompatibility_validation.h
+    nmos/constraints.h
     nmos/device_type.h
     nmos/did_sdid.h
     nmos/event_type.h
@@ -836,6 +1001,10 @@ set(NMOS_CPP_NMOS_HEADERS
     nmos/events_ws_api.h
     nmos/events_ws_client.h
     nmos/filesystem_route.h
+    nmos/streamcompatibility_api.h
+    nmos/streamcompatibility_behaviour.h
+    nmos/streamcompatibility_resources.h
+    nmos/streamcompatibility_utils.h
     nmos/format.h
     nmos/group_hint.h
     nmos/health.h
@@ -887,6 +1056,7 @@ set(NMOS_CPP_NMOS_HEADERS
     nmos/resources.h
     nmos/schemas_api.h
     nmos/sdp_utils.h
+    nmos/streamcompatibility_state.h
     nmos/server.h
     nmos/server_utils.h
     nmos/settings.h
@@ -984,6 +1154,8 @@ target_link_libraries(
     nmos-cpp::nmos_is05_schemas
     nmos-cpp::nmos_is08_schemas
     nmos-cpp::nmos_is09_schemas
+    nmos-cpp::nmos_is11_schemas
+    nmos-cpp::nmos_bcp00401_schemas
     nmos-cpp::mdns
     nmos-cpp::slog
     nmos-cpp::OpenSSL

Development/cmake/NmosCppTest.cmake

@@ -42,12 +42,14 @@ set(NMOS_CPP_TEST_NMOS_TEST_SOURCES
     nmos/test/api_utils_test.cpp
     nmos/test/capabilities_test.cpp
     nmos/test/channels_test.cpp
+    nmos/test/constraints_test.cpp
     nmos/test/did_sdid_test.cpp
     nmos/test/event_type_test.cpp
     nmos/test/json_validator_test.cpp
     nmos/test/paging_utils_test.cpp
     nmos/test/query_api_test.cpp
     nmos/test/sdp_utils_test.cpp
+    nmos/test/streamcompatibility_validation_test.cpp
     nmos/test/system_resources_test.cpp
     nmos/test/video_jxsv_test.cpp
     )

Development/nmos-cpp-node/config.json

@@ -60,6 +60,9 @@
     // smpte2022_7: controls whether senders and receivers have one leg (false) or two legs (true, default)
     //"smpte2022_7": false,
 
+    // edid_support: controls whether inputs and output have EDID support
+    //"edid_support": false,
+
     // Configuration settings and defaults for logging
 
     // error_log [registry, node]: filename for the error log or an empty string to write to stderr
@@ -101,6 +104,9 @@
     // is09_versions [registry, node]: used to specify the enabled API versions for a version-locked configuration
     //"is09_versions": ["v1.0"],
 
+    // is11_versions [node]: used to specify the enabled API versions for a version-locked configuration
+    //"is11_versions": ["v1.0"],
+
     // pri [registry, node]: used for the 'pri' TXT record; specifying nmos::service_priorities::no_priority (maximum value) disables advertisement completely
     //"pri": 100,
 
@@ -132,6 +138,7 @@
     //"events_port": 3216,
     //"events_ws_port": 3217,
     //"channelmapping_port": 3215,
+    //"streamcompatibility_port": 3218,
     // system_port [node]: used to construct request URLs for the System API (if not discovered via DNS-SD)
     //"system_port": 10641,