Revision of OpenConfigDriver

  • Revised L2NM/L3NM Configuration Rules
  • Added flag to optionally commit each rule individually
  • Added controls to skip device configuration if there are no settings for it
  • Updated L2/L3 services in Load Generator
Edited by Lluis Gifre Renom

Merge request reports

Loading
+3 −3
Changes for hackfest/tfs-descriptors/old/device.json: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -27,7 +27,7 @@
            "device_config": {"config_rules": [
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.15"}},
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "8301"}},
                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"username\": \"admin\", \"password\": \"admin\", \"force_running\": true, \"hostkey_verify\": false, \"look_for_keys\": false, \"allow_agent\": true, \"delete_rule\": false, \"device_params\"  : {\"name\": \"default\"}, \"manager_params\" : {\"timeout\": 15}}"}}
                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"username\": \"admin\", \"password\": \"admin\", \"force_running\": true, \"hostkey_verify\": false, \"look_for_keys\": false, \"allow_agent\": true, \"commit_per_rule\": false, \"device_params\"  : {\"name\": \"default\"}, \"manager_params\" : {\"timeout\": 15}}"}}
            ]},
            "device_operational_status": 1,
            "device_drivers": [1],
@@ -39,7 +39,7 @@
            "device_config": {"config_rules": [
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.15"}},
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "8302"}},
                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"username\": \"admin\", \"password\": \"admin\", \"force_running\": true, \"hostkey_verify\": false, \"look_for_keys\": false, \"allow_agent\": true, \"delete_rule\": false, \"device_params\"  : {\"name\": \"default\"}, \"manager_params\" : {\"timeout\": 15}}"}}
                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"username\": \"admin\", \"password\": \"admin\", \"force_running\": true, \"hostkey_verify\": false, \"look_for_keys\": false, \"allow_agent\": true, \"commit_per_rule\": false, \"device_params\"  : {\"name\": \"default\"}, \"manager_params\" : {\"timeout\": 15}}"}}
            ]},
            "device_operational_status": 1,
            "device_drivers": [1],
@@ -51,7 +51,7 @@
            "device_config": {"config_rules": [
                {"action": 1, "custom": {"resource_key": "_connect/address", "resource_value": "10.0.2.15"}},
                {"action": 1, "custom": {"resource_key": "_connect/port", "resource_value": "8303"}},
                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"username\": \"admin\", \"password\": \"admin\", \"force_running\": true, \"hostkey_verify\": false, \"look_for_keys\": false, \"allow_agent\": true, \"delete_rule\": false, \"device_params\"  : {\"name\": \"default\"}, \"manager_params\" : {\"timeout\": 15}}"}}
                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": "{\"username\": \"admin\", \"password\": \"admin\", \"force_running\": true, \"hostkey_verify\": false, \"look_for_keys\": false, \"allow_agent\": true, \"commit_per_rule\": false, \"device_params\"  : {\"name\": \"default\"}, \"manager_params\" : {\"timeout\": 15}}"}}
            ]},
            "device_operational_status": 1,
            "device_drivers": [1],
+4 −4
Changes for hackfest/tfs-descriptors/device-all.json: 4 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@
                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {
                    "username": "admin", "password": "admin",
                    "force_running": false, "hostkey_verify": false, "look_for_keys": false,
                    "allow_agent": false, "delete_rule": true, "device_params": {"name": "default"},
                    "allow_agent": false, "commit_per_rule": true, "device_params": {"name": "default"},
                    "manager_params": {"timeout" : 120}
                }}}
            ]},
@@ -26,7 +26,7 @@
                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {
                    "username": "admin", "password": "admin",
                    "force_running": false, "hostkey_verify": false, "look_for_keys": false,
                    "allow_agent": false, "delete_rule": true, "device_params": {"name": "default"},
                    "allow_agent": false, "commit_per_rule": true, "device_params": {"name": "default"},
                    "manager_params": {"timeout" : 120}
                }}}
            ]},
@@ -43,7 +43,7 @@
                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {
                    "username": "admin", "password": "admin",
                    "force_running": false, "hostkey_verify": false, "look_for_keys": false,
                    "allow_agent": false, "delete_rule": true, "device_params": {"name": "default"},
                    "allow_agent": false, "commit_per_rule": true, "device_params": {"name": "default"},
                    "manager_params": {"timeout" : 120}
                }}}
            ]},
@@ -60,7 +60,7 @@
                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {
                    "username": "admin", "password": "admin",
                    "force_running": false, "hostkey_verify": false, "look_for_keys": false,
                    "allow_agent": false, "delete_rule": true, "device_params": {"name": "default"},
                    "allow_agent": false, "commit_per_rule": true, "device_params": {"name": "default"},
                    "manager_params": {"timeout" : 120}
                }}}
            ]},
+1 −1
Changes for hackfest/tfs-descriptors/device-netconf-openconfig.json: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@
                {"action": 1, "custom": {"resource_key": "_connect/settings", "resource_value": {
                    "username": "admin", "password": "admin",
                    "force_running": false, "hostkey_verify": false, "look_for_keys": false,
                    "allow_agent": false, "delete_rule": true, "device_params": {"name": "default"},
                    "allow_agent": false, "commit_per_rule": true, "device_params": {"name": "default"},
                    "manager_params": {"timeout" : 15}
                }}}
            ]},
+1 −0
Changes for src/device/service/drivers/openconfig/templates/interface/edit_config.xml: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@
        {% if operation is defined and operation != 'delete' %}
        <config>
            <name>{{name}}</name>
            <type xmlns:ianaift="urn:ietf:params:xml:ns:yang:iana-if-type">ianaift:{{type}}</type>
            <description></description>
            <mtu>{{mtu}}</mtu>
        </config>
+1 −1
Changes for src/device/service/drivers/openconfig/templates/network_instance/interface/edit_config.xml: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@
    <network-instance>
        <name>{{name}}</name>
        <interfaces>
            <interface>
            <interface{% if operation is defined %} xmlns:nc="urn:ietf:params:xml:ns:netconf:base:1.0" nc:operation="{{operation}}"{% endif %}>
                <id>{{id}}</id>
                <config>
                    <id>{{id}}</id>
Loading
Loading