From 197dd370187014c4ff262f1b6d43c49efd992c8e Mon Sep 17 00:00:00 2001
From: gifrerenom <lluis.gifre@cttc.es>
Date: Thu, 28 Sep 2023 16:38:48 +0000
Subject: [PATCH] Renamed occurrences of ONF TR 352 to ONF TR 532
---
proto/context.proto | 2 +-
.../main/java/eu/teraflow/automation/Serializer.java | 8 ++++----
.../automation/context/model/DeviceDriverEnum.java | 2 +-
.../java/eu/teraflow/automation/SerializerTest.java | 4 ++--
.../grpc/context/ContextOuterClass.java | 12 ++++++------
src/common/type_checkers/Assertions.py | 2 +-
.../service/database/models/enums/DeviceDriver.py | 2 +-
src/device/service/drivers/__init__.py | 2 +-
.../service/drivers/ietf_l2vpn/TfsDebugApiClient.py | 2 +-
.../src/main/java/eu/teraflow/policy/Serializer.java | 8 ++++----
.../policy/context/model/DeviceDriverEnum.java | 2 +-
.../test/java/eu/teraflow/policy/SerializerTest.java | 4 ++--
.../grpc/context/ContextOuterClass.java | 12 ++++++------
.../service/service_handler_api/FilterFields.py | 2 +-
src/service/service/service_handlers/__init__.py | 2 +-
src/webui/service/device/forms.py | 2 +-
src/webui/service/device/routes.py | 4 ++--
src/webui/service/templates/device/add.html | 2 +-
18 files changed, 37 insertions(+), 37 deletions(-)
diff --git a/proto/context.proto b/proto/context.proto
index 55a80470d..3ca8d3e20 100644
--- a/proto/context.proto
+++ b/proto/context.proto
@@ -192,7 +192,7 @@ enum DeviceDriverEnum {
DEVICEDRIVER_TRANSPORT_API = 2;
DEVICEDRIVER_P4 = 3;
DEVICEDRIVER_IETF_NETWORK_TOPOLOGY = 4;
- DEVICEDRIVER_ONF_TR_352 = 5;
+ DEVICEDRIVER_ONF_TR_532 = 5;
DEVICEDRIVER_XR = 6;
DEVICEDRIVER_IETF_L2VPN = 7;
DEVICEDRIVER_GNMI_OPENCONFIG = 8;
diff --git a/src/automation/src/main/java/eu/teraflow/automation/Serializer.java b/src/automation/src/main/java/eu/teraflow/automation/Serializer.java
index b0729aa55..3d5c93b2c 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/Serializer.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/Serializer.java
@@ -849,8 +849,8 @@ public class Serializer {
return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_P4;
case IETF_NETWORK_TOPOLOGY:
return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_NETWORK_TOPOLOGY;
- case ONF_TR_352:
- return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_ONF_TR_352;
+ case ONF_TR_532:
+ return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_ONF_TR_532;
case XR:
return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_XR;
case IETF_L2VPN:
@@ -872,8 +872,8 @@ public class Serializer {
return DeviceDriverEnum.P4;
case DEVICEDRIVER_IETF_NETWORK_TOPOLOGY:
return DeviceDriverEnum.IETF_NETWORK_TOPOLOGY;
- case DEVICEDRIVER_ONF_TR_352:
- return DeviceDriverEnum.ONF_TR_352;
+ case DEVICEDRIVER_ONF_TR_532:
+ return DeviceDriverEnum.ONF_TR_532;
case DEVICEDRIVER_XR:
return DeviceDriverEnum.XR;
case DEVICEDRIVER_IETF_L2VPN:
diff --git a/src/automation/src/main/java/eu/teraflow/automation/context/model/DeviceDriverEnum.java b/src/automation/src/main/java/eu/teraflow/automation/context/model/DeviceDriverEnum.java
index 3a26937e7..c1e1491c9 100644
--- a/src/automation/src/main/java/eu/teraflow/automation/context/model/DeviceDriverEnum.java
+++ b/src/automation/src/main/java/eu/teraflow/automation/context/model/DeviceDriverEnum.java
@@ -22,7 +22,7 @@ public enum DeviceDriverEnum {
TRANSPORT_API,
P4,
IETF_NETWORK_TOPOLOGY,
- ONF_TR_352,
+ ONF_TR_532,
XR,
IETF_L2VPN
}
diff --git a/src/automation/src/test/java/eu/teraflow/automation/SerializerTest.java b/src/automation/src/test/java/eu/teraflow/automation/SerializerTest.java
index d2257d1b3..7351d16a9 100644
--- a/src/automation/src/test/java/eu/teraflow/automation/SerializerTest.java
+++ b/src/automation/src/test/java/eu/teraflow/automation/SerializerTest.java
@@ -1212,8 +1212,8 @@ class SerializerTest {
DeviceDriverEnum.IETF_NETWORK_TOPOLOGY,
ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_NETWORK_TOPOLOGY),
Arguments.of(
- DeviceDriverEnum.ONF_TR_352,
- ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_ONF_TR_352),
+ DeviceDriverEnum.ONF_TR_532,
+ ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_ONF_TR_532),
Arguments.of(DeviceDriverEnum.XR, ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_XR),
Arguments.of(
DeviceDriverEnum.IETF_L2VPN,
diff --git a/src/automation/target/generated-sources/grpc/context/ContextOuterClass.java b/src/automation/target/generated-sources/grpc/context/ContextOuterClass.java
index a605e30de..be7596350 100644
--- a/src/automation/target/generated-sources/grpc/context/ContextOuterClass.java
+++ b/src/automation/target/generated-sources/grpc/context/ContextOuterClass.java
@@ -170,9 +170,9 @@ public final class ContextOuterClass {
*/
DEVICEDRIVER_IETF_NETWORK_TOPOLOGY(4),
/**
- * <code>DEVICEDRIVER_ONF_TR_352 = 5;</code>
+ * <code>DEVICEDRIVER_ONF_TR_532 = 5;</code>
*/
- DEVICEDRIVER_ONF_TR_352(5),
+ DEVICEDRIVER_ONF_TR_532(5),
/**
* <code>DEVICEDRIVER_XR = 6;</code>
*/
@@ -213,9 +213,9 @@ public final class ContextOuterClass {
*/
public static final int DEVICEDRIVER_IETF_NETWORK_TOPOLOGY_VALUE = 4;
/**
- * <code>DEVICEDRIVER_ONF_TR_352 = 5;</code>
+ * <code>DEVICEDRIVER_ONF_TR_532 = 5;</code>
*/
- public static final int DEVICEDRIVER_ONF_TR_352_VALUE = 5;
+ public static final int DEVICEDRIVER_ONF_TR_532_VALUE = 5;
/**
* <code>DEVICEDRIVER_XR = 6;</code>
*/
@@ -259,7 +259,7 @@ public final class ContextOuterClass {
case 2: return DEVICEDRIVER_TRANSPORT_API;
case 3: return DEVICEDRIVER_P4;
case 4: return DEVICEDRIVER_IETF_NETWORK_TOPOLOGY;
- case 5: return DEVICEDRIVER_ONF_TR_352;
+ case 5: return DEVICEDRIVER_ONF_TR_532;
case 6: return DEVICEDRIVER_XR;
case 7: return DEVICEDRIVER_IETF_L2VPN;
case 8: return DEVICEDRIVER_GNMI_OPENCONFIG;
@@ -74215,7 +74215,7 @@ public final class ContextOuterClass {
"RIVER_OPENCONFIG\020\001\022\036\n\032DEVICEDRIVER_TRANS" +
"PORT_API\020\002\022\023\n\017DEVICEDRIVER_P4\020\003\022&\n\"DEVIC" +
"EDRIVER_IETF_NETWORK_TOPOLOGY\020\004\022\033\n\027DEVIC" +
- "EDRIVER_ONF_TR_352\020\005\022\023\n\017DEVICEDRIVER_XR\020" +
+ "EDRIVER_ONF_TR_532\020\005\022\023\n\017DEVICEDRIVER_XR\020" +
"\006\022\033\n\027DEVICEDRIVER_IETF_L2VPN\020\007\022 \n\034DEVICE" +
"DRIVER_GNMI_OPENCONFIG\020\010*\217\001\n\033DeviceOpera" +
"tionalStatusEnum\022%\n!DEVICEOPERATIONALSTA" +
diff --git a/src/common/type_checkers/Assertions.py b/src/common/type_checkers/Assertions.py
index 25eb42fab..42ea864f3 100644
--- a/src/common/type_checkers/Assertions.py
+++ b/src/common/type_checkers/Assertions.py
@@ -31,7 +31,7 @@ def validate_device_driver_enum(message):
'DEVICEDRIVER_TRANSPORT_API',
'DEVICEDRIVER_P4',
'DEVICEDRIVER_IETF_NETWORK_TOPOLOGY',
- 'DEVICEDRIVER_ONF_TR_352',
+ 'DEVICEDRIVER_ONF_TR_532',
'DEVICEDRIVER_XR',
'DEVICEDRIVER_IETF_L2VPN',
'DEVICEDRIVER_GNMI_OPENCONFIG',
diff --git a/src/context/service/database/models/enums/DeviceDriver.py b/src/context/service/database/models/enums/DeviceDriver.py
index 09be94b1d..0ed68d23b 100644
--- a/src/context/service/database/models/enums/DeviceDriver.py
+++ b/src/context/service/database/models/enums/DeviceDriver.py
@@ -22,7 +22,7 @@ class ORM_DeviceDriverEnum(enum.Enum):
TRANSPORT_API = DeviceDriverEnum.DEVICEDRIVER_TRANSPORT_API
P4 = DeviceDriverEnum.DEVICEDRIVER_P4
IETF_NETWORK_TOPOLOGY = DeviceDriverEnum.DEVICEDRIVER_IETF_NETWORK_TOPOLOGY
- ONF_TR_352 = DeviceDriverEnum.DEVICEDRIVER_ONF_TR_352
+ ONF_TR_532 = DeviceDriverEnum.DEVICEDRIVER_ONF_TR_532
XR = DeviceDriverEnum.DEVICEDRIVER_XR
IETF_L2VPN = DeviceDriverEnum.DEVICEDRIVER_IETF_L2VPN
GNMI_OPENCONFIG = DeviceDriverEnum.DEVICEDRIVER_GNMI_OPENCONFIG
diff --git a/src/device/service/drivers/__init__.py b/src/device/service/drivers/__init__.py
index 4ae7128b0..0d85e8ff9 100644
--- a/src/device/service/drivers/__init__.py
+++ b/src/device/service/drivers/__init__.py
@@ -69,7 +69,7 @@ DRIVERS.append(
# DeviceDriverEnum.DEVICEDRIVER_TRANSPORT_API,
# DeviceDriverEnum.DEVICEDRIVER_P4,
# DeviceDriverEnum.DEVICEDRIVER_IETF_NETWORK_TOPOLOGY,
- # DeviceDriverEnum.DEVICEDRIVER_ONF_TR_352,
+ # DeviceDriverEnum.DEVICEDRIVER_ONF_TR_532,
# DeviceDriverEnum.DEVICEDRIVER_GNMI_OPENCONFIG,
# ],
#}
diff --git a/src/device/service/drivers/ietf_l2vpn/TfsDebugApiClient.py b/src/device/service/drivers/ietf_l2vpn/TfsDebugApiClient.py
index 19adc31c3..2d3901695 100644
--- a/src/device/service/drivers/ietf_l2vpn/TfsDebugApiClient.py
+++ b/src/device/service/drivers/ietf_l2vpn/TfsDebugApiClient.py
@@ -40,7 +40,7 @@ MAPPING_DRIVER = {
'DEVICEDRIVER_TRANSPORT_API' : 2,
'DEVICEDRIVER_P4' : 3,
'DEVICEDRIVER_IETF_NETWORK_TOPOLOGY': 4,
- 'DEVICEDRIVER_ONF_TR_352' : 5,
+ 'DEVICEDRIVER_ONF_TR_532' : 5,
'DEVICEDRIVER_XR' : 6,
'DEVICEDRIVER_IETF_L2VPN' : 7,
'DEVICEDRIVER_GNMI_OPENCONFIG' : 8,
diff --git a/src/policy/src/main/java/eu/teraflow/policy/Serializer.java b/src/policy/src/main/java/eu/teraflow/policy/Serializer.java
index 5a95f0e6e..e7fb00029 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/Serializer.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/Serializer.java
@@ -2270,8 +2270,8 @@ public class Serializer {
return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_P4;
case IETF_NETWORK_TOPOLOGY:
return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_NETWORK_TOPOLOGY;
- case ONF_TR_352:
- return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_ONF_TR_352;
+ case ONF_TR_532:
+ return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_ONF_TR_532;
case XR:
return ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_XR;
case IETF_L2VPN:
@@ -2293,8 +2293,8 @@ public class Serializer {
return DeviceDriverEnum.P4;
case DEVICEDRIVER_IETF_NETWORK_TOPOLOGY:
return DeviceDriverEnum.IETF_NETWORK_TOPOLOGY;
- case DEVICEDRIVER_ONF_TR_352:
- return DeviceDriverEnum.ONF_TR_352;
+ case DEVICEDRIVER_ONF_TR_532:
+ return DeviceDriverEnum.ONF_TR_532;
case DEVICEDRIVER_XR:
return DeviceDriverEnum.XR;
case DEVICEDRIVER_IETF_L2VPN:
diff --git a/src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceDriverEnum.java b/src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceDriverEnum.java
index ad763e35d..e4198b9d0 100644
--- a/src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceDriverEnum.java
+++ b/src/policy/src/main/java/eu/teraflow/policy/context/model/DeviceDriverEnum.java
@@ -22,7 +22,7 @@ public enum DeviceDriverEnum {
TRANSPORT_API,
P4,
IETF_NETWORK_TOPOLOGY,
- ONF_TR_352,
+ ONF_TR_532,
XR,
IETF_L2VPN
}
diff --git a/src/policy/src/test/java/eu/teraflow/policy/SerializerTest.java b/src/policy/src/test/java/eu/teraflow/policy/SerializerTest.java
index 32055a182..fb60ef8d1 100644
--- a/src/policy/src/test/java/eu/teraflow/policy/SerializerTest.java
+++ b/src/policy/src/test/java/eu/teraflow/policy/SerializerTest.java
@@ -3602,8 +3602,8 @@ class SerializerTest {
DeviceDriverEnum.IETF_NETWORK_TOPOLOGY,
ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_IETF_NETWORK_TOPOLOGY),
Arguments.of(
- DeviceDriverEnum.ONF_TR_352,
- ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_ONF_TR_352),
+ DeviceDriverEnum.ONF_TR_532,
+ ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_ONF_TR_532),
Arguments.of(DeviceDriverEnum.XR, ContextOuterClass.DeviceDriverEnum.DEVICEDRIVER_XR),
Arguments.of(
DeviceDriverEnum.IETF_L2VPN,
diff --git a/src/policy/target/generated-sources/grpc/context/ContextOuterClass.java b/src/policy/target/generated-sources/grpc/context/ContextOuterClass.java
index a605e30de..be7596350 100644
--- a/src/policy/target/generated-sources/grpc/context/ContextOuterClass.java
+++ b/src/policy/target/generated-sources/grpc/context/ContextOuterClass.java
@@ -170,9 +170,9 @@ public final class ContextOuterClass {
*/
DEVICEDRIVER_IETF_NETWORK_TOPOLOGY(4),
/**
- * <code>DEVICEDRIVER_ONF_TR_352 = 5;</code>
+ * <code>DEVICEDRIVER_ONF_TR_532 = 5;</code>
*/
- DEVICEDRIVER_ONF_TR_352(5),
+ DEVICEDRIVER_ONF_TR_532(5),
/**
* <code>DEVICEDRIVER_XR = 6;</code>
*/
@@ -213,9 +213,9 @@ public final class ContextOuterClass {
*/
public static final int DEVICEDRIVER_IETF_NETWORK_TOPOLOGY_VALUE = 4;
/**
- * <code>DEVICEDRIVER_ONF_TR_352 = 5;</code>
+ * <code>DEVICEDRIVER_ONF_TR_532 = 5;</code>
*/
- public static final int DEVICEDRIVER_ONF_TR_352_VALUE = 5;
+ public static final int DEVICEDRIVER_ONF_TR_532_VALUE = 5;
/**
* <code>DEVICEDRIVER_XR = 6;</code>
*/
@@ -259,7 +259,7 @@ public final class ContextOuterClass {
case 2: return DEVICEDRIVER_TRANSPORT_API;
case 3: return DEVICEDRIVER_P4;
case 4: return DEVICEDRIVER_IETF_NETWORK_TOPOLOGY;
- case 5: return DEVICEDRIVER_ONF_TR_352;
+ case 5: return DEVICEDRIVER_ONF_TR_532;
case 6: return DEVICEDRIVER_XR;
case 7: return DEVICEDRIVER_IETF_L2VPN;
case 8: return DEVICEDRIVER_GNMI_OPENCONFIG;
@@ -74215,7 +74215,7 @@ public final class ContextOuterClass {
"RIVER_OPENCONFIG\020\001\022\036\n\032DEVICEDRIVER_TRANS" +
"PORT_API\020\002\022\023\n\017DEVICEDRIVER_P4\020\003\022&\n\"DEVIC" +
"EDRIVER_IETF_NETWORK_TOPOLOGY\020\004\022\033\n\027DEVIC" +
- "EDRIVER_ONF_TR_352\020\005\022\023\n\017DEVICEDRIVER_XR\020" +
+ "EDRIVER_ONF_TR_532\020\005\022\023\n\017DEVICEDRIVER_XR\020" +
"\006\022\033\n\027DEVICEDRIVER_IETF_L2VPN\020\007\022 \n\034DEVICE" +
"DRIVER_GNMI_OPENCONFIG\020\010*\217\001\n\033DeviceOpera" +
"tionalStatusEnum\022%\n!DEVICEOPERATIONALSTA" +
diff --git a/src/service/service/service_handler_api/FilterFields.py b/src/service/service/service_handler_api/FilterFields.py
index 1b22c5c42..430e25938 100644
--- a/src/service/service/service_handler_api/FilterFields.py
+++ b/src/service/service/service_handler_api/FilterFields.py
@@ -33,7 +33,7 @@ DEVICE_DRIVER_VALUES = {
DeviceDriverEnum.DEVICEDRIVER_TRANSPORT_API,
DeviceDriverEnum.DEVICEDRIVER_P4,
DeviceDriverEnum.DEVICEDRIVER_IETF_NETWORK_TOPOLOGY,
- DeviceDriverEnum.DEVICEDRIVER_ONF_TR_352,
+ DeviceDriverEnum.DEVICEDRIVER_ONF_TR_532,
DeviceDriverEnum.DEVICEDRIVER_XR,
DeviceDriverEnum.DEVICEDRIVER_IETF_L2VPN,
DeviceDriverEnum.DEVICEDRIVER_GNMI_OPENCONFIG,
diff --git a/src/service/service/service_handlers/__init__.py b/src/service/service/service_handlers/__init__.py
index 7ea0d4f62..cb926e5b7 100644
--- a/src/service/service/service_handlers/__init__.py
+++ b/src/service/service/service_handlers/__init__.py
@@ -71,7 +71,7 @@ SERVICE_HANDLERS = [
(MicrowaveServiceHandler, [
{
FilterFieldEnum.SERVICE_TYPE : ServiceTypeEnum.SERVICETYPE_L2NM,
- FilterFieldEnum.DEVICE_DRIVER : [DeviceDriverEnum.DEVICEDRIVER_IETF_NETWORK_TOPOLOGY, DeviceDriverEnum.DEVICEDRIVER_ONF_TR_352],
+ FilterFieldEnum.DEVICE_DRIVER : [DeviceDriverEnum.DEVICEDRIVER_IETF_NETWORK_TOPOLOGY, DeviceDriverEnum.DEVICEDRIVER_ONF_TR_532],
}
]),
(P4ServiceHandler, [
diff --git a/src/webui/service/device/forms.py b/src/webui/service/device/forms.py
index e884e96a5..bcd5804d3 100644
--- a/src/webui/service/device/forms.py
+++ b/src/webui/service/device/forms.py
@@ -27,7 +27,7 @@ class AddDeviceForm(FlaskForm):
device_drivers_transport_api = BooleanField('TRANSPORT_API')
device_drivers_p4 = BooleanField('P4')
device_drivers_ietf_network_topology = BooleanField('IETF_NETWORK_TOPOLOGY')
- device_drivers_onf_tr_352 = BooleanField('ONF_TR_352')
+ device_drivers_onf_tr_532 = BooleanField('ONF_TR_532')
device_drivers_xr = BooleanField('XR')
device_drivers_ietf_l2vpn = BooleanField('IETF L2VPN')
device_drivers_gnmi_openconfig = BooleanField('GNMI OPENCONFIG')
diff --git a/src/webui/service/device/routes.py b/src/webui/service/device/routes.py
index 4590c7f01..110a19b40 100644
--- a/src/webui/service/device/routes.py
+++ b/src/webui/service/device/routes.py
@@ -116,8 +116,8 @@ def add():
device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_P4)
if form.device_drivers_ietf_network_topology.data:
device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_IETF_NETWORK_TOPOLOGY)
- if form.device_drivers_onf_tr_352.data:
- device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_ONF_TR_352)
+ if form.device_drivers_onf_tr_532.data:
+ device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_ONF_TR_532)
if form.device_drivers_xr.data:
device_drivers.append(DeviceDriverEnum.DEVICEDRIVER_XR)
if form.device_drivers_ietf_l2vpn.data:
diff --git a/src/webui/service/templates/device/add.html b/src/webui/service/templates/device/add.html
index c9165667d..c115657aa 100644
--- a/src/webui/service/templates/device/add.html
+++ b/src/webui/service/templates/device/add.html
@@ -87,7 +87,7 @@
<br />
{{ form.device_drivers_p4 }} {{ form.device_drivers_p4.label(class="col-sm-3 col-form-label") }}
{{ form.device_drivers_ietf_network_topology }} {{form.device_drivers_ietf_network_topology.label(class="col-sm-3 col-form-label") }}
- {{ form.device_drivers_onf_tr_352 }} {{ form.device_drivers_onf_tr_352.label(class="col-sm-3 col-form-label") }}
+ {{ form.device_drivers_onf_tr_532 }} {{ form.device_drivers_onf_tr_532.label(class="col-sm-3 col-form-label") }}
<br />
{{ form.device_drivers_xr }} {{ form.device_drivers_xr.label(class="col-sm-3 col-form-label") }}
{{ form.device_drivers_ietf_l2vpn }} {{ form.device_drivers_ietf_l2vpn.label(class="col-sm-3 col-form-label") }}
--
GitLab