Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
21 changes: 17 additions & 4 deletions nmostesting/Config.py
Original file line number Diff line number Diff line change
Expand Up @@ -170,8 +170,8 @@
# video/raw, etc.
"width": 1920,
"height": 1080,
"interlace": True,
"exactframerate": "25",
"interlace": False,
"exactframerate": "60",
"depth": 10,
"sampling": "YCbCr-4:2:2",
"colorimetry": "BT709",
Expand Down Expand Up @@ -375,6 +375,17 @@
}
}
},
"bcp-004-02": {
"repo": "bcp-004-02",
"branch": "v1.0-dev",
"versions": ["v1.0-dev"],
"default_version": "v1.0-dev",
"apis": {
"sender-caps": {
"name": "Sender Capabilities"
}
}
},
"bcp-005-01": {
"repo": "bcp-005-01",
"versions": ["v1.0"],
Expand All @@ -383,8 +394,10 @@
},
"nmos-parameter-registers": {
"repo": "nmos-parameter-registers",
"versions": ["main"],
"default_version": "main",
"url": "https://github.com/alabou/",
"branch": "bcp-004-02",
"versions": ["bcp-004-02"],
"default_version": "bcp-004-02",
Comment on lines +397 to +400
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be removed once AMWA-TV/nmos-parameter-registers#65 has been merged.

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For future reference, these parameters can be overridden in your UserConfig.py so you don't need to touch the Config.py when using development config, like this:

CONFIG.SPECIFICATIONS["nmos-parameter-registers"]["url"] = "https://github.com/alabou/"
CONFIG.SPECIFICATIONS["nmos-parameter-registers"]["versions"] = ["bcp-004-02"]
CONFIG.SPECIFICATIONS["nmos-parameter-registers"]["default_version"] = "bcp-004-02"

"apis": {
"caps-register": {
"name": "Capabilities Register"
Expand Down
34 changes: 32 additions & 2 deletions nmostesting/NMOSTesting.py
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@
from .suites import BCP0050101Test
from .suites import BCP0060101Test
from .suites import BCP0060102Test
from .suites import BCP0040201Test
from .suites import BCP00604Test


Expand Down Expand Up @@ -431,6 +432,33 @@
}],
"class": BCP0060102Test.BCP0060102Test
},
"BCP-004-02-01": {
"name": "BCP-004-02 Sender Capabilities",
"specs": [{
"spec_key": "is-04",
"api_key": "node"
}, {
"spec_key": "is-05",
"api_key": "connection"
}],
"extra_specs": [{
"spec_key": "nmos-parameter-registers",
"api_key": "flow-register"
}, {
"spec_key": "nmos-parameter-registers",
"api_key": "sender-register"
}, {
"spec_key": "nmos-parameter-registers",
"api_key": "caps-register"
}, {
"spec_key": "bcp-004-01",
"api_key": "receiver-caps"
}, {
"spec_key": "bcp-004-02",
"api_key": "sender-caps"
}],
"class": BCP0040201Test.BCP0040201Test
},
"BCP-006-04": {
"name": "BCP-006-04 NMOS With MPEG TS",
"specs": [{
Expand Down Expand Up @@ -730,8 +758,9 @@ def init_spec_cache():
if repo_data["repo"] is None:
continue
if not os.path.exists(path):
print(" * Initialising repository '{}'".format(repo_data["repo"]))
repo = git.Repo.clone_from('https://github.com/AMWA-TV/' + repo_data["repo"] + '.git', path)
repo_url = repo_data.get("url", "https://github.com/AMWA-TV/")
print(" * Initialising repository '{}' at url '{}'".format(repo_data["repo"], repo_url))
repo = git.Repo.clone_from(repo_url + repo_data["repo"] + '.git', path)
update_last_pull = True
else:
repo = git.Repo(path)
Expand Down Expand Up @@ -1272,3 +1301,4 @@ def main(args):

# Exit the application with the desired code
sys.exit(exit_code)

Loading