Skip to content
Snippets Groups Projects
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
No related branches found
No related tags found
2 merge requests!142Release TeraFlowSDN 2.1,!37Revision of OpenConfigDriver
......@@ -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}
}}}
]},
......
......@@ -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}
}}}
]},
......
......@@ -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],
......
......@@ -58,18 +58,18 @@ class NetconfSessionHandler:
self.__connected = threading.Event()
self.__address = address
self.__port = int(port)
self.__username = settings.get('username')
self.__password = settings.get('password')
self.__vendor = settings.get('vendor')
self.__key_filename = settings.get('key_filename')
self.__hostkey_verify = settings.get('hostkey_verify', True)
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.__device_params = settings.get('device_params', {})
self.__manager_params = settings.get('manager_params', {})
self.__nc_params = settings.get('nc_params', {})
self.__username = settings.get('username')
self.__password = settings.get('password')
self.__vendor = settings.get('vendor')
self.__key_filename = settings.get('key_filename')
self.__hostkey_verify = settings.get('hostkey_verify', True)
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_per_rule', False)
self.__device_params = settings.get('device_params', {})
self.__manager_params = settings.get('manager_params', {})
self.__nc_params = settings.get('nc_params', {})
self.__manager : Manager = None
self.__candidate_supported = False
......@@ -192,7 +192,7 @@ def do_sampling(
def edit_config(
netconf_handler : NetconfSessionHandler, logger : logging.Logger, resources : List[Tuple[str, Any]], delete=False,
commit_per_rule= False, target='running', default_operation='merge', test_option=None, error_option=None,
commit_per_rule=False, target='running', default_operation='merge', test_option=None, error_option=None,
format='xml' # pylint: disable=redefined-builtin
):
str_method = 'DeleteConfig' if delete else 'SetConfig'
......
......@@ -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},
})
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment