Loading deploy/tfs.sh +3 −3 Viewed Changes for deploy/tfs.sh: 3 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -486,11 +486,11 @@ if [[ "$TFS_COMPONENTS" == *"webui"* ]]; then curl -X POST ${GRAFANA_URL_UPDATED}/api/user/stars/dashboard/${DASHBOARD_ID} echo # Dashboard: Device ConfigureDevice Details curl -X POST -H "Content-Type: application/json" -d '@src/webui/grafana_prom_device_config_exec_details.json' \ # Dashboard: Device Execution Details curl -X POST -H "Content-Type: application/json" -d '@src/webui/grafana_prom_device_exec_details.json' \ ${GRAFANA_URL_UPDATED}/api/dashboards/db echo DASHBOARD_URL="${GRAFANA_URL_UPDATED}/api/dashboards/uid/tfs-dev-confdev" DASHBOARD_URL="${GRAFANA_URL_UPDATED}/api/dashboards/uid/tfs-dev-exec" DASHBOARD_ID=$(curl -s "${DASHBOARD_URL}" | jq '.dashboard.id') curl -X POST ${GRAFANA_URL_UPDATED}/api/user/stars/dashboard/${DASHBOARD_ID} echo Loading src/device/service/driver_api/_Driver.py +17 −2 Viewed Changes for src/device/service/driver_api/_Driver.py: 17 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -27,7 +27,7 @@ RESOURCE_ACL = '__acl__' class _Driver: def __init__(self, address: str, port: int, **settings) -> None: def __init__(self, name : str, address: str, port: int, **settings) -> None: """ Initialize Driver. Parameters: address : str Loading @@ -37,7 +37,22 @@ class _Driver: **settings Extra settings required by the driver. """ raise NotImplementedError() self._name = name self._address = address self._port = port self._settings = settings @property def name(self): return self._name @property def address(self): return self._address @property def port(self): return self._port @property def settings(self): return self._settings def Connect(self) -> bool: """ Connect to the Device. Loading src/device/service/drivers/emulated/EmulatedDriver.py +5 −3 Viewed Changes for src/device/service/drivers/emulated/EmulatedDriver.py: 5 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -31,16 +31,18 @@ LOGGER = logging.getLogger(__name__) RE_GET_ENDPOINT_FROM_INTERFACE = re.compile(r'^\/interface\[([^\]]+)\].*') METRICS_POOL = MetricsPool('Device', 'Driver', labels={'driver': 'emulated'}) DRIVER_NAME = 'emulated' METRICS_POOL = MetricsPool('Device', 'Driver', labels={'driver': DRIVER_NAME}) class EmulatedDriver(_Driver): def __init__(self, address : str, port : int, **settings) -> None: # pylint: disable=super-init-not-called def __init__(self, address : str, port : int, **settings) -> None: super().__init__(DRIVER_NAME, address, port, **settings) self.__lock = threading.Lock() self.__initial = TreeNode('.') self.__running = TreeNode('.') self.__subscriptions = TreeNode('.') endpoints = settings.get('endpoints', []) endpoints = self.settings.get('endpoints', []) endpoint_resources = [] for endpoint in endpoints: endpoint_resource = compose_resource_endpoint(endpoint) Loading src/device/service/drivers/ietf_l2vpn/IetfL2VpnDriver.py +9 −7 Viewed Changes for src/device/service/drivers/ietf_l2vpn/IetfL2VpnDriver.py: 9 added lines, 7 removed lines. Original line number Diff line number Diff line Loading @@ -39,21 +39,23 @@ ALL_RESOURCE_KEYS = [ SERVICE_TYPE = 'ELINE' METRICS_POOL = MetricsPool('Device', 'Driver', labels={'driver': 'ietf_l2vpn'}) DRIVER_NAME = 'ietf_l2vpn' METRICS_POOL = MetricsPool('Device', 'Driver', labels={'driver': DRIVER_NAME}) class IetfL2VpnDriver(_Driver): def __init__(self, address: str, port: int, **settings) -> None: # pylint: disable=super-init-not-called def __init__(self, address: str, port: int, **settings) -> None: super().__init__(DRIVER_NAME, address, port, **settings) self.__lock = threading.Lock() self.__started = threading.Event() self.__terminate = threading.Event() username = settings.get('username') password = settings.get('password') scheme = settings.get('scheme', 'http') wim = {'wim_url': '{:s}://{:s}:{:d}'.format(scheme, address, int(port))} username = self.settings.get('username') password = self.settings.get('password') scheme = self.settings.get('scheme', 'http') wim = {'wim_url': '{:s}://{:s}:{:d}'.format(scheme, self.address, int(self.port))} wim_account = {'user': username, 'password': password} # Mapping updated dynamically with each request config = {'mapping_not_needed': False, 'service_endpoint_mapping': []} self.dac = TfsDebugApiClient(address, int(port), scheme=scheme, username=username, password=password) self.dac = TfsDebugApiClient(self.address, int(self.port), scheme=scheme, username=username, password=password) self.wim = WimconnectorIETFL2VPN(wim, wim_account, config=config) self.conn_info = {} # internal database emulating OSM storage provided to WIM Connectors Loading src/device/service/drivers/microwave/IETFApiDriver.py +10 −8 Viewed Changes for src/device/service/drivers/microwave/IETFApiDriver.py: 10 added lines, 8 removed lines. Original line number Diff line number Diff line Loading @@ -23,20 +23,22 @@ from .Tools import create_connectivity_service, find_key, config_getter, delete_ LOGGER = logging.getLogger(__name__) METRICS_POOL = MetricsPool('Device', 'Driver', labels={'driver': 'microwave'}) DRIVER_NAME = 'microwave' METRICS_POOL = MetricsPool('Device', 'Driver', labels={'driver': DRIVER_NAME}) class IETFApiDriver(_Driver): def __init__(self, address: str, port: int, **settings) -> None: # pylint: disable=super-init-not-called def __init__(self, address: str, port: int, **settings) -> None: super().__init__(DRIVER_NAME, address, port, **settings) self.__lock = threading.Lock() self.__started = threading.Event() self.__terminate = threading.Event() username = settings.get('username') password = settings.get('password') username = self.settings.get('username') password = self.settings.get('password') self.__auth = HTTPBasicAuth(username, password) if username is not None and password is not None else None scheme = settings.get('scheme', 'http') self.__ietf_root = '{:s}://{:s}:{:d}'.format(scheme, address, int(port)) self.__timeout = int(settings.get('timeout', 120)) self.__node_ids = set(settings.get('node_ids', [])) scheme = self.settings.get('scheme', 'http') self.__ietf_root = '{:s}://{:s}:{:d}'.format(scheme, self.address, int(self.port)) self.__timeout = int(self.settings.get('timeout', 120)) self.__node_ids = set(self.settings.get('node_ids', [])) def Connect(self) -> bool: url = self.__ietf_root + '/nmswebs/restconf/data/ietf-network:networks' Loading Loading
deploy/tfs.sh +3 −3 Viewed Changes for deploy/tfs.sh: 3 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -486,11 +486,11 @@ if [[ "$TFS_COMPONENTS" == *"webui"* ]]; then curl -X POST ${GRAFANA_URL_UPDATED}/api/user/stars/dashboard/${DASHBOARD_ID} echo # Dashboard: Device ConfigureDevice Details curl -X POST -H "Content-Type: application/json" -d '@src/webui/grafana_prom_device_config_exec_details.json' \ # Dashboard: Device Execution Details curl -X POST -H "Content-Type: application/json" -d '@src/webui/grafana_prom_device_exec_details.json' \ ${GRAFANA_URL_UPDATED}/api/dashboards/db echo DASHBOARD_URL="${GRAFANA_URL_UPDATED}/api/dashboards/uid/tfs-dev-confdev" DASHBOARD_URL="${GRAFANA_URL_UPDATED}/api/dashboards/uid/tfs-dev-exec" DASHBOARD_ID=$(curl -s "${DASHBOARD_URL}" | jq '.dashboard.id') curl -X POST ${GRAFANA_URL_UPDATED}/api/user/stars/dashboard/${DASHBOARD_ID} echo Loading
src/device/service/driver_api/_Driver.py +17 −2 Viewed Changes for src/device/service/driver_api/_Driver.py: 17 added lines, 2 removed lines. Original line number Diff line number Diff line Loading @@ -27,7 +27,7 @@ RESOURCE_ACL = '__acl__' class _Driver: def __init__(self, address: str, port: int, **settings) -> None: def __init__(self, name : str, address: str, port: int, **settings) -> None: """ Initialize Driver. Parameters: address : str Loading @@ -37,7 +37,22 @@ class _Driver: **settings Extra settings required by the driver. """ raise NotImplementedError() self._name = name self._address = address self._port = port self._settings = settings @property def name(self): return self._name @property def address(self): return self._address @property def port(self): return self._port @property def settings(self): return self._settings def Connect(self) -> bool: """ Connect to the Device. Loading
src/device/service/drivers/emulated/EmulatedDriver.py +5 −3 Viewed Changes for src/device/service/drivers/emulated/EmulatedDriver.py: 5 added lines, 3 removed lines. Original line number Diff line number Diff line Loading @@ -31,16 +31,18 @@ LOGGER = logging.getLogger(__name__) RE_GET_ENDPOINT_FROM_INTERFACE = re.compile(r'^\/interface\[([^\]]+)\].*') METRICS_POOL = MetricsPool('Device', 'Driver', labels={'driver': 'emulated'}) DRIVER_NAME = 'emulated' METRICS_POOL = MetricsPool('Device', 'Driver', labels={'driver': DRIVER_NAME}) class EmulatedDriver(_Driver): def __init__(self, address : str, port : int, **settings) -> None: # pylint: disable=super-init-not-called def __init__(self, address : str, port : int, **settings) -> None: super().__init__(DRIVER_NAME, address, port, **settings) self.__lock = threading.Lock() self.__initial = TreeNode('.') self.__running = TreeNode('.') self.__subscriptions = TreeNode('.') endpoints = settings.get('endpoints', []) endpoints = self.settings.get('endpoints', []) endpoint_resources = [] for endpoint in endpoints: endpoint_resource = compose_resource_endpoint(endpoint) Loading
src/device/service/drivers/ietf_l2vpn/IetfL2VpnDriver.py +9 −7 Viewed Changes for src/device/service/drivers/ietf_l2vpn/IetfL2VpnDriver.py: 9 added lines, 7 removed lines. Original line number Diff line number Diff line Loading @@ -39,21 +39,23 @@ ALL_RESOURCE_KEYS = [ SERVICE_TYPE = 'ELINE' METRICS_POOL = MetricsPool('Device', 'Driver', labels={'driver': 'ietf_l2vpn'}) DRIVER_NAME = 'ietf_l2vpn' METRICS_POOL = MetricsPool('Device', 'Driver', labels={'driver': DRIVER_NAME}) class IetfL2VpnDriver(_Driver): def __init__(self, address: str, port: int, **settings) -> None: # pylint: disable=super-init-not-called def __init__(self, address: str, port: int, **settings) -> None: super().__init__(DRIVER_NAME, address, port, **settings) self.__lock = threading.Lock() self.__started = threading.Event() self.__terminate = threading.Event() username = settings.get('username') password = settings.get('password') scheme = settings.get('scheme', 'http') wim = {'wim_url': '{:s}://{:s}:{:d}'.format(scheme, address, int(port))} username = self.settings.get('username') password = self.settings.get('password') scheme = self.settings.get('scheme', 'http') wim = {'wim_url': '{:s}://{:s}:{:d}'.format(scheme, self.address, int(self.port))} wim_account = {'user': username, 'password': password} # Mapping updated dynamically with each request config = {'mapping_not_needed': False, 'service_endpoint_mapping': []} self.dac = TfsDebugApiClient(address, int(port), scheme=scheme, username=username, password=password) self.dac = TfsDebugApiClient(self.address, int(self.port), scheme=scheme, username=username, password=password) self.wim = WimconnectorIETFL2VPN(wim, wim_account, config=config) self.conn_info = {} # internal database emulating OSM storage provided to WIM Connectors Loading
src/device/service/drivers/microwave/IETFApiDriver.py +10 −8 Viewed Changes for src/device/service/drivers/microwave/IETFApiDriver.py: 10 added lines, 8 removed lines. Original line number Diff line number Diff line Loading @@ -23,20 +23,22 @@ from .Tools import create_connectivity_service, find_key, config_getter, delete_ LOGGER = logging.getLogger(__name__) METRICS_POOL = MetricsPool('Device', 'Driver', labels={'driver': 'microwave'}) DRIVER_NAME = 'microwave' METRICS_POOL = MetricsPool('Device', 'Driver', labels={'driver': DRIVER_NAME}) class IETFApiDriver(_Driver): def __init__(self, address: str, port: int, **settings) -> None: # pylint: disable=super-init-not-called def __init__(self, address: str, port: int, **settings) -> None: super().__init__(DRIVER_NAME, address, port, **settings) self.__lock = threading.Lock() self.__started = threading.Event() self.__terminate = threading.Event() username = settings.get('username') password = settings.get('password') username = self.settings.get('username') password = self.settings.get('password') self.__auth = HTTPBasicAuth(username, password) if username is not None and password is not None else None scheme = settings.get('scheme', 'http') self.__ietf_root = '{:s}://{:s}:{:d}'.format(scheme, address, int(port)) self.__timeout = int(settings.get('timeout', 120)) self.__node_ids = set(settings.get('node_ids', [])) scheme = self.settings.get('scheme', 'http') self.__ietf_root = '{:s}://{:s}:{:d}'.format(scheme, self.address, int(self.port)) self.__timeout = int(self.settings.get('timeout', 120)) self.__node_ids = set(self.settings.get('node_ids', [])) def Connect(self) -> bool: url = self.__ietf_root + '/nmswebs/restconf/data/ietf-network:networks' Loading