Merge branch 'feat/device-oc-acl-candidate' of...

Merge branch 'feat/device-oc-acl-candidate' of https://gitlab.com/teraflow-h2020/controller into feat/device-oc-acl-candidate

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

@@ -404,4 +404,3 @@ class OpenConfigDriver(_Driver):
                 return
             if sample is None: continue
             yield sample
-            
\ No newline at end of file

src/device/service/drivers/openconfig/templates/__init__.py

@@ -16,7 +16,7 @@ import json, logging, lxml.etree as ET, re
 from typing import Any, Dict
 from jinja2 import Environment, PackageLoader, select_autoescape
 from device.service.driver_api._Driver import (
-    RESOURCE_ENDPOINTS, RESOURCE_INTERFACES, RESOURCE_NETWORK_INSTANCES, RESOURCE_ROUTING_POLICIES,RESOURCE_ACL)
+    RESOURCE_ENDPOINTS, RESOURCE_INTERFACES, RESOURCE_NETWORK_INSTANCES, RESOURCE_ROUTING_POLICIES, RESOURCE_ACL)
 from .EndPoints import parse as parse_endpoints
 from .Interfaces import parse as parse_interfaces, parse_counters
 from .NetworkInstances import parse as parse_network_instances

src/device/tests/Device_OpenConfig_Template.py

@@ -28,7 +28,7 @@ DEVICE_OC    = json_device_packetrouter_disabled(DEVICE_OC_UUID)
 DEVICE_OC_CONNECT_RULES = json_device_connect_rules(DEVICE_OC_ADDRESS, DEVICE_OC_PORT, {
     'username'       : DEVICE_OC_USERNAME,
     'password'       : DEVICE_OC_PASSWORD,
-    'force_running'  : True,
+    'force_running'  : False,
     'hostkey_verify' : True,
     'look_for_keys'  : True,
     'allow_agent'    : True,