Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

IS-11 support #271

Open
wants to merge 116 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
116 commits
Select commit Hold shift + click to select a range
d5e46c1
Add Flow Compatibility Management API base route
N-Nagorny Jan 11, 2022
487818e
Add IS-11 resource makers and implement all GET operations
N-Nagorny Jan 12, 2022
79d2024
Implement PUT and DELETE for /inputs/{inputId}/edid/base
N-Nagorny Jan 14, 2022
634967d
flowcompatibility_api.cpp: refactor repeated code
N-Nagorny Jan 14, 2022
6d2a212
Add IS-11 and BCP-004-01 JSON Schemas
N-Nagorny Jan 16, 2022
ca8c804
Implement PUT and DELETE for /senders/{senderId}/constraints/active, …
N-Nagorny Jan 16, 2022
4b8f590
Implement States of Sender and Receiver
N-Nagorny Jan 24, 2022
fff7420
Fix bst::optional nullopt values
N-Nagorny Feb 3, 2022
3de8159
Allow making Outputs without EDID
N-Nagorny Feb 21, 2022
142f765
Remove "senders"/"receivers" arrays from Input/Output properties
N-Nagorny Feb 21, 2022
7ba0287
Add Sender Capabilities to flowcompatibility_active_constraints_put_h…
N-Nagorny Mar 11, 2022
b11402e
IS-11: update schemas, apply the new spec name to the sources
N-Nagorny May 14, 2022
ae50dd1
flowcompatibility -> streamcompatibility
N-Nagorny May 14, 2022
d230c3a
Node: replace EDID examples with dummies, add minor fixes
N-Nagorny May 14, 2022
2bcaba0
Sync Sender/Receiver states with IS-11 spec
N-Nagorny May 14, 2022
16941f7
Prevent IS-11 restrictions violation
N-Nagorny May 14, 2022
f2b8918
Fix is_subconstraint(), add unit tests
N-Nagorny May 31, 2022
6604027
Get rid of list of parameter constraints used for checking if a Const…
N-Nagorny May 31, 2022
583969d
Align bst::optional usage in IS-11 with the rest of code
N-Nagorny May 31, 2022
b3cf776
Replace string literals with platform-independent version
N-Nagorny May 31, 2022
3755db2
Convert EDID binary stored as utility::string_t to std::vector<uint8_t>
N-Nagorny Jun 27, 2022
986820e
Sync IS-11 Status with the spec
N-Nagorny Jun 27, 2022
c8f111b
Make Sender validator of streamcompatibility_behaviour_thread customi…
N-Nagorny Jul 6, 2022
278a802
streamcompatibility_behaviour: make namespaces full
N-Nagorny Jul 6, 2022
4836364
is_subconstraint(): fix the rational case
N-Nagorny Jul 20, 2022
b48f40f
Add match_constraint() for arbitrary JSON value
N-Nagorny Nov 16, 2022
8141286
is_subconstraint(): fix comparing of rationals
N-Nagorny Nov 16, 2022
c5d2000
Add constraints matcher for Senders
N-Nagorny Nov 17, 2022
2bac1b6
Add validate_receiver() callback, expand validate_sender()'s return v…
N-Nagorny Nov 17, 2022
e94eddf
Remove senderReceiverSubrouteType
N-Nagorny Nov 17, 2022
0812d6f
Minor fixes
N-Nagorny Nov 17, 2022
8eabb3f
Align make_node_implementation_streamcompatibility_...() naming
N-Nagorny Nov 17, 2022
7df92e9
Fix is_constraint_subset()
N-Nagorny Nov 20, 2022
376d616
Decouple IS-11 and IS-05
N-Nagorny Nov 20, 2022
5c8ab03
Apply suggestions from code review
N-Nagorny Nov 22, 2022
0dcdd31
Remove trailing commas
N-Nagorny Nov 22, 2022
a538f15
Move default connection_resource_patch_validator to nmos/connection_s…
N-Nagorny Nov 22, 2022
8801298
Replace validate_sender_resources with make_streamcompatibility_sende…
N-Nagorny Nov 23, 2022
b62883e
Fix inverted logic in subconstraint and constraint subset definitions
N-Nagorny Nov 23, 2022
e83e7d9
Get rid of structured bindings
N-Nagorny Nov 23, 2022
8084118
constraint_{min,max}imum: field<double> -> field_as_value
N-Nagorny Nov 30, 2022
e0756a2
Rename validate_sender to validate_sender_resources
N-Nagorny Nov 30, 2022
7d799c5
Add a Stream Compatibility validation test
N-Nagorny Nov 30, 2022
8ba4b46
Merge remote-tracking branch 'origin/master' into is-11
garethsb Dec 2, 2022
0444c02
Compare integer min/max as int64_t
garethsb Dec 2, 2022
6574cd7
Merge branch 'master' into is-11
N-Nagorny Dec 4, 2022
402fa7d
Revert changes in sdp_utils.{cpp,h}
N-Nagorny Dec 4, 2022
f5216f3
Add make_streamcompatibility_sdp_constraint_sets_matcher
N-Nagorny Dec 4, 2022
cd890ad
Fix /{senders,receivers}/{resourceId}/{inputs,outputs}
N-Nagorny Dec 6, 2022
6f46f53
Fix PUTting an empty array to Active Constraints
N-Nagorny Feb 2, 2023
8fc7591
Add default streamcompatibility_sender_validator to node_implementation
N-Nagorny Feb 2, 2023
8680a8f
Move empty Active Constraints fix
N-Nagorny Feb 3, 2023
d24eb37
Add "edid_support" to Node config
N-Nagorny Mar 21, 2023
2e08ff5
Different supported parameter constraints and Sedner Caps for video a…
N-Nagorny Mar 21, 2023
f5106ca
Add handling of Active Constraints which Constraint Sets contain less…
N-Nagorny Mar 21, 2023
fb0e20e
Fix build
N-Nagorny Mar 21, 2023
c5f2834
Merge remote-tracking branch 'origin/master' into is-11
N-Nagorny Apr 9, 2023
15a27a9
Add room for custom "debug" in 422 response
N-Nagorny Apr 9, 2023
c07645b
Fix Windows build
N-Nagorny Apr 17, 2023
fdaac5c
Merge remote-tracking branch 'origin/master' into is-11
garethsb Apr 20, 2023
e31e434
Add make_streamcompatibility_receiver_validator
N-Nagorny Apr 20, 2023
48b3c2c
Fix Sender validator for video/jxsv
N-Nagorny Apr 20, 2023
29bc35b
Fix receivers validation
N-Nagorny Apr 20, 2023
16af3ee
Fill Sender Caps from impl::fields
N-Nagorny Apr 20, 2023
9a4d99f
Restore the elegance of make_node_implementation
N-Nagorny Apr 20, 2023
8e22199
Merge Base EDID PUT and Base EDID DELETE handlers into a single one
N-Nagorny Apr 20, 2023
0195a9e
Remove has_value()
N-Nagorny Apr 20, 2023
389bcd2
streamcompatibility_active_constraints_put_handler: take streamcompat…
N-Nagorny Apr 20, 2023
1d1f878
Add get_constraint_set_intersection for streamcompatibility_active_co…
N-Nagorny Apr 21, 2023
56d9555
Store intersection of Sender Caps and Active Constraints in streamcom…
N-Nagorny Apr 22, 2023
abd69b1
Fix print-outs
N-Nagorny Apr 22, 2023
9bc3c91
constraints.cpp tweaks
N-Nagorny Apr 25, 2023
fd69423
streamcompatibility_active_constraints_put_handler -> streamcompatibi…
N-Nagorny Apr 25, 2023
6b75505
Separate 422 and empty intersection
N-Nagorny Apr 25, 2023
e0b29e1
Run IS-11 test suite as part of CI
N-Nagorny Apr 25, 2023
9e9ac54
Quickfix
N-Nagorny Apr 25, 2023
1631623
Temporarily ignore auto_connection_21
N-Nagorny Apr 25, 2023
dff5591
Revert "Temporarily ignore auto_connection_21"
N-Nagorny Apr 27, 2023
3d71441
CI: switch IS-11 branch
N-Nagorny Apr 28, 2023
e5efb1d
Move video_jxsv_sender_resources_matcher to video_jxsv.{h,cpp}
N-Nagorny Apr 28, 2023
ecf6aaf
Fix streamcompatibility_sender_validator typedef
N-Nagorny Apr 28, 2023
e1f707c
Remove "merge" from get_constraint_set_intersection
N-Nagorny Apr 28, 2023
c0c479f
Replace make_streamcompatibility_receiver_validator's transport_file_…
N-Nagorny Apr 28, 2023
4edcf0c
Simplify make_node_implementation_streamcompatibility_active_constrai…
N-Nagorny May 5, 2023
4a37cd8
constraint_value_less: detail -> details
N-Nagorny May 5, 2023
bd128a3
Restore filtering out "meta" in get_constraint_set_intersection
N-Nagorny May 5, 2023
ca0b38a
Fix '"enum" matches "min"/"max"' case
N-Nagorny May 22, 2023
c17013f
Add settings for IS-11 implementation control
N-Nagorny May 22, 2023
04f1fc9
CI: print test results for failed suites
N-Nagorny May 22, 2023
bda591e
Fix streamcompatibility_index issue
N-Nagorny Jun 13, 2023
dbfc11d
Add "device_id" to IS-11 Input/Output
N-Nagorny Feb 13, 2023
60fa835
Add "base_edid_changeable" to Input
N-Nagorny Feb 15, 2023
3c01117
"base_edid_changeable" -> "base_edid_support"
N-Nagorny Jul 1, 2023
17f9721
Add "default_signal"
N-Nagorny Jul 1, 2023
28241d0
Update JSON Schemas
N-Nagorny Jul 1, 2023
b24f84d
Add "adjust_to_caps"
N-Nagorny Jul 3, 2023
b98dab7
Update JSON Schemas
N-Nagorny Jul 20, 2023
2e033b5
Remove support of obsolete "base_edid", "effective_edid" and "edid" J…
N-Nagorny Jul 20, 2023
146beed
Add "master_enable" check before Receiver's stream compliance check
N-Nagorny Jul 22, 2023
74e20cc
Wrap adjust_to_caps checks with U macro
N-Nagorny Jul 22, 2023
8f3301c
Erase "debug" in Status of S/R if it's empty in the last update
N-Nagorny Jul 22, 2023
c778adc
CI: temporarily switch to nmos-testing fork
N-Nagorny Jul 22, 2023
4c446ba
Fix edid_href
N-Nagorny Oct 12, 2023
0d8f8e4
CI: change the branch
N-Nagorny Nov 1, 2023
20b8a7d
Remove BCP-004-01 schemas since they were copied to IS-11
N-Nagorny Nov 1, 2023
290c745
Switch nmos-testing to AMWA-TV:is-11
N-Nagorny Mar 4, 2024
a21a413
Merge branch 'master' into is-11
N-Nagorny Mar 4, 2024
effaa6f
Add IS-11 docs
N-Nagorny Mar 6, 2024
726f18f
Temporarily disable IS-11 tests
N-Nagorny Mar 6, 2024
373ffa9
Merge branch 'master' into is-11
N-Nagorny Mar 7, 2024
a522324
Remove spaces
lo-simon Mar 11, 2024
fbb4470
Add IS-10 support
lo-simon Mar 11, 2024
d33fdfa
Merge pull request #1 from lo-simon/add-is10-support-to-is11
N-Nagorny Mar 12, 2024
3fa4720
Apply suggestions from code review
N-Nagorny Mar 13, 2024
7bce8b5
IS-11 branch: v1.0-dev -> v1.0.x
N-Nagorny Mar 15, 2024
7d47286
Update IS-11 docs
N-Nagorny Mar 21, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Prevent IS-11 restrictions violation
  • Loading branch information
N-Nagorny committed Nov 16, 2022
commit 16941f76421a04836e8cf91f42ecd17bf6416201
19 changes: 19 additions & 0 deletions Development/nmos/connection_api.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
#include "nmos/model.h"
#include "nmos/sdp_utils.h"
#include "nmos/slog.h"
#include "nmos/streamcompatibility_state.h"
#include "nmos/transport.h"
#include "nmos/thread_utils.h"
#include "nmos/version.h"
Expand Down Expand Up @@ -455,6 +456,24 @@ namespace nmos
// find resource again just in case, since waiting releases and reacquires the lock
resource = find_resource(resources, id_type);
}

// "At any time if State of an active Sender becomes active_constraints_violation, the Sender MUST become inactive.
// An inactive Sender in this state MUST NOT allow activations.
// At any time if State of an active Receiver becomes non_compliant_stream, the Receiver SHOULD become inactive.
// An inactive Receiver in this state SHOULD NOT allow activations."
// See https://specs.amwa.tv/is-11/branches/v1.0-dev/docs/Behaviour_-_Server_Side.html#preventing-restrictions-violation
auto streamcompatibility_resource = find_resource(model.streamcompatibility_resources, id_type);
if (model.streamcompatibility_resources.end() != streamcompatibility_resource)
{
auto resource_state = nmos::fields::state(nmos::fields::status(nmos::fields::endpoint_status(streamcompatibility_resource->data)));

if (resource_state == nmos::sender_states::active_constraints_violation.name || resource_state == nmos::receiver_states::non_compliant_stream.name)
{
slog::log<slog::severities::error>(gate, SLOG_FLF) << "Rejecting PATCH request for " << id_type << " due to its state: " << resource_state;
N-Nagorny marked this conversation as resolved.
Show resolved Hide resolved

return details::make_connection_resource_patch_error_response(status_codes::InternalError);
}
}
}
else
{
Expand Down
65 changes: 50 additions & 15 deletions Development/nmos/streamcompatibility_behaviour.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,8 @@
#include <vector>
#include <boost/range/adaptor/filtered.hpp>
#include <boost/range/adaptor/transformed.hpp>
#include "nmos/activation_mode.h"
#include "nmos/activation_utils.h"
#include "nmos/capabilities.h" // for constraint_sets
#include "nmos/constraints.h"
#include "nmos/id.h"
Expand Down Expand Up @@ -120,7 +122,7 @@ namespace nmos
using web::json::value;
using web::json::value_of;

auto lock = model.write_lock(); // in order to update the resources
auto lock = model.write_lock(); // in order to update state of Sender/Receiver
auto& node_resources = model.node_resources;
auto& connection_resources = model.connection_resources;
auto& streamcompatibility_resources = model.streamcompatibility_resources;
Expand All @@ -135,7 +137,7 @@ namespace nmos
auto streamcompatibility_senders_ids = get_resources_ids(streamcompatibility_resources, nmos::types::sender);
auto streamcompatibility_receivers_ids = get_resources_ids(streamcompatibility_resources, nmos::types::receiver);

// find IS-11 recently updated Senders and Senders with recently updated Flow or Source
// find Senders with recently updated IS-11 properties, associated Flow or Source
for (const nmos::id& sender_id : streamcompatibility_senders_ids)
{
try
Expand All @@ -144,39 +146,36 @@ namespace nmos

const std::pair<nmos::id, nmos::type> sender_id_type{ sender_id, nmos::types::sender };
auto sender = find_resource(node_resources, sender_id_type);
if (node_resources.end() == sender) throw std::logic_error("Matching IS-04 sender not found");
if (node_resources.end() == sender) throw std::logic_error("Matching IS-04 Sender not found");

const std::pair<nmos::id, nmos::type> flow_id_type{ nmos::fields::flow_id(sender->data).as_string(), nmos::types::flow };
auto flow = find_resource(node_resources, flow_id_type);
if (node_resources.end() == flow) throw std::logic_error("Matching IS-04 flow not found");
if (node_resources.end() == flow) throw std::logic_error("Matching IS-04 Flow not found");

const std::pair<nmos::id, nmos::type> source_id_type{ nmos::fields::source_id(flow->data), nmos::types::source };
auto source = find_resource(node_resources, source_id_type);
if (node_resources.end() == source) throw std::logic_error("Matching IS-04 source not found");
if (node_resources.end() == source) throw std::logic_error("Matching IS-04 Source not found");

updated = most_recent_update < sender->updated ||
most_recent_update < flow->updated ||
most_recent_update < source->updated;

if (updated)
{
slog::log<slog::severities::info>(gate, SLOG_FLF) << "Sender " << sender_id << " or its Flow or Source has been updated recently and Sender State is being updated as well";
slog::log<slog::severities::info>(gate, SLOG_FLF) << "Sender " << sender_id << " or its Flow or Source has been updated recently and the state of this Sender is being updated as well";

const std::pair<nmos::id, nmos::type> streamcompatibility_sender_id_type{ sender_id, nmos::types::sender };
auto streamcompatibility_sender = find_resource(streamcompatibility_resources, streamcompatibility_sender_id_type);
if (streamcompatibility_resources.end() == streamcompatibility_sender) throw std::logic_error("Matching IS-11 sender not found");
auto streamcompatibility_sender = find_resource(streamcompatibility_resources, sender_id_type);
if (streamcompatibility_resources.end() == streamcompatibility_sender) throw std::logic_error("Matching IS-11 Sender not found");

auto connection_sender = find_resource(connection_resources, sender_id_type);
if (connection_resources.end() == connection_sender) throw std::logic_error("Matching IS-05 Sender not found");

nmos::signal_state signal_state(nmos::fields::signal_state(nmos::fields::endpoint_status(streamcompatibility_sender->data)));
nmos::sender_state sender_state(signal_state.name);

if (signal_state == nmos::signal_states::signal_is_present)
{
const auto& constraint_sets = nmos::fields::constraint_sets(nmos::fields::active_constraint_sets(nmos::fields::endpoint_active_constraints(streamcompatibility_sender->data))).as_array();

const std::pair<nmos::id, nmos::type> connection_sender_id_type{ sender_id, nmos::types::sender };
auto connection_sender = find_resource(connection_resources, connection_sender_id_type);
if (connection_resources.end() == connection_sender) throw std::logic_error("Matching IS-05 sender not found");

auto& transport_file = nmos::fields::endpoint_transportfile(connection_sender->data);

slog::log<slog::severities::info>(gate, SLOG_FLF) << "Sender " << sender_id << " is being validated with its Flow, Source and transport file";
Expand All @@ -197,11 +196,29 @@ namespace nmos

update_version(node_resources, sender_id, updated_timestamp);
}

if (sender_state == nmos::sender_states::active_constraints_violation)
{
slog::log<slog::severities::info>(gate, SLOG_FLF) << "Stopping Sender " << sender->id;
web::json::value merged;
nmos::modify_resource(connection_resources, sender_id, [&merged](nmos::resource& connection_resource)
{
connection_resource.data[nmos::fields::version] = web::json::value::string(nmos::make_version());
merged = nmos::fields::endpoint_staged(connection_resource.data);
merged[nmos::fields::master_enable] = value::boolean(false);
auto activation = nmos::make_activation();
activation[nmos::fields::mode] = value::string(nmos::activation_modes::activate_immediate.name);
details::merge_activation(merged[nmos::fields::activation], activation, nmos::tai_now());
connection_resource.data[nmos::fields::endpoint_staged] = merged;
});

details::handle_immediate_activation_pending(model, lock, sender_id_type, merged[nmos::fields::activation], gate);
}
}
}
catch (const std::exception& e)
{
slog::log<slog::severities::warning>(gate, SLOG_FLF) << "Updating sender status for " << sender_id << " raised exception: " << e.what();
slog::log<slog::severities::warning>(gate, SLOG_FLF) << "An exception appeared while updating the state of Sender " << sender_id << ": " << e.what();
continue;
}
}
Expand Down Expand Up @@ -251,6 +268,24 @@ namespace nmos

update_version(node_resources, receiver_id, updated_timestamp);
}

if (receiver_state == nmos::receiver_states::non_compliant_stream)
{
slog::log<slog::severities::info>(gate, SLOG_FLF) << "Stopping Receiver " << receiver->id;
web::json::value merged;
nmos::modify_resource(connection_resources, receiver_id, [&merged](nmos::resource& connection_resource)
{
connection_resource.data[nmos::fields::version] = web::json::value::string(nmos::make_version());
merged = nmos::fields::endpoint_staged(connection_resource.data);
merged[nmos::fields::master_enable] = value::boolean(false);
auto activation = nmos::make_activation();
activation[nmos::fields::mode] = value::string(nmos::activation_modes::activate_immediate.name);
details::merge_activation(merged[nmos::fields::activation], activation, nmos::tai_now());
connection_resource.data[nmos::fields::endpoint_staged] = merged;
});

details::handle_immediate_activation_pending(model, lock, receiver_id_type, merged[nmos::fields::activation], gate);
}
}
}
catch (const std::exception& e)
Expand Down