Skip to content
Snippets Groups Projects
Commit 381ff5a6 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'develop' of https://gitlab.com/teraflow-h2020/controller into... 

Merge branch 'develop' of https://gitlab.com/teraflow-h2020/controller into feat/microk8s-deployment
parents 3c8fd7a0 2d6184e5
No related branches found
No related tags found
1 merge request!54Release 2.0.0
Hide whitespace changes
Inline Side-by-side
src/tests/ofc22/descriptors_emulated.json
+ 15
− 15
View file @ 381ff5a6
...@@ -18,9 +18,9 @@ ...@@ -18,9 +18,9 @@
"device_id": {"device_uuid": {"uuid": "R1-EMU"}}, "device_id": {"device_uuid": {"uuid": "R1-EMU"}},
"device_type": "emu-packet-router", "device_type": "emu-packet-router",
"device_config": {"config_rules": [ "device_config": {"config_rules": [
{"action": 1, "resource_key": "_connect/address", "resource_value": "127.0.0.1"}, {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
{"action": 1, "resource_key": "_connect/port", "resource_value": "0"}, {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
{"action": 1, "resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"} {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"}}
]}, ]},
"device_operational_status": 1, "device_operational_status": 1,
"device_drivers": [0], "device_drivers": [0],
...@@ -30,9 +30,9 @@ ...@@ -30,9 +30,9 @@
"device_id": {"device_uuid": {"uuid": "R2-EMU"}}, "device_id": {"device_uuid": {"uuid": "R2-EMU"}},
"device_type": "emu-packet-router", "device_type": "emu-packet-router",
"device_config": {"config_rules": [ "device_config": {"config_rules": [
{"action": 1, "resource_key": "_connect/address", "resource_value": "127.0.0.1"}, {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
{"action": 1, "resource_key": "_connect/port", "resource_value": "0"}, {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
{"action": 1, "resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"} {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"}}
]}, ]},
"device_operational_status": 1, "device_operational_status": 1,
"device_drivers": [0], "device_drivers": [0],
...@@ -42,9 +42,9 @@ ...@@ -42,9 +42,9 @@
"device_id": {"device_uuid": {"uuid": "R3-EMU"}}, "device_id": {"device_uuid": {"uuid": "R3-EMU"}},
"device_type": "emu-packet-router", "device_type": "emu-packet-router",
"device_config": {"config_rules": [ "device_config": {"config_rules": [
{"action": 1, "resource_key": "_connect/address", "resource_value": "127.0.0.1"}, {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
{"action": 1, "resource_key": "_connect/port", "resource_value": "0"}, {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
{"action": 1, "resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"} {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"}}
]}, ]},
"device_operational_status": 1, "device_operational_status": 1,
"device_drivers": [0], "device_drivers": [0],
...@@ -54,9 +54,9 @@ ...@@ -54,9 +54,9 @@
"device_id": {"device_uuid": {"uuid": "R4-EMU"}}, "device_id": {"device_uuid": {"uuid": "R4-EMU"}},
"device_type": "emu-packet-router", "device_type": "emu-packet-router",
"device_config": {"config_rules": [ "device_config": {"config_rules": [
{"action": 1, "resource_key": "_connect/address", "resource_value": "127.0.0.1"}, {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
{"action": 1, "resource_key": "_connect/port", "resource_value": "0"}, {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
{"action": 1, "resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"} {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"13/0/0\"}, {\"sample_types\": [101, 102, 201, 202], \"type\": \"copper\", \"uuid\": \"13/1/2\"}]}"}}
]}, ]},
"device_operational_status": 1, "device_operational_status": 1,
"device_drivers": [0], "device_drivers": [0],
...@@ -66,9 +66,9 @@ ...@@ -66,9 +66,9 @@
"device_id": {"device_uuid": {"uuid": "O1-OLS"}}, "device_id": {"device_uuid": {"uuid": "O1-OLS"}},
"device_type": "emu-optical-line-system", "device_type": "emu-optical-line-system",
"device_config": {"config_rules": [ "device_config": {"config_rules": [
{"action": 1, "resource_key": "_connect/address", "resource_value": "127.0.0.1"}, {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "127.0.0.1"}},
{"action": 1, "resource_key": "_connect/port", "resource_value": "0"}, {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},
{"action": 1, "resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"aade6001-f00b-5e2f-a357-6a0a9d3de870\"}, {\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"eb287d83-f05e-53ec-ab5a-adf6bd2b5418\"}, {\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"0ef74f99-1acc-57bd-ab9d-4b958b06c513\"}, {\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"50296d99-58cc-5ce7-82f5-fc8ee4eec2ec\"}]}"} {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"endpoints\": [{\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"aade6001-f00b-5e2f-a357-6a0a9d3de870\"}, {\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"eb287d83-f05e-53ec-ab5a-adf6bd2b5418\"}, {\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"0ef74f99-1acc-57bd-ab9d-4b958b06c513\"}, {\"sample_types\": [], \"type\": \"optical\", \"uuid\": \"50296d99-58cc-5ce7-82f5-fc8ee4eec2ec\"}]}"}}
]}, ]},
"device_operational_status": 1, "device_operational_status": 1,
"device_drivers": [0], "device_drivers": [0],
......
src/webui/service/templates/device/detail.html
+ 4
− 2
View file @ 381ff5a6
...@@ -75,13 +75,15 @@ ...@@ -75,13 +75,15 @@
<div class="col-sm-10"> <div class="col-sm-10">
<ul> <ul>
{% for config in device.device_config.config_rules %} {% for config in device.device_config.config_rules %}
<li>{{ config.resource_key }}: {% if config.WhichOneof('config_rule') == 'custom' %}
<li>{{ config.custom.resource_key }}:
<ul> <ul>
{% for key, value in (config.resource_value | from_json).items() %} {% for key, value in (config.custom.resource_value | from_json).items() %}
<li><b>{{ key }}:</b> {{ value }}</li> <li><b>{{ key }}:</b> {{ value }}</li>
{% endfor %} {% endfor %}
</ul> </ul>
</li> </li>
{% endif %}
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
......
src/webui/service/templates/service/detail.html
+ 4
− 2
View file @ 381ff5a6
...@@ -65,13 +65,15 @@ ...@@ -65,13 +65,15 @@
<div class="col-sm-10"> <div class="col-sm-10">
<ul> <ul>
{% for config in service.service_config.config_rules %} {% for config in service.service_config.config_rules %}
<li>{{ config.resource_key }}: {% if config.WhichOneof('config_rule') == 'custom' %}
<li>{{ config.custom.resource_key }}:
<ul> <ul>
{% for key, value in (config.resource_value | from_json).items() %} {% for key, value in (config.custom.resource_value | from_json).items() %}
<li><b>{{ key }}:</b> {{ value }}</li> <li><b>{{ key }}:</b> {{ value }}</li>
{% endfor %} {% endfor %}
</ul> </ul>
</li> </li>
{% endif %}
{% endfor %} {% endfor %}
</ul> </ul>
</div> </div>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment