Commit d3e89f37 authored by Lluis Gifre Renom's avatar Lluis Gifre Renom
Browse files

Pre-merge cleanup: 

- Updated Netconf/OpenConfig descriptor files
- Normalized variable names in OpenConfigDriver
- Minor code cleanup
parent d73844d2

hackfest/tfs-descriptors/device-all.json

+4 −4
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}

                }}}

            ]},

hackfest/tfs-descriptors/device-netconf-openconfig.json

+1 −1
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}

                }}}

            ]},

hackfest/tfs-descriptors/old/device.json

+3 −3
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],

src/device/service/drivers/openconfig/OpenConfigDriver.py

+13 −13
Original line number Diff line number Diff line
@@ -66,7 +66,7 @@ class NetconfSessionHandler: 
        self.__look_for_keys   = settings.get('look_for_keys', True)

        self.__allow_agent     = settings.get('allow_agent', True)

        self.__force_running   = settings.get('force_running', False)

        self.__commit_per_rule  = settings.get('commit_rule', False)

        self.__commit_per_rule = settings.get('commit_per_rule', False)

        self.__device_params   = settings.get('device_params', {})

        self.__manager_params  = settings.get('manager_params', {})

        self.__nc_params       = settings.get('nc_params', {})

src/device/tests/Device_OpenConfig_Template.py

+1 −1
Original line number Diff line number Diff line
@@ -32,7 +32,7 @@ DEVICE_OC_CONNECT_RULES = json_device_connect_rules(DEVICE_OC_ADDRESS, DEVICE_OC 
    'hostkey_verify' : True,

    'look_for_keys'  : True,

    'allow_agent'    : True,

    'delete_rule'    : False,

    'commit_per_rule': False,

    'device_params'  : {'name': 'default'},

    'manager_params' : {'timeout' : DEVICE_OC_TIMEOUT},

})