Commit 2d6184e5 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Merge branch 'feat/webui' into 'develop' 

Arranged ConfigRules in WebUI component and OFC'22 functional test

See merge request teraflow-h2020/controller!131
parents 09dfed15 6ed788c8

src/tests/ofc22/descriptors_emulated.json

+21 −21
Original line number Diff line number Diff line
@@ -15,12 +15,12 @@ 
    ],

    "devices": [

        {

            "device_id": {"device_uuid": {"uuid": "R1-INF"}},

            "device_id": {"device_uuid": {"uuid": "R1-EMU"}},

            "device_type": "emu-packet-router",

            "device_config": {"config_rules": [

                {"action": 1, "resource_key": "_connect/address", "resource_value": "127.0.0.1"},

                {"action": 1, "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/address", "resource_value": "127.0.0.1"}},

                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},

                {"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_drivers": [0],
@@ -30,21 +30,21 @@ 
            "device_id": {"device_uuid": {"uuid": "R2-EMU"}},

            "device_type": "emu-packet-router",

            "device_config": {"config_rules": [

                {"action": 1, "resource_key": "_connect/address", "resource_value": "127.0.0.1"},

                {"action": 1, "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/address", "resource_value": "127.0.0.1"}},

                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},

                {"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_drivers": [0],

            "device_endpoints": []

        },

        {

            "device_id": {"device_uuid": {"uuid": "R3-INF"}},

            "device_id": {"device_uuid": {"uuid": "R3-EMU"}},

            "device_type": "emu-packet-router",

            "device_config": {"config_rules": [

                {"action": 1, "resource_key": "_connect/address", "resource_value": "127.0.0.1"},

                {"action": 1, "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/address", "resource_value": "127.0.0.1"}},

                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},

                {"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_drivers": [0],
@@ -54,9 +54,9 @@ 
            "device_id": {"device_uuid": {"uuid": "R4-EMU"}},

            "device_type": "emu-packet-router",

            "device_config": {"config_rules": [

                {"action": 1, "resource_key": "_connect/address", "resource_value": "127.0.0.1"},

                {"action": 1, "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/address", "resource_value": "127.0.0.1"}},

                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},

                {"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_drivers": [0],
@@ -66,9 +66,9 @@ 
            "device_id": {"device_uuid": {"uuid": "O1-OLS"}},

            "device_type": "emu-optical-line-system",

            "device_config": {"config_rules": [

                {"action": 1, "resource_key": "_connect/address", "resource_value": "127.0.0.1"},

                {"action": 1, "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/address", "resource_value": "127.0.0.1"}},

                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "0"}},

                {"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_drivers": [0],
@@ -77,9 +77,9 @@ 
    ],

    "links": [

        {

            "link_id": {"link_uuid": {"uuid": "R1-INF/13/0/0==O1-OLS/aade6001-f00b-5e2f-a357-6a0a9d3de870"}},

            "link_id": {"link_uuid": {"uuid": "R1-EMU/13/0/0==O1-OLS/aade6001-f00b-5e2f-a357-6a0a9d3de870"}},

            "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "R1-INF"}}, "endpoint_uuid": {"uuid": "13/0/0"}},

                {"device_id": {"device_uuid": {"uuid": "R1-EMU"}}, "endpoint_uuid": {"uuid": "13/0/0"}},

                {"device_id": {"device_uuid": {"uuid": "O1-OLS"}}, "endpoint_uuid": {"uuid": "aade6001-f00b-5e2f-a357-6a0a9d3de870"}}

            ]

        },
@@ -91,9 +91,9 @@ 
            ]

        },

        {

            "link_id": {"link_uuid": {"uuid": "R3-INF/13/0/0==O1-OLS/0ef74f99-1acc-57bd-ab9d-4b958b06c513"}},

            "link_id": {"link_uuid": {"uuid": "R3-EMU/13/0/0==O1-OLS/0ef74f99-1acc-57bd-ab9d-4b958b06c513"}},

            "link_endpoint_ids": [

                {"device_id": {"device_uuid": {"uuid": "R3-INF"}}, "endpoint_uuid": {"uuid": "13/0/0"}},

                {"device_id": {"device_uuid": {"uuid": "R3-EMU"}}, "endpoint_uuid": {"uuid": "13/0/0"}},

                {"device_id": {"device_uuid": {"uuid": "O1-OLS"}}, "endpoint_uuid": {"uuid": "0ef74f99-1acc-57bd-ab9d-4b958b06c513"}}

            ]

        },

src/webui/service/templates/device/detail.html

+4 −2
Original line number Diff line number Diff line
@@ -75,13 +75,15 @@ 
        <div class="col-sm-10">

            <ul>

            {% for config in device.device_config.config_rules %}

                <li>{{ config.resource_key }}:

                {% if config.WhichOneof('config_rule') == 'custom' %}

                <li>{{ config.custom.resource_key }}:

                    <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>

                        {% endfor %}

                    </ul>

                </li>

                {% endif %}

            {% endfor %}

            </ul>

        </div>

src/webui/service/templates/service/detail.html

+4 −2
Original line number Diff line number Diff line
@@ -65,13 +65,15 @@ 
        <div class="col-sm-10">

            <ul>

            {% for config in service.service_config.config_rules %}

                <li>{{ config.resource_key }}:

                {% if config.WhichOneof('config_rule') == 'custom' %}

                <li>{{ config.custom.resource_key }}:

                    <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>

                        {% endfor %}

                    </ul>

                </li>

                {% endif %}

            {% endfor %}

            </ul>

        </div>