diff --git a/proto/context.proto b/proto/context.proto
index 8a6b019dc99863da32631425d954afbaf167f1b7..a4cc4c6a797a30a6ad817f30891566abc6cea0c1 100644
--- a/proto/context.proto
+++ b/proto/context.proto
@@ -211,7 +211,7 @@ enum DeviceDriverEnum {
DEVICEDRIVER_XR = 6;
DEVICEDRIVER_IETF_L2VPN = 7;
DEVICEDRIVER_GNMI_OPENCONFIG = 8;
- DEVICEDRIVER_FLEXSCALE = 9;
+ DEVICEDRIVER_OPTICAL_TFS = 9;
DEVICEDRIVER_IETF_ACTN = 10;
DEVICEDRIVER_OC = 11;
}
diff --git a/src/common/type_checkers/Assertions.py b/src/common/type_checkers/Assertions.py
index 87d8e54ee390fb1f56266317be5317731bb755b6..ac1462ac450778ce41f5073d2d03da26b7507cee 100644
--- a/src/common/type_checkers/Assertions.py
+++ b/src/common/type_checkers/Assertions.py
@@ -46,7 +46,7 @@ def validate_device_driver_enum(message):
'DEVICEDRIVER_XR',
'DEVICEDRIVER_IETF_L2VPN',
'DEVICEDRIVER_GNMI_OPENCONFIG',
- 'DEVICEDRIVER_FLEXSCALE',
+ 'DEVICEDRIVER_OPTICAL_TFS',
'DEVICEDRIVER_IETF_ACTN',
]
diff --git a/src/context/service/database/models/enums/DeviceDriver.py b/src/context/service/database/models/enums/DeviceDriver.py
index 2ccdda2725a7f7bb13ba296d4eca25f88b1e73d1..194d66fedb3014b07974196bdc4eac2b2c9c0c39 100644
--- a/src/context/service/database/models/enums/DeviceDriver.py
+++ b/src/context/service/database/models/enums/DeviceDriver.py
@@ -31,7 +31,7 @@ class ORM_DeviceDriverEnum(enum.Enum):
XR = DeviceDriverEnum.DEVICEDRIVER_XR
IETF_L2VPN = DeviceDriverEnum.DEVICEDRIVER_IETF_L2VPN
GNMI_OPENCONFIG = DeviceDriverEnum.DEVICEDRIVER_GNMI_OPENCONFIG
- FLEXSCALE = DeviceDriverEnum.DEVICEDRIVER_FLEXSCALE
+ OPTICAL_TFS = DeviceDriverEnum.DEVICEDRIVER_OPTICAL_TFS
IETF_ACTN = DeviceDriverEnum.DEVICEDRIVER_IETF_ACTN
OC = DeviceDriverEnum.DEVICEDRIVER_OC
diff --git a/src/device/service/drivers/__init__.py b/src/device/service/drivers/__init__.py
index beb3db38e153445e48d61e3ad4ac5d514297a91d..97cf166e6cdf5bc025e1883e66181e2d5aab8f74 100644
--- a/src/device/service/drivers/__init__.py
+++ b/src/device/service/drivers/__init__.py
@@ -156,12 +156,12 @@ if LOAD_ALL_DEVICE_DRIVERS:
]))
if LOAD_ALL_DEVICE_DRIVERS:
- from .flexscale.FlexScaleDriver import FlexScaleDriver # pylint: disable=wrong-import-position
+ from .optical_tfs.OpticalTfsDriver import OpticalTfsDriver # pylint: disable=wrong-import-position
DRIVERS.append(
- (FlexScaleDriver, [
+ (OpticalTfsDriver, [
{
FilterFieldEnum.DEVICE_TYPE: DeviceTypeEnum.OPEN_LINE_SYSTEM,
- FilterFieldEnum.DRIVER: DeviceDriverEnum.DEVICEDRIVER_FLEXSCALE,
+ FilterFieldEnum.DRIVER: DeviceDriverEnum.DEVICEDRIVER_OPTICAL_TFS,
}
]))
diff --git a/src/device/service/drivers/ietf_l2vpn/TfsDebugApiClient.py b/src/device/service/drivers/ietf_l2vpn/TfsDebugApiClient.py
index 06c55c5dc1b0feb77d817581ae5d735e1158e38d..a160e14bbb62cad01bbefaccafc29cd89b36b34a 100644
--- a/src/device/service/drivers/ietf_l2vpn/TfsDebugApiClient.py
+++ b/src/device/service/drivers/ietf_l2vpn/TfsDebugApiClient.py
@@ -44,7 +44,9 @@ MAPPING_DRIVER = {
'DEVICEDRIVER_XR' : 6,
'DEVICEDRIVER_IETF_L2VPN' : 7,
'DEVICEDRIVER_GNMI_OPENCONFIG' : 8,
- 'DEVICEDRIVER_FLEXSCALE' : 9,
+ 'DEVICEDRIVER_OPTICAL_TFS' : 9,
+ 'DEVICEDRIVER_IETF_ACTN' : 10,
+ 'DEVICEDRIVER_OC' : 11,
}
MSG_ERROR = 'Could not retrieve devices in remote TeraFlowSDN instance({:s}). status_code={:s} reply={:s}'
diff --git a/src/device/service/drivers/flexscale/FlexScaleDriver.py b/src/device/service/drivers/optical_tfs/OpticalTfsDriver.py
similarity index 90%
rename from src/device/service/drivers/flexscale/FlexScaleDriver.py
rename to src/device/service/drivers/optical_tfs/OpticalTfsDriver.py
index f91ee1cebbd686cceed2370df98445aa247d5990..0bac68fc974189ea6d12a1bce5cc428c16dff445 100644
--- a/src/device/service/drivers/flexscale/FlexScaleDriver.py
+++ b/src/device/service/drivers/optical_tfs/OpticalTfsDriver.py
@@ -26,11 +26,11 @@ from device.service.driver_api.ImportTopologyEnum import ImportTopologyEnum, get
LOGGER = logging.getLogger(__name__)
-DRIVER_NAME = 'flexscale'
+DRIVER_NAME = 'optical_tfs'
METRICS_POOL = MetricsPool('Device', 'Driver', labels={'driver': DRIVER_NAME})
-class FlexScaleDriver(_Driver):
+class OpticalTfsDriver(_Driver):
def __init__(self, address: str, port: int, **settings) -> None:
super().__init__(DRIVER_NAME, address, port, **settings)
self.__lock = threading.Lock()
@@ -41,7 +41,7 @@ class FlexScaleDriver(_Driver):
self.__auth = HTTPBasicAuth(username, password) if username is not None and password is not None else None
scheme = self.settings.get('scheme', 'http')
self.dac = TfsDebugApiClient(self.address, int(self.port), scheme=scheme, username=username, password=password)
- self.__flexscale_root = '{:s}://{:s}:{:d}'.format(scheme, self.address, int(self.port))
+ self.__base_url = '{:s}://{:s}:{:d}'.format(scheme, self.address, int(self.port))
self.__timeout = int(self.settings.get('timeout', 120))
# Options are:
@@ -54,7 +54,7 @@ class FlexScaleDriver(_Driver):
def Connect(self) -> bool:
- url = self.__flexscale_root + '/OpticalTFS/GetLightpaths'
+ url = self.__base_url + '/OpticalTFS/GetLightpaths'
with self.__lock:
if self.__started.is_set(): return True
try:
@@ -94,7 +94,7 @@ class FlexScaleDriver(_Driver):
results.extend(self.dac.get_devices_endpoints(self.__import_topology))
# results.extend(get_lightpaths(
- # self.__flexscale_root, resource_key, timeout=self.__timeout, auth=self.__auth))
+ # self.__base_url, resource_key, timeout=self.__timeout, auth=self.__auth))
return results
@metered_subclass_method(METRICS_POOL)
@@ -110,7 +110,7 @@ class FlexScaleDriver(_Driver):
dst_node = find_key(resource, 'dst_node')
bitrate = find_key(resource, 'bitrate')
- response = add_lightpath(self.__flexscale_root, src_node, dst_node, bitrate,
+ response = add_lightpath(self.__base_url, src_node, dst_node, bitrate,
auth=self.__auth, timeout=self.__timeout)
results.extend(response)
@@ -129,23 +129,23 @@ class FlexScaleDriver(_Driver):
dst_node = find_key(resource, 'dst_node')
bitrate = find_key(resource, 'bitrate')
- response = del_lightpath(self.__flexscale_root, flow_id, src_node, dst_node, bitrate)
+ response = del_lightpath(self.__base_url, flow_id, src_node, dst_node, bitrate)
results.extend(response)
return results
@metered_subclass_method(METRICS_POOL)
def SubscribeState(self, subscriptions : List[Tuple[str, float, float]]) -> List[Union[bool, Exception]]:
- # FlexScale does not support monitoring by now
+ # Optical TFS does not support monitoring by now
return [False for _ in subscriptions]
@metered_subclass_method(METRICS_POOL)
def UnsubscribeState(self, subscriptions : List[Tuple[str, float, float]]) -> List[Union[bool, Exception]]:
- # FlexScale does not support monitoring by now
+ # Optical TFS does not support monitoring by now
return [False for _ in subscriptions]
def GetState(
self, blocking=False, terminate : Optional[threading.Event] = None
) -> Iterator[Tuple[float, str, Any]]:
- # FlexScale does not support monitoring by now
+ # Optical TFS does not support monitoring by now
return []
diff --git a/src/device/service/drivers/flexscale/Tools.py b/src/device/service/drivers/optical_tfs/Tools.py
similarity index 100%
rename from src/device/service/drivers/flexscale/Tools.py
rename to src/device/service/drivers/optical_tfs/Tools.py
diff --git a/src/device/service/drivers/flexscale/__init__.py b/src/device/service/drivers/optical_tfs/__init__.py
similarity index 100%
rename from src/device/service/drivers/flexscale/__init__.py
rename to src/device/service/drivers/optical_tfs/__init__.py
diff --git a/src/policy/src/main/java/org/etsi/tfs/policy/Serializer.java b/src/policy/src/main/java/org/etsi/tfs/policy/Serializer.java
index 570a7fb9e5501ce9e81037e7010cdb1c5fc35a94..e9024d86f347a66196acabb57f8bbabb3fa9e7d1 100644
--- a/src/policy/src/main/java/org/etsi/tfs/policy/Serializer.java
+++ b/src/policy/src/main/java/org/etsi/tfs/policy/Serializer.java
@@ -2300,8 +2300,8 @@ public class Serializer {
return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_L2VPN;
case GNMI_OPENCONFIG:
return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_GNMI_OPENCONFIG;
- case FLEXSCALE:
- return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_FLEXSCALE;
+ case OPTICAL_TFS:
+ return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_OPTICAL_TFS;
case IETF_ACTN:
return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_ACTN;
case UNDEFINED:
@@ -2329,8 +2329,8 @@ public class Serializer {
return DeviceDriverEnum.IETF_L2VPN;
case DEVICEDRIVER_GNMI_OPENCONFIG:
return DeviceDriverEnum.GNMI_OPENCONFIG;
- case DEVICEDRIVER_FLEXSCALE:
- return DeviceDriverEnum.FLEXSCALE;
+ case DEVICEDRIVER_OPTICAL_TFS:
+ return DeviceDriverEnum.OPTICAL_TFS;
case DEVICEDRIVER_IETF_ACTN:
return DeviceDriverEnum.IETF_ACTN;
case DEVICEDRIVER_UNDEFINED:
diff --git a/src/policy/src/main/java/org/etsi/tfs/policy/context/model/DeviceDriverEnum.java b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/DeviceDriverEnum.java
index 72a1d7136c00d2bac93087d7f8b8f3b7626f9803..ce1d6a3f6955d9c5130b380c3a26862efe273fca 100644
--- a/src/policy/src/main/java/org/etsi/tfs/policy/context/model/DeviceDriverEnum.java
+++ b/src/policy/src/main/java/org/etsi/tfs/policy/context/model/DeviceDriverEnum.java
@@ -26,6 +26,6 @@ public enum DeviceDriverEnum {
XR,
IETF_L2VPN,
GNMI_OPENCONFIG,
- FLEXSCALE,
+ OPTICAL_TFS,
IETF_ACTN
}
diff --git a/src/policy/src/test/java/org/etsi/tfs/policy/SerializerTest.java b/src/policy/src/test/java/org/etsi/tfs/policy/SerializerTest.java
index 396706f36bbf4b575ba08761cf3d088b7647c4a7..37c7ddbdf970df2a1e0f3d9aa2807c9814eeb41c 100644
--- a/src/policy/src/test/java/org/etsi/tfs/policy/SerializerTest.java
+++ b/src/policy/src/test/java/org/etsi/tfs/policy/SerializerTest.java
@@ -3618,7 +3618,7 @@ class SerializerTest {
DeviceDriverEnum.GNMI_OPENCONFIG,
ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_GNMI_OPENCONFIG),
Arguments.of(
- DeviceDriverEnum.FLEXSCALE, ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_FLEXSCALE),
+ DeviceDriverEnum.OPTICAL_TFS, ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_OPTICAL_TFS),
Arguments.of(
DeviceDriverEnum.IETF_ACTN, ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_ACTN),
Arguments.of(
diff --git a/src/service/service/service_handler_api/FilterFields.py b/src/service/service/service_handler_api/FilterFields.py
index 633f41b63c71727d9ead0ee57b79002dc3a6cd97..be7a4506ead661d24d83f64c4fd8b450b228c68a 100644
--- a/src/service/service/service_handler_api/FilterFields.py
+++ b/src/service/service/service_handler_api/FilterFields.py
@@ -39,7 +39,7 @@ DEVICE_DRIVER_VALUES = {
DeviceDriverEnum.DEVICEDRIVER_XR,
DeviceDriverEnum.DEVICEDRIVER_IETF_L2VPN,
DeviceDriverEnum.DEVICEDRIVER_GNMI_OPENCONFIG,
- DeviceDriverEnum.DEVICEDRIVER_FLEXSCALE,
+ DeviceDriverEnum.DEVICEDRIVER_OPTICAL_TFS,
DeviceDriverEnum.DEVICEDRIVER_IETF_ACTN,
DeviceDriverEnum.DEVICEDRIVER_OC
}
diff --git a/src/service/service/service_handlers/__init__.py b/src/service/service/service_handlers/__init__.py
index f0628110fbd5f2b15308f05c9061c699a09dbcff..0f35e063c7d5be5af327d6aab00badbeba161cd8 100644
--- a/src/service/service/service_handlers/__init__.py
+++ b/src/service/service/service_handlers/__init__.py
@@ -98,7 +98,7 @@ SERVICE_HANDLERS = [
(E2EOrchestratorServiceHandler, [
{
FilterFieldEnum.SERVICE_TYPE : ServiceTypeEnum.SERVICETYPE_E2E,
- FilterFieldEnum.DEVICE_DRIVER : [DeviceDriverEnum.DEVICEDRIVER_FLEXSCALE],
+ FilterFieldEnum.DEVICE_DRIVER : [DeviceDriverEnum.DEVICEDRIVER_OPTICAL_TFS],
}
]),
(OCServiceHandler, [
diff --git a/src/tests/tools/mock_flexscale_opt_ctrl/MockFlexscaleOptCtrl.py b/src/tests/tools/mock_tfs_optical_sdn_ctrl/MockTfsOpticalSdnCtrl.py
similarity index 100%
rename from src/tests/tools/mock_flexscale_opt_ctrl/MockFlexscaleOptCtrl.py
rename to src/tests/tools/mock_tfs_optical_sdn_ctrl/MockTfsOpticalSdnCtrl.py
diff --git a/src/tests/tools/mock_flexscale_opt_ctrl/data.py b/src/tests/tools/mock_tfs_optical_sdn_ctrl/data.py
similarity index 100%
rename from src/tests/tools/mock_flexscale_opt_ctrl/data.py
rename to src/tests/tools/mock_tfs_optical_sdn_ctrl/data.py
diff --git a/src/tests/tools/mock_flexscale_opt_ctrl/run.sh b/src/tests/tools/mock_tfs_optical_sdn_ctrl/run.sh
similarity index 95%
rename from src/tests/tools/mock_flexscale_opt_ctrl/run.sh
rename to src/tests/tools/mock_tfs_optical_sdn_ctrl/run.sh
index 183df7a030dca352ee2bb5fdfd0ac081cdcec960..4dc59b04646d80a0a5afbb34a77256a0c4ac6dca 100755
--- a/src/tests/tools/mock_flexscale_opt_ctrl/run.sh
+++ b/src/tests/tools/mock_tfs_optical_sdn_ctrl/run.sh
@@ -13,4 +13,4 @@
# See the License for the specific language governing permissions and
# limitations under the License.
-python MockFlexscaleOptCtrl.py
+python MockTfsOpticalSdnCtrl.py
diff --git a/src/webui/service/device/forms.py b/src/webui/service/device/forms.py
index 4c04bbfe12d8d39e51bd8275021064a5a7ad4fc3..45cece44f770f156d6a588a1d66538a86124e9ba 100644
--- a/src/webui/service/device/forms.py
+++ b/src/webui/service/device/forms.py
@@ -31,7 +31,7 @@ class AddDeviceForm(FlaskForm):
device_drivers_xr = BooleanField('XR')
device_drivers_ietf_l2vpn = BooleanField('IETF L2VPN')
device_drivers_gnmi_openconfig = BooleanField('GNMI OPENCONFIG')
- device_drivers_flexscale = BooleanField('FLEXSCALE')
+ device_drivers_optical_tfs = BooleanField('OPTICAL TFS')
device_drivers_ietf_actn = BooleanField('IETF ACTN')
device_config_address = StringField('connect/address',default='127.0.0.1',validators=[DataRequired(), Length(min=5)])
diff --git a/src/webui/service/device/routes.py b/src/webui/service/device/routes.py
index 8b8bc236af019c4f9d1209013d1f3f2cc8a8eeb0..e6f3cd7b8dd50507d2640afabb346129f8bce9cc 100644
--- a/src/webui/service/device/routes.py
+++ b/src/webui/service/device/routes.py
@@ -125,8 +125,8 @@ def add():
device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_IETF_L2VPN)
if form.device_drivers_gnmi_openconfig.data:
device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_GNMI_OPENCONFIG)
- if form.device_drivers_flexscale.data:
- device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_FLEXSCALE)
+ if form.device_drivers_optical_tfs.data:
+ device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_OPTICAL_TFS)
if form.device_drivers_ietf_actn.data:
device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_IETF_ACTN)
device_obj.device_drivers.extend(device_drivers) # pylint: disable=no-member
diff --git a/src/webui/service/templates/device/add.html b/src/webui/service/templates/device/add.html
index c4d7f16858b7c63bd87e730cff6d586dc702e0c9..3785b3e30f54f14c9f6680841163353a433c5091 100644
--- a/src/webui/service/templates/device/add.html
+++ b/src/webui/service/templates/device/add.html
@@ -93,7 +93,7 @@
{{ form.device_drivers_ietf_l2vpn }} {{ form.device_drivers_ietf_l2vpn.label(class="col-sm-3 col-form-label") }}
{{ form.device_drivers_gnmi_openconfig }} {{ form.device_drivers_gnmi_openconfig.label(class="col-sm-3 col-form-label") }}
<br />
- {{ form.device_drivers_flexscale }} {{ form.device_drivers_flexscale.label(class="col-sm-3 col-form-label") }}
+ {{ form.device_drivers_optical_tfs }} {{ form.device_drivers_optical_tfs.label(class="col-sm-3 col-form-label") }}
{{ form.device_drivers_ietf_actn }} {{ form.device_drivers_ietf_actn.label(class="col-sm-3 col-form-label") }}
{% endif %}
</div>
diff --git a/src/ztp/src/main/java/org/etsi/tfs/ztp/Serializer.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/Serializer.java
index 6106c95ffd0d5dfbddc0d809520a320251cbead9..725a8f12f0bb3f93fe3541a1cb7bb362988b6461 100644
--- a/src/ztp/src/main/java/org/etsi/tfs/ztp/Serializer.java
+++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/Serializer.java
@@ -865,8 +865,8 @@ public class Serializer {
return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_L2VPN;
case GNMI_OPENCONFIG:
return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_GNMI_OPENCONFIG;
- case FLEXSCALE:
- return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_FLEXSCALE;
+ case OPTICAL_TFS:
+ return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_OPTICAL_TFS;
case IETF_ACTN:
return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_ACTN;
case UNDEFINED:
@@ -894,8 +894,8 @@ public class Serializer {
return DeviceDriverEnum.IETF_L2VPN;
case DEVICEDRIVER_GNMI_OPENCONFIG:
return DeviceDriverEnum.GNMI_OPENCONFIG;
- case DEVICEDRIVER_FLEXSCALE:
- return DeviceDriverEnum.FLEXSCALE;
+ case DEVICEDRIVER_OPTICAL_TFS:
+ return DeviceDriverEnum.OPTICAL_TFS;
case DEVICEDRIVER_IETF_ACTN:
return DeviceDriverEnum.IETF_ACTN;
case DEVICEDRIVER_UNDEFINED:
diff --git a/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/DeviceDriverEnum.java b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/DeviceDriverEnum.java
index 8e89be8a6ddc993e7d90794c756f406fa72104f2..ec41193032ecdd0718a92cfff147590ba8db50f5 100644
--- a/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/DeviceDriverEnum.java
+++ b/src/ztp/src/main/java/org/etsi/tfs/ztp/context/model/DeviceDriverEnum.java
@@ -26,6 +26,6 @@ public enum DeviceDriverEnum {
XR,
IETF_L2VPN,
GNMI_OPENCONFIG,
- FLEXSCALE,
+ OPTICAL_TFS,
IETF_ACTN
}
diff --git a/src/ztp/src/test/java/org/etsi/tfs/ztp/SerializerTest.java b/src/ztp/src/test/java/org/etsi/tfs/ztp/SerializerTest.java
index f1cb798b284c80e27011127f50180aa1f3886b7e..52b50db1bced5e6c18bf5bbf4649765f1a016605 100644
--- a/src/ztp/src/test/java/org/etsi/tfs/ztp/SerializerTest.java
+++ b/src/ztp/src/test/java/org/etsi/tfs/ztp/SerializerTest.java
@@ -1227,7 +1227,7 @@ class SerializerTest {
DeviceDriverEnum.GNMI_OPENCONFIG,
ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_GNMI_OPENCONFIG),
Arguments.of(
- DeviceDriverEnum.FLEXSCALE, ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_FLEXSCALE),
+ DeviceDriverEnum.OPTICAL_TFS, ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_OPTICAL_TFS),
Arguments.of(
DeviceDriverEnum.IETF_ACTN, ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_ACTN),
Arguments.of(